Merge branch 'dev' of http://git.izouma.com/xiongzhu/raex_front into dev

src/views/order/Detail.vue

@@ -120,18 +120,16 @@ export default {
                 message: '加载中...',
                 forbidClick: true
             });
-            setTimeout(() => {
-                return this.$http.get('/order/get/' + this.$route.query.id).then(res => {
-                    if (res.subOrders) {
-                        this.orderList = res.subOrders;
-                    }
-                    this.info = res;
-                    this.$toast.clear();
-                    if (this.info.type === 'BLIND_BOX' && !this.info.opened) {
-                        this.openBlindBox();
-                    }
-                });
-            }, 50);
+            return this.$http.get('/order/get/' + this.$route.query.id).then(res => {
+                if (res.subOrders) {
+                    this.orderList = res.subOrders;
+                }
+                this.info = res;
+                this.$toast.clear();
+                if (this.info.type === 'BLIND_BOX' && !this.info.opened) {
+                    this.openBlindBox();
+                }
+            });
         },
         copy() {
             this.$copyText(this.info.id).then(

src/views/user/Rice.vue

@@ -137,7 +137,7 @@ export default {
 
 .page {
     min-height: var(--app-height) !important;
-    background-color: #272B2E;
+    background-color: #272b2e;
     // background: linear-gradient(181deg, #7dbdff 0%, #7ebdff 54%, #61c65e 61%, #61c65d 100%);
     // .flex-col();
     // justify-content: center;

src/views/user/ShoppingCartSubmit.vue

@@ -77,7 +77,7 @@ export default {
             id: '',
             orderId: '',
             payName: '',
-            gas: 1,
+            gas: 0,
             collectionList: [],
             collectionIds: '',
             price: 0,
@@ -324,7 +324,6 @@ export default {
                         if (e) {
                             this.showPwdDialog = false;
                             this.$toast.clear();
-                            console.log('sdgdfvdgvd');
                             this.$dialog
                                 .alert({
                                     title: '提示',
@@ -346,9 +345,14 @@ export default {
                     })
                     .then(res => {
                         this.$toast.success('支付成功');
+                        this.$toast.loading({
+                            message: '请稍等',
+                            forbidClick: true
+                        });
                         setTimeout(() => {
+                            this.$toast.clear();
                             this.$router.replace('/orderDetail?id=' + this.id);
-                        }, 1000);
+                        }, 1500);
                     })
                     .catch(e => {
                         this.tradeCode = '';