更新 模板语法中，页面跳转的方式

mobile-code/src/App.vue

@@ -11,6 +11,8 @@ export default {
 		// this.getAllOptions()
 		// #ifdef MP-WEIXIN
 		wxLoginFn()
+		let extConfig = wx.getExtConfigSync ? wx.getExtConfigSync() : {}
+		console.log('extConfig', extConfig)
 		// #endif
 		// 开发
 		uni.setStorageSync('token', 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiIsImp0aSI6IjFfMTI1MzY2MzAifQ.eyJpc3MiOiJodHRwOlwvXC9tLmhoYi5jb20iLCJhdWQiOiJodHRwOlwvXC9tLmhoYi5jb20iLCJqdGkiOiIxXzEyNTM2NjMwIiwiaWF0IjoxNTc0NDIzMDc4LCJuYmYiOjE1NzQ0MjMwNzgsImV4cCI6MTU3NDQyNjY3OCwidXNlcklkIjoxMjUzNjYzMH0.v_T9NuFRpzuI7GtwuuuNlVg6EylImaCUwqo2A6NRTE4')

mobile-code/src/admin/ad/list.vue

@@ -36,7 +36,7 @@
 		</div>
 		<!-- 按钮 -->
 		<div class="app-footer">
-			<div class="admin-button-com middle blue" @click="$util.pageTo({
+			<div class="admin-button-com middle blue" @click="pageTo({
 				url: '/admin/ad/add',
 				query: {
 					type: tabIndex

mobile-code/src/admin/goodsManage/img-store.vue

@@ -54,7 +54,7 @@
 		</app-uploader>
 		<!-- button -->
 		<div class="app-footer">
-			<button class="admin-button-com middle default" @click="$util.pageTo('/admin/goodsManage/category')">查看分类</button>
+			<button class="admin-button-com middle default" @click="pageTo('/admin/goodsManage/category')">查看分类</button>
 			<button class="admin-button-com middle blue" @click="$refs.appUploader.chooseImage()">新增</button>
 		</div>
 		<!-- 图片上传成功弹窗！ -->

mobile-code/src/admin/goodsManage/list.vue

@@ -13,7 +13,7 @@
 					<!--内容部分 start -->
 					<block v-if="!$util.isEmpty(list.data)">
 						<div class="page-view">
-							<div class="goods-list" v-for="(item, index) in list.data" :key="index" @click="$util.pageTo(`/pages/goods/detail?id=${item.id}`)">
+							<div class="goods-list" v-for="(item, index) in list.data" :key="index" @click="pageTo(`/pages/goods/detail?id=${item.id}`)">
 								<div class="img-blo">
 									<img :src="item.imgList[0].middle" alt="商品图" mode="center" />
 								</div>
@@ -43,10 +43,10 @@
 				<span>其他设置</span>
 			</div>
 			<div class="btn-list">
-				<button class="admin-button-com default" @click="$util.pageTo('/admin/goodsManage/category')">分类管理</button>
+				<button class="admin-button-com default" @click="pageTo('/admin/goodsManage/category')">分类管理</button>
 			</div>
 			<div class="btn-list">
-				<button class="admin-button-com blue" @click="$util.pageTo('/admin/goodsManage/add')">新增商品</button>
+				<button class="admin-button-com blue" @click="pageTo('/admin/goodsManage/add')">新增商品</button>
 			</div>
 		</div>
 		<!-- 操作弹窗 -->

mobile-code/src/admin/home/member.vue

@@ -1,10 +1,10 @@
 <template>
 	<div class="app-main app-content">
-		<app-tabs :tabs="tabs" :isFixed="true" :isAdd="true" :currentTab="tabIndex" :height="100" @add="$util.pageTo('/admin/member/add')" @change="change" itemWidth="33.33%" />
+		<app-tabs :tabs="tabs" :isFixed="true" :isAdd="true" :currentTab="tabIndex" :height="100" @add="pageTo('/admin/member/add')" @change="change" itemWidth="33.33%" />
 		<!-- list -->
 		<block v-if="!$util.isEmpty(list.data)">
 			<block v-for="(item,index) in list.data" :key="index">
-				<tui-list-cell :arrow="true" @click="$util.pageTo({
+				<tui-list-cell :arrow="true" @click="pageTo({
 					url: '/admin/member/detail',
 					query: {
 						id: item.id

mobile-code/src/admin/home/order.vue

@@ -3,7 +3,7 @@
 		<app-tabs :tabs="tabs" :isFixed="true" :currentTab="tabIndex" :height="100" @change="change" itemWidth="20%" />
 		<div class="list-wrap">
 			<block v-if="!$util.isEmpty(list.data)">
-				<div class="list" v-for="(item, index) in list.data" :key="index" @click="$util.pageTo({
+				<div class="list" v-for="(item, index) in list.data" :key="index" @click="pageTo({
 					url: '/admin/order/detail',
 					query: {
 						id: item.id
@@ -27,7 +27,7 @@
 						<div class="list-button">
 							<!-- 待配送 -->
 							<div v-if="item.status == 2" class="admin-button-com" @click="freeShippingFn(item)">免发货</div>
-							<div v-if="item.status == 2" class="admin-button-com" @click="$util.pageTo({
+							<div v-if="item.status == 2" class="admin-button-com" @click="pageTo({
 						url: '/admin/order/ship',
 						query: {
 							id: item.id,

mobile-code/src/admin/home/workbench.vue

@@ -4,11 +4,11 @@
 		<div class="user-wrap">
 			<div class="user-top">
 				<div class="app-size-28">今日概况</div>
-				<div @click="$util.pageTo('/admin/setting/password')">
+				<div @click="pageTo('/admin/setting/password')">
 					<app-avatar-module :src="avatarImg | default_avatar" :width="80" />
 				</div>
 			</div>
-			<div class="income-amount" @click="$util.pageTo('/admin/assets/list')">
+			<div class="income-amount" @click="pageTo('/admin/assets/list')">
 				<div>收入金额</div>
 				<div class="price">{{ data.todayData.income }}</div>
 			</div>
@@ -51,7 +51,7 @@
 		</div>
 		<!-- 客户按钮 -->
 		<div class="module-com tabs-wrap">
-			<div class="tabs-list" v-for="(item, index) in tabsData" :key="index" @click="$util.pageTo(item)">
+			<div class="tabs-list" v-for="(item, index) in tabsData" :key="index" @click="pageTo(item)">
 				<div class="tabs-img">
 					<img :src="item.img" alt mode="widthFix" />
 				</div>

mobile-code/src/admin/interest/invite.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="app-content">
-		<app-tabs :tabs="tabs" :isFixed="true" :isAdd="true" addIcon="iconshezhi" addText="设置" @add="$util.pageTo('/admin/interest/setting')" :isBoxShadow="false" :currentTab="form.status" @change="change" itemWidth="25%" :padding="0" />
+		<app-tabs :tabs="tabs" :isFixed="true" :isAdd="true" addIcon="iconshezhi" addText="设置" @add="pageTo('/admin/interest/setting')" :isBoxShadow="false" :currentTab="form.status" @change="change" itemWidth="25%" :padding="0" />
 		<div class="input-wrap">
 			<!-- <div class="map-search"> -->
 			<app-search-module placeholder="请输入商品名称" :isBtn="true" />

mobile-code/src/admin/member/detail.vue

@@ -29,7 +29,7 @@
 		</div>
 		<!-- 客户按钮 -->
 		<div class="module-com tabs-wrap">
-			<div class="tabs-list" v-for="(item, index) in tabsData" :key="index" @click="$util.pageTo(item)">
+			<div class="tabs-list" v-for="(item, index) in tabsData" :key="index" @click="pageTo(item)">
 				<div class="tabs-img">
 					<img :src="item.img" alt mode="widthFix" />
 				</div>

mobile-code/src/admin/order/components/sel-order.vue

@@ -14,7 +14,7 @@
 						<div class="axis-title">打单</div>
 						<div class="axis-det">
 							<button class="admin-button-com big blue" @click="hasSendOrderFn">有配送单</button>
-							<button class="admin-button-com big blue" @click="$util.pageTo({
+							<button class="admin-button-com big blue" @click="pageTo({
 						url: '/admin/order/fill-form',
 						query: {
 							id: orderData.id

mobile-code/src/admin/order/detail.vue

@@ -136,7 +136,7 @@
 					</block>
 					<block v-else>
 						<button class="admin-button-com middle" @click="freeShippingFn">免发货</button>
-						<button class="admin-button-com middle" @click="$util.pageTo({
+						<button class="admin-button-com middle" @click="pageTo({
 						url: '/admin/order/ship',
 						query: {
 							id: data.id,

mobile-code/src/admin/setting/list.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="app-content">
-		<tui-list-cell :arrow="true" v-for="(item, index) in data" :key="index" @click="$util.pageTo(item)">
+		<tui-list-cell :arrow="true" v-for="(item, index) in data" :key="index" @click="pageTo(item)">
 			<div class="list">
 				<i class="iconfont" :class="[item.icon]"></i>
 				<span>{{ item.name }}</span>

mobile-code/src/admin/setting/wx-menu.vue

@@ -27,7 +27,7 @@
 		<div class="prompt-text">菜单最多只能添加5个，可以没有子菜单。</div>
 		<!-- 按钮 -->
 		<div class="btn-wrap">
-			<div class="admin-button-com big default" @click="$util.pageTo(1)">返回</div>
+			<div class="admin-button-com big default" @click="pageTo(1)">返回</div>
 			<div class="admin-button-com blue big" @click="submitFn">提交</div>
 		</div>
 		<!-- 操作弹窗 -->

mobile-code/src/admin/staff/list.vue

@@ -28,7 +28,7 @@
 								</div>
 							</div>
 							<div class="list-det-right">
-								<div @click="$util.pageTo({
+								<div @click="pageTo({
 								url: '/admin/staff/add',
 								query: {
 									id: item.id
@@ -50,7 +50,7 @@
 			</div>
 			<!-- 按钮 -->
 			<div class="app-footer">
-				<div class="admin-button-com middle blue" @click="$util.pageTo('/admin/staff/add')">添加</div>
+				<div class="admin-button-com middle blue" @click="pageTo('/admin/staff/add')">添加</div>
 			</div>
 		</block>
 		<!-- 角色管理 -->

mobile-code/src/components/app-footer.vue

@@ -1,7 +1,7 @@
 <template>
     <div id="deFooter" class="de-footer">
         <div class="btn-list-wrap">
-            <div class="btn_list" v-for="(item, index) in btnData" :key="index" @click="$util.pageTo(item)" v-show="item.judge()">
+            <div class="btn_list" v-for="(item, index) in btnData" :key="index" @click="pageTo(item)" v-show="item.judge()">
                 <div class="btn_blo active" v-if="index == activeIndex">
                     <div class="btn-img-wrap">
                         <img class="btn_img" :src="constant.imgUrl + item.activeImg" alt mode="widthFix" />

mobile-code/src/config.js

@@ -1,2 +1,2 @@
 // 项目配置--由bat脚本自动变更
-export const ProjectName = 'official'
+export const ProjectName = 'mobile'

mobile-code/src/ext.json

@@ -0,0 +1,12 @@
+{
+    "extEnable": true,
+    "extAppid": "wxe4675bab299a52f7",
+    "directCommit": false,
+    "ext": {
+      "account": 12358,
+      "host": "https://mini.huahb.com",
+      "miniUrl": "https://mini.huahb.com",
+      "imgUrl": "https://img.huahb.com",
+      "merchantName":"花卉宝"
+    }
+  }

mobile-code/src/m-manifest.json

@@ -1,64 +0,0 @@
-{
-    "name" : "花卉宝",
-    "appid" : "",
-    "description" : "应用描述",
-    "versionName" : "1.0.0",
-    "versionCode" : "100",
-    "transformPx" : true,
-    "debug": false,
-    "networkTimeout": {
-        "request":200000
-    },
-    "mp-weixin" : {
-        "appid" : "wxe4675bab299a52f7",
-        "setting" : {
-            "urlCheck" : false
-        },
-        "usingComponents" : true,
-        "permission" : {
-            "scope.userLocation" : {
-                "desc" : "请点击确定"
-            }
-        }
-    },
-    "mp-alipay" : {
-        "usingComponents" : true
-    },
-    "mp-baidu" : {
-        "usingComponents" : true
-    },
-    "mp-toutiao" : {
-        "usingComponents" : true
-    },
-    "h5" : {
-        "template" : "template.h5.html",
-        "router" : {
-            // "mode" : "history",
-            "base" : "/",
-            "publicPath" : "/"
-        },
-        "async": {
-            "timeout": 200000
-        },
-        "devServer": {
-            "port": 81,
-            "proxy": {
-                "/api": {
-                    "target": "http://api.m.huaml.com",
-                    "secure": false,
-                    "changeOrigin": true,
-                    "pathRewrite": {
-                        "^/api": ""
-                    }
-                }
-            }
-        },
-        "sdkConfigs" : {
-            "maps" : {
-                "qqmap" : {
-                    "key" : ""
-                }
-            }
-        }
-    }
-}

mobile-code/src/m-pages.json

@@ -1,203 +0,0 @@
-{
-	"pages": [
-		{
-			"path": "pages/home/index",
-			"style": {
-				"navigationBarTitleText": "加载中..."
-			}
-		},
-		{
-			"path": "pages/home/category",
-			"style": {
-				"navigationBarTitleText": "分类"
-			}
-		},
-		{
-			"path": "pages/home/shop",
-			"style": {
-				"navigationBarTitleText": "门店"
-			}
-		},
-		{
-			"path": "pages/home/user",
-			"style": {
-				"navigationBarTitleText": "我的"
-			}
-		},
-		{
-			"path": "pages/common/redirect",
-			"style": {
-				"navigationBarTitleText": "加载中..."
-			}
-		},
-		{
-			"path": "pages/common/webview",
-			"style": {
-				"navigationBarBackgroundColor": "#ffffff",
-				"navigationBarTextStyle": "black"
-			}
-		}
-	],
-	"subPackages": [
-		{
-			"root": "pages/user",
-			"pages": [
-				{
-					"path": "register",
-					"style": {
-						"navigationBarTitleText": "注册"
-					}
-				},
-				{
-					"path": "password",
-					"style": {
-						"navigationBarTitleText": "修改密码"
-					}
-				}
-			]
-		},
-		{
-			"root": "pages/goods",
-			"pages": [
-				{
-					"path": "detail",
-					"style": {
-						"navigationBarTitleText": "详情"
-					}
-				}
-			]
-		},
-		{
-			"root": "pages/pay",
-			"pages": [
-				{
-					"path": "index",
-					"style": {
-						"navigationBarTitleText": "支付"
-					}
-				}
-			]
-		},
-		{
-			"root": "pages/callback",
-			"pages": [
-				{
-					"path": "index"
-				}
-			]
-		},
-		{
-			"root": "pages/coupon",
-			"pages": [
-				{
-					"path": "list",
-					"style": {
-						"navigationBarTitleText": "优惠券",
-						"enablePullDownRefresh": true
-					}
-				}
-			]
-		},
-		{
-			"root": "pages/order",
-			"pages": [
-				{
-					"path": "list",
-					"style": {
-						"navigationBarTitleText": "订单列表",
-						"enablePullDownRefresh": true
-					}
-				},
-				{
-					"path": "detail",
-					"style": {
-						"navigationBarTitleText": "订单列表"
-					}
-				},
-				{
-					"path": "buy",
-					"style": {
-						"navigationBarTitleText": "订单确认"
-					}
-				},
-				{
-					"path": "comment",
-					"style": {
-						"navigationBarTitleText": "评价"
-					}
-				}
-			]
-		},
-		{
-			"root": "pages/interest",
-			"pages": [
-				{
-					"path": "invite",
-					"style": {
-						"navigationBarTitleText": "邀请排行",
-						"enablePullDownRefresh": true
-					}
-				},
-				{
-					"path": "level",
-					"style": {
-						"navigationBarTitleText": "会员等级",
-						"enablePullDownRefresh": true
-					}
-				}
-			]
-		},
-		{
-			"root": "pages/chat",
-			"pages": [
-				{
-					"path": "index",
-					"style": {
-						"navigationBarTitleText": "客服",
-						"enablePullDownRefresh": true
-					}
-				}
-			]
-		}
-	],
-	"globalStyle": {
-		// #ifdef H5
-		"navigationStyle": "custom",
-		// #endif
-		"navigationBarBackgroundColor": "#fff",
-		"navigationBarTitleText": "花卉宝",
-		"navigationBarTextStyle": "black"
-	},
-	"tabBar": {
-		"color": "#C0C4CC",
-		"selectedColor": "#fa436a",
-		"borderStyle": "black",
-		"backgroundColor": "#ffffff",
-		"list": [{
-				"pagePath": "pages/home/index",
-				"iconPath": "static/images/common/home-no.png",
-				"selectedIconPath": "static/images/common/home-is.png",
-				"text": "首页"
-			},
-			{
-				"pagePath": "pages/home/category",
-				"iconPath": "static/images/common/category-no.png",
-				"selectedIconPath": "static/images/common/category-is.png",
-				"text": "分类"
-			},
-			{
-				"pagePath": "pages/home/shop",
-				"iconPath": "static/images/common/shop-no.png",
-				"selectedIconPath": "static/images/common/shop-is.png",
-				"text": "门店"
-			},
-			{
-				"pagePath": "pages/home/user",
-				"iconPath": "static/images/common/user-no.png",
-				"selectedIconPath": "static/images/common/user-is.png",
-				"text": "我的"
-			}
-		]
-	}
-}
-

mobile-code/src/manifest.json

@@ -1,41 +1,41 @@
 {
-    "name": "花卉宝",
-    "appid": "",
-    "description": "应用描述",
-    "versionName": "1.0.0",
-    "versionCode": "100",
-    "transformPx": true,
+    "name" : "花卉宝",
+    "appid" : "",
+    "description" : "应用描述",
+    "versionName" : "1.0.0",
+    "versionCode" : "100",
+    "transformPx" : true,
     "debug": false,
     "networkTimeout": {
-        "request": 200000
+        "request":200000
     },
-    "mp-weixin": {
-        "appid": "wx3a163add860e0a86",
-        "setting": {
-            "urlCheck": false
+    "mp-weixin" : {
+        "appid" : "wxe4675bab299a52f7",
+        "setting" : {
+            "urlCheck" : false
         },
-        "usingComponents": true,
-        "permission": {
-            "scope.userLocation": {
-                "desc": "请点击确定"
+        "usingComponents" : true,
+        "permission" : {
+            "scope.userLocation" : {
+                "desc" : "请点击确定"
             }
         }
     },
-    "mp-alipay": {
-        "usingComponents": true
+    "mp-alipay" : {
+        "usingComponents" : true
     },
-    "mp-baidu": {
-        "usingComponents": true
+    "mp-baidu" : {
+        "usingComponents" : true
     },
-    "mp-toutiao": {
-        "usingComponents": true
+    "mp-toutiao" : {
+        "usingComponents" : true
     },
-    "h5": {
-        "template": "template.h5.html",
-        "router": {
+    "h5" : {
+        "template" : "template.h5.html",
+        "router" : {
             // "mode" : "history",
-            "base": "/",
-            "publicPath": "/"
+            "base" : "/",
+            "publicPath" : "/"
         },
         "async": {
             "timeout": 200000
@@ -44,7 +44,7 @@
             "port": 81,
             "proxy": {
                 "/api": {
-                    "target": "http://api.w.huaml.com",
+                    "target": "http://api.m.huaml.com",
                     "secure": false,
                     "changeOrigin": true,
                     "pathRewrite": {
@@ -53,17 +53,12 @@
                 }
             }
         },
-        "sdkConfigs": {
-            "maps": {
-                "qqmap": {
-                    "key": ""
+        "sdkConfigs" : {
+            "maps" : {
+                "qqmap" : {
+                    "key" : ""
                 }
             }
-        },
-        "optimization": {
-            "treeShaking": {
-                "enable": true
-            }
         }
     }
-}
+}

mobile-code/src/mixins/globalMixins.js

@@ -1,11 +1,16 @@
 import { mapGetters } from 'vuex'
+import { pageTo } from '@/utils/util.js'
 export default {
 	data() {
 		return {
 			// 全局混入，插入链接参数
 			option: null,
 			// 全局混入，插入全局常量
-			constant: this.$constant
+			constant: this.$constant,
+			// 全局混入，插入全局工具函数
+			$util: this.$util,
+			// 全局混入，插入全局跳转函数
+			pageTo: pageTo
 		}
 	},
 	computed: {

mobile-code/src/official/index.vue

@@ -42,18 +42,18 @@
 			<img :src="`${constant.imgUrl}/retail/common/trademark.png`" alt="">
 		</div>
 		<!-- buttom -->
-		<div v-if="status == -1" class="app-footer" @click="$util.pageTo({
+		<div v-if="status == -1" class="app-footer" @click="pageTo({
 			url: '/official/apply',
 			status: 2
 		})">申请试用</div>
 		<div v-if="status == 0" class="app-footer under-review">审核中</div>
 		<div v-if="status == 1" class="app-footer under-review">试用中</div>
 		<div v-if="status == 2" class="app-footer under-review">审核未通过</div>
-		<div v-if="status == 3" class="app-footer" @click="$util.pageTo({
+		<div v-if="status == 3" class="app-footer" @click="pageTo({
 			url: '/official/pay',
 			status: 1
 		})">立即续费</div>
-		<div v-if="status == 4" class="app-footer" @click="$util.pageTo({
+		<div v-if="status == 4" class="app-footer" @click="pageTo({
 			url: '/official/pay',
 			status: 2
 		})">立即订购</div>

mobile-code/src/pages.json

@@ -1,28 +1,163 @@
 {
 	"pages": [
 		{
-			"path": "official/index",
+			"path": "pages/home/index",
 			"style": {
-				"navigationBarTitleText": "花卉宝"
+				"navigationBarTitleText": "加载中..."
 			}
 		},
 		{
-			"path": "official/apply",
+			"path": "pages/home/category",
 			"style": {
-				"navigationBarTitleText": "填写资料"
+				"navigationBarTitleText": "分类"
 			}
 		},
 		{
-			"path": "official/pay",
+			"path": "pages/home/shop",
 			"style": {
-				"navigationBarTitleText": "支付"
+				"navigationBarTitleText": "门店"
 			}
 		},
 		{
-			"path": "official/callback",
+			"path": "pages/home/user",
 			"style": {
-				"navigationBarTitleText": "支付"
+				"navigationBarTitleText": "我的"
 			}
+		},
+		{
+			"path": "pages/common/redirect",
+			"style": {
+				"navigationBarTitleText": "加载中..."
+			}
+		},
+		{
+			"path": "pages/common/webview",
+			"style": {
+				"navigationBarBackgroundColor": "#ffffff",
+				"navigationBarTextStyle": "black"
+			}
+		}
+	],
+	"subPackages": [
+		{
+			"root": "pages/user",
+			"pages": [
+				{
+					"path": "register",
+					"style": {
+						"navigationBarTitleText": "注册"
+					}
+				},
+				{
+					"path": "password",
+					"style": {
+						"navigationBarTitleText": "修改密码"
+					}
+				}
+			]
+		},
+		{
+			"root": "pages/goods",
+			"pages": [
+				{
+					"path": "detail",
+					"style": {
+						"navigationBarTitleText": "详情"
+					}
+				}
+			]
+		},
+		{
+			"root": "pages/pay",
+			"pages": [
+				{
+					"path": "index",
+					"style": {
+						"navigationBarTitleText": "支付"
+					}
+				}
+			]
+		},
+		{
+			"root": "pages/callback",
+			"pages": [
+				{
+					"path": "index"
+				}
+			]
+		},
+		{
+			"root": "pages/coupon",
+			"pages": [
+				{
+					"path": "list",
+					"style": {
+						"navigationBarTitleText": "优惠券",
+						"enablePullDownRefresh": true
+					}
+				}
+			]
+		},
+		{
+			"root": "pages/order",
+			"pages": [
+				{
+					"path": "list",
+					"style": {
+						"navigationBarTitleText": "订单列表",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "detail",
+					"style": {
+						"navigationBarTitleText": "订单列表"
+					}
+				},
+				{
+					"path": "buy",
+					"style": {
+						"navigationBarTitleText": "订单确认"
+					}
+				},
+				{
+					"path": "comment",
+					"style": {
+						"navigationBarTitleText": "评价"
+					}
+				}
+			]
+		},
+		{
+			"root": "pages/interest",
+			"pages": [
+				{
+					"path": "invite",
+					"style": {
+						"navigationBarTitleText": "邀请排行",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "level",
+					"style": {
+						"navigationBarTitleText": "会员等级",
+						"enablePullDownRefresh": true
+					}
+				}
+			]
+		},
+		{
+			"root": "pages/chat",
+			"pages": [
+				{
+					"path": "index",
+					"style": {
+						"navigationBarTitleText": "客服",
+						"enablePullDownRefresh": true
+					}
+				}
+			]
 		}
 	],
 	"globalStyle": {
@@ -32,6 +167,37 @@
 		"navigationBarBackgroundColor": "#fff",
 		"navigationBarTitleText": "花卉宝",
 		"navigationBarTextStyle": "black"
+	},
+	"tabBar": {
+		"color": "#C0C4CC",
+		"selectedColor": "#fa436a",
+		"borderStyle": "black",
+		"backgroundColor": "#ffffff",
+		"list": [{
+				"pagePath": "pages/home/index",
+				"iconPath": "static/images/common/home-no.png",
+				"selectedIconPath": "static/images/common/home-is.png",
+				"text": "首页"
+			},
+			{
+				"pagePath": "pages/home/category",
+				"iconPath": "static/images/common/category-no.png",
+				"selectedIconPath": "static/images/common/category-is.png",
+				"text": "分类"
+			},
+			{
+				"pagePath": "pages/home/shop",
+				"iconPath": "static/images/common/shop-no.png",
+				"selectedIconPath": "static/images/common/shop-is.png",
+				"text": "门店"
+			},
+			{
+				"pagePath": "pages/home/user",
+				"iconPath": "static/images/common/user-no.png",
+				"selectedIconPath": "static/images/common/user-is.png",
+				"text": "我的"
+			}
+		]
 	}
 }
 

mobile-code/src/pages/callback/index.vue

@@ -49,13 +49,13 @@
 				<!-- 两个主按钮 -->
 				<block v-else-if="pagestatus == 3 || pagestatus == 4 || pagestatus == 5">
 					<div class="call-btn-com call-two-btn">
-						<button class="button-com default" @click="$util.pageTo({
+						<button class="button-com default" @click="pageTo({
 							url: '/pages/order/detail',
 							query: {
 								orderSn: option.orderSn
 							}
 						})">查看订单</button>
-						<button class="button-com" @click="$util.pageTo({
+						<button class="button-com" @click="pageTo({
 							url: '/pages/home/index',
 							type: 4
 						})">返回首页</button>

mobile-code/src/pages/goods/components/buy-foot.vue

@@ -1,11 +1,11 @@
 <template>
 	<div class="app-footer">
         <div class="btn-left">
-            <div class="btn-wrap" @click="$util.pageTo('/pages/chat/index')">
+            <div class="btn-wrap" @click="pageTo('/pages/chat/index')">
                 <i class="iconfont iconxiaoxi"></i>
                 <div class="btn-text">客服</div>
             </div>
-            <div class="btn-wrap" @click="$util.pageTo({
+            <div class="btn-wrap" @click="pageTo({
                 url: '/pages/home/shop',
                 type: 4
             })">

mobile-code/src/pages/home/category.vue

@@ -9,7 +9,7 @@
 			<scroll-view scroll-y class="right-box" :style="{height:height+'px'}" v-if="currentTab==index">
 				<!--内容部分 start -->
 				<div class="page-view" v-if="!$util.isEmpty(list.data)">
-					<div class="goods-list" v-for="(items, subIndex) in list.data" :key="items.id" @click="$util.pageTo(`/pages/goods/detail?id=${items.id}`)">
+					<div class="goods-list" v-for="(items, subIndex) in list.data" :key="items.id" @click="pageTo(`/pages/goods/detail?id=${items.id}`)">
 						<div class="img-blo">
 							<app-img :src="items.smallImgList[0]" alt="商品图" mode="aspectFit" :height="200" />
 						</div>

mobile-code/src/pages/home/components/goods-list-big.vue

@@ -8,18 +8,25 @@
 			</div>
 		</div>
 		<div class="goods-wrap">
-			<div class="goods-list" v-for="(item, index) in info.goodsInfoList" :key="index" @click="$util.pageTo(`/pages/goods/detail?id=${item.id}`)">
-				<div class="goods-img">
-					<app-img :src="item.smallImgList[0]" alt="商品图片" mode="aspectFit" :height="534" />
-				</div>
-				<div class="goods-det">
-					<div class="goods-left">
-						<div class="goods-name">{{ item.goodsName }}</div>
-						<div class="app-price">￥{{ item.price }}</div>
+			<block>
+				<div class="goods-list" v-for="(item, index) in info.goodsInfoList" :key="index" @click="pageTo({
+					url: '/pages/goods/detail',
+					query: {
+						id: item.id
+					}
+				})">
+					<div class="goods-img">
+						<app-img :src="item.smallImgList[0]" alt="商品图片" mode="aspectFit" :height="534" />
+					</div>
+					<div class="goods-det">
+						<div class="goods-left">
+							<div class="goods-name">{{ item.goodsName }}</div>
+							<div class="app-price">￥{{ item.price }}</div>
+						</div>
+						<div class="button-com red buy-com-btn">购买</div>
 					</div>
-					<div class="button-com red buy-com-btn">购买</div>
 				</div>
-			</div>
+			</block>
 		</div>
 	</div>
 </template>
@@ -41,28 +48,27 @@ export default {
 		return {
 			constant: this.$constant
 		}
-	},
-	methods: {}
+	}
 }
 </script>
 
 <style lang="scss" scoped>
 	.goods-list-big-module {
 		.title-tag {
-            position: relative;
+			position: relative;
 			.title-text {
-                position: absolute;
-                left: 0;
-                right: 0;
-                font-size: 34px;
-                text-align: center;
-            }
-            .title-img {
-                width: 94%;
-                margin: 0 auto 30px;
-            }
-        }
-        // 商品列表
+				position: absolute;
+				left: 0;
+				right: 0;
+				font-size: 34px;
+				text-align: center;
+			}
+			.title-img {
+				width: 94%;
+				margin: 0 auto 30px;
+			}
+		}
+		// 商品列表
 		.goods-list {
 			background-color: #fff;
 			box-shadow: 4px 4px 10px #eee;

mobile-code/src/pages/home/components/goods-list-middle.vue

@@ -7,7 +7,7 @@
 			</div>
 		</div>
 		<div class="goods-wrap">
-			<div class="goods-list" v-for="(item, index) in info.goodsInfoList" :key="index" @click="$util.pageTo(`/pages/goods/detail?id=${item.id}`)">
+			<div class="goods-list" v-for="(item, index) in info.goodsInfoList" :key="index" @click="pageTo(`/pages/goods/detail?id=${item.id}`)">
 				<div class="goods-img">
 					<img :src="item.img" alt="商品图片" mode="aspectFit" :height="346" />
 				</div>
@@ -16,7 +16,7 @@
 						<div class="goods-name">{{ item.goodsName }}</div>
 						<div class="app-price">￥{{ item.price }}</div>
 					</div>
-					<div class="button-com red buy-com-btn" @click="$util.pageTo(`/pages/goods/detail?id=${item.id}`)">购买</div>
+					<div class="button-com red buy-com-btn" @click="pageTo(`/pages/goods/detail?id=${item.id}`)">购买</div>
 				</div>
 			</div>
 		</div>

mobile-code/src/pages/home/components/goods-list-small.vue

@@ -7,7 +7,7 @@
 			</div>
 		</div>
 		<div class="goods-wrap">
-			<div class="goods-list" v-for="(item, index) in info.goodsInfoList" :key="index" @click="$util.pageTo(`/pages/goods/detail?id=${item.id}`)">
+			<div class="goods-list" v-for="(item, index) in info.goodsInfoList" :key="index" @click="pageTo(`/pages/goods/detail?id=${item.id}`)">
 				<div class="goods-img">
 					<app-img :src="item.smallImgList[0]" alt="商品图片" mode="aspectFit" :height="246" />
 				</div>

mobile-code/src/pages/home/index.vue

@@ -1,7 +1,7 @@
 <template>
 	<div class="app-main app-content">
-		<!-- <button @click="$util.pageTo('/pages/user/register')">注册</button>
-		<button @click="$util.pageTo('/pages/chat/index')">聊天</button>-->
+		<!-- <button @click="pageTo('/pages/user/register')">注册</button>
+		<button @click="pageTo('/pages/chat/index')">聊天</button>-->
 		<!-- <app-footer /> -->
 		<app-swiper v-if="!$util.isEmpty(ad)" :list="ad" @detail="adDetailFn" />
 		<block v-if="!$util.isEmpty(category)">

mobile-code/src/pages/home/shop.vue

@@ -16,7 +16,7 @@
 				<tui-list-cell @click="phoneCall" :lineLeft="false" :lineRight="false" class="tui-list">
 					<div class="list-wrap">
 						<div class="list-label">联系电话</div>
-						<div class="list-val">{{ shop.telephone }}</div>
+						<div class="list-val">{{ shop.telephone || '暂无' }}</div>
 					</div>
 					<div class="list-icon">
 						<i class="iconfont iconditu"></i>
@@ -25,7 +25,7 @@
 				<tui-list-cell @click="goNavBtn" :lineLeft="false" :lineRight="false" class="tui-list">
 					<div class="list-wrap">
 						<div class="list-label">门店地址</div>
-						<div class="list-val">{{ shop.shopFullAddress }}</div>
+						<div class="list-val">{{ shop.shopFullAddress || '暂无' }}</div>
 					</div>
 					<div class="list-icon">
 						<i class="iconfont icondianhua"></i>

mobile-code/src/pages/home/user.vue

@@ -46,13 +46,13 @@
 					<div class="my-surplus">{{ shopUser.userAsset.balance || 0.00 }}</div>
 				</div>
 				<div class="surplus-right">
-					<button class="button-com" @click="$util.pageTo({
+					<button class="button-com" @click="pageTo({
 					url: '/pages/pay/index',
 					query: {
 						pageStatus: 'recharge'
 					}
 				})">充值</button>
-					<button class="button-com red" @click="$util.pageTo({
+					<button class="button-com red" @click="pageTo({
 					url: '/pages/pay/index',
 					query: {
 						pageStatus: 'payment'
@@ -63,29 +63,29 @@
 		</template>
 		<div class="list-content">
 			<tui-list-view class="tui-list-view">
-				<tui-list-cell class="tui-list" :arrow="true" @click="$util.pageTo('/pages/order/list')">
+				<tui-list-cell class="tui-list" :arrow="true" @click="pageTo('/pages/order/list')">
 					<div class="list-wrap">
 						<div class="list-label">我的订单</div>
 						<!-- <div class="list-text">{{ shopUser.userAsset.totalBuyNum }}</div> -->
 					</div>
 				</tui-list-cell>
-				<tui-list-cell class="tui-list" :arrow="true" @click="$util.pageTo('/pages/interest/invite')">
+				<tui-list-cell class="tui-list" :arrow="true" @click="pageTo('/pages/interest/invite')">
 					<div class="list-wrap">
 						<div class="list-label">我的邀请</div>
 						<div class="list-text">领金币奖励</div>
 					</div>
 				</tui-list-cell>
-				<tui-list-cell class="tui-list" :arrow="true" @click="$util.pageTo('/pages/coupon/list')">
+				<tui-list-cell class="tui-list" :arrow="true" @click="pageTo('/pages/coupon/list')">
 					<div class="list-wrap">
 						<div class="list-label">我的优惠券</div>
 					</div>
 				</tui-list-cell>
-				<tui-list-cell class="tui-list" :arrow="true" @click="$util.pageTo('/pages/user/password')">
+				<tui-list-cell class="tui-list" :arrow="true" @click="pageTo('/pages/user/password')">
 					<div class="list-wrap">
 						<div class="list-label">支付密码设置</div>
 					</div>
 				</tui-list-cell>
-				<tui-list-cell class="tui-list" :arrow="true" @click="$util.pageTo('/pages/interest/level')">
+				<tui-list-cell class="tui-list" :arrow="true" @click="pageTo('/pages/interest/level')">
 					<div class="list-wrap">
 						<div class="list-label">会员权益</div>
 					</div>
@@ -159,6 +159,10 @@ export default {
 			location.reload()
 			// #endif
 			// #ifndef H5
+			this.$util.pageTo({
+				url: '/pages/home/index',
+				type: 4
+			})
 			// #endif
 		},
 		// 获取微信信息

mobile-code/src/pages/interest/level.vue

@@ -34,7 +34,7 @@
 			</div>
             <!-- 按钮 -->
             <div class="btn-wrap">
-                <div class="button-com red big" @click="$util.pageTo('/pages/user/register')">申请成为会员</div>
+                <div class="button-com red big" @click="pageTo('/pages/user/register')">申请成为会员</div>
             </div>
 		</div>
         <!-- 商标 -->

mobile-code/src/pages/member/detail.vue

@@ -29,7 +29,7 @@
 		</div>
 		<!-- 客户按钮 -->
 		<div class="module-com tabs-wrap">
-			<div class="tabs-list" v-for="(item, index) in tabsData" :key="index" @click="$util.pageTo(item)">
+			<div class="tabs-list" v-for="(item, index) in tabsData" :key="index" @click="pageTo(item)">
 				<div class="tabs-img">
 					<img :src="item.img" alt mode="widthFix" />
 				</div>

mobile-code/src/pages/order/list.vue

@@ -1,7 +1,7 @@
 <template>
 	<div class="app-content">
 		<block v-if="!$util.isEmpty(list.data)">
-			<div class="list-wrap" v-for="(item, index) in list.data" :key="index" @click="$util.pageTo({
+			<div class="list-wrap" v-for="(item, index) in list.data" :key="index" @click="pageTo({
 			url: '/pages/order/detail',
 			query: {
 				id: item.id
@@ -22,7 +22,7 @@
 						<span class="app-size-30 app-bold">¥{{ item.actPrice }}</span>
 					</div>
 					<block v-if="item.status == 0">
-						<button class="button-com red" @click.stop="$util.pageTo({
+						<button class="button-com red" @click.stop="pageTo({
 						url: '/pages/callback/index',
 						query: {
 							pagestatus: 1,
@@ -33,7 +33,7 @@
 					})">立即付款</button>
 					</block>
 					<block v-if="item.status == 1">
-						<button class="button-com red defalut" @click.stop="$util.pageTo({
+						<button class="button-com red defalut" @click.stop="pageTo({
 						url: '/pages/order/buy',
 						query: {
 							id: item.id
@@ -41,7 +41,7 @@
 					})">填写收花地址</button>
 					</block>
 					<block v-if="item.status == 5">
-						<button class="button-com red defalut" @click.stop="$util.pageTo({
+						<button class="button-com red defalut" @click.stop="pageTo({
 						url: '/pages/order/comment',
 						query: {
 							id: item.id

mobile-code/src/static/css/base.scss

@@ -5,9 +5,11 @@
     // line-height: 1;
     background-color: $backColor;
     min-height: 100vh;
+    // #ifdef H5
     &.app-main {
         min-height: calc(100vh - 100px);
     }
+    // #endif
 }
 .gray_txt {
     color: #999 !important;

mobile-code/src/uni.scss

@@ -8,11 +8,11 @@
 
 /* 颜色变量 */
 /*图片地址*/
-$imgUrl: 'https://img.huaml.com';
+$imgUrl: 'https://wximg.meijiabang.com/hkds/miniapp/images/';
 
 // 所有样式为公共样式，已在全局引用可直接使用
 // 主色
-$mainColor: #3385FF;
+$mainColor: #FF2842;
 $mainColor1: #049E2C;
 $auxiliaryColor2: #ff6900;
 

mobile-code/src/utils/util.js

@@ -162,6 +162,7 @@ export const $formatDate = (num, fmt = 'YYYY-MM-DD HH:mm', all) => {
  * @parmas item.type 为跳转调用的函数 1为navigateTo, 2为redirectTo, 3为reLaunch, 4为switchTab
  */
 export const pageTo = (item) => {
+	console.log('item', item)
 	if (isNumber(item)) {
 		uni.navigateBack({
 			delta: item

mobile-code/src/m-config.js → mobile-code/src/w-config.js

@@ -1,2 +1,2 @@
 // 项目配置--由bat脚本自动变更
-export const ProjectName = 'mobile'
+export const ProjectName = 'official'

mobile-code/src/w-manifest.json

@@ -0,0 +1,69 @@
+{
+    "name": "花卉宝",
+    "appid": "",
+    "description": "应用描述",
+    "versionName": "1.0.0",
+    "versionCode": "100",
+    "transformPx": true,
+    "debug": false,
+    "networkTimeout": {
+        "request": 200000
+    },
+    "mp-weixin": {
+        "appid": "wx3a163add860e0a86",
+        "setting": {
+            "urlCheck": false
+        },
+        "usingComponents": true,
+        "permission": {
+            "scope.userLocation": {
+                "desc": "请点击确定"
+            }
+        }
+    },
+    "mp-alipay": {
+        "usingComponents": true
+    },
+    "mp-baidu": {
+        "usingComponents": true
+    },
+    "mp-toutiao": {
+        "usingComponents": true
+    },
+    "h5": {
+        "template": "template.h5.html",
+        "router": {
+            // "mode" : "history",
+            "base": "/",
+            "publicPath": "/"
+        },
+        "async": {
+            "timeout": 200000
+        },
+        "devServer": {
+            "port": 81,
+            "proxy": {
+                "/api": {
+                    "target": "http://api.w.huaml.com",
+                    "secure": false,
+                    "changeOrigin": true,
+                    "pathRewrite": {
+                        "^/api": ""
+                    }
+                }
+            }
+        },
+        "sdkConfigs": {
+            "maps": {
+                "qqmap": {
+                    "key": ""
+                }
+            }
+        },
+        "optimization": {
+            "treeShaking": {
+                "enable": true
+            }
+        }
+    }
+}

mobile-code/src/w-pages.json

@@ -0,0 +1,37 @@
+{
+	"pages": [
+		{
+			"path": "official/index",
+			"style": {
+				"navigationBarTitleText": "花卉宝"
+			}
+		},
+		{
+			"path": "official/apply",
+			"style": {
+				"navigationBarTitleText": "填写资料"
+			}
+		},
+		{
+			"path": "official/pay",
+			"style": {
+				"navigationBarTitleText": "支付"
+			}
+		},
+		{
+			"path": "official/callback",
+			"style": {
+				"navigationBarTitleText": "支付"
+			}
+		}
+	],
+	"globalStyle": {
+		// #ifdef H5
+		"navigationStyle": "custom",
+		// #endif
+		"navigationBarBackgroundColor": "#fff",
+		"navigationBarTitleText": "花卉宝",
+		"navigationBarTextStyle": "black"
+	}
+}
+

mobile-code/src/m-uni.scss → mobile-code/src/w-uni.scss

@@ -8,11 +8,11 @@
 
 /* 颜色变量 */
 /*图片地址*/
-$imgUrl: 'https://wximg.meijiabang.com/hkds/miniapp/images/';
+$imgUrl: 'https://img.huaml.com';
 
 // 所有样式为公共样式，已在全局引用可直接使用
 // 主色
-$mainColor: #FF2842;
+$mainColor: #3385FF;
 $mainColor1: #049E2C;
 $auxiliaryColor2: #ff6900;