Merge pull request #122 from John-Hong/John/release-2.9.0/KIP-9697

消费减免金额使用用户最终选择的长度

src/pages/parkingFee/mixins/parkingFeeDetail.js

@@ -163,8 +163,8 @@ export default {
           let discountTime = 0
           let discountFee = 0
           if(selected) {
-            discountTime = consume[0].hasOwnProperty('discountTime') ? consume[0].discountTime : consume[0].defaultDiscountTime; 
-            discountFee = consume[0].hasOwnProperty('discountFee') ? consume[0].discountFee : discountTime * hourPrice;
+            discountFee = consume[0].hasOwnProperty('discountFee') ? consume[0].discountFee : memberGrade[0].defaultDiscountTime * hourPrice;
+            discountTime = discountFee / hourPrice;
           }
           params.discountInfo.consume = {
             ...consume[0],

src/store/index.js

@@ -214,7 +214,7 @@ const store = new Vuex.Store({
         commit('SET_APPID',appId);
 
         // let { groupId, mallId } =
-        if ( !/CRM|PUDONG/.test(source)) {
+        if (!/CRM|PUDONG/.test(source)) {
           const groupIdAndMallId = getGroupIdAndMallIdByLsbId(lbsId);
           groupId = groupIdAndMallId.groupId;
           mallId = groupIdAndMallId.mallId;