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

src/layout/direct/directDetail.vue

@@ -46,7 +46,7 @@
             <p>服务范围:</p>
             <p class="moreScope" v-if="scope != ''">{{ directInfo.scope || '暂无' }}</p>
             <p class="moreScope1" v-else>{{ directInfo.scope || '暂无' }}</p>
-            <el-button size="mini" v-if="directInfo.scope != null">
+            <el-button size="mini" v-if="directInfo.scope != null && directInfo.scope.length > 300">
               <span v-if="scope != ''" @click="scopeMore()">更多</span>
               <span v-else @click="scopeMore1()">收起</span>
             </el-button>
@@ -55,7 +55,7 @@
             <p>产品简介:</p>
             <p class="introduction" v-if="introduction != ''">{{ directInfo.introduction || '暂无' }}</p>
             <p class="introduction1" v-else>{{ directInfo.introduction || '暂无' }}</p>
-            <el-button size="mini" v-if="directInfo.introduction != null">
+            <el-button size="mini" v-if="directInfo.introduction != null && directInfo.introduction.length > 300">
               <span v-if="introduction != ''" @click="introductionMore()">更多</span>
               <span v-else @click="introductionMore1()">收起</span>
             </el-button>

src/layout/direct/exportDetail.vue

@@ -53,7 +53,7 @@
             <p>工作简介:</p>
             <p class="profile" v-if="scope != ''">{{ exportInfo.resume }}</p>
             <p class="profile1" v-else>{{ exportInfo.resume }}</p>
-            <el-button size="mini" v-if="exportInfo.resume != null">
+            <el-button size="mini" v-if="exportInfo.resume != null && exportInfo.resume.length > 300">
               <span v-if="scope != ''" @click="scopeMore()">更多</span>
               <span v-else @click="scopeMore1()">收起</span>
             </el-button>

src/views/direct.vue

@@ -391,29 +391,29 @@ export default {
     // 嘉宾访谈
     jiabinlist: [
       {
-        url: 'https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg',
+        url: require('@/assets/test.jpeg'),
         title: '测试title',
         date: '2017-03-04',
-        context: '1231232121212121212121212121212121212121231111111111111111111111111111111111111111121212121212121212121212121212121212121212121212121321',
+        context: '测试内容测试内容测试内容测试内容测试内容测试内容测试内容测试内容',
       },
       {
-        url: 'https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg',
+        url: require('@/assets/test.jpeg'),
         title: '测试title',
         date: '2017-03-04',
-        context: '1231232121212121212121212121212121212121231111111111111111111111111111111111111111121212121212121212121212121212121212121212121212121321',
+        context: '测试内容测试内容测试内容测试内容测试内容测试内容测试内容测试内容',
       },
       {
-        url: 'https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg',
+        url: require('@/assets/test.jpeg'),
         title: '测试title',
         date: '2017-03-04',
-        context: '1231232121212121212121212121212121212121231111111111111111111111111111111111111111121212121212121212121212121212121212121212121212121321',
+        context: '测试内容测试内容测试内容测试内容测试内容测试内容测试内容测试内容',
       },
 
       {
-        url: 'https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg',
+        url: require('@/assets/test.jpeg'),
         title: '测试title',
         date: '2017-03-04',
-        context: '1231232121212121212121212121212121212121231111111111111111111111111111111111111111121212121212121212121212121212121212121212121212121321',
+        context: '测试内容测试内容测试内容测试内容测试内容测试内容测试内容测试内容',
       },
     ],
     superOne: require('@/assets/live/main1.png'),
@@ -431,12 +431,10 @@ export default {
     ...market({ marketFetch: 'fetch' }),
     ...dock({ dockQuery: 'query' }),
     ...expertsuser({ expertQuery: 'query' }),
-    //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' });
       // if (this.$checkRes(res)) this.$set(this, `demandList`, res.data);
       // res = await this.mapProductQuery({ skip: 0, limit: 10, totaltype: '2' });
@@ -444,45 +442,21 @@ export default {
       // 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);
     },
-    //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);
     },
-
-    //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 } });
-    },
-    // 技术,产品，服务详情
-    oneBtnDetail(data) {
-      this.dialogVisible = true;
-      this.$set(this, `directInfo`, data);
-    },
-    // 关闭dialog
-    handleClose(done) {
-      done();
-    },
-    // 专家详情
-    twoBtnDetail(data) {
-      this.dialogExport = true;
-      this.$set(this, `exportInfo`, data);
-    },
-    // 关闭专家详情
-    handleCloseExport(done) {
-      done();
-    },
     //tabs
     handleClick(tab, event) {
       if (event.target.getAttribute('id') == 'tab-0') {
@@ -507,6 +481,7 @@ export default {
         }
       }
     },
+    // 点击查询
     resetForm(name) {
       if (this.panduan == '找技术') {
         if (name) {
@@ -534,6 +509,29 @@ export default {
         }
       }
     },
+    // 直播详情
+    btnDirectDetail() {
+      this.$router.push({ path: '/live/hallDetail', query: { id: this.$route.query.id } });
+    },
+    // 技术,产品，服务详情
+    oneBtnDetail(data) {
+      this.dialogVisible = true;
+      console.log(data.introduction.length);
+      this.$set(this, `directInfo`, data);
+    },
+    // 关闭dialog
+    handleClose(done) {
+      done();
+    },
+    // 专家详情
+    twoBtnDetail(data) {
+      this.dialogExport = true;
+      this.$set(this, `exportInfo`, data);
+    },
+    // 关闭专家详情
+    handleCloseExport(done) {
+      done();
+    },
   },
   computed: {
     pageTitle() {

src/views/hall/dock/dockDetail.vue

@@ -17,7 +17,7 @@
                       <el-carousel trigger="click" height="210px">
                         <template v-if="detailInfo.image && detailInfo.image.length > 0">
                           <el-carousel-item v-for="(item, index) in detailInfo.image" :key="index">
-                            <el-image :src="item.url"> </el-image>
+                            <el-image :src="item.url" style="width: 100%;height: 210px;"> </el-image>
                           </el-carousel-item>
                         </template>
                       </el-carousel>
@@ -55,7 +55,7 @@
                         <p>服务范围:</p>
                         <p class="moreScope" v-if="scope != ''">{{ detailInfo.scope || '暂无' }}</p>
                         <p class="moreScope1" v-else>{{ detailInfo.scope || '暂无' }}</p>
-                        <el-button size="mini" v-if="detailInfo.scope != null">
+                        <el-button size="mini" v-if="detailInfo.scope != null && detailInfo.scope.length > 300">
                           <span v-if="scope != ''" @click="scopeMore()">更多</span>
                           <span v-else @click="scopeMore1()">收起</span>
                         </el-button>
@@ -64,7 +64,7 @@
                         <p>产品简介:</p>
                         <p class="introduction" v-if="introduction != ''">{{ detailInfo.introduction || '暂无' }}</p>
                         <p class="introduction1" v-else>{{ detailInfo.introduction || '暂无' }}</p>
-                        <el-button size="mini" v-if="detailInfo.introduction != null">
+                        <el-button size="mini" v-if="detailInfo.introduction != null && detailInfo.introduction.length > 300">
                           <span v-if="introduction != ''" @click="introductionMore()">更多</span>
                           <span v-else @click="introductionMore1()">收起</span>
                         </el-button>