From b9437e26e0560e24cbbe63db81fdf4b832e51ac0 Mon Sep 17 00:00:00 2001
From: panliang <1163816051@qq.com>
Date: Sun, 26 Feb 2023 10:39:49 +0800
Subject: [PATCH] back

---
 src/App.vue                         | 17 ++++++++---------
 src/pageB/select_product/search.vue | 13 ++++++++++++-
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index f0e9839..0869b3f 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,7 +1,7 @@
 <script>
 // import { checkUpdate } from '@/utils/check-update';
 import { strToParams } from '@/utils/tools';
-import { wxMnpLogin } from '@/utils/login'
+import { wxMnpLogin } from '@/utils/login';
 export default {
   data() {
     return {
@@ -15,7 +15,7 @@ export default {
     this.$store.dispatch('app/getArticle');
 
     /* #ifdef MP-WEIXIN */
-   // wxMnpLogin()
+    // wxMnpLogin()
     /* #endif */
 
     // #ifdef APP-PLUS
@@ -28,13 +28,12 @@ export default {
     // checkUpdate();
     // #endif
   },
- onShow(option) {
-   console.log('onShowaaa');
-    let invite_code = option.query.invite_code || strToParams(decodeURIComponent(option.query.scene)).invite_code||''
-     uni.setStorageSync('INVITE_CODE',invite_code)
-     /* #ifdef MP-WEIXIN */
-        // wxMnpLogin(invite_code)
-     /* #endif */
+  onShow(option) {
+    let invite_code = option.query.invite_code || strToParams(decodeURIComponent(option.query.scene)).invite_code || '';
+    uni.setStorageSync('INVITE_CODE', invite_code);
+    /* #ifdef MP-WEIXIN */
+    // wxMnpLogin(invite_code)
+    /* #endif */
   },
   onHide: function () {
     console.log('App Hide');
diff --git a/src/pageB/select_product/search.vue b/src/pageB/select_product/search.vue
index 8dd767d..297b05b 100644
--- a/src/pageB/select_product/search.vue
+++ b/src/pageB/select_product/search.vue
@@ -1,6 +1,6 @@
 <template>
   <view>
-    <u-navbar :border-bottom="false" back-icon-color="#000000" :background="{ background: '#ffffff' }">
+    <u-navbar :border-bottom="false" back-icon-color="#000000" :background="{ background: '#ffffff' }" :custom-back="handleBack">
       <view class="w-full">
         <u-search placeholder="搜索商品" @change="Change" @search="Search" v-model="searchText" :show-action="false"></u-search>
       </view>
@@ -223,6 +223,17 @@ export default {
       this.$api.get(`/v1/store/${this.mid}/product-sku/${e.sku_id}`).then(res => {
         this.sku = res
       })
+    },
+    handleBack() {
+      if (getCurrentPages().length > 1) {
+        uni.navigateBack();
+      } else {
+        // 清空桌号
+        uni.clearStorageSync('desk')
+        uni.switchTab({
+          url: '/pages/index/index'
+        })
+      }
     }
   },
 };