Merge branch 'release-zl' into 'release'

feat: add

See merge request !263

src/views/entitlement/list.vue

@@ -32,22 +32,45 @@
               {{ item.detectionName || '--' }}
             </div>
           </div>
-          <div class="item">
-            <div class="label">
-              领取机构：
+
+          <div v-if="item.expressContent">
+            <div class="item">
+              <div class="label">
+                运单号：
+              </div>
+              <div class="value">
+                {{ item.expressNo || "--" }}
+              </div>
             </div>
-            <div class="value">
-              {{ item.hospitalName || '--' }}
+            <div class="item">
+              <div class="label">
+                物流进度：
+              </div>
+              <div class="value">
+                {{ item.expressContent || "--" }}
+              </div>
             </div>
           </div>
-          <div class="item">
-            <div class="label">
-              检测时间：
+
+          <div v-else>
+            <div class="item">
+              <div class="label">
+                领取机构：
+              </div>
+              <div class="value">
+                {{ item.hospitalName || '--' }}
+              </div>
             </div>
-            <div class="value">
-              {{ formatDate(item.detectionTime) || "--" }}
+            <div class="item">
+              <div class="label">
+                检测时间：
+              </div>
+              <div class="value">
+                {{ formatDate(item.detectionTime) || "--" }}
+              </div>
             </div>
           </div>
+
         </div>
         <div
           class="btn"
@@ -65,23 +88,6 @@
             </script>
           </wx-open-launch-weapp>
         </div>
-        <!-- <div
-          v-else
-          class="btn pbackground"
-        >
-          <wx-open-launch-weapp
-            id="launch-btn"
-            style="position: absolute; top: 0; left: 0; width: 100%; height: 100%"
-            :username="openWebAppConfig.username"
-            :path="`pagesInsurance/all-entrance/index?channelSource=insurance_channel&projectEquityNo=${item.projectEquityNo}&yunOrderNo=${item.yunOrderNoFirst_self}&detectionKind=${item.detectionKind}&tradeDetectionServiceRecordId=${item.tradeDetectionServiceRecordId}`"
-            :env-version="envVersion"
-            :extra-data="openWebAppConfig.extraData"
-          >
-            <script type="text/wxtag-template">
-              <style>.btn {position:absolute; top: -3px; color: #ffffff;text-align: center;line-height: 40px; left: 0; width:100%; height: 100%;}</style> <div class="btn">{{ item.btnTxt }}</div>
-            </script>
-          </wx-open-launch-weapp>
-        </div> -->
       </div>
       <div
         v-if="entitlementList.length == 0"
@@ -148,10 +154,8 @@
 
       monitorMiniProgram() {
         const self = this;
-        document.addEventListener('visibilitychange', e => {
+        document.addEventListener('visibilitychange', () => {
           self.entitlementList = [];
-          console.log('monitor', e);
-          console.log('visibilityState', document.visibilityState);
           if(document.visibilityState == 'visible') {
             self.refreshList();
           }
@@ -230,6 +234,14 @@
                   r.statusTxt = '审核驳回';
                   r.btnTxt = '查看详情';
                   break;
+                case '0205':
+                  r.statusTxt = '未发货';
+                  r.btnTxt = '查看物流';
+                  break;
+                case '0206':
+                  r.statusTxt = '已发货';
+                  r.btnTxt = '上传结果';
+                  break;
               }
 
               // 已采样 单独处理
@@ -255,9 +267,6 @@
             that.entitlementList = arr;
           } else {
             that.entitlementList = [];
-            // const l = window.location.origin;
-            // const hr = l + `/pica-insurance/sz-public?projectEquityNo=${projectEquityNo}&externalOrderNo=${externalOrderNo}`;
-            // window.location.href = hr;
             this.$router.push({
               path: '/sz-public-new',
               query: {
@@ -274,7 +283,7 @@
     }
   };
   </script>
-  <style lang="scss" scoped>
+<style lang="scss" scoped>
   .page-entitlement {
     width: 100%;
     height: 100vh;
@@ -347,6 +356,8 @@
               color: #212121;
               font-weight: 700;
               word-break: break-all;
+              overflow: hidden;
+              text-overflow: ellipsis;
             }
           }
         }
@@ -388,4 +399,4 @@
       }
     }
   }
-  </style>
+</style>

src/views/sz-public-new/index.vue

@@ -104,7 +104,9 @@
         v-if="showProtocol"
         class="protocol-content"
       >
-        <div class="block70 f20">身份校验通过</div>
+        <div class="block70 f20">
+          身份校验通过
+        </div>
         <div class="block70">
           请点击“领取权益”按钮填写预约领取信息
         </div>