Merge branch 'release' into feature/ui-optimize-0801

.env.dev

@@ -2,6 +2,9 @@ NODE_ENV=production
 # 自定义 VUE_APP_ENV
 VUE_APP_ENV ='dev'
 
+# 微信小程序的环境变量
+VUE_APP_MINI_PROGRAM_ENV = 'trial'
+
 VUE_APP_SERVICE_URL=https://dev-sc.yunqueyi.com
 
 # 阿里云OSS对象存储地址

.env.development.local

 NODE_ENV=development
 VUE_APP_ENV=development
-
+VUE_APP_MINI_PROGRAM_ENV='trial'
 VUE_APP_SERVICE_URL=
 
 # 模拟用户信息

.env.production

@@ -3,6 +3,9 @@ NODE_ENV=production
 # 自定义 VUE_APP_ENV
 VUE_APP_ENV ='production'
 
+# 微信小程序的环境变量
+VUE_APP_MINI_PROGRAM_ENV = 'release'
+
 VUE_APP_SERVICE_URL=https://sc.yunqueyi.com
 
 # 阿里云OSS对象存储地址

.env.testing

@@ -3,6 +3,9 @@ NODE_ENV=production
 # 自定义 VUE_APP_ENV
 VUE_APP_ENV ='production'
 
+# 微信小程序的环境变量
+VUE_APP_MINI_PROGRAM_ENV='trial'
+
 VUE_APP_SERVICE_URL=https://test1-sc.yunqueyi.com
 # 阿里云OSS对象存储地址
 VUE_APP_OSS_URL=https://pica-h5-test.yunqueyi.com/

README.md

 # pica-insurance
 > 请先查看每个目录的 md 文件
 
+## 仓库入口
+[pica-insurance](http://192.168.110.53/com.pica.cloud.frontend/pica-insurance)
+
 ## 启动
 ```shell script
 npm run start

src/api/entitlement.js

@@ -6,9 +6,9 @@ export const getEntitlementList = async (externalOrderNo, projectEquityNo) => {
     method: 'get',
     url: `/tis/insurance/projectEquityNo/externalOrderNo?externalOrderNo=${externalOrderNo}&projectEquityNo=${projectEquityNo}`,
     withCredentials: true,
-      hasLoading:true,
+    hasLoading: true,
   });
-  };
+};
 
 // 获取banner
 export const getBanner = async (pageType, yunOrderNo) => {
@@ -16,6 +16,15 @@ export const getBanner = async (pageType, yunOrderNo) => {
     method: 'get',
     url: `/tis/insurance/explain/${yunOrderNo}/${pageType}`,
     withCredentials: true,
-    hasLoading:true,
+    hasLoading: true,
+  });
+};
+
+// 查询证件类型字典的接口
+export const getCardTypes = () => {
+  return request({
+    url: 'basic-data/constants/app?typeCodeList=P333',
+    method: 'get',
+    withCredentials: true,
   });
 };

src/main.js

-import { router, store, vueApp } from '@pica-cli/vue-cli-plugin-pica-cli-plugin/auto';
+import {
+  router,
+  store,
+  vueApp,
+} from '@pica-cli/vue-cli-plugin-pica-cli-plugin/auto';
 import * as dd from 'dingtalk-jsapi';
 import '@/router';
 console.log('router, store, vueApp: ', router, store, vueApp);
 import '@/assets/js/flexible';
-import {isWeixin } from './utils/index';
+import { isWeixin } from './utils/index';
 import Loading from '@/components/loading/loading.js';
 import CryptoJS from 'crypto-js/crypto-js';
 import JsEncrypt from 'jsencrypt/bin/jsencrypt';
@@ -39,22 +43,21 @@ document.documentElement.addEventListener(
     passive: false,
   }
 );
-
+console.log('z', vueApp.$rocNative);
 vueApp.$rocNative.appInit();
 vueApp.$rocNative.on('wx_ready', function () {
   console.log('-wx_ready-', window._picaWechat);
   // 初始化wx jssdk 后 执行 脚手架将 wx 对象挂在到 $rocNative对象上，后执行  小程序环境判断方法 miniProgram.getEnv
-  vueApp.$rocNative.WXInstance.miniProgram.getEnv(function(res) {
+  vueApp.$rocNative.WXInstance.miniProgram.getEnv(function (res) {
     console.log('_miniprogram', res.miniprogram); // true
     window._miniprogram = res.miniprogram;
   });
-
 });
 console.log('---', isWeixin());
-if(isWeixin()) {
+if (isWeixin()) {
   window._picaWechat = 'wechat';
 }
-if(dd.env.version) {
+if (dd.env.version) {
   window._picaWechat = 'dingtalk';
 }
 
@@ -63,7 +66,7 @@ sessionStorage.setItem('headerHeight', 0);
 window.Vue.use(Loading);
 // 设置安全密钥
 window._AMapSecurityConfig = {
-  securityJsCode: 'f5093bfce95bd0393749259bcc44ede8'
+  securityJsCode: 'f5093bfce95bd0393749259bcc44ede8',
 };
 
 console.log('router, store, vueApp: ', router, store, vueApp);

src/views/appointDetails/index.vue

@@ -151,6 +151,17 @@
             </text> -->
           </div>
         </div>
+        <div
+          v-if="detailInfo.helpDetectionFlag == 1"
+          class="detail-bottom-item"
+        >
+          <div class="title">
+            采集方式:
+          </div>
+          <div class="value">
+            现场检测
+          </div>
+        </div>
       </div>
       <div class="appoint-detail-tel">
         客服电话：<a

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>
@@ -39,7 +45,7 @@
                 运单号：
               </div>
               <div class="value">
-                {{ item.expressNo || "--" }}
+                {{ item.expressNo || '--' }}
               </div>
             </div>
             <div class="item">
@@ -47,7 +53,7 @@
                 物流进度：
               </div>
               <div class="value">
-                {{ item.expressContent || "--" }}
+                {{ item.expressContent || '--' }}
               </div>
             </div>
           </div>
@@ -66,18 +72,21 @@
                 检测时间：
               </div>
               <div class="value">
-                {{ formatDate(item.detectionTime) || "--" }}
+                {{ formatDate(item.detectionTime) || '--' }}
               </div>
             </div>
           </div>
-
         </div>
-        <div
-          class="btn"
-        >
+        <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"
@@ -105,47 +114,44 @@
   </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';
+import { getEntitlementList, getBanner } from '@/api/entitlement';
+
+export default {
   data() {
     return {
       bgPath: '',
       entitlementList: [],
-        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({})
+      emptyIconPath:
+        'https://files.yunqueyi.com/image/png/common/20230602155400880.png',
+      envVersion: process.env.VUE_APP_MINI_PROGRAM_ENV,
+      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();
         }
@@ -156,7 +162,7 @@
       const self = this;
       document.addEventListener('visibilitychange', () => {
         self.entitlementList = [];
-          if(document.visibilityState == 'visible') {
+        if (document.visibilityState == 'visible') {
           self.refreshList();
         }
       });
@@ -176,11 +182,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) {
@@ -245,21 +251,24 @@
               }
 
               // 已采样 单独处理
-              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;
               }
             });
@@ -271,26 +280,26 @@
               path: '/sz-public-new',
               query: {
                 externalOrderNo: externalOrderNo,
-                projectEquityNo:projectEquityNo,
+                projectEquityNo: projectEquityNo,
                 reload: 'reload',
-              }
+              },
             });
           }
           // that.$loading.hide();
         }
       });
     },
-    }
-  };
-  </script>
+  },
+};
+</script>
 <style lang="scss" scoped>
-  .page-entitlement {
+.page-entitlement {
   width: 100%;
   height: 100vh;
   background: #f5f6f8;
   overflow-y: auto;
 
-    .banner{
+  .banner {
     width: 375px;
     height: 287px;
   }
@@ -326,15 +335,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;
         }
       }
 
@@ -381,22 +390,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>

src/views/sz-public-new/date-picker.vue

+<template>
+  <div class="pica-date-picker">
+    <van-field
+      :border="false"
+      readonly
+      placeholder="请选择出生年月日"
+      :value="value"
+      class="appoint-form-items"
+      @click="handleOpenPopup"
+    />
+    <van-popup
+      v-model="visible"
+      position="bottom"
+      :transition-appear="false"
+    >
+      <van-datetime-picker
+        type="date"
+        title="选择年月日"
+        :value="currentDate"
+        :min-date="minDate"
+        :max-date="maxDate"
+        @confirm="handleConfirm"
+        @cancel="visible = false"
+      />
+    </van-popup>
+  </div>
+</template>
+
+<script>
+import dayjs from 'dayjs';
+export default {
+  props: {
+    value: {
+      type: String,
+      default: '',
+    },
+  },
+  data() {
+    return {
+      visible: false,
+      currentDate: new Date(),
+      minDate: new Date(1900, 0, 1),
+      maxDate: new Date(),
+    };
+  },
+
+  methods: {
+    handleOpenPopup() {
+      this.visible = true;
+    },
+
+    handleConfirm(value) {
+      this.visible = false;
+      const formatDate = dayjs(value).format('YYYY-MM-DD');
+      this.$emit('input', formatDate);
+    },
+  },
+};
+</script>
+<style scoped lang="scss">
+.pica-date-picker {
+  width: 100%;
+  .van-cell {
+    padding: 0 !important;
+  }
+}
+</style>

vue.config.js

@@ -36,7 +36,7 @@ module.exports = {
     port: 8083,
     proxy: {
       '/proxy': {
-        target: 'https://test1-sc.yunqueyi.com/',
+        target: 'https://dev-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