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

src/views/direct.vue

@@ -77,7 +77,7 @@
               </el-link>
             </el-col>
             <el-col :span="24" class="tabsData">
-              <el-tabs type="border-card">
+              <el-tabs type="border-card" @tab-click="handleClick">
                 <el-tab-pane label="找技术">
                   <el-col :span="24" class="one">
                     <el-col :span="24" class="onnList" v-for="(item, index) in jishulist" :key="index">
@@ -193,6 +193,10 @@
                   </el-col>
                 </el-tab-pane>
               </el-tabs>
+              <el-col :span="24" class="marketPublish">
+                <el-col :span="18"> <el-input v-model="name" placeholder="请输入名称" class="input"></el-input></el-col>
+                <el-col :span="6"><el-button class="btnSearch" size="mini" @click="resetForm(name)">查询</el-button></el-col>
+              </el-col>
             </el-col>
             <el-col :span="24" class="newimage2">
               <el-image :src="two" style="width:100%;height:100px;position:relative;"> </el-image>
@@ -253,10 +257,6 @@
     <el-dialog title="专家信息" :visible.sync="dialogExport" width="50%" :before-close="handleCloseExport">
       <exportDetail :exportInfo="exportInfo"></exportDetail>
     </el-dialog>
-    <el-col :span="24" class="marketPublish">
-      <el-col :span="18"> <el-input v-model="name" placeholder="请输入名称" class="input"></el-input></el-col>
-      <el-col :span="6"><el-button class="btnSearch" size="mini" @click="resetForm(search)">查询</el-button></el-col>
-    </el-col>
   </div>
 </template>
 
@@ -300,6 +300,9 @@ export default {
     // 专家详情
     dialogExport: false,
     exportInfo: {},
+
+    //搜索判断用
+    panduan: '找技术',
     // 找技术
     jishulist: [],
     // 找产品
@@ -416,22 +419,45 @@ export default {
   }),
   created() {
     this.searchInfo();
+    this.searchzhanjia();
+    this.searchchanpin();
+    this.searchfuwu();
   },
   methods: {
     ...mapProduct({ mapProductQuery: 'newquery' }),
     ...market({ marketFetch: 'fetch' }),
     ...dock({ dockQuery: 'query' }),
     ...talentExperts({ expertQuery: 'query' }),
-    async searchInfo() {
-      let res = await this.mapProductQuery({ skip: 0, limit: 10, totaltype: '0' });
+    //jishu
+    async searchInfo(newname) {
+      console.log(newname);
+      let res = await this.mapProductQuery({ skip: 0, limit: 10, totaltype: '0', name: newname });
       if (this.$checkRes(res)) this.$set(this, `jishulist`, res.data);
-      res = await this.mapProductQuery({ skip: 0, limit: 10, totaltype: '1' });
+
+      // res = await this.mapProductQuery({ skip: 0, limit: 10, totaltype: '1' });
+      // if (this.$checkRes(res)) this.$set(this, `demandList`, res.data);
+      // res = await this.mapProductQuery({ skip: 0, limit: 10, totaltype: '2' });
+      // if (this.$checkRes(res)) this.$set(this, `serviceList`, res.data);
+      // res = await this.expertQuery({ skip: 0, limit: 10 });
+      // if (this.$checkRes(res)) this.$set(this, `expertList`, res.data);
+    },
+    //chanpin
+    async searchchanpin(newname) {
+      let res = await this.mapProductQuery({ skip: 0, limit: 10, totaltype: '1', name: newname });
       if (this.$checkRes(res)) this.$set(this, `demandList`, res.data);
-      res = await this.mapProductQuery({ skip: 0, limit: 10, totaltype: '2' });
+    },
+    //fuwu
+    async searchfuwu(newname) {
+      let res = await this.mapProductQuery({ skip: 0, limit: 10, totaltype: '2', name: newname });
       if (this.$checkRes(res)) this.$set(this, `serviceList`, res.data);
-      res = await this.expertQuery({ skip: 0, limit: 10 });
+    },
+
+    //zhuanjia
+    async searchzhanjia(newname) {
+      let res = await this.expertQuery({ skip: 0, limit: 10, name: newname });
       if (this.$checkRes(res)) this.$set(this, `expertList`, res.data);
     },
+
     // 直播详情
     btnDirectDetail() {
       this.$router.push({ path: '/live/hallDetail', query: { id: this.$route.query.id } });
@@ -454,6 +480,52 @@ export default {
     handleCloseExport(done) {
       done();
     },
+    //tabs
+    handleClick(tab, event) {
+      console.log(event.target.getAttribute('id'));
+      if (event.target.getAttribute('id') == 'tab-0') {
+        this.panduan = '找技术';
+        if (this.name) {
+          this.searchInfo();
+        }
+      } else if (event.target.getAttribute('id') == 'tab-1') {
+        this.panduan = '找产品';
+        if (this.name) {
+          this.searchchanpin();
+        }
+      } else if (event.target.getAttribute('id') == 'tab-2') {
+        this.panduan = '找服务';
+        if (this.name) {
+          this.searchfuwu();
+        }
+      } else if (event.target.getAttribute('id') == 'tab-3') {
+        this.panduan = '找专家';
+        if (this.name) {
+          this.searchzhanjia();
+        }
+      }
+    },
+
+    resetForm(name) {
+      if (this.panduan == '找技术') {
+        let newname = this.name;
+        this.searchInfo(newname);
+
+        console.log('1');
+      } else if (this.panduan == '找产品') {
+        let newname = this.name;
+        this.searchchanpin(newname);
+        console.log('2');
+      } else if (this.panduan == '找服务') {
+        let newname = this.name;
+        this.searchfuwu(newname);
+        console.log('3');
+      } else if (this.panduan == '找专家') {
+        let newname = this.name;
+        this.searchzhanjia(newname);
+        console.log('4');
+      }
+    },
   },
   computed: {
     pageTitle() {
@@ -772,6 +844,7 @@ export default {
   width: 33%;
 }
 .tabsData {
+  position: relative;
   height: 510px;
   margin: 20px 0;
   border: 1px solid red;
@@ -881,7 +954,7 @@ export default {
   height: 100px;
   z-index: 999;
   left: 42%;
-  top: 28%;
+  top: -6%;
   text-align: center;
   line-height: 100px;
   font-size: 18px;