Merge branch 'release' into hotfix0626

src/views/entitlement/list.vue

@@ -171,7 +171,7 @@
 
       getEntitlementList(externalOrderNo, projectEquityNo) {
         const that = this;
-        that.$loading.show();
+        // that.$loading.show();
         getEntitlementList(externalOrderNo, projectEquityNo).then(res => {
         if (res.code === '000000') {
           if(res?.data.length > 0) {
@@ -255,20 +255,19 @@
             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;
-            // that.$router.replace(
-            //   {
-            //     path:  '/sz-public',
-            //     query: {
-            //       projectEquityNo: projectEquityNo,
-            //       externalOrderNo: externalOrderNo
-            //     },
-            //   }
-            // );
+            // 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',
+              query: {
+                externalOrderNo: externalOrderNo,
+                projectEquityNo:projectEquityNo,
+                reload: 'reload',
+              }
+            });
           }
-          that.$loading.hide();
+          // that.$loading.hide();
         }
       });
     },

src/views/sz-public/index.vue

@@ -14,8 +14,6 @@
           :username="openWebAppConfigPositive.username"
           :path="openWebAppConfigPositive.path"
           :env-version="envVersion"
-          @error="handleErrorFn"
-          @launch="handleLaunchFn"
         >
           <script type="text/wxtag-template">
             <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>
@@ -23,58 +21,6 @@
         </wx-open-launch-weapp>
       </div>
     </div>
-    <van-popup
-      v-model="show"
-      closeable
-      round
-      position="bottom"
-      :style="{ height: '500px' ,overflow:'hidden'}"
-    >
-      <div class="popup-title">
-        选择被保险人
-      </div>
-      <div class="popup-list">
-        <van-radio-group v-model="person">
-          <van-cell-group>
-            <van-cell
-              v-for="(item) in userinfo"
-              :key="item.id"
-              clickable
-              @click="person = item.name"
-            >
-              <div class="popup-list-item">
-                <div class="name">
-                  {{ item.name }}
-                </div>
-                <div class="info">
-                  <div class="phoneNum">
-                    <span>手机号码：</span>
-                    <span>{{ item.mobile }}</span>
-                  </div>
-                  <div class="idCard">
-                    <span>身份证号：</span>
-                    <span>{{ item.id_number }}</span>
-                  </div>
-                </div>
-              </div>
-              <template #right-icon>
-                <van-radio :name="item.name" />
-              </template>
-            </van-cell>
-          </van-cell-group>
-        </van-radio-group>
-      </div>
-      <div class="popup-btn-box">
-        <van-button
-          class="popup-btn"
-          :disabled="!person"
-          @click="show=false
-          "
-        >
-          确定
-        </van-button>
-      </div>
-    </van-popup>
   </div>
 </template>
 
@@ -86,11 +32,6 @@
   export default {
     data() {
       return {
-        show: false,
-        person: null,
-        userinfo: [
-
-        ],
         envVersion: VUE_APP_ENV == 'production' ? 'release' : 'trial',
         // envVersion:'trial',
         openWebAppConfigPositive:{
@@ -105,13 +46,17 @@
       };
     },
     mounted() {
-      const {externalOrderNo, projectEquityNo} = this.$route.query;
+      const {externalOrderNo, projectEquityNo, reload} = this.$route.query;
       this.routerInfo = this.$route.query;
       that = this;
-      this.openWebAppConfigPositive.path = `pagesInsurance/all-entrance/index?channelSource=insurance_channel&projectEquityNo=${projectEquityNo}&externalOrderNo=${externalOrderNo}&detectionKind=1`;
       console.log('-this.openWebAppConfigPositiv', this.openWebAppConfigPositive);
+      if(reload && reload == 'reload') {
+        const l = window.location.origin;
+        const hr = l + `/pica-insurance/sz-public?projectEquityNo=${projectEquityNo}&externalOrderNo=${externalOrderNo}`;
+        window.location.href = hr;
+      }
       this.vis();
-      this.getDetailtxt(projectEquityNo);
+      this.getDetailtxt(projectEquityNo, externalOrderNo);
     },
     methods: {
       vis() {
@@ -121,12 +66,6 @@
           }
         });
       },
-      handleErrorFn(e) {
-        console.log('handleErrorFn', e);
-      },
-      handleLaunchFn(e) {
-        console.log('handleLaunchFn', e);
-      },
       getEntitlementList() {
         that.$loading.show();
         const {externalOrderNo, projectEquityNo} = that.routerInfo;
@@ -147,13 +86,14 @@
           }
         });
       },
-      getDetailtxt(projectEquityNo) {
+      getDetailtxt(projectEquityNo, externalOrderNo) {
         const o = {
           yunOrderNo: projectEquityNo,
           pageType: 5
         };
         getDetailtxt(o).then(res => {
           this.insuranceText = res.data;
+          this.openWebAppConfigPositive.path = `pagesInsurance/all-entrance/index?channelSource=insurance_channel&projectEquityNo=${projectEquityNo}&externalOrderNo=${externalOrderNo}&detectionKind=1`;
         });
       }
     }
@@ -173,6 +113,7 @@
       bottom: 0;
       width: 100vw;
       background: #fff;
+      z-index: 1000;
       padding-bottom: 27px;
       .bottom-text{
         padding: 10px 21px 10px 15px;