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

src/views/account/Login.vue

@@ -128,6 +128,7 @@
 
 <script>
 import phone from '../../mixins/phone';
+let fromRoute = null;
 export default {
     mixins: [phone],
     data() {
@@ -141,6 +142,9 @@ export default {
             checked: false
         };
     },
+    beforeRouteEnter(to, from) {
+        fromRoute = from;
+    },
     methods: {
         sendPhone() {
             this.$refs.code.validate('手机号码').then(() => {
@@ -155,7 +159,7 @@ export default {
             this.check().then(() => {
                 this.$toast.success('登录成功');
                 setTimeout(() => {
-                    if (history.length <= 2) {
+                    if (!fromRoute.name) {
                         this.$router.replace('/home');
                     } else {
                         this.$router.back();

src/views/account/Register.vue

@@ -124,6 +124,7 @@
 
 <script>
 import phone from '../../mixins/phone';
+let fromRoute = null;
 export default {
     mixins: [phone],
     data() {
@@ -139,6 +140,9 @@ export default {
             checked: false
         };
     },
+    beforeRouteEnter(to, from) {
+        fromRoute = from;
+    },
     methods: {
         sendPhone() {
             this.$refs.form.validate('手机号码').then(() => {
@@ -163,7 +167,7 @@ export default {
                 .then(() => {
                     this.$toast.success('注册成功');
                     setTimeout(() => {
-                        if (history.length <= 2) {
+                        if (!fromRoute.name) {
                             this.$router.replace('/home');
                         } else {
                             this.$router.back();

src/views/asset/Detail.vue

@@ -568,10 +568,10 @@ export default {
             });
             this.$http.get('/asset/get/' + this.$route.query.id).then(res => {
                 this.info = res;
-                if(res.orderId){
-                this.$http.get('/order/get/' + res.orderId).then(res => {
-                    this.orderInfo = res;
-                });
+                if (res.orderId) {
+                    this.$http.get('/order/get/' + res.orderId).then(res => {
+                        this.orderInfo = res;
+                    });
                 }
                 wx.updateAppMessageShareData({
                     title: '第九空间-' + res.name,
@@ -776,6 +776,7 @@ export default {
             line-height: 24px;
             background: linear-gradient(135deg, @prim 0%, @warn 100%);
             -webkit-background-clip: text;
+            background-clip: text;
             -webkit-text-fill-color: transparent;
             border-width: 0px;
             margin-left: 10px;
@@ -1026,6 +1027,7 @@ export default {
             line-height: 22px;
             background: linear-gradient(135deg, @prim 0%, @warn 100%);
             -webkit-background-clip: text;
+            background-clip: text;
             -webkit-text-fill-color: transparent;
             &.prim {
                 color: @text3;
@@ -1198,6 +1200,7 @@ export default {
             line-height: 17px;
             background: linear-gradient(135deg, @prim 0%, @warn 100%);
             -webkit-background-clip: text;
+            background-clip: text;
             -webkit-text-fill-color: transparent;
         }