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

src/layout/live/head.vue

@@ -13,8 +13,8 @@
             {{ user.name }}
           </p>
           <p v-else>
-            <button type="button">登录</button>
-            <button type="button">注册</button>
+            <button type="button" @click="toLogin">登录</button>
+            <button type="button" @click="toLogin">注册</button>
           </p>
         </div>
       </div>
@@ -72,6 +72,9 @@ export default {
   },
   created() {},
   methods: {
+    toLogin() {
+      window.location.href = 'http://free.liaoningdoupo.com/platlogin';
+    },
     turnTo(type) {
       if (type == 'index') {
         console.log('首页未出');

src/views/market/index.vue

@@ -17,13 +17,13 @@
                 </el-col>
                 <el-col :span="24" class="leftListDown">
                   <span></span>
-                  <a href="http://localhost:8001/supermaket/supermarketlist?totaltype=1">MORE</a>
+                  <a href="http://139.210.167.203/free-technological-management/supermaket/supermarketlist?totaltype=1">MORE</a>
                 </el-col>
               </el-col>
             </el-col>
             <el-col :span="12" class="right">
               <el-col :span="24" class="rightTop">
-                <a href="http://localhost:8001/supermaket/supermarketlist?totaltype=0">MORE</a>
+                <a href="http://139.210.167.203/free-technological-management/supermaket/supermarketlist?totaltype=0">MORE</a>
                 <span></span>
               </el-col>
               <el-col :span="23" class="rightList">
@@ -45,7 +45,7 @@
             <el-col :span="12" class="left">
               <el-col :span="24" class="leftTop">
                 <span>服务供求</span>
-                <a href="http://localhost:8001/supermaket/supermarketlist?totaltype=2">MORE</a>
+                <a href="http://139.210.167.203/free-technological-management/supermaket/supermarketlist?totaltype=2">MORE</a>
               </el-col>
               <el-col :span="24" class="leftList">
                 <el-col :span="24" class="serviceList" v-for="(item, index) in serviceList" :key="index" @click.native="clickdetail(item)">
@@ -123,19 +123,19 @@ export default {
     detail(id) {
       console.log(id.id);
       let newid = id.id;
-      window.location.href = 'http://localhost:8001/supermaket/supermarketdetail?totaltype=1&&?&id=' + newid + '';
+      window.location.href = ' http://139.210.167.203/free-technological-management/supermaket/supermarketdetail?totaltype=1&&?&id=' + newid + '';
     },
 
     detailjishu(id) {
       console.log('ads');
       console.log(id.id);
       let newid = id.id;
-      window.location.href = 'http://localhost:8001/supermaket/supermarketdetail?totaltype=0&&?&id=' + newid + '';
+      window.location.href = 'http://139.210.167.203/free-technological-management/supermaket/supermarketdetail?totaltype=0&&?&id=' + newid + '';
     },
     clickdetail(id) {
       console.log(id.id);
       let newid = id.id;
-      window.location.href = 'http://localhost:8001/supermaket/supermarketdetail?totaltype=2&&?&id=' + newid + '';
+      window.location.href = 'http://139.210.167.203/free-technological-management/supermaket/supermarketdetail?totaltype=2&&?&id=' + newid + '';
     },
   },
   filters: {