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

@@ -2,13 +2,13 @@ import request from 'mn-template/plugins/http';
 
 // 获取权益列表
 export const getEntitlementList = async (externalOrderNo, projectEquityNo) => {
-    return request({
-      method: 'get',
-      url: `/tis/insurance/projectEquityNo/externalOrderNo?externalOrderNo=${externalOrderNo}&projectEquityNo=${projectEquityNo}`,
-      withCredentials: true,
-      hasLoading:true,
-    });
-  };
+  return request({
+    method: 'get',
+    url: `/tis/insurance/projectEquityNo/externalOrderNo?externalOrderNo=${externalOrderNo}&projectEquityNo=${projectEquityNo}`,
+    withCredentials: 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/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