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

src/main.js

@@ -52,7 +52,7 @@ if (query.code) {
     });
 } else {
     if (/micromessenger/i.test(navigator.userAgent) && !/localhost|(192\.168)/i.test(location.host)) {
-        document.location.replace('https://nft.9space.vip/wx/redirect?redirectUrl=' + location.href);
+        // document.location.replace(location.origin + '/wx/redirect?redirectUrl=' + location.href);
     }
 }
 if (query.invitor) {

src/views/Submit.vue

@@ -262,9 +262,7 @@ export default {
                                             this.$nextTick(() => {
                                                 document.getElementById('pay').click();
                                             });
-                                            if (!this.inApp) {
-                                                this.getOrder(true);
-                                            }
+                                            this.getOrder(true);
                                         })
                                         .catch(e => {
                                             if (e.error) {

src/views/account/TradingPassword.vue

@@ -260,17 +260,17 @@ export default {
                 border-right: 1px solid @text3;
             }
             i {
-                background-color: #fff;
+                //background-color: #fff;
             }
         }
     }
 }
 /deep/.van-number-keyboard__body {
-    background-color: #4a4a4a;
+    //background-color: #4a4a4a;
     .van-key {
-        background-color: @bg;
+        //background-color: @bg;
         &:active {
-            background-color: @bg3;
+            //background-color: @bg3;
         }
     }
 }

src/views/asset/Consignment.vue

@@ -139,7 +139,7 @@ export default {
                 border-right: 1px solid @text3;
             }
             i {
-                background-color: #fff;
+                // background-color: #fff;
             }
         }
     }
@@ -182,7 +182,7 @@ export default {
                     border-right: 1px solid @text3;
                 }
                 i {
-                    background-color: #fff;
+                    // background-color: #fff;
                 }
             }
         }