Merge branch 'master' of git.huaml.com:zhh/front-end

ghs/src/admin/home/console.vue

@@ -23,7 +23,7 @@ export default {
         });
       } else {
         this.$util.pageTo({
-          url: "/admin/official/index",
+          url: "/pagesClient/official/index",
           type: 2
         });
       }

ghs/src/admin/home/member.vue

@@ -6,7 +6,7 @@
       :isAdd="true"
       :currentTab="tabIndex"
       :height="100"
-      @add="pageTo('/admin/member/add')"
+      @add="pageTo('/pagesClient/member/add')"
       @change="change"
       itemWidth="50%"
     />
@@ -15,7 +15,7 @@
         <tui-list-cell
           :arrow="true"
           @click="pageTo({
-					url: '/admin/member/detail',
+					url: '/pagesClient/member/detail',
 					query: {
 						id: item.id
 					}

ghs/src/admin/home/workbench.vue

@@ -360,7 +360,7 @@ export default {
     // 续费
     renewFn() {
       this.$util.pageTo({
-        url: "/admin/official/index",
+        url: "/pagesClient/official/index",
         query: {
           pay: 1
         },

ghs/src/admin/interest/my-invite.vue

@@ -138,7 +138,7 @@ export default {
           title: "更懂您的花卉宝",
           desc: "",
           imgUrl: this.constant.imgUrl + "/retail/official/banner-1.png",
-          pagePath: "admin/official/index?introMerchantId=" + res.id
+          pagePath: "pagesClient/official/index?introMerchantId=" + res.id
         };
         this.jweixinFn(params);
       });

ghs/src/mixins/globalMixins.js

@@ -31,7 +31,7 @@ export default {
 				.then(res => {
 					console.log(123)
 					//花店员工和未知身份可以访问的地址
-					var urlArr = ['admin/shopAdmin/bind', 'admin/official'];
+					var urlArr = ['admin/shopAdmin/bind', 'pagesClient/official'];
 					var redirectPage = res.redirectPage;
 					var needRedirect = true;
 					urlArr.forEach((item, index, array) => {
@@ -49,13 +49,13 @@ export default {
 						//花店员工
 						} else if(res.data.admin.identity == '1'){
 							this.$util.pageTo({
-								url: "/admin/official/latest-shop",
+								url: "/pagesClient/official/latest-shop",
 								type: 2
 							});
 						//未知身份
 						}else{
 							this.$util.pageTo({
-								url: "/admin/official/index",
+								url: "/pagesClient/official/index",
 								type: 2
 							});
 						}

ghs/src/pages.json

@@ -57,75 +57,58 @@
 	],
 	"subPackages": [
 		{
-			"root": "admin/order",
+			"root": "pagesClient",
 			"pages": [
 				{
-					"path": "detail",
-					"style": {
-						"navigationBarTitleText": "详情"
-					}
-				},
-				{
-					"path": "ship",
+					"path": "member/add",
 					"style": {
-						"navigationBarTitleText": "发货"
+						"navigationBarTitleText": "添加客户"
 					}
 				},
 				{
-					"path": "fill-form",
+					"path": "member/detail",
 					"style": {
-						"navigationBarTitleText": "填写收花人"
+						"navigationBarTitleText": "客户详情"
 					}
 				},
 				{
-					"path": "print",
-					"style": {
-						"navigationBarTitleText": "打印"
-					}
-				}
-			]
-		},
-		{
-			"root": "admin/official",
-			"pages": [
-				{
-					"path": "index",
+					"path": "official/index",
 					"style": {
 						"navigationBarTitleText": "花卉宝"
 					}
 				},
 				{
-					"path": "pay",
+					"path": "official/pay",
 					"style": {
 						"navigationBarTitleText": "支付"
 					}
 				},
 				{
-					"path": "apply",
+					"path": "official/apply",
 					"style": {
 						"navigationBarTitleText": "申请"
 					}
 				},
 				{
-					"path": "callback",
+					"path": "official/callback",
 					"style": {
 						"navigationBarTitleText": "回调"
 					}
 				},
 				{
-					"path": "latest-shop",
+					"path": "official/latest-shop",
 					"style": {
 						"navigationBarTitleText": "最近访问的店铺"
 					}
 				},
 				{
-					"path": "result",
+					"path": "official/result",
 					"style": {
 						"navigationBarTitleText": "结果"
 					}
 				},
 				{
-					"path": "warn",
+					"path": "official/warn",
 					"style": {
 						"navigationBarTitleText": "开启微信提醒"
 					}
@@ -133,18 +116,30 @@
 			]
 		},
 		{
-			"root": "admin/member",
+			"root": "admin/order",
 			"pages": [
 				{
-					"path": "add",
+					"path": "detail",
 					"style": {
-						"navigationBarTitleText": "添加客户"
+						"navigationBarTitleText": "详情"
 					}
 				},
 				{
-					"path": "detail",
+					"path": "ship",
 					"style": {
-						"navigationBarTitleText": "客户详情"
+						"navigationBarTitleText": "发货"
+					}
+				},
+				{
+					"path": "fill-form",
+					"style": {
+						"navigationBarTitleText": "填写收花人"
+					}
+				},
+				{
+					"path": "print",
+					"style": {
+						"navigationBarTitleText": "打印"
 					}
 				}
 			]

ghs/src/admin/member/detail.vue → ghs/src/pagesClient/member/detail.vue

@@ -190,7 +190,7 @@ export default {
           title: "更懂您的花卉宝",
           desc: "",
           imgUrl: this.constant.imgUrl + "/retail/official/banner-1.png",
-          pagePath: "admin/official/index?introMerchantId=" + res.data.id
+          pagePath: "pagesClient/official/index?introMerchantId=" + res.data.id
         };
         this.jweixinFn(params);
       });

ghs/src/admin/official/apply.vue → ghs/src/pagesClient/official/apply.vue

@@ -221,7 +221,7 @@ export default {
       }).then(res => {
         uni.setStorageSync("officialApply", res.data);
         this.$util.pageTo({
-          url: "/admin/official/callback",
+          url: "/pagesClient/official/callback",
           type: 2,
           query: {
             pagestatus: 3
@@ -350,7 +350,7 @@ export default {
       let formData = this.form;
       let checkRes = form.validation(formData, rules);
       this.$util.pageTo({
-          url: "/admin/official/callback",
+          url: "/pagesClient/official/callback",
           type: 2,
           query: {
             pagestatus: 1

ghs/src/admin/official/index.vue → ghs/src/pagesClient/official/index.vue

@@ -54,12 +54,12 @@
       v-if="status == 3"
       class="app-footer"
       @click="pageTo({
-			url: '/admin/official/pay',
+			url: '/pagesClient/official/pay',
 			status: 1
 		})"
     >立即续费</div>
     <div v-else class="app-footer" @click="pageTo({
-			url: '/admin/official/pay'
+			url: '/pagesClient/official/pay'
 		})">申请试用</div>
   </div>
 </template>
@@ -138,7 +138,7 @@ export default {
   onLoad() {
     this.jweixinFn({
       title: "更懂您的花卉宝",
-      pagePath: "admin/official/index",
+      pagePath: "pagesClient/official/index",
       imageUrl: ""
     });
   },

ghs/src/admin/official/pay.vue → ghs/src/pagesClient/official/pay.vue

@@ -47,7 +47,7 @@
         v-if="$util.isEmpty(renewOption)"
         class="admin-button-com middle blue"
         @click="pageTo({
-			url: '/admin/official/apply',type:2
+			url: '/pagesClient/official/apply',type:2
 		})"
       >免费试用</button>
       <button v-else class="admin-button-com middle blue" @click="wxPay">支付</button>

ghs/src/admin/official/result.vue → ghs/src/pagesClient/official/result.vue

@@ -8,7 +8,7 @@
 		<button 
             class="admin-button-com blue big" 
             @click="pageTo({
-                url:'/admin/official/warn'
+                url:'/pagesClient/official/warn'
             })"
             >
             去开启