فهرست منبع

check-out、unlicensed-car-checkout 的超时提示逻辑跳转

john 1 سال پیش
والد
کامیت
f23de6fbc6
3فایلهای تغییر یافته به همراه20 افزوده شده و 6 حذف شده
  1. 2 2
      src/api/parking/index.js
  2. 10 3
      src/api/request.js
  3. 8 1
      src/store/order/index.js

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

@@ -23,7 +23,7 @@ export function checkOut(vehicleNo, unlicensed) {
   // console.log(212121, vehicleNo);
   // 'https://dev-kip-service-internal.kerryonvip.com/temporary-parking-service/parking/check-out?vehicleNo=浙
   return window.requestms.get(`/parking/check-out?vehicleNo=${vehicleNo}&unlicensed=${unlicensed}`, {
-    loading: true,
+    loading: false,
     timeout: 10000,
     headers: {
       buildingId: window.localStorage.getItem('buildingId'),
@@ -158,7 +158,7 @@ export function invoiceEmails() {
  * @returns {*}
  */
 export function unlicensedCarCheckout(vehicleNo, unlicensed, gateId) {
-  return window.requestms.post(`/parking/unlicensed-car-checkout`, { vehicleNo, gateId }, { loading: true, timeout: 10000 });
+  return window.requestms.post(`/parking/unlicensed-car-checkout`, { vehicleNo, gateId }, { loading: false, timeout: 10000 });
 }
 // 1.25 车场二维码信息查询(通过CodeID)
 /**

+ 10 - 3
src/api/request.js

@@ -233,10 +233,17 @@ export const createAxiosByinterceptors = (config) => {
         if(error.config.url.indexOf('parking-lots/lbs') > -1) {
           msg = '车场连接有问题,请联系服务台!'
         }
-        const toast = Toast(msg)
+        Toast.clear()
         setTimeout(() => {
-          toast.clear()
-        }, 3000)
+          Toast.loading({
+            message: msg,
+            duration: 0,
+            icon: 'none'
+          });
+        }, 300)
+        setTimeout(() => {
+          Toast.clear()
+        }, 3800)
         return Promise.reject(error.code);
       }
       // 断网

+ 8 - 1
src/store/order/index.js

@@ -1,4 +1,4 @@
-import checkOutQHResponse from "@/api/mockData/checkout.sy6.response.json";
+import checkOutQHResponse from "@/api/mockData/checkout.bj6.response.json";
 import { checkOut,calculateDiscount,ordersAndPrepay,currentUnlicensedPlate,unlicensedCarCheckIn,unlicensedCarCheckout } from '@/api/parking';
 import state from "@/store/order/state";
 import mutations from "@/store/order/mutations";
@@ -8,6 +8,7 @@ import coupon from "@/store/order/coupon";
 import consume from "@/store/order/consume";
 import unlicensed from "@/store/order/unlicensed";
 import paperCoupon from "@/store/order/paperCoupon";
+import { Toast } from 'vant';
 
 export default {
   //开启命名模块
@@ -35,8 +36,13 @@ export default {
         // const res = await checkOut('沪DCJ986');
         // console.log('无牌车扫码出场', endlessLoop);
         // 场内缴费,调 check-out 接口,
+        Toast.loading({
+          message: '正在努力加载中....',
+          duration: 0
+        });
         const method = unlicensed && endlessLoop && gateId || !vehicleNo ? unlicensedCarCheckout : checkOut
         const res = await method(vehicleNo, unlicensed, gateId);
+        Toast.clear();
         // const res = checkOutQHResponse
         if ( res?.parkingRecord?.totalFee <= 0 ) {
           callback && callback({
@@ -57,6 +63,7 @@ export default {
           unlicensed: unlicensed && endlessLoop && gateId || !vehicleNo ? true : false
         });
       } catch ( error ) {
+        Toast.clear();
         // console.log('151151151151151',error);
         /* if (/NOT_FOUND|PARKING_RECORD_NOT_FOUND/.test(error.code)) {
          callback && callback(error)