Forráskód Böngészése

积分抵扣时,加减时出现积分不够,依然参与优惠计算

john.hong 2 éve
szülő
commit
874ee07223
3 módosított fájl, 33 hozzáadás és 6 törlés
  1. 1 1
      src/store/index.js
  2. 6 4
      src/store/order.js
  3. 26 1
      yarn.lock

+ 1 - 1
src/store/index.js

@@ -51,7 +51,7 @@ const store = new Vuex.Store({
     source: '', // 访问方:微信小程序:(CRM|KIP)
     brandInfo: {},
     curMarket: {},
-    isInit: true, // 当内嵌在小程序中的H5页面,没有接收到小程序数据时,默认显示骨架屏幕
+    isInit: false, // 当内嵌在小程序中的H5页面,没有接收到小程序数据时,默认显示骨架屏幕
     // 无牌车
     unlicensedInfo: '',
     // 防止用户在无牌车流程中卡死

+ 6 - 4
src/store/order.js

@@ -328,12 +328,14 @@ const actions = {
     if (maxPointsTime > state.availableDiscountFee) {
       maxPointsTime = state.availableDiscountFee
     }
-    console.log(303, maxPointsTime);
     if (type === 'add' && state.pointsTime < maxPointsTime) {
       const pointsTime = state.pointsTime + state.unitAmount;
-      // 如果是深圳车场
-      commit('setAvailable', state.available - state.pointsPerUnit);
-      commit('setPointsTime', pointsTime);
+      const available = state.available - state.pointsPerUnit;
+      if (available > -1) {
+        // 如果是深圳车场
+        commit('setAvailable', available);
+        commit('setPointsTime', pointsTime);  
+      }
     }
     if (type === 'minus' && state.pointsTime > 0) {
       const pointsTime = state.pointsTime - state.unitAmount;

+ 26 - 1
yarn.lock

@@ -922,7 +922,7 @@
     "@babel/types" "^7.4.4"
     esutils "^2.0.2"
 
-"@babel/runtime@7.x", "@babel/runtime@^7.11.0", "@babel/runtime@^7.8.4", "@babel/runtime@~7.17.9":
+"@babel/runtime@7.x", "@babel/runtime@^7.11.0", "@babel/runtime@^7.17.2", "@babel/runtime@^7.8.4", "@babel/runtime@~7.17.9":
   version "7.17.9"
   resolved "https://nexus-internal.kerryonvip.com/repository/kerry-npm-group/@babel/runtime/-/runtime-7.17.9.tgz#d19fbf802d01a8cb6cf053a64e472d42c434ba72"
   integrity sha512-lSiBBvodq29uShpWGNbgFdKYNiFDo5/HIYsaCEY9ff4sb10x9jizo2+pRrSyF4jKZCXqgzuqBOQKbUm90gQwJg==
@@ -3285,6 +3285,11 @@ copy-descriptor@^0.1.0:
   resolved "https://nexus-internal.kerryonvip.com/repository/kerry-npm-group/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
   integrity sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw==
 
+copy-text-to-clipboard@^3.0.1:
+  version "3.1.0"
+  resolved "https://nexus-internal.kerryonvip.com/repository/kerry-npm-group/copy-text-to-clipboard/-/copy-text-to-clipboard-3.1.0.tgz#6bf40deef0a51ac6858efb0d76ded2c6d6a15059"
+  integrity sha512-PFM6BnjLnOON/lB3ta/Jg7Ywsv+l9kQGD4TWDCSlRBGmqnnTM5MrDkhAFgw+8HZt0wW6Q2BBE4cmy9sq+s9Qng==
+
 copy-webpack-plugin@^5.1.1:
   version "5.1.2"
   resolved "https://nexus-internal.kerryonvip.com/repository/kerry-npm-group/copy-webpack-plugin/-/copy-webpack-plugin-5.1.2.tgz#8a889e1dcafa6c91c6cd4be1ad158f1d3823bae2"
@@ -3310,6 +3315,11 @@ core-js-compat@^3.25.1, core-js-compat@^3.6.5:
   dependencies:
     browserslist "^4.21.4"
 
+core-js@^3.11.0:
+  version "3.29.0"
+  resolved "https://nexus-internal.kerryonvip.com/repository/kerry-npm-group/core-js/-/core-js-3.29.0.tgz#0273e142b67761058bcde5615c503c7406b572d6"
+  integrity sha512-VG23vuEisJNkGl6XQmFJd3rEG/so/CNatqeE+7uZAwTSwFeB/qaO0be8xZYUNWprJ/GIwL8aMt9cj1kvbpTZhg==
+
 core-js@^3.6.5:
   version "3.25.5"
   resolved "https://nexus-internal.kerryonvip.com/repository/kerry-npm-group/core-js/-/core-js-3.25.5.tgz#e86f651a2ca8a0237a5f064c2fe56cef89646e27"
@@ -6750,6 +6760,11 @@ multicast-dns@^6.0.1:
     dns-packet "^1.3.1"
     thunky "^1.0.2"
 
+mutation-observer@^1.0.3:
+  version "1.0.3"
+  resolved "https://nexus-internal.kerryonvip.com/repository/kerry-npm-group/mutation-observer/-/mutation-observer-1.0.3.tgz#42e9222b101bca82e5ba9d5a7acf4a14c0f263d0"
+  integrity sha512-M/O/4rF2h776hV7qGMZUH3utZLO/jK7p8rnNgGkjKUw8zCGjRQPxB8z6+5l8+VjRUQ3dNYu4vjqXYLr+U8ZVNA==
+
 mz@^2.4.0:
   version "2.7.0"
   resolved "https://nexus-internal.kerryonvip.com/repository/kerry-npm-group/mz/-/mz-2.7.0.tgz#95008057a56cafadc2bc63dde7f9ff6955948e32"
@@ -9696,6 +9711,16 @@ vary@~1.1.2:
   resolved "https://nexus-internal.kerryonvip.com/repository/kerry-npm-group/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
   integrity sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==
 
+vconsole@^3.15.0:
+  version "3.15.0"
+  resolved "https://nexus-internal.kerryonvip.com/repository/kerry-npm-group/vconsole/-/vconsole-3.15.0.tgz#2383482b0a4106204090046ec128071284e04a90"
+  integrity sha512-8hq7wabPcRucSWQyN7/1tthMawP9JPvM95zgtMHpPknMMMCKj+abpoK7P7oKK4B0qw58C24Mdvo9+raUdpHyVQ==
+  dependencies:
+    "@babel/runtime" "^7.17.2"
+    copy-text-to-clipboard "^3.0.1"
+    core-js "^3.11.0"
+    mutation-observer "^1.0.3"
+
 vendors@^1.0.0:
   version "1.0.4"
   resolved "https://nexus-internal.kerryonvip.com/repository/kerry-npm-group/vendors/-/vendors-1.0.4.tgz#e2b800a53e7a29b93506c3cf41100d16c4c4ad8e"