Эх сурвалжийг харах

Merge pull request #246 from tron/lock/release-2.16.0/SCRM-4268

feat(KIP-11748):  Temp Parking | Frontend H5|支付-创建支付订单接口调整
Tron 1 жил өмнө
parent
commit
9f7743887b

+ 2 - 2
src/api/parking/index.js

@@ -52,8 +52,8 @@ export function calculateDiscount(params) {
 }
 
 // 1.13 下单并发起支付
-export function ordersAndPrepay(params) {
-  return window.requestms.post(`/parking/orders-and-prepay`, params, { loading: true });
+export function ordersAndPrepay(params, unlicensed) {
+  return window.requestms.post(`/parking/orders-and-prepay?unlicensed=${unlicensed}`, params, { loading: true });
 }
 
 // 1.23 会员查询无牌车临牌

+ 1 - 1
src/api/request.js

@@ -244,7 +244,7 @@ export const createAxiosByinterceptors = (config) => {
       }
       // 错误信息提示
       const { code, langMessage = '', message = '', status } = error.response.data;
-      const codeList = ['INTERNAL_SERVER_ERROR', 'VALIDATION_FAILED', 'CAR_HAS_PLATE', "NOT_FOUND", "LOCAL_PARK_ERROR", "LOCK_OCCUPIED", "REMOTE_CALL_FAIL", 'PLEASE_SCAN_QRCODE', 'SUBIN_CAR_IN_DEVICE_EXCEPTION', 'COUPON_UNAVAILABLE', 'COUPON_SELECTION_FAILED']; // 默认处理的错误code
+      const codeList = ['INTERNAL_SERVER_ERROR', 'VALIDATION_FAILED', 'CAR_HAS_PLATE', "NOT_FOUND", "LOCAL_PARK_ERROR", "LOCK_OCCUPIED", "REMOTE_CALL_FAIL", 'PLEASE_SCAN_QRCODE', 'SUBIN_CAR_IN_DEVICE_EXCEPTION', 'COUPON_UNAVAILABLE', 'COUPON_SELECTION_FAILED', 'NEED_REFRESHING_PARKING_FEE', 'PARKING_RECORD_NOT_FOUND', 'LOCK_OCCUPIED']; // 默认处理的错误code
       if (codeList.indexOf(code) > -1) {
         uni.showToast({ title: langMessage || message, duration: 3000, icon: 'fail' });
       }

+ 1 - 3
src/pages/parkingFee/mixins/parkingFeeDetail.js

@@ -220,8 +220,6 @@ export default {
             serviceMin: parkingRecord.serviceMin,
             totalFee: parkingRecord.totalFeeInYuan, //应缴
             actualPayFee: this.actualPayFee, //应付金额
-            unlicensed: unlicensed // 判断当前车是否是无牌车
-
           },
           discountInfo: {
             usingTotalDiscount: discountInfo?.usingTotalDiscount || 0, //优惠金额"
@@ -300,7 +298,7 @@ export default {
             })
          }
         console.log('下单时的参数', params);
-        const res = await ordersAndPrepay(params);
+        const res = await ordersAndPrepay(params, unlicensed);
         // console.log('orderDetail', res);
         if (res?.paymentType === 'NO_FEE_PAY') {
           this.btnLoading = false;