From 3a69e4e313b77daa1289d07eb7b166f5881c06d3 Mon Sep 17 00:00:00 2001
From: mo-bai <1873032855@qq.com>
Date: Tue, 19 Apr 2022 11:45:14 +0800
Subject: [PATCH] bug

---
 enums/index.js                                |  1 +
 pages.json                                    |  2 +-
 pages/client-detail/base-paper-deals.vue      |  2 +-
 pages/client-detail/basic-information.vue     |  2 +-
 pages/client-detail/equipment-information.vue |  2 +-
 pages/client-detail/no-data.vue               |  2 +-
 pages/follow-up-records/index.vue             |  2 +-
 pages/mall/no-data.vue                        |  6 ++--
 pages/merchant-list/index.vue                 | 19 ++++++++----
 pages/order-detail/index.vue                  | 14 ++++++++-
 pages/page-view/index.vue                     | 29 +++++++++++--------
 11 files changed, 54 insertions(+), 27 deletions(-)

diff --git a/enums/index.js b/enums/index.js
index 8a7be11..4420d08 100644
--- a/enums/index.js
+++ b/enums/index.js
@@ -227,6 +227,7 @@ export const mallSupplierTypeMap = {
 
 /**
  * 申请单状态 0 待申请 1 已提交 2 重新提交 3 审核中 4 已驳回 5 待账户验证 6 待签约 7 开通权限中 8 已完成 9 申请单已被撤销
+ *
  */
 export const applyStatusEnum = {
   WAIT_APPLY: '0',
diff --git a/pages.json b/pages.json
index c36b829..ccacd44 100644
--- a/pages.json
+++ b/pages.json
@@ -105,7 +105,7 @@
       "path": "pages/order-detail/index",
       "style": {
         "navigationBarTitleText": "订单详情",
-        "enablePullDownRefresh": false,
+        "enablePullDownRefresh": true,
         "navigationStyle": "custom"
       }
     },
diff --git a/pages/client-detail/base-paper-deals.vue b/pages/client-detail/base-paper-deals.vue
index 846b97e..9a9e21a 100644
--- a/pages/client-detail/base-paper-deals.vue
+++ b/pages/client-detail/base-paper-deals.vue
@@ -149,7 +149,7 @@ export default {
 }
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
 .wrapper {
   width: 750rpx;
   .sum-box {
diff --git a/pages/client-detail/basic-information.vue b/pages/client-detail/basic-information.vue
index 039b2b5..987b18f 100644
--- a/pages/client-detail/basic-information.vue
+++ b/pages/client-detail/basic-information.vue
@@ -213,7 +213,7 @@ export default {
 }
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
 .wrapper {
   width: 750rpx;
   height: 100%;
diff --git a/pages/client-detail/equipment-information.vue b/pages/client-detail/equipment-information.vue
index e9a91be..2adcde5 100644
--- a/pages/client-detail/equipment-information.vue
+++ b/pages/client-detail/equipment-information.vue
@@ -231,7 +231,7 @@ export default {
 }
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
 .wrapper {
   .card-box {
     .header {
diff --git a/pages/client-detail/no-data.vue b/pages/client-detail/no-data.vue
index ed99fc2..b847a0f 100644
--- a/pages/client-detail/no-data.vue
+++ b/pages/client-detail/no-data.vue
@@ -22,7 +22,7 @@ export default {
 }
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
 .wrapper {
   display: flex;
   flex-direction: column;
diff --git a/pages/follow-up-records/index.vue b/pages/follow-up-records/index.vue
index fb06fbe..a80dc01 100644
--- a/pages/follow-up-records/index.vue
+++ b/pages/follow-up-records/index.vue
@@ -146,7 +146,7 @@ export default {
 }
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
 .wrapper {
   background-color: #ffffff;
   .time {
diff --git a/pages/mall/no-data.vue b/pages/mall/no-data.vue
index 6e8ecb9..5e8b1b9 100644
--- a/pages/mall/no-data.vue
+++ b/pages/mall/no-data.vue
@@ -1,5 +1,5 @@
 <template>
-  <view class="wrapper">
+  <view class="empty-area">
     <image class="icon" src="/static/imgs/client-detail/no-data-icon.png"></image>
     <view class="text-row">
       <view>还没有纸品快去</view>
@@ -32,8 +32,8 @@ export default {
 }
 </script>
 
-<style lang="scss">
-.wrapper {
+<style lang="scss" scoped>
+.empty-area {
   display: flex;
   flex-direction: column;
   justify-content: center;
diff --git a/pages/merchant-list/index.vue b/pages/merchant-list/index.vue
index eaa80d2..793d95b 100644
--- a/pages/merchant-list/index.vue
+++ b/pages/merchant-list/index.vue
@@ -6,9 +6,9 @@
         <view class="flex-row group_4 justify-between">
           <view class="flex-row">
             <text class="text_4">{{ merchant.name }}</text>
-            <image v-if="showIcon(merchant.applymentState).img" :src="showIcon(merchant.applymentState).img" class="image_4" />
+            <image v-if="showIcon(merchant).img" :src="showIcon(merchant).img" class="image_4" />
           </view>
-          <view v-if="showIcon(merchant.applymentState).text" class="button" @click="checkInfo(merchant)">{{ showIcon(merchant.applymentState).text }}</view>
+          <view v-if="showIcon(merchant).text" class="button" @click="checkInfo(merchant, showIcon(merchant).text)">{{ showIcon(merchant).text }}</view>
         </view>
         <view class="flex-col group_5" v-if="infoShowStatus.indexOf(merchant.applymentState) < -1">
           <view class="top-section flex-col view_1">
@@ -145,7 +145,8 @@ export default {
         urls: [url]
       })
     },
-    showIcon(status) {
+    showIcon(merchant) {
+      let status = merchant.applymentState
       if (this.cache[status]) {
         return this.cache[status]
       }
@@ -158,6 +159,7 @@ export default {
         text: ''
       }
       let infoMap = [applyStatusEnum.RE_SUBMIT, applyStatusEnum.REJECTED, applyStatusEnum.CANCELED]
+      let verifyMap = [applyStatusEnum.AUDITING, applyStatusEnum.WAIT_VERIFY, applyStatusEnum.WAIT_SIGN]
       if (status === applyStatusEnum.FINISHED) {
         result.img = '/static/imgs/merchant/apply-finished-icon.png'
       } else if (status === applyStatusEnum.WAIT_APPLY) {
@@ -167,12 +169,19 @@ export default {
         result.text = '查看'
       } else {
         result.img = '/static/imgs/merchant/apply-auditing-icon.png'
+        if (verifyMap.includes(status) && merchant.signUrl) {
+          result.text = '去验证'
+        }
       }
       this.cache[status] = result
       return result
     },
-    checkInfo(merchant) {
-      go2('merchant-setting', { info: JSON.stringify(merchant) })
+    checkInfo(merchant, text) {
+      if (text == '去验证') {
+        go2('page-view', { url: encodeURIComponent(merchant.signUrl) })
+      } else {
+        go2('merchant-setting', { info: JSON.stringify(merchant) })
+      }
     }
   }
 }
diff --git a/pages/order-detail/index.vue b/pages/order-detail/index.vue
index 0542cff..becad05 100644
--- a/pages/order-detail/index.vue
+++ b/pages/order-detail/index.vue
@@ -209,6 +209,7 @@ const showUploadStatus = [
 export default {
   data() {
     return {
+      orderId: null,
       orderInfo: {
         deliveryAddress: {},
         supplierOrder: [],
@@ -229,7 +230,8 @@ export default {
   },
   onLoad(option) {
     if (option.orderId) {
-      this.init(option.orderId)
+      this.orderId = option.orderId
+      // this.init(option.orderId)
     } else {
       uni.showToast({
         title: '订单信息错误',
@@ -242,6 +244,16 @@ export default {
       })
     }
   },
+  onPullDownRefresh() {
+    console.log('下拉刷新')
+    this.init(this.orderId)
+    uni.stopPullDownRefresh()
+  },
+  onShow() {
+    if (this.orderId) {
+      this.init(this.orderId)
+    }
+  },
   methods: {
     go2,
     back,
diff --git a/pages/page-view/index.vue b/pages/page-view/index.vue
index 237b364..2dc8a12 100644
--- a/pages/page-view/index.vue
+++ b/pages/page-view/index.vue
@@ -33,14 +33,25 @@ export default {
       })
     }
   },
-  created() {
-    makeSocket({ pageInfo: 'page-view', retry: true }).then((res) => {
-      this.destroySocket()
-      this.socket = res
-      this.socket.onMessage(this.getMessage)
-    })
+  onShow() {
+    this.initSocket()
+  },
+  onHide() {
+    console.log('onHide')
+    this.destroySocket()
+  },
+  onUnload() {
+    console.log('onUnload')
+    this.destroySocket()
   },
   methods: {
+    initSocket() {
+      makeSocket({ pageInfo: 'page-view', retry: true }).then((res) => {
+        this.destroySocket()
+        this.socket = res
+        this.socket.onMessage(this.getMessage)
+      })
+    },
     /**
      * @param {Object} data {data:{},type:''}
      */
@@ -68,12 +79,6 @@ export default {
         this.socket = null
       }
     }
-  },
-  destroyed() {
-    this.destroySocket()
   }
-  // onHide() {
-  //   this.destroySocket()
-  // }
 }
 </script>