upgrade && 储值卡扣费1163

package.json

@@ -42,20 +42,26 @@
     "test:mp-weixin": "cross-env UNI_PLATFORM=mp-weixin jest -i"
   },
   "dependencies": {
-    "@dcloudio/uni-app-plus": "^2.0.0-28920200907001",
-    "@dcloudio/uni-h5": "^2.0.0-28920200907001",
+    "@dcloudio/uni-app-plus": "2.0.1-36520221121002",
+    "@dcloudio/uni-h5": "2.0.1-36520221121002",
     "@dcloudio/uni-helper-json": "*",
-    "@dcloudio/uni-mp-360": "^2.0.0-28920200907001",
-    "@dcloudio/uni-mp-alipay": "^2.0.0-28920200907001",
-    "@dcloudio/uni-mp-baidu": "^2.0.0-28920200907001",
-    "@dcloudio/uni-mp-qq": "^2.0.0-28920200907001",
-    "@dcloudio/uni-mp-toutiao": "^2.0.0-28920200907001",
-    "@dcloudio/uni-mp-vue": "^2.0.0-28920200907001",
-    "@dcloudio/uni-mp-weixin": "^2.0.0-28920200907001",
-    "@dcloudio/uni-quickapp-native": "^2.0.0-28920200907001",
-    "@dcloudio/uni-quickapp-webview": "^2.0.0-28920200907001",
-    "@dcloudio/uni-stat": "^2.0.0-28920200907001",
-    "@vue/shared": "^3.0.0-rc.4",
+    "@dcloudio/uni-i18n": "2.0.1-36520221121002",
+    "@dcloudio/uni-mp-360": "2.0.1-36520221121002",
+    "@dcloudio/uni-mp-alipay": "2.0.1-36520221121002",
+    "@dcloudio/uni-mp-baidu": "2.0.1-36520221121002",
+    "@dcloudio/uni-mp-jd": "2.0.1-36520221121002",
+    "@dcloudio/uni-mp-kuaishou": "2.0.1-36520221121002",
+    "@dcloudio/uni-mp-lark": "2.0.1-36520221121002",
+    "@dcloudio/uni-mp-qq": "2.0.1-36520221121002",
+    "@dcloudio/uni-mp-toutiao": "2.0.1-36520221121002",
+    "@dcloudio/uni-mp-vue": "2.0.1-36520221121002",
+    "@dcloudio/uni-mp-weixin": "2.0.1-36520221121002",
+    "@dcloudio/uni-mp-xhs": "2.0.1-36520221121002",
+    "@dcloudio/uni-quickapp-native": "2.0.1-36520221121002",
+    "@dcloudio/uni-quickapp-webview": "2.0.1-36520221121002",
+    "@dcloudio/uni-stacktracey": "2.0.1-36520221121002",
+    "@dcloudio/uni-stat": "2.0.1-36520221121002",
+    "@vue/shared": "^3.0.0",
     "core-js": "^3.6.5",
     "flyio": "^0.6.2",
     "regenerator-runtime": "^0.12.1",
@@ -63,15 +69,16 @@
   },
   "devDependencies": {
     "@dcloudio/types": "*",
-    "@dcloudio/uni-automator": "^2.0.0-28920200907001",
-    "@dcloudio/uni-cli-shared": "^2.0.0-28920200907001",
-    "@dcloudio/uni-migration": "^2.0.0-28920200907001",
-    "@dcloudio/uni-template-compiler": "^2.0.0-28920200907001",
-    "@dcloudio/vue-cli-plugin-hbuilderx": "^2.0.0-28920200907001",
-    "@dcloudio/vue-cli-plugin-uni": "^2.0.0-28920200907001",
-    "@dcloudio/vue-cli-plugin-uni-optimize": "^2.0.0-28920200907001",
-    "@dcloudio/webpack-uni-mp-loader": "^2.0.0-28920200907001",
-    "@dcloudio/webpack-uni-pages-loader": "^2.0.0-28920200907001",
+    "@dcloudio/uni-automator": "2.0.1-36520221121002",
+    "@dcloudio/uni-cli-i18n": "2.0.1-36520221121002",
+    "@dcloudio/uni-cli-shared": "2.0.1-36520221121002",
+    "@dcloudio/uni-migration": "2.0.1-36520221121002",
+    "@dcloudio/uni-template-compiler": "2.0.1-36520221121002",
+    "@dcloudio/vue-cli-plugin-hbuilderx": "2.0.1-36520221121002",
+    "@dcloudio/vue-cli-plugin-uni": "2.0.1-36520221121002",
+    "@dcloudio/vue-cli-plugin-uni-optimize": "2.0.1-36520221121002",
+    "@dcloudio/webpack-uni-mp-loader": "2.0.1-36520221121002",
+    "@dcloudio/webpack-uni-pages-loader": "2.0.1-36520221121002",
     "@vue/cli-plugin-babel": "~4.5.0",
     "@vue/cli-service": "~4.5.0",
     "babel-plugin-import": "^1.11.0",
@@ -84,7 +91,7 @@
     "postcss-comment": "^2.0.0",
     "sass-loader": "^10.1.1",
     "vue-template-compiler": "^2.6.11",
-    "vuex": "^3.6.0"
+    "vuex": "^3.2.0"
   },
   "browserslist": [
     "Android >= 4",

src/subpackage/order/pages/value_card/detail/detail.vue

@@ -11,10 +11,10 @@
             </view>
             <view class="vh-btns">
                 <view @click="toRecord">消费记录</view>
-                <block v-if="orderInfo.status == 1">
-                    <view class="red" @click="isDeductModal = true">扣费</view>
-                    <view class="orange" @click="isRechargeModal = true">充值</view>
-                </block>
+
+                <view v-if="orderInfo.status == 0 || orderInfo.status == 1" class="red" @click="isDeductModal = true">扣费</view>
+                <view v-if="orderInfo.status == 1" class="orange" @click="isRechargeModal = true">充值</view>
+                
             </view>
             <!-- 0: '待激活',
                 1: '使用中',
@@ -442,7 +442,7 @@ export default {
                 }
             }
             .vh-btns{
-                @include centerFlex(space-between);
+                @include centerFlex(flex-start);
                 >view{
                     width: 176upx;
                     height: 80upx;
@@ -460,6 +460,9 @@ export default {
                         color: #FF873D;
                         border-color: #FF873D;
                     }
+                    &:not(:first-child){
+                        margin-left: 58upx;
+                    }
                 }
             }
             .vh-tag{