Преглед на файлове

修改支付方式和部分页面细节问题

zaijin преди 2 години
родител
ревизия
0d445c2932
променени са 7 файла, в които са добавени 33 реда и са изтрити 10 реда
  1. 1 1
      App.vue
  2. 1 1
      package.json
  3. 4 3
      pages/OnsitePayment/OnsitePayment.vue
  4. 2 1
      pages/VehicleInquiry/VehicleInquiry.vue
  5. 3 3
      pages/choosePayment/choosePayment.vue
  6. 3 1
      pages/parkingLock/parkingLock.vue
  7. 19 0
      utils/index.js

+ 1 - 1
App.vue

@@ -1,7 +1,7 @@
 <script>
 export default {
   onLaunch: function () {
-    this.handleUrl(location.href);
+    // this.handleUrl(location.href);
     //判断客户端类别
     if (/MicroMessenger/.test(window.navigator.userAgent)) {
       uni.setStorage({

+ 1 - 1
package.json

@@ -87,7 +87,7 @@
 					"H_WXAPPID": "wxea865618d910b155",
 					"DESCRIBE": "乌当正式环境",
 					"H_PROJECT": "wudang",
-					"H_PROJECT_NAME": "wudang",
+					"H_PROJECT_NAME": "乌当",
 					"H_PROJECT_URL": "https://h5.wud.qfzhtc.com/#/?type=jumpurl"
 				}
 			}

+ 4 - 3
pages/OnsitePayment/OnsitePayment.vue

@@ -27,6 +27,7 @@
 
 <script>
 import ChoosePayment from '@/pages/choosePayment/choosePayment.vue';
+import { base64Decrypt } from '@/utils';
 export default {
   components: {
     ChoosePayment
@@ -65,8 +66,8 @@ export default {
     console.log('options', options);
     const { vehicleNo, parkNo, isBack, polyOrderId, needPay } = options;
     if (vehicleNo && parkNo) {
-			// 车牌号进行base64加密解密   防止贵州银行支付报错
-      this.paramsObj.vehicleNo = new Buffer(vehicleNo, 'base64').toString('utf8');
+      // 车牌号进行base64加密解密   防止贵州银行支付报错
+      this.paramsObj.vehicleNo = base64Decrypt(vehicleNo);
       this.paramsObj.parkNo = parkNo;
       this.isBack = isBack ?? 0;
       this.polyOrderId = polyOrderId;
@@ -81,7 +82,7 @@ export default {
         this.getOrderDetails(this.paramsObj.vehicleNo, parkNo);
       }
       this.jumpUrl = `${location.origin}/#/pages/OnsitePayment/OnsitePayment?vehicleNo=${vehicleNo}&parkNo=${parkNo}&isBack=1`;
-			console.log(this.jumpUrl);
+      console.log(this.jumpUrl);
     } else {
       uni.showModal({
         title: '提示',

+ 2 - 1
pages/VehicleInquiry/VehicleInquiry.vue

@@ -39,6 +39,7 @@
 </template>
 
 <script>
+import { base64Encrypt } from '@/utils'
 export default {
   data() {
     return {
@@ -185,7 +186,7 @@ export default {
               url: '/pages/OnsitePayment/OnsitePayment',
               params: {
                 ...this.form,
-								vehicleNo: new Buffer(this.form.vehicleNo).toString('base64')
+                vehicleNo: base64Encrypt(this.form.vehicleNo)
               },
               callback: () => {
                 this.loading = false;

+ 3 - 3
pages/choosePayment/choosePayment.vue

@@ -315,9 +315,9 @@ export default {
     payRadioChange({ detail }) {
       this.radioCurrent = detail.value;
     },
-		payRadioClick(value) {
-			this.radioCurrent = value;
-		},
+    payRadioClick(value) {
+      this.radioCurrent = value;
+    },
     /**
      * 选中优惠券
      * @date 2023-02-17

+ 3 - 1
pages/parkingLock/parkingLock.vue

@@ -163,6 +163,9 @@ export default {
       this.deviceNo = page.deviceNo;
       this.isBack = page?.isBack;
       this.polyOrderId = page?.polyOrderId;
+    } else if (page.msg) {
+      this.tipsMsg = page?.msg;
+      this.parkingLockStatus = 5;
     } else {
       uni.showModal({
         title: '提示',
@@ -176,7 +179,6 @@ export default {
           }
         }
       });
-      this.parkingLockStatus = 5;
     }
   },
   onShow() {

+ 19 - 0
utils/index.js

@@ -0,0 +1,19 @@
+/**
+ * @description: 对于字符串进行base64处理
+ * @param {*} val
+ * @return {*}
+ */
+export function base64Encrypt(val) {
+  if (!val) return;
+  return new Buffer(val).toString('base64');
+}
+
+/**
+ * @description: 对于字符串进行base64还原处理
+ * @param {*} val
+ * @return {*}
+ */
+export function base64Decrypt(val) {
+  if (!val) return;
+  return new Buffer(val, 'base64').toString('utf8');
+}