auto commit

src/api/appoint.js

@@ -49,3 +49,20 @@ export const getHospitalList = async(data) => {
     withCredentials: true,
   });
 };
+
+export const getDetailHospital = async (id) => {
+  return request({
+    method: 'get',
+    url: `hospital/hospitals/hospital/${id}/encrypt`,
+    withCredentials: true,
+  });
+};
+
+export const getCheckInUserInfo = async(data) => {
+  return request({
+    method: 'post',
+    data,
+    url: '/tis/marketing/checkInUserInfo',
+    withCredentials: true,
+  });
+};

src/components/selectTime/index.vue

@@ -19,7 +19,6 @@
             :key="item"
             class="text"
             :class="selectTimes === item.appointmentDate ?'selected':''"
-            :style="item.amAppointmentFlag && item.pmAppointmentFlag?'color:#999999':''"
             @click="selectTime(item.appointmentDate,item)"
           >
             {{ item.appointmentDate }}
@@ -30,7 +29,6 @@
             v-show="currentItem.amTimeBegin !='' && currentItem.amTimeEnd !=''"
             class="text"
             :class="selectTimeBucket === currentItem.amTimeBegin ?'selected':''"
-            :style="currentItem.amAppointmentFlag?'':'color:#212121'"
             @click="selectTimeB('am')"
           >
             {{ currentItem.amTimeContent }}
@@ -39,7 +37,6 @@
             v-if="currentItem.pmTimeBegin !='' && currentItem.pmTimeEnd!=''"
             class="text"
             :class="selectTimeBucket === currentItem.pmTimeBegin ?'selected':''"
-            :style="currentItem.pmAppointmentFlag?'':'color:#212121'"
             @click="selectTimeB('pm')"
           >
             {{ currentItem.pmTimeContent }}
@@ -120,7 +117,6 @@ export default {
       });
     },
     selectItem() {
-
       if (this.selectTimes === '') {
         // this.$toast('请选择日期');
         return;
@@ -232,15 +228,11 @@ export default {
       font-size: 16px;
       font-family: PingFangSC-Regular, PingFang SC;
       font-weight: 400;
-      color: #999999;
+      color: #666666;
       line-height: 41px;
     }
   }
 }
-.canselect{
-  color: #02120F;
-
-}
 .selected{
   color: #00BDA5 !important;
   background: #FFFFFF

src/router/index.js

@@ -53,6 +53,16 @@ const routerConfig = [
     path: '/pdf-preview',
     name: 'pdfPreview',
     component: () => import('@/views/pdf-preview/index.vue'),
+  }, //
+  {
+    path: '/insurance-register',
+    name: 'insuranceregister',
+    component: () => import('@/views/insurance-register/index.vue'),
+  },
+  {
+    path: '/insurance-register-success',
+    name: 'insuranceregistersuccess',
+    component: () => import('@/views/insurance-register/register-success.vue'),
   },
 ];
 // // 无问卷-0001 有问卷未填写-0101 已填写问卷未出结果-0102 已出结果无需领用-0401 已出结果未预约-0201 已预约未采样-0301 已预约已采样-0302

src/views/appoint/index.vue

@@ -16,7 +16,6 @@
         <van-form
           ref="dectionForm"
           validate-first
-          @submit="onSubmit"
         >
           <van-field
             name="checkboxGroup"
@@ -24,7 +23,7 @@
             required
           >
             <template #input>
-              <span style="font-weight:600">{{ dectionForm.detectName }}</span>
+              {{ dectionForm.detectName }}
             </template>
           </van-field>
           <van-field
@@ -174,10 +173,7 @@
         提交
       </van-button>
       <div class="appoint-tel">
-        客服电话：<a
-          style="font-weight:600"
-          href="tel:400-006-5252"
-        >400-006-5252</a>
+        客服电话：<a href="tel:400-006-5252">400-006-5252</a>
       </div>
     </div>
     <SelectHospital
@@ -592,8 +588,8 @@ export default {
   }
   .appoint-form-title{
     font-size: 14px;
-    font-family:  PingFang SC;
-    font-weight: 400;
+    font-family: PingFangSC-Medium, PingFang SC;
+    font-weight: 500;
     color: #212121;
     padding-top:22px ;
     padding-bottom: 0;
@@ -652,25 +648,11 @@ export default {
     }
   }
   .appoint-form-items{
-    // font-weight: 600;
-
     /deep/ .van-field__label{
       color: #999999;
     }
-    /deep/ .van-field__control{
-      font-weight: 600;
-    }
-    /deep/ .van-field__control::placeholder{
-      font-weight: 450;
-    }
-    .appoint-form-placeholder{
-      font-weight: 450;
-    }
 
   }
-  .appoint-form-value{
-      font-weight: 600;
-    }
   .appoint-form-placeholder{
     color: #999999;
   }
@@ -811,14 +793,12 @@ export default {
   .appoint-form-submit{
     margin-top: 30px;
     height: 40px;
-    font-weight: 600;
     background: #D9D9D9;
     border-radius: 20px;
     border: 1px solid #D9D9D9;
   }
   .appoint-form-submit-active{
     background: #00BDA5;
-    border: 1px solid #00BDA5;
   }
   .appoint-tel{
     margin-top: 25px;

src/views/appointDetails/index.vue

@@ -22,7 +22,7 @@
       </div>
       <div class="detail-top insurance-detection">
         <div class="detection-title">
-          您的{{ isUnderLine ? '领取' : '检测' }}时间
+          您的领取时间
         </div>
         <div class="detection-time">
           {{ detailInfo.appointmentTimeStr }}
@@ -42,7 +42,7 @@
             >
               <img
                 class="navigation-img"
-                src="https://files.yunqueyi.com/image/png/common/20230301160437750.png"
+                src="https://files.yunqueyi.com/image/png/common/20221220105602921.png"
               >
               <div class="navigation-text">
                 导航
@@ -54,10 +54,7 @@
             src="https://files.yunqueyi.com/image/png/common/20230228180052259.png"
             alt=""
           >
-          <div
-            v-if="detailInfo.hospitalRemarks && detailInfo.hospitalRemarks !== ''"
-            class="detail-top-hospitalInfo"
-          >
+          <div class="detail-top-hospitalInfo">
             <img
               src="https://files.yunqueyi.com/image/png/common/20230228181040335.png"
               alt=""
@@ -79,17 +76,7 @@
             云鹊医温馨提示
             <div class="tip-org-right" />
           </div>
-          <div
-            v-if="isUnderLine"
-            class="tip-grey"
-          >
-            <div class="tip-grey-dot" />
-            请在预约日前往现场领取产品；
-          </div>
-          <div
-            v-else
-            class="tip-grey"
-          >
+          <div class="tip-grey">
             <div class="tip-grey-dot" />
             请在预约日期前往预约医院完成采样。无需空腹，采样前三天可适当清淡饮食；
           </div>
@@ -155,10 +142,7 @@
         </div>
       </div>
       <div class="appoint-detail-tel">
-        客服电话：<a
-          style="font-weight:600"
-          href="tel:400-006-5252"
-        >400-006-5252</a>
+        客服电话：<a href="tel:400-006-5252">400-006-5252</a>
       </div>
       <!-- <div
       class="detail-btn"
@@ -175,7 +159,7 @@
           class="detail-btn-bottom-tips"
         >
           <van-icon name="warning-o" />
-          请在预约日前往预约地{{ isUnderLine ? '领取产品' : '完成采样' }}，并点击按钮绑定采样码
+          请在预约日前往预约地完成采样，并点击按钮绑定采样码
         </div>
         <div
           class="detail-btn btn-empty reAppoint"
@@ -236,8 +220,7 @@ export default {
       yunOrderNo: '',
       projectEquityNo: '',
       expireFlag:false,
-      query: {},
-      isUnderLine:false,
+      query:{},
       // 状态 代码 说明
       // 0101 未填写问卷
       // 0102 已填写问卷
@@ -253,7 +236,7 @@ export default {
         '0101': '未填写问卷',
         '0102': '已填写问卷',
         '0201': '待预约',
-        '0202': '预约成功',
+        '0202': '已预约',
         '0203': '已取消待重新预约',
         '0301': '待采样',
         '0302': '已采样',
@@ -285,7 +268,6 @@ export default {
         console.log(res);
         this.detailInfo = res.data;
         this.expireFlag = res.data.expireFlag;
-        this.isUnderLine = res.data.detectionCategory == 2;
         this.$loading.hide();
       });
     },
@@ -494,9 +476,8 @@ export default {
       margin-bottom: 10px;
     }
     .detail-top-hospitalInfo{
-      position: relative;
       display: flex;
-      padding-left: 27px;
+      padding-left: 15px;
       font-size: 13px;
       font-family: PingFangSC-Regular, PingFang SC;
       font-weight: 400;
@@ -505,9 +486,6 @@ export default {
       align-items: center;
 
       img{
-        position: absolute;
-        left: 12px;
-        top: 1px;
         width: 12px;
         height: 14px;
         margin-right: 5px;
@@ -540,7 +518,7 @@ export default {
   }
   .detail-top-address {
     position: relative;
-    padding: 15px 52px 6px 12px;
+    padding: 15px 52px 18px 12px;
     .detail-top-address-name {
       height:21px;
       width: 257px;
@@ -627,7 +605,7 @@ export default {
     .tips {
       font-size: 14px;
       border-radius: 11px;
-      padding: 5px 0 10px 0;
+      padding: 20px 0 10px 0;
       .tip-org {
         text-align: center;
         height: 21px;
@@ -769,7 +747,7 @@ export default {
     left: 0;
     width: calc(100vw - 24px);
     bottom: 0;
-    padding:5px 12px 5px 12px ;
+    padding:5px 12px 26px 12px ;
     display: flex;
     .detail-btn-bottom-tips{
       position: absolute;

src/views/insurance-bind-code/insurance-bind-code.vue

@@ -116,7 +116,11 @@
       <div
         class="l-right"
       >
-        <a class="fw600" href="tel:400-006-5252">400-006-5252</a>
+<!--        <img-->
+<!--          class="l-right-img"-->
+<!--          src="https://files.yunqueyi.com/image/png/common/20230207134347503.png"-->
+<!--        />-->
+        <a href="tel:400-006-5252">400-006-5252</a>
       </div>
     </div>
     <van-popup
@@ -563,7 +567,7 @@ export default {
       display: flex;
       align-items: center;
       justify-content: center;
-      font-weight: 600;
+      font-weight: 500;
       color: #FFFFFF;
       margin: 0 auto;
     }
@@ -630,13 +634,13 @@ export default {
       overflow-y: scroll;
       -webkit-overflow-scrolling: touch;
       line-height: 2;
+      padding-bottom: 60px;
       &>p{
         -webkit-overflow-scrolling: touch;
         min-height: 1000px;
       }
     }
     .btn{
-      border: none;
       background-color: #00BDA5;
       color: #ffffff;
       width: 300px;
@@ -754,9 +758,6 @@ export default {
       color:#00BDA5;
       display: flex;
       align-items: center;
-      .fw600{
-        font-weight: 600;
-      }
     }
     .l-right-img{
       width: 12px;

src/views/insurance-bindCode-success/index.scss

@@ -24,7 +24,7 @@
         width: 120px;
         height: 20px;
         font-size: 20px;
-        font-weight: 600;
+        font-weight: 500;
         color: #ffffff;
         line-height: 20px;
       }

src/views/insurance-question-result/insuranceQuestionResult.vue

@@ -33,7 +33,6 @@
           <img
             src="https://files.yunqueyi.com/image/gif/common/20230228173135233.gif"
             class="info-btn"
-            @click="toAppoint"
           >
 
           <div class="info-tips">
@@ -133,7 +132,7 @@ export default {
       };
       return m[status];
     },
-     // 目前是配置一个检测信息，可能会拓展，所以返回的是一个list  ces
+     // 目前是配置一个检测信息，可能会拓展，所以返回的是一个list
      getDetectionName(yunOrderNo) {
       getDetectionName(yunOrderNo).then(res => {
         if (res.code === '000000' && res.data) {
@@ -348,7 +347,7 @@ background: #F3FCFF;
   }
 }
 .tips-fixed{
-  margin-top: 53px;
+  position: fixed;
   width: 100%;
   bottom: 70px;
   height: 21px;

src/views/insurance-register/index.vue

+<template>
+  <div class="insurance-register">
+    <page-model
+      v-if="picaWechat != 'wechat'"
+      ref="PageModel"
+      :header-info="headerInfo"
+    />
+    <div class="insurance-register-bg">
+      <div class="bg-img">
+        <img
+          src="https://files.yunqueyi.com/image/png/common/20230302151152742.png"
+          alt="success"
+        >
+      </div>
+      <div class="text">
+        <span class="text-icon">
+          <img
+            src="https://files.yunqueyi.com/image/png/common/20230302152425130.png"
+            alt="success"
+          >
+        </span>
+        <span class="text-border">&nbsp;&nbsp;&nbsp;&nbsp;{{ hospitalName }} &nbsp;&nbsp;</span>
+      </div>
+      <div class="wrap-reg">
+        <div class="choose-section">
+          <van-form
+            ref="dectionForm"
+            validate-first
+          >
+            <van-field
+              label="被保险人信息"
+              required
+              disabled
+
+              class="appoint-form-title"
+            />
+            <van-field
+              v-model="dectionForm.beneficiaryName"
+              label="被保险人"
+              clearable
+              class="appoint-form-items"
+              placeholder="请输入被保险人姓名"
+              :rules="[{ required: true, message: '请输入被保险人姓名' },{
+                         pattern: /^[\u4e00-\u9fa5_a-zA-Z0-9]+$/,
+                         message: '请输入正确格式',
+                       },
+                       {
+                         pattern: /^.{2,20}$/,
+                         message: '被保险人姓名请填写2-20位',
+                       },]"
+            />
+            <van-field
+              v-model="dectionForm.beneficiaryPhone"
+              class="appoint-form-items"
+              label="手 机 号"
+              clearable
+              placeholder="请输入手机号"
+              :rules="[{ required: true, message: '请输入手机号' },
+                       {
+                         pattern: /^([1][3,4,5,6,7,8,9])\d{9}$/,
+                         message: '手机号格式填写有误',
+                       },]"
+            />
+            <van-field
+              v-model="dectionForm.beneficiaryIdNum"
+              class="appoint-form-items"
+              clearable
+              label="身份证号"
+              placeholder="请输入真实身份证号"
+              :rules="[{ required: true, message: '请输入真实身份证号' },
+                       {
+                         pattern: /(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/,
+                         message: '身份证号格式填写有误',
+                       },]"
+            />
+          </van-form>
+        </div>
+        <van-button
+          round
+          block
+          type="info"
+          :disabled="!canSubmit"
+          class="appoint-form-submit "
+          :class="canSubmit ? 'appoint-form-submit-active':''"
+          @click="appointment"
+        >
+          免费领取
+        </van-button>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { getDetailHospital, getCheckInUserInfo} from '@/api/appoint';
+
+export default {
+  components: {
+  },
+  data() {
+    return {
+      picaWechat:window._picaWechat,
+      headerInfo: {
+        title: '肠癌早筛权益优先领取登记',
+        isBlack: true,
+        backMethod: 'web',
+        style: 'backgroundColor:#ffffff;zIndex:100;',
+        background: '',
+      },
+      dectionForm: {
+        beneficiaryPhone: '',
+        beneficiaryIdNum:'',
+        beneficiaryName: '',
+      },
+      hospitalName:''
+    };
+  },
+  computed: {
+    canSubmit() {
+      return (
+        this.dectionForm.beneficiaryIdNum &&
+        this.dectionForm.beneficiaryName &&
+        this.dectionForm.beneficiaryPhone
+      );
+    },
+  },
+  mounted() {
+    // this.$loading.show();
+    this.getID();
+  },
+  methods: {
+    getID() {
+      console.log('--res', this.$route);
+      const {hospitalId} = this.$route.query;
+      if(hospitalId) {
+        getDetailHospital(hospitalId).then(res => {
+          console.log('--res', res);
+          if (res.code === '000000') {
+            const {name} = res.data;
+            this.hospitalName = name;
+          }
+        });
+      }
+    },
+    appointment() {
+      const {projectEquityNo, hospitalId} = this.$route.query;
+      this.$refs.dectionForm.validate().then(result => {
+        console.log('this.dectionForm', result);
+        const data = {
+          idCard: this.dectionForm.beneficiaryIdNum,
+          mobilePhone: this.dectionForm.beneficiaryPhone,
+          patientName: this.dectionForm.beneficiaryName,
+          hospitalId: hospitalId,
+          projectEquityNo: projectEquityNo,
+          idType: 1,
+        };
+        getCheckInUserInfo(data).then(res => {
+          console.log('this.dectionForm', res);
+          if (res.code === '000000') {
+            this.$router.push({
+              path: '/insurance-register-success',
+            });
+          }
+        });
+
+      }).catch(err => {
+        console.log(err);
+      });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.insurance-register {
+  width: 100%;
+  height: 100vh;
+  overflow: auto;
+  box-sizing: border-box;
+  color: #ffffff;
+  background: #F3FCFF;
+  .insurance-register-bg{
+    width: 100%;
+    //height: 350px;
+    position: relative;
+    .bg-img{
+      width: 100%;
+      //height: 350px;
+      img{
+        width: 100%;
+        height: 100%;
+      }
+    }
+    .text{
+      position: absolute;
+      font-size: 10px;
+      font-weight: 400;
+      color: #08A588;
+      top: 131px;
+      left: 23px;
+      display: flex;
+      align-items: center;
+      .text-icon{
+        display: inline-block;
+        width: 17px;
+        height: 15px;
+        img{
+          width: 100%;
+          height: 100%;
+        }
+      }
+      .text-border{
+        height: 13px;
+        line-height: 13px;
+        display: inline-block;
+        border-radius: 5px;
+        border: 1px solid #08A588;
+        border-left: none;
+        position: relative;
+        left: -5px;
+        box-sizing: content-box;
+      }
+    }
+    .wrap-reg{
+      width: 350px;
+      background: linear-gradient(180deg, #FFFFFF 0%, #FFFFFF 100%);
+      box-shadow: 0px 18px 12px 0px #EBF9F8;
+      border-radius: 20px;
+      position: absolute;
+      top: 170px;
+      left: 13px;
+    }
+  }
+
+  .choose-section {
+    padding: 10px 12px;
+    background: #ffffff;
+    border-radius: 11px;
+    /deep/ .van-field__label{
+      color: #212121;
+    }
+    /deep/ .van-field__control:disabled{
+      color: #323233;
+      -webkit-text-fill-color: #323233;
+    }
+    .item {
+      color: #212121;
+      font-size: 14px;
+      display: flex;
+      height: 60px;
+      align-items: center;
+      position: relative;
+      .input-key {
+        font-weight: 300;
+        margin-left: 10px;
+      }
+      .input-value {
+        margin-left: 18px;
+        font-weight: 500;
+        overflow: visible;
+      }
+      .right {
+        position: absolute;
+        right: 10px;
+        top: 25px;
+      }
+    }
+    .height60 {
+      height: 30px;
+    }
+    .required {
+      position: relative;
+    }
+    .required::after {
+      position: absolute;
+      content: '*';
+      display: block;
+      left: -10px;
+      top: 0;
+      text-align: center;
+      color: rgba(255, 56, 56, 1);
+    }
+  }
+  .appoint-form-items{
+    /deep/ .van-field__label{
+      color: #999999;
+    }
+
+  }
+  .appoint-form-placeholder{
+    color: #999999;
+  }
+  .appoint-form-title::after{
+    display: none;
+  }
+  .appoint-form-submit{
+    margin-top: 30px;
+    height: 40px;
+    background: #D9D9D9;
+    border-radius: 20px;
+    border: none;
+    position: absolute;
+    font-size: 16px;
+    font-weight: 600;
+  }
+  .appoint-form-submit-active{
+    background: #00BDA5;
+  }
+}
+</style>

src/views/insurance-register/register-success.vue

+<template>
+  <div class="register-success">
+    <div class="icon-item">
+      <img src="https://files.yunqueyi.com/image/png/common/20221213135338128.png">
+    </div>
+    <div class="font-big">
+      信息登记成功
+    </div>
+    <div class="font-normal">
+      请点击下方按钮，完成投保缴费
+    </div>
+    <div
+      class="custom-style"
+      @click="tomx"
+    >
+      立即投保
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+    };
+  },
+  created() {
+  },
+  methods: {
+    tomx() {
+      window.location.href = 'https://yahyb.airiskeys.com/?t=1677741338534';
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.register-success {
+  width: 100%;
+  height: 100vh;
+  background: #ffffff;
+  box-sizing: border-box;
+  padding: 20px 16px;
+  color: #676869;
+  text-align: center;
+  .icon-item {
+    width: 57px;
+    height: 65px;
+    margin: 0 auto;
+    margin-top: 83px;
+    image {
+      width: 100%;
+      height: 100%;
+    }
+  }
+  .font-big {
+    margin-top: 22px;
+    font-size: 20px;
+    font-weight: 700;
+    color: #02120f;
+  }
+  .font-normal {
+    margin-top: 12px;
+    font-size: 15px;
+    font-weight: 400;
+    color: #666666;
+  }
+  .custom-style {
+    width: 350px;
+    height: 40px;
+    background: #00BDA5;
+    font-size: 16px;
+    color: #ffffff;
+    font-weight: 600;
+    line-height: 40px;
+    border-radius: 40px;
+    border: none;
+    margin-top: 108px;
+  }
+}
+</style>

vue.config.js

@@ -35,7 +35,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