Merge branch 'feature/zl' into 'release'

Feature/zl

See merge request !248

src/api/question.js

@@ -16,7 +16,6 @@ export const getJumpPageStatus = ({externalOrderNo, yunOrderNo, projectEquityNo}
     withCredentials: true,
   });
 };
-// https://dev-sc.yunqueyi.com/tis/insurance/create/order
 
 export const createOrder = (data) => {
   return request({
@@ -27,11 +26,27 @@ export const createOrder = (data) => {
   });
 };
 
-// tis/insurance/makeAppointmentStatus?yunOrderNo=PCX2023021608340000000709043
-export const getAppointmentStatus = (yunOrderNo) => {
+export const getLanZhouFlag = (externalOrderNo) => {
   return request({
     method: 'get',
-    url: `/tis/insurance/makeAppointmentStatus?yunOrderNo=${yunOrderNo}`,
+    url: `/tis/insurance/common/lanZhou/flag/${externalOrderNo}`,
     withCredentials: true,
   });
 };
+export const createOrderSz = (data) => {
+  return request({
+    url: '/tis/insurance/middleware/create/order/sz',
+    method: 'POST',
+    withCredentials: true,
+    data,
+  });
+};
+
+export const createOrderSzV2 = (data) => {
+  return request({
+    url: '/tis/insurance/middleware/create/order/sz/v2',
+    method: 'POST',
+    withCredentials: true,
+    data,
+  });
+};

src/router/index.js

@@ -121,11 +121,21 @@ const routerConfig = [
     name: 'sz-home',
     component: () => import('@/views/sz-home/index.vue'),
   },
+  {
+    path: '/lz-home',
+    name: 'lz-home',
+    component: () => import('@/views/lz-home/index.vue'),
+  },
   {
     path: '/sz-public',
     name: 'sz-public',
     component: () => import('@/views/sz-public/index.vue'),
   },
+  {
+    path: '/sz-public-new',
+    name: 'sz-public-new',
+    component: () => import('@/views/sz-public-new/index.vue'),
+  },
   {
     path: '/entitlement',
     name: 'entitlement',

src/views/entitlement/list.vue

@@ -59,8 +59,6 @@
             :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"
-            @error="handleErrorFn"
-            @launch="handleLaunchFn"
           >
             <script type="text/wxtag-template">
               <style>.btn {color: #00bda5;text-align: center;line-height: 36px; width:100%; height: 100%;}</style> <div class="btn">{{ item.btnTxt }}</div>
@@ -128,12 +126,6 @@
     },
 
     mounted() {
-      // const { query:
-      //   {
-      //     project_equity_no = 'RDSZ20230602011',
-      //     external_order_no = 'SZ202306011000938751'
-      //   }
-      // } = this.$route;
       const {externalOrderNo, projectEquityNo} = this.$route.query;
       this.externalOrderNo = externalOrderNo;
       this.projectEquityNo = projectEquityNo;
@@ -141,25 +133,6 @@
       this.getEntitlementList(externalOrderNo, projectEquityNo);
       this.monitorMiniProgram();
     },
-
-    // updated() {
-    //   const self = this;
-    //   var launchBtn0 = document.getElementById('launch-btn0');
-    //   if(launchBtn0) {
-    //     launchBtn0.addEventListener('launch', function (e) {
-    //       console.log('success-launch-updated0', e);
-    //       setTimeout(() => {self.showDialog = true;}, 3000);
-    //     });
-    //   }
-    //   var launchBtn1 = document.getElementById('launch-btn1');
-    //   if(launchBtn1) {
-    //     launchBtn1.addEventListener('launch', function (e) {
-    //       console.log('success-launch-updated1', e);
-    //       setTimeout(() => {self.showDialog = true;}, 3000);
-    //     });
-    //   }
-    // },
-
     methods:{
 
       getBanner(pageType, yunOrderNo) {
@@ -268,11 +241,7 @@
                 }
               }
 
-              // detectionKind 1 早早检（快检）  0 or null DNA甲基化（早筛）
               r.title = r.detectionKind == 1 ? '癌症早早检权益领取' : '癌症早检权益领取';
-
-              // r.btnTxt = (r.statusCode == '0905' || r.statusCode == '0101' || r.statusCode == '0102' || r.statusCode == '0902') ? '查看结果' : r.statusCode == '0202' ? '预约详情' :
-              // r.statusCode == '0104' ? '去支付' : r.statusCode == '0201' ? '去预约' : '检测详情';
               return r;
             });
             arr.map((item, index) => {
@@ -285,16 +254,16 @@
             console.log('--arr', arr);
             that.entitlementList = arr;
           } else {
-            // that.entitlementList = [];
-            // that.$router.push(
-            //   {
-            //     path:  '/sz-public',
-            //     query: {
-            //       projectEquityNo: projectEquityNo,
-            //       externalOrderNo: externalOrderNo
-            //     },
-            //   }
-            // );
+            that.entitlementList = [];
+            that.$router.replace(
+              {
+                path:  '/sz-public',
+                query: {
+                  projectEquityNo: projectEquityNo,
+                  externalOrderNo: externalOrderNo
+                },
+              }
+            );
           }
           that.$loading.hide();
         }

src/views/lz-home/index.scss

+

src/views/lz-home/index.vue

+<template>
+  <div class="sz-appoint" />
+</template>
+
+<script>
+import { getLanZhouFlag} from '@/api/question';
+export default {
+  data() {
+    return {
+      projectEquityNo: '',
+      externalOrderNo: '',
+    };
+  },
+  computed: {
+    canSubmit() {
+      return (
+        this.dectionForm.beneficiaryIdNum &&
+        this.dectionForm.beneficiaryName &&
+        this.dectionForm.beneficiaryPhone
+      );
+    },
+  },
+  mounted() {
+    const {externalOrderNo} = this.$route.query;
+    if(externalOrderNo) {
+      this.getJumpPageStatus(externalOrderNo);
+    }
+  },
+  methods: {
+    getJumpPageStatus(externalOrderNo) {
+      getLanZhouFlag(externalOrderNo).then(res => {
+        if (res.code === '000000') {
+          const {externalOrderNo, flag, projectEquityNo} = res.data;
+          let url = '/home';
+          if(flag == 0) {
+            url = '/home';
+          }
+          if(flag == 1) {
+            url = '/entitlement';
+          }
+          this.$loading.hide();
+          console.log(externalOrderNo, flag, projectEquityNo, url);
+          this.$router.replace(
+            {
+              path: url,
+              query: {
+                projectEquityNo: projectEquityNo,
+                externalOrderNo: externalOrderNo
+              },
+            }
+          );
+        }
+      });
+    },
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.sz-appoint {
+  width: 100%;
+  height: 100vh;
+  overflow: auto;
+  box-sizing: border-box;
+  color: #ffffff;
+  background: #F3FCFF;
+}
+</style>

src/views/sz-public/index.vue

@@ -2,7 +2,7 @@
   <div class="insurance-sz">
     <div class="text">
       <img
-        src="https://files.yunqueyi.com/image/png/common/20230620135424634.png"
+        :src="insuranceText.logoUrl"
         alt=""
       >
     </div>
@@ -81,6 +81,7 @@
 <script>
   // const { VUE_APP_ENV } = process.env;
   import {getEntitlementList} from '@/api/entitlement';
+  import {getDetailtxt} from '@/api/appoint';
   let that;
   export default {
     data() {
@@ -98,6 +99,9 @@
           extraData: JSON.stringify({})
         },
         routerInfo:{},
+        insuranceText:{
+          logoUrl: ''
+        }
       };
     },
     mounted() {
@@ -107,18 +111,14 @@
       this.openWebAppConfigPositive.path = `pagesInsurance/all-entrance/index?channelSource=insurance_channel&projectEquityNo=${projectEquityNo}&externalOrderNo=${externalOrderNo}&detectionKind=1`;
       console.log('-this.openWebAppConfigPositiv', this.openWebAppConfigPositive);
       this.vis();
+      this.getDetailtxt(projectEquityNo);
     },
     methods: {
       vis() {
         document.addEventListener('visibilitychange', function() {
-          console.log('--22', document.visibilityState);
           if(document.visibilityState == 'visible') {
-            console.log('进入前台');
             that.getEntitlementList();
           }
-          if(document.visibilityState == 'hidden') {
-            console.log('切换到后台');
-          }
         });
       },
       handleErrorFn(e) {
@@ -147,6 +147,15 @@
           }
         });
       },
+      getDetailtxt(projectEquityNo) {
+        const o = {
+          yunOrderNo: projectEquityNo,
+          pageType: 5
+        };
+        getDetailtxt(o).then(res => {
+          this.insuranceText = res.data;
+        });
+      }
     }
   };
   </script>
@@ -159,9 +168,6 @@
     padding-bottom: 70px;
     height: 712px;
     background: #fff;
-    // .text{
-
-    // }
     .bottom{
       position: fixed;
       bottom: 0;

vue.config.js

@@ -36,7 +36,7 @@ module.exports = {
     port: 8083,
     proxy: {
       '/proxy': {
-        target: 'https://dev-sc.yunqueyi.com/',
+        target: 'https://test1-sc.yunqueyi.com/',
         // target: 'https://test1-sc.yunqueyi.com/',
         // target: 'https://uat-sc.yunqueyi.com/',
         // http://10.241.65.90:3000/mock/1071/cs/route/removeUser