二维码扫描 调整

src/views/myOrder/detail/logisticsDetail.vue

@@ -234,20 +234,20 @@ export default {
     /* GPS 定位信息 */
     getGpsPoint() {
       this.gpsLoading = true
-      // let data = {
-      //   'orderType': this.orderInfo.orderType, // 'SALE',
-      //   'shippingNo': this.shippingInfo.shippingNo, // '3S1255202103190010',
-      //   'sourceDb': this.orderInfo.sourceDb, // 'SHYY',
-      //   'gisTime': this.shippingInfo.actualArrivalTime,
-      //   'orderNo': this.orderInfo.orderNo // '879202103190016'
-      // }
       let data = {
-        'orderType': 'SALE', // 'SALE',
-        'shippingNo': '543533082508945661', // '3S1255202103190010',
-        'sourceDb': 'SHYY', // 'SHYY',
-        'gisTime': '',
-        'orderNo': '543533035211583431' // '879202103190016'
+        'orderType': this.orderInfo.orderType, // 'SALE',
+        'shippingNo': this.shippingInfo.shippingNo, // '3S1255202103190010',
+        'sourceDb': this.orderInfo.sourceDb, // 'SHYY',
+        'gisTime': this.shippingInfo.actualArrivalTime,
+        'orderNo': this.orderInfo.orderNo // '879202103190016'
       }
+      // let data = {
+      //   'orderType': 'SALE', // 'SALE',
+      //   'shippingNo': '543533082508945661', // '3S1255202103190010',
+      //   'sourceDb': 'SHYY', // 'SHYY',
+      //   'gisTime': '',
+      //   'orderNo': '543533035211583431' // '879202103190016'
+      // }
       getGpsMapPoint(data).then(res => {
         if (res.code === 200 && res.data.code === '00000' &&
           res.data.entity && res.data.entity.gisMapInfoList) {

src/views/scanQRCode/index.vue

 <template>
   <div id="scanQRCode">
    <!-- <h1>{{activeTab}}</h1> -->
-   <van-notice-bar v-if="isShowNoticeBar" :scrollable="false" text="请点击左上角按钮，使用默认浏览器打开本页面！">
+   <!-- <van-notice-bar v-if="isShowNoticeBar" :scrollable="false" text="请点击左上角按钮，使用默认浏览器打开本页面！">
      <div slot="right-icon">
-       SSSS
      </div>
-   </van-notice-bar>
+   </van-notice-bar> -->
+   <div class="head" v-if="isShowNoticeBar">
+     <div class="headTitle">
+       请点击右上角按钮，使用默认浏览器打开本页面！
+     </div>
+     <div class="headimage">
+       <img style="height: 40px;width: 35px; margin-top: 0px" :src="guideImage" alt="">
+     </div>
+   </div>
    <van-empty class="customEmpty" :description="activeTab" :image="sphImage">
       <div slot="description" class="description">
         <div class="subTitle">上药移动APP</div>
@@ -31,7 +38,8 @@ export default {
       moreSearchShow: false,
       activeTab: '',
       isFirst: false,
-      isShowNoticeBar: false,
+      isShowNoticeBar: true,
+      guideImage: require('@/assets/img/guide.png'),
       sphImage: require('@/assets/img/icon_sph.png')
     }
   },
@@ -188,6 +196,26 @@ export default {
 <style lang="scss" scoped>
   #scanQRCode {
     height: 100%;
+    overflow-x: hidden;
+    overflow-y: auto;
+    .head{
+      height: 130px;
+      width: 100%;
+      background-color: #343434;
+      display: flex;
+      padding: 10px;
+      .headTitle{
+        color: #737172;
+        width: 90%;
+        font-size: 20px;
+        font-weight: 600;
+        line-height: 28px;
+        margin: auto;
+      }
+      .headimage{
+        width: 10%;
+      }
+    }
     .van-empty{
       height: 100%;
       .description{