Merge pull request #130 from tron/lock/release-2.9.0/heji_rollout

Lock/release 2.9.0/heji rollout

src/kui/theme/theme.js

@@ -31,5 +31,16 @@ export default {
     primaryColor04: '#c1b6c9',
     primaryColor05: '#e0dbe5',
     primaryColor06: '#f0eff2',
+  },
+  'theme-pudong':{
+    primaryColor: '#2E663F',
+    primaryColorActive: '#82A38C',
+    primaryColorDisabled: ' #D5E0D9',
+    primaryColor01: '#2E663F',
+    primaryColor02: '#588565',
+    primaryColor03: '#82A38C',
+    primaryColor04: '#ABC2B2',
+    primaryColor05: '#D5E0D9',
+    primaryColor06: '#EAF0EC',
   }
 };

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

@@ -322,7 +322,7 @@ export default {
         title: '开票失败原因',
         message: reson,
         confirmButtonText: '关闭',
-        confirmButtonColor: 'var(--k-color-primary-01)',
+        confirmButtonColor: this.$theme[this.theme].primaryColor,
       }).then(() => {
         // on confirm
         console.log('confirm');

src/pages/parkingFee/parkingReceipt/parkingReceipt.vue

@@ -190,7 +190,7 @@ export default {
     position: fixed;
     top: 0;
     left: 0;
-
+    z-index:99999;
     div {
       width: 45%;
       text-align: center;
@@ -573,6 +573,9 @@ export default {
   flex-direction: column;
   background: #F4F7FF;
   border-radius: 15px;
+  .van-checkbox-group{
+    padding-bottom:104px;
+  }
 }
 
 .flewx {