Merge branch 'feature/zl2' into 'develop'

auto commit

See merge request !17

src/main.js

@@ -3,6 +3,7 @@ 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 {PicaArea} from 'pica-area';
 console.log('PicaArea', PicaArea);
 // 禁用双指放大
@@ -37,12 +38,17 @@ document.documentElement.addEventListener(
 
 vueApp.$rocNative.appInit();
 vueApp.$rocNative.on('wx_ready', function () {
-  console.log('-wx_ready-');
-  window._picaWechat = 'wechat';
+  console.log('-wx_ready-', window._picaWechat);
 });
-if(dd.env.platform) {
+console.log('---', isWeixin());
+if(isWeixin()) {
+  window._picaWechat = 'wechat';
+}
+if(dd.env.version) {
   window._picaWechat = 'dingtalk';
 }
+sessionStorage.setItem('headerHeight', 0);
+
 window.Vue.use(PicaArea);
 console.log('router, store, vueApp: ', router, store, vueApp);
 console.log('window :>> ', window);

src/utils/index.js

@@ -32,8 +32,12 @@ export const formatDay = (datetime) => {
 
 // 判断是否是微信
 export function isWeixin() {
-    const ua = navigator.userAgent.toLowerCase();
-    return ua.match(/MicroMessenger/i) === 'micromessenger';
+  const ua = window.navigator.userAgent.toLowerCase();
+  if(ua.match(/MicroMessenger/i) == 'micromessenger' || ua.match(/_SQ_/i) == '_sq_') {
+    return true;
+  } else{
+    return false;
+  }
 }
 
 // 时间戳 格式化为 时分秒（00: 00: 00）
@@ -105,3 +109,4 @@ export function getBirthdayAndSex(idCard) {
     info.sex = (order % 2 === 0 ? 0 : 1);
     return info;
 }
+

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

 <template>
   <div class="insurance-binding-code-container">
     <page-model
+      v-if="picaWechat != 'wechat'"
       ref="PageModel"
       :header-info="headerInfo"
     />
@@ -59,6 +60,7 @@
                   >
                 </div>
                 <div
+                  v-if="picaWechat == 'wechat'"
                   class="scan-qr-img-container-code"
                   @click="scanCode()"
                 >
@@ -81,9 +83,7 @@
       </div>
     </div>
 
-    <div
-      class="notification"
-    >
+    <div class="notification">
       <div class="sign-detection">
         <img
           v-if="isCheck"
@@ -196,14 +196,15 @@ import { signDetection, getProtocolContent, getProtocolName, sampleCodeValidate,
 export default {
   data() {
     return {
+      picaWechat:window._picaWechat,
       headerInfo: {
         title: '绑定条码',
         isBlack: true,
         backMethod: 'web',
-        style: 'backgroundColor:#ffffff;zIndex:100;',
+        style: 'backgroundColor:#ffffff;zIndex:100;paddingTop:8px;',
         background: '',
       },
-      showBindingInfo: true,
+      showBindingInfo: false,
       showEditModal: false,
       isCheck: false,
       barCode: '020987654321',
@@ -228,6 +229,7 @@ export default {
   computed: {
   },
   created() {
+    console.log('--window._picaWechat', window._picaWechat);
     // 11073
     const mock = {
       checkName: '博厚检测2',
@@ -270,13 +272,20 @@ export default {
       this.barCode = '';
     },
     scanCode() {
-      window.wx && window.wx.scanQRCode({
-        needResult: 0, // 默认为0，扫描结果由微信处理，1则直接返回扫描结果，
-        scanType: ['qrCode', 'barCode'], // 可以指定扫二维码还是一维码，默认二者都有
+      const that = this;
+      console.log('--$rocNative', this.$rocNative);
+      const p = {
+        needResult: 1, // 默认为0，扫描结果由微信处理，1则直接返回扫描结果，
+        scanType: ['barCode'], // 可以指定扫二维码还是一维码，默认二者都有
         success: function (res) {
           console.log('---res', res);
-          // var result = res.resultStr; // 当needResult 为 1 时，扫码返回的结果
+          const s = res.resultStr;
+          that.barCode = s && s.spilt(',')[1];
+
         }
+      };
+      this.$rocNative && this.$rocNative.scanQRCode(p, (res) => {
+        console.log('====', res);
       });
     },
     toggleBindingInfo() {
@@ -536,13 +545,11 @@ export default {
 
   }
   .submit-button-top{
-    position: absolute;
-    bottom: 0;
     display: flex;
     width: 100%;
     font-size: 16px;
     font-weight: 700;
-    margin-bottom: 210px;
+    margin-top: 90px;
     .submit-button{
       width: 90%;
       height: 40px;
@@ -560,13 +567,12 @@ export default {
     }
   }
   .notification{
-    margin-top: 16px;
+    margin: 0 auto;
+    width: 100%;
+    margin-top: 60px;
     position: absolute;
-    bottom: 260px;
-    left:0;right:0;
     font-size: 16px;
     font-weight: 700;
-
     .sign-detection{
       margin:0 auto;
       height: auto;
@@ -616,9 +622,14 @@ export default {
     }
     .protocol-text{
       height: 400PX;
-      overflow: scroll;
+      overflow-y: scroll;
+      -webkit-overflow-scrolling: touch;
       line-height: 2;
-      padding: 0px 4px;
+      padding: 0 4px;
+      &>p{
+        -webkit-overflow-scrolling: touch;
+        min-height: 1000px;
+      }
     }
     .btn{
       background-color: #00BDA5;

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

 <template>
   <div class="insurance-bindCode-success">
     <page-model
+      v-if="picaWechat != 'wechat'"
       ref="PageModel"
       :header-info="headerInfo"
     />
@@ -61,7 +62,6 @@
               </div>
             </div>
           </div>
-
         </div>
       </div>
     </div>
@@ -89,6 +89,7 @@ export default {
   },
   data() {
     return {
+      picaWechat:window._picaWechat,
       status: '',
       headerInfo: {
         title: '检测服务',

src/views/insurance-detection-detail/insurance-detection-detail.vue

 <template>
   <div class="d-box">
     <page-model
+      v-if="picaWechat != 'wechat'"
       ref="PageModel"
       :header-info="headerInfo"
     />
@@ -76,7 +77,10 @@
                   src="https://files.yunqueyi.com/image/png/common/2022081612011851.png"
                 >
               </div>
-              <div v-else class="express-step-icon"></div>
+              <div
+                v-else
+                class="express-step-icon"
+              />
               <div
                 class="express-step-msg"
               >
@@ -84,7 +88,12 @@
                   <p>
                     {{ item.nodeName }}
                   </p>
-                <p v-if="dataDetail.status == 6" class="tips">温馨提示:可联系医生重新采样</p>
+                  <p
+                    v-if="dataDetail.status == 6"
+                    class="tips"
+                  >
+                    温馨提示:可联系医生重新采样
+                  </p>
                 </div>
                 <div
                   class="step-time"
@@ -150,12 +159,12 @@
             </div>
             <div class="l-right">
               {{ dataDetail.sampleCode || '--' }}
-            <div
-              class="l-copy"
-              @click="copyText(dataDetail.sampleCode)"
-            >
-              复制
-            </div>
+              <div
+                class="l-copy"
+                @click="copyText(dataDetail.sampleCode)"
+              >
+                复制
+              </div>
             </div>
           </div>
         </div>
@@ -228,6 +237,7 @@ export default {
   },
   data() {
     return {
+      picaWechat:window._picaWechat,
       status: '',
       headerInfo: {
         title: '检测详情',