Merge pull request #408 from tron/lock/release-3.1.0/KIP-13638-3

Lock/release 3.1.0/kip 13638 3

src/pages/parkingFeeV2/mixins/parkingFindCar.js

@@ -70,11 +70,12 @@ export default {
   },
   async created() {
     this.options = this.$route.query;
+    this.dataObject = this.options
     // this.parkingLots()
   },
   async mounted() {
       this.$nextTick(()=>{
-        this.getCarInformations(this.options.vehicleNo)
+        // this.getCarInformations(this.options.vehicleNo)
       })
       await initWxJsSdkConfig(['checkJsApi', 'scanQRCode']);
     setTimeout(() => {
@@ -120,6 +121,9 @@ export default {
         this.dataObject = res.data
       }
     },
+    getCarNum (carNum) {
+        return carNum.replace(new RegExp(".{" + (1+1) + "}"), "$&·")
+    },
     isQHKC() {
         const lbsList = ['8a88a9fd7f73ffcd017f968739870006','8a8486a37f48f7bd017f4e5bddd10000','8a8486a37f48f7bd017f4e5bddd10000', '8aaa82ea804d07cd0180516ff03b0008']
         return lbsList.indexOf(this.mallid) > -1

src/pages/parkingFeeV2/mixins/parkingFindCarFirst.js

@@ -345,7 +345,7 @@ export default {
     //     return
     //   }
       // 查询车辆优惠资格并提示跳转页面
-      await this.checkEligibility()
+    //   await this.checkEligibility()
     },
     // 去反向寻车详情
     async toParkingFeeDetail(vehicleNumber = this.vehicleNumber) {
@@ -359,7 +359,7 @@ export default {
             this.$nextTick(() => {
                 const query = {
                     ...this.$route.query,
-                    vehicleNo: vehicleNumber,
+                    ...res.data
                   }
                   // fromPage && format && unlicensed
                   query.fromPage = ''

src/pages/parkingFeeV2/parkingFindCar.vue

@@ -4,13 +4,13 @@
 
     <img :src="`${dataObject.carImage}`" style="width:100%;height:544px;" />
     <div class="positionFixed">
-        <span class="carNum">{{dataObject.vehicleNo}}</span>
+        <span class="carNum">{{getCarNum(dataObject.vehicleNo)}}</span>
         <div class="borderOnePx"></div>
         <div class="textFloor">
-            <label>所在楼层：</label><span>{{dataObject.floorName}}</span>
+            <label>所在楼层：</label><span>{{dataObject.area}}</span>
         </div>
         <div class="textFloor">
-            <label>车位地点：</label><span>{{dataObject.area}}</span>
+            <label>车位地点：</label><span>{{dataObject.floorName}}</span>
         </div>
         <div class="textFloor">
             <label>车位地址：</label><span>{{dataObject.spaceNo}}</span>