Merge branch 'develop2' into 'release'

auto commit

See merge request !134

gitPush.sh

@@ -7,7 +7,7 @@ if [ ! $hasGit ];then
 else
   git fetch --all
   result=`git symbolic-ref --short -q HEAD` # 获取分支名
-  current_id=`git log -n 1 origin/develop --pretty=format:"%H"`
+  current_id=`git log -n 1 origin/release --pretty=format:"%H"`
   git reset --soft $current_id
   git add .
   git commit -m "$msg"

src/components/selectTime/index.vue

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

src/views/appoint/index.vue

@@ -6,12 +6,12 @@
       :header-info="headerInfo"
     />
     <div class="wrap">
-      <div class="title-1">
+      <!-- <div class="title-1">
         检测预约
       </div>
       <div class="title-2">
         及时接受检测结果检测报告
-      </div>
+      </div> -->
       <div class="choose-section">
         <van-form
           ref="dectionForm"
@@ -173,6 +173,12 @@
       >
         提交
       </van-button>
+      <div class="appoint-tel">
+        客服电话：<a
+          style="font-weight:550"
+          href="tel:400-006-5252"
+        >400-006-5252</a>
+      </div>
     </div>
     <SelectHospital
       :external-data="externalData"
@@ -561,6 +567,7 @@ export default {
   overflow: auto;
   box-sizing: border-box;
   color: #ffffff;
+  background: #F3FCFF;
 
   .bg-img {
     width: 100%;
@@ -572,9 +579,6 @@ export default {
   .wrap {
     padding: 0 12px;
     overflow: auto;
-    background: url('https://files.yunqueyi.com/image/png/common/20221213160647748.png')
-  no-repeat top left;
-  background-size: 100% 281px;
   }
   .title-1 {
     font-size: 20px;
@@ -648,11 +652,25 @@ export default {
     }
   }
   .appoint-form-items{
+    font-weight: 550px;
+
     /deep/ .van-field__label{
       color: #999999;
     }
+    /deep/ .van-field__control{
+      font-weight: 550;
+    }
+    /deep/ .van-field__control::placeholder{
+      font-weight: 450;
+    }
+    .appoint-form-placeholder{
+      font-weight: 450;
+    }
 
   }
+  .appoint-form-value{
+      font-weight: 550;
+    }
   .appoint-form-placeholder{
     color: #999999;
   }
@@ -793,6 +811,7 @@ export default {
   .appoint-form-submit{
     margin-top: 30px;
     height: 40px;
+    font-weight: 550;
     background: #D9D9D9;
     border-radius: 20px;
     border: 1px solid #D9D9D9;
@@ -800,6 +819,16 @@ export default {
   .appoint-form-submit-active{
     background: #00BDA5;
   }
+  .appoint-tel{
+    margin-top: 25px;
+    height: 22px;
+    font-size: 14px;
+    font-family: PingFangSC-Regular, PingFang SC;
+    font-weight: 400;
+    color: #666666;
+    line-height: 22px;
+    text-align: center;
+  }
 }
 ::v-deep {
   .address-wrap {

src/views/geoNavigation/index.vue

 <template>
-  <div>
-    <div
-      id="navigation"
-      @click="openGeoApp"
-    />
-    <van-button
-      type="primary"
-      block
-      class="navigation-button"
-      @click="openGeoApp"
-    >
-      块级元素
-    </van-button>
-  </div>
+  <van-uploader
+    v-model="fileList"
+    capture="user"
+    accept="image/*"
+  />
 </template>
 
 <script>
-import AMapLoader from '@amap/amap-jsapi-loader';
 export default {
-  mounted() {
-    this.initMap();
-    window.location.href = 'amapuri://route';
-  },
-  methods: {
-    data() {
-      return {
-        geoNavigation:null
-      };
-    },
-    initMap() {
-      var that = this;
-      AMapLoader.load({
-        key:'d22c1f112c97cb93b8d343b18420b98d', // 申请好的Web端开发者Key，首次调用 load 时必填
-        version:'2.0', // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
-        plugins:[''], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
-      }).then((AMap) => {
-        var map = new AMap.Map('navigation', {
-          resizeEnable: true
-        });
-        AMap.plugin('AMap.Driving', function() {
-          that.geoNavigation = new AMap.Driving({
-            // 驾车路线规划策略，AMap.DrivingPolicy.LEAST_TIME是最快捷模式
-            policy: AMap.DrivingPolicy.LEAST_TIME,
-            map:map
-          });
-
-          var startLngLat = [116.379028, 39.865042];
-          var endLngLat = [116.427281, 39.903719];
-
-          that.geoNavigation.search(startLngLat, endLngLat, function (status, result) {
-            // 未出错时，result即是对应的路线规划方案
-            console.log(status, result);
-          });
-        });
-        // geolocation.getCurrentPosition((status, result) => {
-        //   console.log('geolocation,', status, result);
-        // });
-
-      });
-    },
-    openGeoApp() {
-      var target = document.querySelector('#navigation').parentElement.previousElementSibling.previousElementSibling.innerHTML;
-      console.log(target);
-
-      window.location.href = `iosamap://plan${target}`;
-    }
+  data() {
+    return {
+      fileList:[]
+    };
   }
 };
 </script>
 
 <style>
-#navigation{
-  width: 100vw;
-  height: 100vh;
-}
-.navigation-button{
-  position: fixed;
-  bottom: 0;
-  z-index: 99;
-}
+
 </style>

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

 <template>
-  <div class="insurance-binding-code-container" :class="picaWechat == 'wechat' && 'mt20'">
+  <div
+    class="insurance-binding-code-container"
+    :class="picaWechat == 'wechat' && 'mt20'"
+  >
     <page-model
       v-if="picaWechat != 'wechat'"
       ref="PageModel"
@@ -106,6 +109,20 @@
         提交
       </div>
     </div>
+    <div class="tel-wrap">
+      <div class="l-left">
+        客服电话: &nbsp;
+      </div>
+      <div
+        class="l-right"
+      >
+<!--        <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
       v-model="showProtocol"
       position="bottom"
@@ -398,6 +415,7 @@ export default {
         }
       });
     },
+    callPhone() {}
   }
 };
 
@@ -608,7 +626,8 @@ export default {
       line-height: 30px;
       text-align: center;
       font-size: 18px;
-      font-weight: bold;
+      color: #212121;
+      font-weight: 600;
     }
     .protocol-text{
       height: 400PX;
@@ -629,10 +648,11 @@ export default {
       display: flex;
       align-items: center;
       justify-content: center;
-      font-weight: 500;
+      font-weight: 600;
       margin: 0 auto;
       position: absolute;
       bottom: 10px;
+      font-size: 16px;
       left: calc(50% - 150px);
     }
   }
@@ -672,7 +692,7 @@ export default {
         flex: 1;
         height: 50px;
         font-size: 18px;
-        font-weight: 500;
+        font-weight: 600;
         line-height: 50px;
         letter-spacing: 3px;
         color: #00BDA5;
@@ -723,6 +743,28 @@ export default {
       white-space: nowrap;
     }
   }
+  .tel-wrap{
+    font-size: 14px;
+    font-weight: 400;
+    color: #666666;
+    width: 100%;
+    text-align: center;
+    margin-top: 200px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    .l-right{
+      color:#00BDA5;
+      display: flex;
+      align-items: center;
+    }
+    .l-right-img{
+      width: 12px;
+      height: 12px;
+      position: relative;
+      //top: 1px;
+    }
+  }
 }
 .mt20{padding-top: 20px}
 </style>

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

@@ -13,13 +13,14 @@
     z-index: 1;
     .status {
       padding: 16px 0;
-      display: flex;
-      align-items: center;
       img {
-        width: 27px;
+        width: 57px;
+        height: 66px;
+        margin:  0 auto;
       }
-      div {
-        padding-left: 9px;
+      .text {
+        text-align: center;
+        margin:  0 auto;
         width: 120px;
         height: 20px;
         font-size: 20px;
@@ -30,14 +31,16 @@
     }
     .content {
       height: auto;
+      position: relative;
+      top: 20px;
+      box-shadow: 0px 15px 10px 0px rgba(229,248,245,0.4);
+      border-radius: 20px;
       .info {
         width: 100%;
         height: auto;
         background: #ffffff;
         border-radius: 10px;
-        margin-bottom: 10px;
-        padding-top: 20px;
-        padding-bottom: 40px;
+        padding-bottom: 20px;
         .success-title{
           font-size: 16px;
           font-weight: 700;
@@ -70,7 +73,7 @@
             width: auto;
             height: auto;
             font-size: 14px;
-            font-weight: 500;
+            font-weight: 600;
             color: #212121;
             flex: 1;
             line-height: 20px;
@@ -151,6 +154,18 @@
       justify-content: center;
     }
   }
+  .wechat-wrap{
+    position: absolute;
+    bottom: 50px;
+    left: calc(50% - 175px);
+    margin: 0 auto;
+    width: 350px;
+    height: 80px;
+    img{
+      width: 100%;
+      height: 100%;
+    }
+  }
   }
 
 

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

@@ -8,17 +8,28 @@
     <div class="detail-box">
       <div class="status">
         <img
-          src="https://files.yunqueyi.com/image/png/common/20220816135250298.png"
+          src="https://files.yunqueyi.com/image/png/common/20230301101427839.png"
           alt="success"
         >
-        <div>提交成功</div>
+        <div class="text">提交成功</div>
       </div>
       <div class="content">
         <div class="info">
-<!--          <div class="success-title">-->
-<!--            请将以下信息展示给采样医生-->
-<!--          </div>-->
           <div class="blue-wrap">
+            <div class="list">
+              <div class="l-left">
+                条形码:
+              </div>
+              <div class="l-right">
+                {{ dataDetail.sampleCode || '--' }}
+                <div
+                  class="l-copy"
+                  @click="copyText(dataDetail.sampleCode)"
+                >
+                  复制
+                </div>
+              </div>
+            </div>
             <div class="list">
               <p class="l-left">
                 受检人:
@@ -39,28 +50,15 @@
                 {{ dataDetail.checkName || '--' }}
               </p>
             </div>
-            <div class="list">
-              <p class="l-left">
-                检测编号:
-              </p>
-              <p class="l-right">
-                {{ dataDetail.recordNo || '--' }}
-              </p>
-            </div>
-            <div class="list">
-              <div class="l-left">
-                条形码:
-              </div>
-              <div class="l-right">
-                {{ dataDetail.sampleCode || '--' }}
-                <div
-                  class="l-copy"
-                  @click="copyText(dataDetail.sampleCode)"
-                >
-                  复制
-                </div>
-              </div>
-            </div>
+<!--            <div class="list">-->
+<!--              <p class="l-left">-->
+<!--                检测编号:-->
+<!--              </p>-->
+<!--              <p class="l-right">-->
+<!--                {{ dataDetail.recordNo || '&#45;&#45;' }}-->
+<!--              </p>-->
+<!--            </div>-->
+
           </div>
         </div>
       </div>
@@ -76,6 +74,9 @@
         查看我的检测
       </div>
     </div>
+    <div class="wechat-wrap" @click="towechat">
+      <img src="https://files.yunqueyi.com/image/gif/common/20230301171528895.gif" alt="">
+    </div>
   </div>
 </template>
 <script>
@@ -141,6 +142,9 @@ export default {
       document.body.removeChild(input);
       this.$toast('已复制');
     },
+    towechat() {
+      window.location.href = 'https://mp.weixin.qq.com/mp/profile_ext?action=home&__biz=MzIyOTY2MTI0MQ==#wechat_redirect';
+    }
   },
 };
 </script>