Merge branch 'feature/quickly-find-code' into 'release'

feat: 快速找到核销码

See merge request !280

src/views/entitlement/list.vue

@@ -18,8 +18,7 @@
             <span
               v-if="item.detectionPayType == 1"
               class="pay-icon"
-              >付费</span
-            >
+            >付费</span>
           </div>
           <div
             class="status"
@@ -36,7 +35,9 @@
         </div>
         <div class="content">
           <div class="item">
-            <div class="label">检测项目：</div>
+            <div class="label">
+              检测项目：
+            </div>
             <div class="value">
               {{ item.detectionName || '--' }}
             </div>
@@ -44,13 +45,17 @@
 
           <div v-if="item.expressContent">
             <div class="item">
-              <div class="label">运单号：</div>
+              <div class="label">
+                运单号：
+              </div>
               <div class="value">
                 {{ item.expressNo || '--' }}
               </div>
             </div>
             <div class="item">
-              <div class="label">物流进度：</div>
+              <div class="label">
+                物流进度：
+              </div>
               <div class="value">
                 {{ item.expressContent || '--' }}
               </div>
@@ -59,7 +64,9 @@
 
           <div v-else>
             <div class="item">
-              <div class="label">领取机构：</div>
+              <div class="label">
+                领取机构：
+              </div>
               <div class="value">
                 {{ item.hospitalName || '--' }}
               </div>
@@ -107,7 +114,9 @@
           class="empty-icon"
           :src="emptyIconPath"
         />
-        <div class="empty-text">暂无领取记录</div>
+        <div class="empty-text">
+          暂无领取记录
+        </div>
       </div>
     </div>
   </div>
@@ -243,6 +252,14 @@ export default {
                   r.statusTxt = '已发货';
                   r.btnTxt = '上传结果';
                   break;
+                case '0403':
+                  r.statusTxt = '已预约待咨询';
+                  r.btnTxt = '前往咨询';
+                  break;
+                case '0906':
+                  r.statusTxt = '已完成';
+                  r.btnTxt = '查看建议';
+                  break;
               }
 
               // 已采样 单独处理

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

@@ -128,6 +128,18 @@
               </template>
             </van-field>
           </van-form>
+          <wx-open-launch-weapp
+            id="checkBtn"
+            style="display: block;"
+            :username="openWebAppConfigPositive.username"
+            :path="openWebAppConfig_without_yunorder"
+            :env-version="envVersion"
+            @launch="handleLaunchFn"
+          >
+            <script type="text/wxtag-template">
+              <style>.bottom-text { display: flex; align-items: center; justify-content: center; margin-top: 15px; margin-bottom: 10px;height: 18px;font-size: 13px;line-height: 18px;text-align: center;font-weight: 400;font-family: PingFangSC-Regular, PingFang SC;color: #212121ff; }</style> <div class="bottom-text">查看领取记录 ></div>
+            </script>
+          </wx-open-launch-weapp>
         </div>
         <div
           v-for="(i, ind) in staticINFO.logoUrlList"
@@ -136,11 +148,6 @@
         >
           <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">
@@ -174,7 +181,6 @@
         </template>
       </van-cell>
     </van-popup>
-
     <!-- 校验通过弹框 -->
     <van-overlay :show="showProtocol">
       <div class="check-popup-wrapper">
@@ -206,6 +212,7 @@
               <style>.btn {position:absolute; top: -3px; color: #ffffff;text-align: center;line-height: 50px; font-size: 16px; font-weight: 500; left: 0; width:100%; height: 100%;}</style> <div class="btn">下一步</div>
             </script>
           </wx-open-launch-weapp>
+          <div class="btn">下一步<img src="https://files.yunqueyi.com/image/png/common/20231023194533645.png" /></div>
         </div>
       </div>
     </van-overlay>
@@ -261,6 +268,7 @@ export default {
       },
       // 太保项目用户信息
       inherentUserInfo: null,
+      openWebAppConfig_without_yunorder: 'pagesInsurance/all-entrance/index?insurance_without_yunorder=insurance_without_yunorder'
     };
   },
   computed: {
@@ -329,6 +337,7 @@ export default {
     ) {
       this.getTaiBaoUserInfo();
     }
+    this.initInsurancePath();
     this.$sendBuriedData({
       action: 'ACTION_WEB_ENTER',
       component_tag: '7802964#0#0#保险入口页面',
@@ -475,6 +484,9 @@ export default {
       console.log('handleLaunchFn', e);
       that.showProtocol = false;
     },
+    initInsurancePath () {
+      this.openWebAppConfig_without_yunorder = `pagesInsurance/all-entrance/index?insurance_without_yunorder=insurance_without_yunorder&externalOrderNo=${this.externalOrderNo}&projectEquityNo=${this.projectEquityNo}`;
+    },
   },
 };
 </script>
@@ -616,6 +628,9 @@ export default {
     font-weight: 300;
     font-size: 14px;
   }
+  /deep/.van-cell--borderless::after, .van-cell:last-child::after {
+    display: block !important;
+  }
   .phone-wrap {
     .sm-grey {
       font-weight: 100;