Merge pull request #359 from John-Hong/release-2.22.0

Release 2.22.0

src/store/order/memberLevel.js

@@ -26,7 +26,7 @@ export default {
       });
       
       // start 当用户产生消费减免，在当天做了1 次以上的停车缴费，并再次产生消费减免的情况下，重置 discountFee, 仅在第一次加载时生效（杭州、福州），
-      const {parkingRule, discountInfo} = orderDetail
+      /* const {parkingRule, discountInfo} = orderDetail
       const {usingTotalDiscount} = discountInfo
       const {hourPrice} = parkingRule
       const [consume] = [...orderDetail.discountInfo.consume]
@@ -39,7 +39,7 @@ export default {
         orderDetail.discountInfo.consume = [consume]
         orderDetail.discountInfo.usingTotalDiscount = usingTotalDiscount - (consume.defaultDiscountTime - consume.maxDiscountTime) * hourPrice
         commit('setOrderDetail', orderDetail)
-      }
+      } */
       // end
     }
     commit('setCheckedTotal',checkedTotal);