文档修改

src/App.vue

@@ -82,12 +82,14 @@ export default {
           return res.json();
         }).then(res => {
           const data = res.data || {};
+          // alert(JSON.stringify(data))
           let shareinfo = {
             title: title || data.title || '泰古润',
             desc: data.contents || '汇聚平凡梦想，共创美好未来',
             imgUrl: imgUrl || data.img,
             link: this.$getShareLink(),
           };
+          // alert(JSON.stringify(shareinfo))
           const jsApiList = data.jsApiList || ['onMenuShareTimeline', 'onMenuShareAppMessage', 'updateAppMessageShareData', 'updateTimelineShareData'];
           const openTagList = data.openTagList || ['wx-open-launch-weapp'];
           jsApiList.push('wx-open-launch-weapp');

src/components/ManagerPopup.vue

@@ -24,7 +24,7 @@
       <div class="manager_dbox">
         <div @click="navigateAndClose('Home')">
           <img src="/img/my_u4.png" alt="">
-          <span>首页</span>
+          <span>主页</span>
           <van-icon class="r" name="arrow"></van-icon>
         </div>
 

src/main.js

@@ -334,11 +334,11 @@ app.config.globalProperties.$validIdCard = (idCard) => {
 app.config.globalProperties.$getShareLink = () => {
     const query = app.config.globalProperties.$route.query;
     const recommend = localStorage.getItem('cellphone');
-    let link = Object.keys(query).filter(x => x != 'RecommendCode').map(x => {
+    const params = Object.keys(query).filter(x => x != 'RecommendCode').map(x => {
         return `${x}=${query[x]}`;
-    }).join('&');
+    });
-    link += `&RecommendCode=${recommend}`;
+    params.push(`RecommendCode=${recommend}`);
-    return `${location.href.split('?')[0]}?${link}`;
+    return `${location.href.split('?')[0]}?${params.join('&')}`;
 }
 
 // CH

src/views/Goods/Category.vue

@@ -38,12 +38,15 @@
                 </van-tabs>
             </div>
             <div class="goodslist">
-                <van-sidebar v-model="goodsCategoryIndex">
+                <div class="content">
-                    <van-sidebar-item name="" title="全部产品" @click="changeThird('')" />
+                    <van-sidebar v-model="goodsCategoryIndex">
-                    <van-sidebar-item v-for="item in selectedThird" :key="item.id" :title="item.name"
+                        <van-sidebar-item name="" title="全部产品" @click="changeThird('')" />
-                        @click="changeThird(item.id)" />
+                        <van-sidebar-item v-for="item in selectedThird" :key="item.id" :title="item.name"
-                </van-sidebar>
+                            @click="changeThird(item.id)" />
+                    </van-sidebar>
 
+
+                </div>
                 <div class="pro-list">
                     <div class="px">
                         <a @click="toggleValue(0)" :class="searchParams.SortType == 0 ? 'a' : ''">
@@ -75,8 +78,9 @@
                                         </div>
                                         <div class="price">
                                             <b><span>￥</span>{{ item.saleprice?.toFixed(2) }}</b>
-                                            <span class="r" style="color: #8a8a8a;font-size: 3.2vw;">销量{{ item.salenums
+                                            <span class="r" style="color: #8a8a8a;font-size: 3.2vw;">销量{{
-                                                }}</span>
+                                                item.salenums
+                                            }}</span>
                                         </div>
                                     </div>
                                 </div>

src/views/Merchant/PayCode.vue

@@ -56,7 +56,7 @@ export default {
       this.$get(`/v1/client/DShopsClient/${id}`).then(res => {
         this.shopname = res.data.shopname
         this.shopimg = res.data.shopimg
-        this.link = `${location.origin}${location.pathname}#/Checkout?id=${res.data.userid}`
+        this.link = `${location.origin}${location.pathname}#/Checkout?id=${res.data.userid}&RecommendCode=${localStorage.getItem('cellphone')}`
         this.$nextTick(() => {
           this.generateImage()
         })

src/views/Operations/QrReader.vue

@@ -28,10 +28,10 @@
     <div class="footer">
       <div class="tip" v-if="!isScanning && !result && !error">将二维码放入框内即可自动扫描</div>
       <div class="error" v-if="error">{{ error }}</div>
-      <div class="result" v-if="result">
+      <!-- <div class="result" v-if="result">
         <div class="label">扫描结果：</div>
         <div class="value">{{ result }}</div>
-      </div>
+      </div> -->
     </div>
 
     <!-- 开始扫描提示 -->

src/views/Trade/TradeDetail.vue

@@ -40,10 +40,10 @@
                 </div>
             </div>
 
-            <div class="_remark" v-if="data.remark">
+            <div class="_remark" v-if="data.usermsg">
                 <p>买家留言: </p>
                 <span class="r">
-                    {{ data.remark || '无' }}
+                    {{ data.usermsg || '无' }}
                 </span>
             </div>
             <div class="_detail">
@@ -57,7 +57,7 @@
                         <span>-￥{{ data.payjifen?.toFixed(2) }}</span>
                     </p>
                     <p v-if="data.payquan > 0">
-                        会员卡额度抵扣
+                        会员卡抵扣
                         <span>-￥{{ data.payquan?.toFixed(2) }}</span>
                     </p>
                     <p>
@@ -96,7 +96,7 @@
                         <span>{{ $formatGMT(data.exporttime, 'yyyy-MM-dd HH:mm:ss') }}</span>
                     </p>
                     <p v-if="data.receipttime">
-                        收货时间
+                        完成时间
                         <span>{{ $formatGMT(data.receipttime, 'yyyy-MM-dd HH:mm:ss') }}</span>
                     </p>
                     <p v-if="data.evaltime">

src/views/Trade/Tradelist.vue

@@ -187,7 +187,7 @@ export default {
   mounted() {
     const isReturningFromDetail = sessionStorage.getItem('TradeList_fromDetail') === '1'
     sessionStorage.removeItem('TradeList_fromDetail')
-
+    this.loadFilterOptions()
     if (!isReturningFromDetail) {
       sessionStorage.setItem('TradeList_scroll', '0')
     }

src/views/User/Wallet/Certificate.vue

@@ -43,8 +43,17 @@
 </template>
 <script>
 export default {
+  activated() {
+    this.startPolling()
+  },
+  deactivated() {
+    this.stopPolling()
+  },
   mounted() {
-    this.init()
+    this.startPolling()
+  },
+  beforeUnmount() {
+    this.stopPolling()
   },
   data() {
     return {
@@ -53,6 +62,7 @@ export default {
       show: false,
       link: '',
       ewm: {},
+      pollingTimer: null,
     }
   },
   computed: {
@@ -64,6 +74,19 @@ export default {
     }
   },
   methods: {
+    startPolling() {
+      this.init()
+      this.stopPolling()
+      this.pollingTimer = setInterval(() => {
+        this.init()
+      }, 3000)
+    },
+    stopPolling() {
+      if (this.pollingTimer) {
+        clearInterval(this.pollingTimer)
+        this.pollingTimer = null
+      }
+    },
     init() {
       this.$get('/v1/client/DUserlipinquansClient').then(res => {
         this.items = res.data?.items || []