Merge pull request #98 from John-Hong/release-2.8.0

积分加减异常

src/api/mockData/checkout.qh10.response.json

@@ -0,0 +1,47 @@
+{
+  "parkingRecord": {
+    "vehicleNo": "粤Q55568",
+    "enterTime": "2023-05-14 08:15:16",
+    "serviceMin": 180,
+    "totalFee": 10000,
+    "actualPayFee": 80,
+    "thirdPartyId": "7336c4267f0b4d669e3c1085627e803b",
+    "thirdParkOrderNo": "ccd4bf470fe148fbbeddf88156005acd",
+    "createdByQrCode": false,
+    "totalFeeInYuan": 100
+  },
+  "discountInfo": {
+    "usingTotalDiscount": 20,
+    "memberLevelDiscount": false,
+    "points": [
+      {
+        "available": 11790,
+        "maxDiscountFee": 20,
+        "pointsPerUnit": 50,
+        "unitAmount": 5,
+        "newMember": false,
+        "label": "已选择兑换20元",
+        "discountFee": 20,
+        "unlimitUsePoints": "LIMIT"
+      }
+    ]
+  },
+  "parkingRule": {
+    "maxOneDayDiscountFee": 60,
+    "enableNewMemberPoints": false,
+    "enablePoints": true,
+    "enableCoupon": false,
+    "enablePaperCoupons": false,
+    "maxPointsTime": 255,
+    "enableConsume": false,
+    "enableConsumeSplit": false,
+    "availableDiscountFee": 60,
+    "hourPrice": 5
+  },
+  "parkInfo": {
+    "parkName": "深圳前海湾停车场",
+    "description": "15分钟内免费，首小时15元，其后每小时5元，全天封顶60元。\n嘉湾汇会员停车礼遇：\n银卡：每月可免费领取2张首2小时停车券\n金卡：每月可免费领取5张首2小时停车券\n铂金卡：每月可免费领取10张首2小时停车券\n*数量有限，领完即止\n仅限开具一个月内的停车费电子发票 ",
+    "parkMallCode": 5,
+    "buildingId": "QHKC-P1"
+  }
+}

src/store/order/index.js

@@ -1,4 +1,4 @@
-import checkOutQHResponse from "@/api/mockData/checkout.qh9.response.json";
+import checkOutQHResponse from "@/api/mockData/checkout.qh10.response.json";
 import { checkOut,calculateDiscount,ordersAndPrepay,currentUnlicensedPlate,unlicensedCarCheckIn,unlicensedCarCheckout } from '@/api/parking';
 import state from "@/store/order/state";
 import mutations from "@/store/order/mutations";

src/store/order/points.js

@@ -166,7 +166,7 @@ export default {
       return
     }
     // 计算浦东的上限
-    if ( type === 'add' && state.usingTotalDiscount < state.maxOneDayDiscountFee && parkMallCode === 5 && state.unlimitUsePoints === 'LIMIT') {
+    if ( type === 'add' && state.usingTotalDiscount >= state.maxOneDayDiscountFee && parkMallCode === 5 && state.unlimitUsePoints === 'LIMIT') {
       return;
     }
     if ( type === 'add' ) {
@@ -183,9 +183,11 @@ export default {
     }
     if ( type === 'minus' && state.pointsTime > 0 ) {
       const pointsTime = state.pointsTime - (parkMallCode === 5 ? state.unitAmount : state.unitHour);
+      const usingTotalDiscount = state.usingTotalDiscount - state.unitAmount; // 重新计算已经使用的优惠逻辑
       // 如果是深圳车场
       commit('setAvailable',state.available + state.pointsPerUnit);
       commit('setPointsTime',pointsTime);
+      commit('setUsingTotalDiscount',usingTotalDiscount);
     }
   },
   cancelPointsMath( {commit,dispatch,state},callback ) {

vue.config.js

@@ -122,8 +122,8 @@ module.exports = {
         },
       },
       '/msApi': {
-        target: 'https://dev-kip-service-internal.kerryonvip.com/temporary-parking-service', //代理地址，这里设置的地址会代替axios中设置的baseURL
-        // target: 'http://172.20.51.70:8080', // 代理地址，这里设置的地址会代替axios中设置的baseURL
+        // target: 'https://dev-kip-service-internal.kerryonvip.com/temporary-parking-service', //代理地址，这里设置的地址会代替axios中设置的baseURL
+        target: 'http://172.20.51.70:8080', // 代理地址，这里设置的地址会代替axios中设置的baseURL
         changeOrigin: true, // 如果接口跨域，需要进行这个参数配置
         //ws: true, // proxy websockets
         //pathRewrite方法重写url