Merge pull request #401 from tron/lock/release-3.1.0/KIP-13638-2

feat(KIP-13638): 代码调整

src/pages/parkingFeeV2/mixins/parkingFindCar.js

@@ -1,6 +1,7 @@
 import uniPop from '@/components/uni-popup/uni-popup.vue';
 import { Dialog } from 'vant';
 import LoginDom from '@/components/Login/Login.vue';
+import {initWxJsSdkConfig} from '@/utils/login';
 // const app = getApp()
 const app = {};
 import {
@@ -62,11 +63,11 @@ export default {
         area: '',
         spaceNo: '',
         floorName: '',
-        carImage: ''
+        carImage: '',
+        parkId: ''
       }
     };
   },
-
   async created() {
     this.options = this.$route.query;
     // this.parkingLots()
@@ -75,7 +76,7 @@ export default {
       this.$nextTick(()=>{
         this.getCarInformations(this.options.vehicleNo)
       })
-   
+      await initWxJsSdkConfig(['checkJsApi', 'scanQRCode']);
     setTimeout(() => {
       uni.setNavigationBarTitle({
         title: '反向寻车',
@@ -119,5 +120,34 @@ export default {
         this.dataObject = res.data
       }
     },
+    isQHKC() {
+        const lbsList = ['8a88a9fd7f73ffcd017f968739870006','8a8486a37f48f7bd017f4e5bddd10000','8a8486a37f48f7bd017f4e5bddd10000']
+        return lbsList.indexOf(this.mallid) > -1
+      },
+      findcarNum (){
+         // 如果是北京的ETCP 微信支付宝通用版
+         if (this.isQHKC()) {
+            wx.miniProgram.navigateTo({
+              url: `/pages/package-parkingFee/findCar?lotId=${encodeURIComponent(
+                this.dataObject.parkId
+              )}&parkNo=${encodeURIComponent(
+                this.dataObject.spaceNo
+              )}&carNo=${encodeURIComponent(
+                this.dataObject.vehicleNo
+              )}`,
+              complete: function (res) {
+                console.log('回调::', res)
+              },
+              success: function (res) {
+                console.log('跳转成功::', res)
+              },
+              fail: function (err) {
+                console.log('跳转失败::', res)
+              }
+            });
+            // this.$router.back()
+            return
+          }
+      },
   },
 };

src/pages/parkingFeeV2/mixins/parkingFindCarFirst.js

@@ -333,6 +333,10 @@ export default {
     },
     // 校验车牌号
     async preHandleSearch() {
+    this.$router.push({
+        path: 'parkingFindCar',
+        });
+        return
       if (this.disabledBtn) return
       // 不是杭州的车牌 或者 用户拒绝登陆的场景
       if (!isHZ(this.mallId) || this.$route.query.isLogin === 'loginDenied')  {

src/pages/parkingFeeV2/parkingFee.vue

@@ -55,8 +55,8 @@
               <img :src="`${require(`@/pages/parkingFee/static/images/parkingRights.svg`)}`" />
               <span>停车权益</span>
             </div>
-          
-            <div class="menu_item" @click="menuToPage('FIND_CAR')"    v-if="portalsByLbsList.indexOf('FIND_CAR') > -1">
+          <!-- v-if="portalsByLbsList.indexOf('FIND_CAR') > -1" -->
+            <div class="menu_item" @click="menuToPage('FIND_CAR')"    >
               <img :src="`${require(`@/pages/parkingFee/static/images/find_car.png`)}`"/>
               <span>反向寻车</span>
             </div>
@@ -94,7 +94,7 @@
           }"
           >
             <div class="menu_item" @click="menuToPage('FIND_CAR')">
-              <img :src="`${require(`@/pages/parkingFee/static/images/find_car.png`)}`" v-if="portalsByLbsList.indexOf('FIND_CAR') > -1"/>
+              <img :src="`${require(`@/pages/parkingFee/static/images/find_car.png`)}`"/>
               <span>反向寻车</span>
             </div>
             <div class="menu_item" @click="menuToPage('VEHICLE_MANAGE')">

src/pages/parkingFeeV2/parkingFindCar.vue

@@ -17,8 +17,8 @@
         </div>
     </div>
     <div class="positionFixedBottom">
-        <div  class="buttonBg" disabledColor="#D1D2D9"  >
-            <img  :src="`${require(`@/pages/parkingFee/static/images/lanya.png`)}`" class="imgButtonBg"  style="inline-block;" alt="">
+        <div  class="buttonBg" disabledColor="#D1D2D9"  @click="findcarNum()">
+            <img  :src="`${require(`@/pages/parkingFee/static/images/lanya.png`)}`" class="imgButtonBg"  style="inline-block;" alt="" >
             <span>蓝牙找车</span>
             
         </div>