Merge branch 'release' into feature/insurance-h5-0718

src/views/entitlement/list.vue

@@ -18,7 +18,13 @@
           </div>
           <div
             class="status"
-            :class="{particlar : (item.statusCode == '0204' || item.statusCode == '0905' || item.statusCode == '0904'), 'red-particlar':item.statusCode == '0305'}"
+            :class="{
+              particlar:
+                item.statusCode == '0204' ||
+                item.statusCode == '0905' ||
+                item.statusCode == '0904',
+              'red-particlar': item.statusCode == '0305',
+            }"
           >
             {{ item.statusTxt || '--' }}
           </div>
@@ -32,6 +38,27 @@
               {{ item.detectionName || '--' }}
             </div>
           </div>
+
+          <div v-if="item.expressContent">
+            <div class="item">
+              <div class="label">
+                运单号：
+              </div>
+              <div class="value">
+                {{ item.expressNo || '--' }}
+              </div>
+            </div>
+            <div class="item">
+              <div class="label">
+                物流进度：
+              </div>
+              <div class="value">
+                {{ item.expressContent || '--' }}
+              </div>
+            </div>
+          </div>
+
+          <div v-else>
             <div class="item">
               <div class="label">
                 领取机构：
@@ -45,16 +72,21 @@
                 检测时间：
               </div>
               <div class="value">
-              {{ formatDate(item.detectionTime) || "--" }}
+                {{ formatDate(item.detectionTime) || '--' }}
               </div>
             </div>
           </div>
-        <div
-          class="btn"
-        >
+        </div>
+        <div class="btn">
           <wx-open-launch-weapp
             :id="`launch-btn${index}`"
-            style="position: absolute; top: 0; left: 0; width: 100%; height: 100%"
+            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"
@@ -65,23 +97,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"
@@ -99,47 +114,45 @@
   </div>
 </template>
 
-  <script>
-  import { formatDate } from '@/utils/common';
-  const { VUE_APP_ENV } = process.env;
-  import {getEntitlementList, getBanner} from '@/api/entitlement';
-  export default {
+<script>
+import { formatDate } from '@/utils/common';
+const { VUE_APP_ENV } = process.env;
+import { getEntitlementList, getBanner } from '@/api/entitlement';
+export default {
   data() {
     return {
       bgPath: '',
       entitlementList: [],
-        emptyIconPath: 'https://files.yunqueyi.com/image/png/common/20230602155400880.png',
+      emptyIconPath:
+        'https://files.yunqueyi.com/image/png/common/20230602155400880.png',
       envVersion: VUE_APP_ENV == 'production' ? 'release' : 'trial',
       // envVersion: 'trial',
-        openWebAppConfig:{
-          username:'gh_e92f58174364', // 小程序唯一username  1.gh_80d54796f2d5 云鹊助手 2. gh_e92f58174364 云鹊健康
-          path:'pagesInsurance/all-entrance/index', // 打开页面
-          extraData: JSON.stringify({})
+      openWebAppConfig: {
+        username: 'gh_e92f58174364', // 小程序唯一username  1.gh_80d54796f2d5 云鹊助手 2. gh_e92f58174364 云鹊健康
+        path: 'pagesInsurance/all-entrance/index', // 打开页面
+        extraData: JSON.stringify({}),
       },
-        externalOrderNo:'',
-        projectEquityNo:'',
+      externalOrderNo: '',
+      projectEquityNo: '',
       showDialog: false,
     };
   },
-    computed() {
-
-    },
+  computed() {},
 
   mounted() {
-      const {externalOrderNo, projectEquityNo} = this.$route.query;
+    const { externalOrderNo, projectEquityNo } = this.$route.query;
     this.externalOrderNo = externalOrderNo;
     this.projectEquityNo = projectEquityNo;
     this.getBanner(6, projectEquityNo);
     this.getEntitlementList(externalOrderNo, projectEquityNo);
     this.monitorMiniProgram();
   },
-    methods:{
-
+  methods: {
     getBanner(pageType, yunOrderNo) {
       const self = this;
       self.$loading.show();
-        getBanner(pageType, yunOrderNo).then(res => {
-          if(res.code === '000000') {
+      getBanner(pageType, yunOrderNo).then((res) => {
+        if (res.code === '000000') {
           self.bgPath = res.data.logoUrl;
           self.$loading.hide();
         }
@@ -148,11 +161,9 @@
 
     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') {
+        if (document.visibilityState == 'visible') {
           self.refreshList();
         }
       });
@@ -172,11 +183,11 @@
     getEntitlementList(externalOrderNo, projectEquityNo) {
       const that = this;
       // that.$loading.show();
-        getEntitlementList(externalOrderNo, projectEquityNo).then(res => {
+      getEntitlementList(externalOrderNo, projectEquityNo).then((res) => {
         if (res.code === '000000') {
-          if(res?.data.length > 0) {
+          if (res?.data.length > 0) {
             let arr = [];
-            arr = res.data.map( r => {
+            arr = res.data.map((r) => {
               // 0905已完成 0101未填写问卷 0102已填写问卷 0202已预约 0902已结束 0104待支付 0201待预约 0302已采样 0901 已出报告
               // 0903 待报销 0904 已报销
               switch (r.statusCode) {
@@ -230,24 +241,35 @@
                   r.statusTxt = '审核驳回';
                   r.btnTxt = '查看详情';
                   break;
+                case '0205':
+                  r.statusTxt = '未发货';
+                  r.btnTxt = '查看物流';
+                  break;
+                case '0206':
+                  r.statusTxt = '已发货';
+                  r.btnTxt = '上传结果';
+                  break;
               }
 
               // 已采样 单独处理
-              if(r.statusCode == '0302') {
-                if(r.detectionKind == 1) {
+              if (r.statusCode == '0302') {
+                if (r.detectionKind == 1) {
                   r.btnTxt = '上传结果';
-                }else{
+                } else {
                   r.btnTxt = '检测详情';
                 }
               }
 
-              r.title = r.detectionKind == 1 ? '癌症早早检权益领取' : '癌症早检权益领取';
+              r.title =
+                r.detectionKind == 1
+                  ? '癌症早早检权益领取'
+                  : '癌症早检权益领取';
               return r;
             });
             arr.map((item, index) => {
-              if(item.statusCode == '0101') {
+              if (item.statusCode == '0101') {
                 arr[index]['yunOrderNoFirst_self'] = item.yunOrderNoFirst;
-              }else{
+              } else {
                 arr[index]['yunOrderNoFirst_self'] = item.yunOrderNo;
               }
             });
@@ -255,33 +277,30 @@
             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: {
                 externalOrderNo: externalOrderNo,
-                projectEquityNo:projectEquityNo,
+                projectEquityNo: projectEquityNo,
                 reload: 'reload',
-              }
+              },
             });
           }
           // that.$loading.hide();
         }
       });
     },
-    }
-  };
-  </script>
-  <style lang="scss" scoped>
-  .page-entitlement {
+  },
+};
+</script>
+<style lang="scss" scoped>
+.page-entitlement {
   width: 100%;
   height: 100vh;
   background: #f5f6f8;
   overflow-y: auto;
 
-    .banner{
+  .banner {
     width: 375px;
     height: 287px;
   }
@@ -317,15 +336,15 @@
           text-align: right;
           font-size: 12px;
           font-weight: 400;
-            color: #00BDA5;
+          color: #00bda5;
         }
 
-          .particlar{
+        .particlar {
           color: #999999;
         }
 
-          .red-particlar{
-            color: #FF4B33;
+        .red-particlar {
+          color: #ff4b33;
         }
       }
 
@@ -347,6 +366,8 @@
             color: #212121;
             font-weight: 700;
             word-break: break-all;
+            overflow: hidden;
+            text-overflow: ellipsis;
           }
         }
       }
@@ -370,22 +391,22 @@
       // }
     }
 
-      .empty-wrap{
+    .empty-wrap {
       padding: 154px 54px 250px 54px;
       background: #fff;
       border-radius: 10px;
-        .empty-icon{
+      .empty-icon {
         width: 243px;
         height: 127px;
       }
 
-        .empty-text{
+      .empty-text {
         font-size: 18px;
         font-weight: 500;
-          color: #02120F;
+        color: #02120f;
         text-align: center;
       }
     }
   }
-  }
-  </style>
+}
+</style>

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

@@ -111,16 +111,18 @@
             </van-field>
           </van-form>
         </div>
-        <div class="bg-img mt20">
-          <img
-            src="https://files.yunqueyi.com/image/png/common/20230628141616682.png"
-          >
-        </div>
-        <div class="bg-img mt20">
-          <img
-            src="https://files.yunqueyi.com/image/png/common/20230628141650960.png"
+        <div
+          v-for="(i, ind) in staticINFO.logoUrlList"
+          :key="ind"
+          class="bg-img mt20"
         >
+          <img :src="i">
         </div>
+        <!--        <div class="bg-img mt20">-->
+        <!--          <img-->
+        <!--            src="https://files.yunqueyi.com/image/png/common/20230628141650960.png"-->
+        <!--          >-->
+        <!--        </div>-->
       </div>
     </div>
     <div class="bottom-btn">
@@ -227,6 +229,9 @@ export default {
         extraData: JSON.stringify({}),
       },
       bgPath: '',
+      staticINFO: {
+        logoUrlList: [],
+      },
     };
   },
   computed: {
@@ -285,6 +290,7 @@ export default {
       getBanner(pageType, yunOrderNo).then((res) => {
         if (res.code === '000000') {
           self.bgPath = res.data.logoUrl;
+          self.staticINFO = res.data;
           self.$loading.hide();
         }
       });