Merge branch 'release-zl' into 'release'

Release zl

See merge request !273

.prettierrc

+{
+  "singleQuote": true,
+  "singleAttributePerLine": true,
+  "bracketSameLine": false
+}

src/api/entitlement.js

@@ -6,7 +6,7 @@ export const getEntitlementList = async (externalOrderNo, projectEquityNo) => {
     method: 'get',
     url: `/tis/insurance/projectEquityNo/externalOrderNo?externalOrderNo=${externalOrderNo}&projectEquityNo=${projectEquityNo}`,
     withCredentials: true,
-    hasLoading: true,
+    // hasLoading: true,
   });
 };
 
@@ -16,7 +16,7 @@ export const getBanner = async (pageType, yunOrderNo) => {
     method: 'get',
     url: `/tis/insurance/explain/${yunOrderNo}/${pageType}`,
     withCredentials: true,
-    hasLoading: true,
+    // hasLoading: true,
   });
 };
 

src/api/question.js

@@ -9,7 +9,7 @@ export const getButtonStatus = (id) => {
 };
 // 根据订单号获取跳转页状态/
 // /tis/insurance/jumpPageStatus?orderNo=1&projectEquityNo=1
-export const getJumpPageStatus = ({externalOrderNo, yunOrderNo, projectEquityNo}) => {
+export const getJumpPageStatus = ({ externalOrderNo, yunOrderNo, projectEquityNo }) => {
   return request({
     method: 'get',
     url: `/tis/insurance/jumpPageStatus?externalOrderNo=${externalOrderNo}&projectEquityNo=${projectEquityNo}&yunOrderNo=${yunOrderNo}`,
@@ -51,7 +51,7 @@ export const createOrderSzV2 = (data) => {
   });
 };
 
-export const uploadPointData = data => {
+export const uploadPointData = (data) => {
   return request({
     url: '/tis/insurance/promotion_channel/report_data',
     method: 'POST',
@@ -59,3 +59,16 @@ export const uploadPointData = data => {
     data,
   });
 };
+
+/**
+ * 根据外部单号查询用户信息（太保项目使用）
+ * TB202309151004000001
+ * @returns
+ */
+export const taiBaoUserInfo = (externalOrderNo) => {
+  return request({
+    url: `/tis/insurance/common/taiBao/TB202309151004000001/${externalOrderNo}`,
+    method: 'get',
+    withCredentials: true,
+  });
+};

src/utils/index.js

 export const formatDate = (datetime) => {
-    var date = new Date(datetime); // 时间戳为10位需*1000，时间戳为13位的话不需乘1000
-    var year = date.getFullYear(),
-        month = ('0' + (date.getMonth() + 1)).slice(-2),
-        sdate = ('0' + date.getDate()).slice(-2),
-        hour = ('0' + date.getHours()).slice(-2),
-        minute = ('0' + date.getMinutes()).slice(-2),
-        second = ('0' + date.getSeconds()).slice(-2);
-    // 拼接
-    var result =
-        year + '-' + month + '-' + sdate + ' ' + hour + ':' + minute + ':' + second;
-    // 返回
-    return result;
+  var date = new Date(datetime); // 时间戳为10位需*1000，时间戳为13位的话不需乘1000
+  var year = date.getFullYear(),
+    month = ('0' + (date.getMonth() + 1)).slice(-2),
+    sdate = ('0' + date.getDate()).slice(-2),
+    hour = ('0' + date.getHours()).slice(-2),
+    minute = ('0' + date.getMinutes()).slice(-2),
+    second = ('0' + date.getSeconds()).slice(-2);
+  // 拼接
+  var result =
+    year + '-' + month + '-' + sdate + ' ' + hour + ':' + minute + ':' + second;
+  // 返回
+  return result;
 };
 
 export const formatDay = (datetime) => {
-    var date = new Date(datetime);
-    var year = date.getFullYear(),
-        month = ('0' + (date.getMonth() + 1)).slice(-2),
-        day = ('0' + date.getDate()).slice(-2);
-    // 拼接
-    var result = year + '-' + month + '-' + day;
-    // 返回
-    return result;
+  var date = new Date(datetime);
+  var year = date.getFullYear(),
+    month = ('0' + (date.getMonth() + 1)).slice(-2),
+    day = ('0' + date.getDate()).slice(-2);
+  // 拼接
+  var result = year + '-' + month + '-' + day;
+  // 返回
+  return result;
 };
 
 // 判断是否是微信
 export function isWeixin() {
   const ua = window.navigator.userAgent.toLowerCase();
-  if(ua.match(/MicroMessenger/i) == 'micromessenger' || ua.match(/_SQ_/i) == '_sq_') {
+  //   if(ua.match(/MicroMessenger/i) == 'micromessenger' || ua.match(/_SQ_/i) == '_sq_') {
+  if (ua.match(/MicroMessenger/i) == 'micromessenger') {
     return true;
-  } else{
+  } else {
     return false;
   }
 }
 
 // 时间戳 格式化为 时分秒（00: 00: 00）
 export const formatDuring = (time) => {
-    const s = Math.floor(time / 1000);
-    if (!s) {
-        return '';
+  const s = Math.floor(time / 1000);
+  if (!s) {
+    return '';
+  }
+  let t = '';
+  if (s > -1) {
+    const hour = Math.floor(s / 3600);
+    const min = Math.floor(s / 60) % 60;
+    const sec = s % 60;
+    if (hour) {
+      if (hour < 10) {
+        t = '0' + hour + ':';
+      } else {
+        t = hour + ':';
+      }
+    }
+    if (min < 10) {
+      t += '0';
     }
-    let t = '';
-    if (s > -1) {
-        const hour = Math.floor(s / 3600);
-        const min = Math.floor(s / 60) % 60;
-        const sec = s % 60;
-        if (hour) {
-            if (hour < 10) {
-                t = '0' + hour + ':';
-            } else {
-                t = hour + ':';
-            }
-        }
-        if (min < 10) {
-            t += '0';
-        }
-        t += min + ':';
-        if (sec < 10) {
-            t += '0';
-        }
-        t += sec.toFixed(0);
+    t += min + ':';
+    if (sec < 10) {
+      t += '0';
     }
-    return t;
+    t += sec.toFixed(0);
+  }
+  return t;
 };
 
 export function toDecimal2(x) {
-    if (isNaN(x)) {
-        return '';
-    }
-    const f = x / 100;
-    let s = f.toString();
-    let rs = s.indexOf('.');
-    if (rs < 0) {
-        rs = s.length;
-        s += '.';
-    }
-    while (s.length <= rs + 2) {
-        s += '0';
-    }
-    return s;
+  if (isNaN(x)) {
+    return '';
+  }
+  const f = x / 100;
+  let s = f.toString();
+  let rs = s.indexOf('.');
+  if (rs < 0) {
+    rs = s.length;
+    s += '.';
+  }
+  while (s.length <= rs + 2) {
+    s += '0';
+  }
+  return s;
 }
 
 /**
@@ -89,18 +90,18 @@ export function toDecimal2(x) {
  *         birthDay：yyyy-MM-dd
  */
 export function getBirthdayAndSex(idCard) {
-    const info = {};
-    const birth = (idCard.length === 18) ? idCard.slice(6, 14) : idCard.slice(6, 12);
-    // 18位：提取第17位数字；15位：提取最后一位数字
-    const order = (idCard.length === 18) ? idCard.slice(-2, -1) : idCard.slice(-1);
-    info.birthDay = (idCard.length === 18) ? ([birth.slice(0, 4),
-        birth.slice(4, 6), birth.slice(-2)
-    ]).join('-') : ([
-        '19' + birth.slice(0, 2), birth.slice(2, 4),
-        birth.slice(-2)
-    ]).join('-');
-    // 余数为0代表女性，不为0代表男性
-    info.sex = (order % 2 === 0 ? 0 : 1);
-    return info;
+  const info = {};
+  const birth =
+    idCard.length === 18 ? idCard.slice(6, 14) : idCard.slice(6, 12);
+  // 18位：提取第17位数字；15位：提取最后一位数字
+  const order = idCard.length === 18 ? idCard.slice(-2, -1) : idCard.slice(-1);
+  info.birthDay =
+    idCard.length === 18
+      ? [birth.slice(0, 4), birth.slice(4, 6), birth.slice(-2)].join('-')
+      : ['19' + birth.slice(0, 2), birth.slice(2, 4), birth.slice(-2)].join(
+          '-'
+        );
+  // 余数为0代表女性，不为0代表男性
+  info.sex = order % 2 === 0 ? 0 : 1;
+  return info;
 }
-

src/views/entitlement/list.vue

@@ -18,7 +18,8 @@
             <span
               v-if="item.detectionPayType == 1"
               class="pay-icon"
-            >付费</span>
+              >付费</span
+            >
           </div>
           <div
             class="status"
@@ -35,9 +36,7 @@
         </div>
         <div class="content">
           <div class="item">
-            <div class="label">
-              检测项目：
-            </div>
+            <div class="label">检测项目：</div>
             <div class="value">
               {{ item.detectionName || '--' }}
             </div>
@@ -45,17 +44,13 @@
 
           <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>
@@ -64,19 +59,21 @@
 
           <div v-else>
             <div class="item">
-              <div class="label">
-                领取机构：
-              </div>
+              <div class="label">领取机构：</div>
               <div class="value">
                 {{ item.hospitalName || '--' }}
               </div>
             </div>
             <div class="item">
               <div class="label">
-                {{ item.detectionTime ? "检测时间" : "预约时间" }} ：
+                {{ item.detectionTime ? '检测时间' : '预约时间' }} ：
               </div>
               <div class="value">
-                {{ item.detectionTime ? item.detectionTime : item.appointmentTimeStr || '--' }}
+                {{
+                  item.detectionTime
+                    ? item.detectionTime
+                    : item.appointmentTimeStr || '--'
+                }}
               </div>
             </div>
           </div>
@@ -110,9 +107,7 @@
           class="empty-icon"
           :src="emptyIconPath"
         />
-        <div class="empty-text">
-          暂无领取记录
-        </div>
+        <div class="empty-text">暂无领取记录</div>
       </div>
     </div>
   </div>
@@ -353,7 +348,7 @@ export default {
         .item {
           font-size: 14px;
           display: flex;
-          align-items: top;
+          align-items: center;
           margin-bottom: 5px;
           .label {
             display: inline-block;
@@ -403,9 +398,9 @@ export default {
       }
     }
   }
-  .pay-icon{
+  .pay-icon {
     padding: 2px 3px;
-    background: #FF4B33;
+    background: #ff4b33;
     border-radius: 6px;
     color: #ffffff;
     text-align: center;

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

@@ -34,6 +34,10 @@ export default {
       type: String,
       default: '',
     },
+    readonly: {
+      type: Boolean,
+      default: false,
+    },
   },
   data() {
     return {
@@ -46,6 +50,7 @@ export default {
 
   methods: {
     handleOpenPopup() {
+      if (this.readonly) return;
       this.visible = true;
     },