Merge branch 'master' of http://git.cc-lotus.info/live/web-live

src/router/index.js

@@ -1,6 +1,10 @@
 import Vue from 'vue';
 import VueRouter from 'vue-router';
 import store from '@/store/index';
+const originalPush = VueRouter.prototype.push;
+VueRouter.prototype.push = function push(location) {
+  return originalPush.call(this, location).catch(err => err);
+};
 const jwt = require('jsonwebtoken');
 const list = [
   {

src/views/market/list/detail-model/model-1.vue

@@ -214,7 +214,7 @@ export default {
           // this.$message.error('游客身份无法与卖家对话,请先注册');
           this.$message({
             dangerouslyUseHTMLString: true,
-            message: '<strong><a href="http://broadcast.waityou24.cn/live/webLogin" style="color:red;">游客身份无法与卖家对话,请先注册</a></strong>',
+            message: '<strong><a href="http://broadcast.waityou24.cn/live/login" style="color:red;">游客身份无法与卖家对话,请先注册</a></strong>',
             type: 'error',
           });
           return;

src/views/market/list/detail-model/model-3.vue

@@ -137,7 +137,7 @@ export default {
           // this.$message.error('游客身份无法与卖家对话,请先注册');
           this.$message({
             dangerouslyUseHTMLString: true,
-            message: '<strong><a href="http://broadcast.waityou24.cn/live/webLogin" style="color:red;">游客身份无法与卖家对话,请先注册</a></strong>',
+            message: '<strong><a href="http://broadcast.waityou24.cn/live/login" style="color:red;">游客身份无法与卖家对话,请先注册</a></strong>',
             type: 'error',
           });
           return;

src/views/market/list/detail-model/model-4.vue

@@ -167,7 +167,7 @@ export default {
           // this.$message.error('游客身份无法与卖家对话,请先注册');
           this.$message({
             dangerouslyUseHTMLString: true,
-            message: '<strong><a href="http://broadcast.waityou24.cn/live/webLogin" style="color:red;">游客身份无法与卖家对话,请先注册</a></strong>',
+            message: '<strong><a href="http://broadcast.waityou24.cn/live/login" style="color:red;">游客身份无法与卖家对话,请先注册</a></strong>',
             type: 'error',
           });
           return;

src/views/market/list/detail-model/model-5.vue

@@ -188,7 +188,7 @@ export default {
           // this.$message.error('游客身份无法与卖家对话,请先注册');
           this.$message({
             dangerouslyUseHTMLString: true,
-            message: '<strong><a href="http://broadcast.waityou24.cn/live/webLogin" style="color:red;">游客身份无法与卖家对话,请先注册</a></strong>',
+            message: '<strong><a href="http://broadcast.waityou24.cn/live/login" style="color:red;">游客身份无法与卖家对话,请先注册</a></strong>',
             type: 'error',
           });
           return;