Ver Fonte

isAlipayClient

john há 1 ano atrás
pai
commit
c7933c6a85

+ 2 - 1
src/pages/parkingFee/mixins/parkingFee.js

@@ -60,7 +60,8 @@ export default {
       tabbarActive: '手动缴费',
       supportUnlicensed: false, // 控制当前site,是否使用无牌车
       qrCodeHistory: '',
-      currentTabType: this.carType
+      currentTabType: this.carType,
+      isAlipayClient: isAlipayClient
       // custTypeId: 0,
     };
   },

+ 2 - 2
src/pages/parkingFee/parkingFee.vue

@@ -34,8 +34,8 @@
           
           <!-- 中控 -->
           <div class="parkingFee-bottom">
-            <div style="height: 40px; background-color: #FBFCFF;" v-if="source === 'KIP' && !window.isAlipayClient"></div>
-            <div :class="['parkingFee-tab', tabbarActive === '无牌缴费' && 'unlicensed-box-bottom']" v-if="supportUnlicensed && source !== 'KIP' && !window.isAlipayClient">
+            <div style="height: 40px; background-color: #FBFCFF;" v-if="source === 'KIP' && !isAlipayClient"></div>
+            <div :class="['parkingFee-tab', tabbarActive === '无牌缴费' && 'unlicensed-box-bottom']" v-if="supportUnlicensed && source !== 'KIP' && !isAlipayClient">
               <div :class="['bar', tabbarActive === '手动缴费' && 'active']" @click="tabbarActiveEvent('手动缴费')">手动缴费</div>
               <div :class="['bar', tabbarActive === '无牌缴费' && 'active']" @click="tabbarActiveEvent('无牌缴费')">无牌缴费</div>
             </div>

+ 8 - 6
src/pages/parkingFeeV2/mixins/parkingFee.js

@@ -59,7 +59,8 @@ export default {
       preUrl: '',
       tabbarActive: '手动缴费',
       supportUnlicensed: false, // 控制当前site,是否使用无牌车
-      qrCodeHistory: ''
+      qrCodeHistory: '',
+      isAlipayClient: isAlipayClient
       // custTypeId: 0,
     };
   },
@@ -164,11 +165,12 @@ export default {
       this.showSq = true;
     }
     try {
-      if(!isAlipayClient) {
-        setTimeout(async () => {
-          await initWxJsSdkConfig(['checkJsApi', 'scanQRCode']);
-        }, 1500)
-      }
+      // const href = window.location.href;
+      // if(!isAlipayClient && !/808[0-9]/.test(href)) {
+      //   setTimeout(async () => {
+      //     await initWxJsSdkConfig(['checkJsApi', 'scanQRCode']);
+      //   }, 1500)
+      // }
     } catch (e) {
       console.log(e)
     }

+ 3 - 3
src/pages/parkingFeeV2/parkingFee.vue

@@ -15,7 +15,7 @@
           >
             <div class="menu_item" @click="doRouter">
               <img :src="`${require(`@/pages/parkingFee/static/images/icon-order.png`)}`" />
-              <span>缴费记录-{{ window.isAlipayClient }}</span>
+              <span>缴费记录</span>
             </div>
             <div class="menu_item" @click="doRouter3" v-if="source !== 'KIP'">
               <img :src="`${require(`@/pages/parkingFee/static/images/icon-coupon.png`)}`" />
@@ -33,8 +33,8 @@
           
           <!-- 中控 -->
           <div class="parkingFee-bottom">
-            <div style="height: 40px; background-color: #FBFCFF;" v-if="source === 'KIP' && !window.isAlipayClient"></div>
-            <div :class="['parkingFee-tab', tabbarActive === '无牌缴费' && 'unlicensed-box-bottom']" v-if="supportUnlicensed && source !== 'KIP' && !window.isAlipayClient">
+            <div style="height: 40px; background-color: #FBFCFF;" v-if="source === 'KIP' && !isAlipayClient"></div>
+            <div :class="['parkingFee-tab', tabbarActive === '无牌缴费' && 'unlicensed-box-bottom']" v-if="supportUnlicensed && source !== 'KIP' && !isAlipayClient">
               <div :class="['bar', tabbarActive === '手动缴费' && 'active']" @click="tabbarActiveEvent('手动缴费')">手动缴费</div>
               <div :class="['bar', tabbarActive === '无牌缴费' && 'active']" @click="tabbarActiveEvent('无牌缴费')">无牌缴费</div>
             </div>