wuhongyu há 5 anos atrás
pai
commit
9e81b867e7

+ 1 - 1
src/router/index.js

@@ -1,6 +1,6 @@
 import Vue from 'vue';
 import VueRouter from 'vue-router';
-import checkLogin from '@common/router/before';
+import checkLogin from "@common/router/before";
 Vue.use(VueRouter);
 const live = [
   {

+ 0 - 3
src/store/user/mutations.js

@@ -1,9 +1,6 @@
 const jwt = require('jsonwebtoken');
 export const setUser = (state, payload) => {
   let res = true;
-
-  console.log(state);
-  
   //登陆时
   if (payload) {
     state.token = payload;

+ 32 - 2
src/views/direct.vue

@@ -366,8 +366,38 @@ export default {
       },
       {
         time: '2019-03-05',
-        name1: '10条数据',
-        name2: '10条数据',
+        name1: '中科院宁波先进制造所',
+        name2: '深圳市华尔威体育用品',
+      },
+      {
+        time: '2019-03-05',
+        name1: '中科院宁波先进制造所',
+        name2: '深圳市华尔威体育用品',
+      },
+      {
+        time: '2019-03-05',
+        name1: '中科院宁波先进制造所',
+        name2: '深圳市华尔威体育用品',
+      },
+      {
+        time: '2019-03-05',
+        name1: '中科院宁波先进制造所',
+        name2: '深圳市华尔威体育用品',
+      },
+      {
+        time: '2019-03-05',
+        name1: '中科院宁波先进制造所',
+        name2: '深圳市华尔威体育用品',
+      },
+      {
+        time: '2019-03-05',
+        name1: '中科院宁波先进制造所',
+        name2: '深圳市华尔威体育用品',
+      },
+      {
+        time: '2019-03-05',
+        name1: '中科院宁波先进制造所',
+        name2: '深圳市华尔威体育用品',
       },
     ],
 

+ 63 - 1
src/views/market/index.vue

@@ -82,6 +82,31 @@
               </el-col>
             </el-col>
           </el-col>
+
+          <el-col :span="24">
+            <el-col :span="24" class="downLeftTop">
+              <el-image :src="downLeftTopImage"></el-image>
+              <span class="topText">
+                <span>最新发布</span>
+                <span
+                  ><p>B</p>
+                  <p>anking</p></span
+                >
+                <span @click="fabu()">我要发布</span>
+              </span>
+              <el-col :span="24" class="downLeftInfos">
+                <el-col :span="12" class="bankingLists" v-for="(item, index) in serviceList" :key="index" @click.native="serviceDetail(item.id)">
+                  <el-col :span="10">
+                    <el-image :src="item.image[0].url"></el-image>
+                  </el-col>
+                  <el-col :span="12">
+                    <span class="textOvers">{{ item.name }}</span>
+                    <span>{{ item.introduction }}</span>
+                  </el-col>
+                </el-col>
+              </el-col>
+            </el-col>
+          </el-col>
         </el-col>
       </el-col>
     </el-col>
@@ -180,6 +205,10 @@ export default {
     serviceDetail(id) {
       window.location.href = 'http://free.liaoningdoupo.com/platweb/supermaket/supermarketdetail?totaltype=2&&?&id=' + id + '';
     },
+
+    fabu() {
+      window.location.href = 'http://localhost:8002/enterprise/enterprisexuqiu';
+    },
   },
 };
 </script>
@@ -355,7 +384,7 @@ export default {
   color: #044b79;
 }
 .marketDown {
-  height: 550px;
+  height: 780px;
   overflow: hidden;
   margin: 20px 0 20px 0;
   background: #e9edf6;
@@ -409,6 +438,38 @@ export default {
   top: 20px;
   cursor: pointer;
 }
+.bankingLists {
+  height: 152px;
+}
+.bankingLists .el-image {
+  width: 100%;
+  height: 130px;
+  display: inline-block;
+}
+.bankingLists span {
+  margin: 0 5px 0 5px;
+  display: inline-block;
+  width: 80%;
+  font-size: 18px;
+  padding: 0 0 0 10px;
+  color: #044b79;
+  font-weight: 700;
+}
+.bankingLists span:last-child {
+  margin: 10px 0 0 5px;
+  font-size: 16px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  -webkit-line-clamp: 4;
+  word-break: break-all;
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  padding: 0 0 0 10px;
+  color: #666;
+  line-height: 25px;
+  font-weight: 400;
+}
+
 .bankingList {
   height: 152px;
 }
@@ -440,6 +501,7 @@ export default {
   line-height: 25px;
   font-weight: 400;
 }
+
 .downRightImage {
   float: none;
   width: 85%;

+ 1 - 1
src/views/technical/zhibolist.vue

@@ -91,7 +91,7 @@ export default {
 
 <style lang="less" scoped>
 .main {
-  width: 1200px;
+  width: 80%;
   margin: 0 auto;
   float: none;
 }