Merge pull request #158 from John-Hong/John/release-2.11.0/SCRM-4050

John/release 2.11.0/scrm 4050

src/pages/parkingFee/mixins/parkingFeeDetail.js

@@ -172,7 +172,7 @@ export default {
             discountFee = memberGrade[0].hasOwnProperty('discountFee') ? memberGrade[0].discountFee : discountTime * hourPrice;
           }
           params.discountInfo.memberLevel = {
-            "discountTime": discountTime,
+            "discountTime": discountTime * 60, // 小时转成分钟
             "discountFee": discountFee,
             "memberGrade": memberGrade[0].memberGrade
           }

src/pages/parkingFee/mixins/parkingReceipt/parkingApplication.js

@@ -243,7 +243,9 @@ export default {
             this.$router.replace({
               path: 'parkingReceipt',
             });
-            this.$router.go(-1)
+            setTimeout(() => {
+              this.$router.go(-1)
+            }, 300)
           }
         } catch (err) {
           console.log(111, err);

src/pages/parkingFee/parkingReceipt/parkingApplication.vue

@@ -119,10 +119,6 @@
       </div>
     </div>
     <div class="footer">
-      <k-button title="H5" @click="submitTest('H5')" />
-      <k-button title="小程序1" @click="submitTest('小程序1')" />
-      <k-button title="小程序2" @click="submitTest('小程序2')" />
-      <k-button title="小程序3" @click="submitTest('小程序3')" />
       <k-button v-if="headerInfo.titleName" title="提交" style="margin: 0 auto" disabledColor="#D1D2D9" @click="submit" />
       <k-button v-else disabled title="请选择发票抬头" style="margin: 0 auto" disabledColor="#D1D2D9" />
     </div>

src/store/order/points.js

@@ -138,7 +138,7 @@ export default {
       }
     }
     // 单日上限限制
-    if ( oneDayLimitation && !msg && parkMallCode !== 5) {
+    if ( oneDayLimitation && !msg && parkMallCode !== 5 && parkMallCode !== 4 && parkMallCode !== 2) {
       // const maxOneTimeDiscountFee = maxOneDayDiscountFee
       // const remainConsumeTimeFee = remainConsumeTime * hourPrice
       // 计算单日剩余 remainConsumeTime
@@ -150,7 +150,7 @@ export default {
       }
     }
     // 单次上限限制
-    if ( oneTimeLimitation && !msg && parkMallCode !== 5) {
+    if ( oneTimeLimitation && !msg && parkMallCode !== 5 && parkMallCode !== 4 && parkMallCode !== 2) {
       const maxOneTimeDiscountFee = maxOneTimeDiscountTime * hourPrice // 计算时间对应的金额
       // const remainConsumeTimeFee = remainConsumeTime * hourPrice
       // 计算单日剩余 remainConsumeTime