首页代码提交

ghsApp/src/admin/home/result.vue

@@ -1,8 +1,9 @@
 <template>
 <!-- icondaizhifu -->
 	<appResult :title="status == '2' ? '审核中' : '审核通过'" :icon="status == '2' ? 'icondaizhifu' : 'iconchenggong'">
-		<button class="admin-button-com blue big" v-if="status != '2'" @click="loginSys">登录后台{{status}}</button>
+		<button class="admin-button-com blue big" v-if="status != '2'" @click="loginSys">登录后台</button>
 		<button class="admin-button-com big" @click="openInform">开启通知</button>
+    <view class="openInfo">开启通知，第一时间接受{{text}}</view>
 	</appResult>
 </template>
 
@@ -12,14 +13,20 @@ export default {
 	name: "BillingResult", // 开单结果
   data(){
     return {
-      status: '1'
+      status: ''
     }
     
+  },
+  computed: {
+    text() {
+      return status == '2' ? '审核结果' : '门店动态'
+    }
   },
 	components: {
 		appResult
 	},
   onLoad(option){
+    console.log(option)
     this.status = option.status
   },
 	methods: {
@@ -44,4 +51,9 @@ export default {
 	margin-bottom: 20px;
 	width: 100%;
 }
+.openInfo{
+  text-align: center;
+  font-size: 26upx;
+  color: #666;
+}
 </style>

ghsApp/src/admin/home/workbench.vue

@@ -305,9 +305,6 @@ export default {
 	},
 	methods: {
 		init() {
-      this._init
-		},
-    _init(){
       getWeixinId().then(res => {
 				this.getappIdList = res.data
 			});
@@ -338,7 +335,7 @@ export default {
 					this.totalData[5].value = asset.totalPurchase;
 				}
 			});
-    },
+		},
 		goPage (item) {
 			if (item.url === '/admin/my-mall') {
 				this.getMyMall()

ghsApp/src/mixins/globalMixins.js

@@ -109,12 +109,13 @@ export default {
             } else if (res.data.openShop == '3') {
               status = '3'
             }
-            this.$util.pageTo({
-              url: '/admin/home/result',
-              query: {
-                status
-              }
-            })
+            uni.navigateTo({url:'/admin/home/result?status=' + status})
+            // this.$util.pageTo({
+            //   url: '/admin/home/result',
+            //   query: {
+            //     status
+            //   }
+            // })
           }).catch(err => {})
           // this.$util.pageTo({
           //   url: '/admin/home/result',

ghsApp/src/pagesClient/official/result.vue

@@ -24,7 +24,8 @@ export default {
             console.log(e)
         },
         close() {
-          this.pageTo({url: '/admin/home/workbench', type: 4})
+          // this.pageTo({url: '/admin/home/workbench', type:})
+          uni.reLaunch({url: '/admin/home/workbench'})
           uni.setStorageSync('OPEN_SHOP_ID', '2')
         }
     }