guhongwei 4 år sedan
förälder
incheckning
0908de7c2a
2 ändrade filer med 41 tillägg och 19 borttagningar
  1. 3 3
      src/views/market/index.vue
  2. 38 16
      src/views/market/marketlists.vue

+ 3 - 3
src/views/market/index.vue

@@ -164,7 +164,7 @@
           </el-col>
         </el-col>
       </el-col>
-      <el-col :span="24" class="marketPublish" @click.native="fabu()"> <span @click="fabu()">我要发布</span></el-col>
+      <el-col :span="24" class="marketPublish" @click.native="fabu()"> <span>我要发布</span></el-col>
     </el-col>
   </div>
 </template>
@@ -250,10 +250,10 @@ export default {
       this.$router.push({ path: '/market/marketlists', query: { id: id, display: 3, column_name: '专家供求' } });
     },
     fabu() {
-      if (this.user.role == '2' || this.user.role == '3') {
+      if (this.user.role == '4' || this.user.role == '5') {
         this.$router.push({ path: '/market/marketfabu' });
       } else if (this.user.uid == undefined) {
-        this.$router.push({ path: '/login' });
+        this.$router.push({ path: '/newlogin' });
       } else {
       }
     },

+ 38 - 16
src/views/market/marketlists.vue

@@ -14,9 +14,9 @@
             <el-col :span="24" class="leftTop">
               <span>|</span> <span>{{ menuName }}</span>
             </el-col>
-            <el-col class="zhuantiList" :span="24" v-for="(item, index) in zhuantiList" :key="index">
+            <el-col class="chanpinList" :span="24" v-for="(item, index) in chanpinList" :key="index">
               <el-col :span="24">
-                <el-col :span="20" class="name textOver">
+                <el-col :span="20" class="name textOver" @click.native="clickshanpin(item.id)">
                   {{ item.name }}
                 </el-col>
                 <el-col :span="4" class="date">
@@ -41,7 +41,7 @@
             <el-col :span="24" class="leftTop">
               <span>|</span> <span>{{ menuName }}</span>
             </el-col>
-            <el-col class="infoRightList" :span="24" v-for="(item, index) in hangyeList" :key="index">
+            <el-col class="infoRightList" :span="24" v-for="(item, index) in serviceList" :key="index">
               <p>
                 <span class="textOver" @click="clickfuwu(item.id)">{{ item.name }}</span>
                 <span class="textOver">{{ item.meta && item.meta.createdAt ? new Date(item.meta.createdAt).toLocaleDateString() : '' || '' }}</span>
@@ -52,8 +52,8 @@
             <el-col :span="24" class="leftTop">
               <span>|</span> <span>{{ menuName }}</span>
             </el-col>
-            <el-col class="jiaoyuList" :span="24" v-for="(item, index) in jiaoyuList" :key="index">
-              <el-col :span="20" class="name textOver">
+            <el-col class="exportList" :span="24" v-for="(item, index) in exportList" :key="index">
+              <el-col :span="20" class="name textOver" @click.native="clickzhuanjia(item.id)">
                 {{ item.name }}
               </el-col>
               <el-col :span="4" class="date">
@@ -73,7 +73,7 @@
             >
             </el-pagination>
           </el-col>
-          <el-col :span="24" class="marketPublish" @click.native="fabu()"> <span @click="fabu()">我要发布</span></el-col>
+          <el-col :span="24" class="marketPublish" @click.native="fabu()"> <span>我要发布</span></el-col>
         </el-col>
         <el-col :span="19" v-else-if="display == '2'" class="info">
           <context :detailInfo="detailInfo" @onSubmit="onSubmit"></context>
@@ -113,10 +113,10 @@ export default {
     pageTotal: 0,
     pageSize: 10,
     limit: 10,
-    zhuantiList: [],
+    chanpinList: [],
     jishuList: [],
-    hangyeList: [],
-    jiaoyuList: [],
+    serviceList: [],
+    exportList: [],
     display: '1',
     detailInfo: {},
     zhuanjiainfo: {},
@@ -178,7 +178,7 @@ export default {
       if (name == '产品供求') {
         let totaltype = '1';
         res = await this.list({ skip, limit, totaltype, status: 1, ...info });
-        this.$set(this, `zhuantiList`, res.data);
+        this.$set(this, `chanpinList`, res.data);
         this.$set(this, `pageTotal`, res.total);
       } else if (name == '技术供求') {
         // this.skip = 0;
@@ -193,12 +193,12 @@ export default {
         this.skip = 0;
         this.limit = 10;
         res = await this.list({ skip, limit, totaltype, status: 1, ...info });
-        this.$set(this, `hangyeList`, res.data);
+        this.$set(this, `serviceList`, res.data);
         this.$set(this, `pageTotal`, res.total);
       } else if (name == '专家供求') {
         let totaltype = this.totaltype;
         res = await this.lists({ skip, limit, ...info });
-        this.$set(this, `jiaoyuList`, res.data);
+        this.$set(this, `exportList`, res.data);
         this.$set(this, `pageTotal`, res.total);
       }
       // this.$set(this, `pageTotal`, res.total);
@@ -257,10 +257,10 @@ export default {
       this.$set(this, `zhuanjiainfo`, res.data);
     },
     fabu() {
-      if (this.user.role == '2' || this.user.role == '3') {
+      if (this.user.role == '4' || this.user.role == '5') {
         this.$router.push({ path: '/market/marketfabu' });
       } else if (this.user.uid == undefined) {
-        this.$router.push({ path: '/login' });
+        this.$router.push({ path: '/newlogin' });
       } else {
       }
     },
@@ -525,7 +525,7 @@ export default {
 }
 // 新增
 // 技术
-.zhuantiList {
+.chanpinList {
   padding: 0 30px 0 10px;
   margin: 0px 0 11px 0;
   .name {
@@ -547,8 +547,19 @@ export default {
     -webkit-box-orient: vertical;
   }
 }
+.chanpinList .name:hover {
+  -webkit-transform: translateY(-3px);
+  -ms-transform: translateY(-3px);
+  transform: translateY(-3px);
+  -webkit-box-shadow: 0 0 6px #999;
+  box-shadow: 0 0 6px #999;
+  -webkit-transition: all 0.5s ease-out;
+  transition: all 0.5s ease-out;
+  color: #005293;
+  cursor: pointer;
+}
 // 专家
-.jiaoyuList {
+.exportList {
   padding: 0 30px 0 10px;
   margin: 0px 0 11px 0;
   .name {
@@ -570,4 +581,15 @@ export default {
     -webkit-box-orient: vertical;
   }
 }
+.exportList .name:hover {
+  -webkit-transform: translateY(-3px);
+  -ms-transform: translateY(-3px);
+  transform: translateY(-3px);
+  -webkit-box-shadow: 0 0 6px #999;
+  box-shadow: 0 0 6px #999;
+  -webkit-transition: all 0.5s ease-out;
+  transition: all 0.5s ease-out;
+  color: #005293;
+  cursor: pointer;
+}
 </style>