guhongwei 4 years ago
parent
commit
8c4849b78d

+ 1 - 1
src/views/hall/direct.vue

@@ -268,7 +268,7 @@
                     </el-row>
                     </el-row>
                   </el-col>
                   </el-col>
                 </el-tab-pane> -->
                 </el-tab-pane> -->
-                <el-tab-pane label="专家服务">
+                <el-tab-pane label="专家智库">
                   <el-col :span="24" class="two">
                   <el-col :span="24" class="two">
                     <el-col :span="12" class="twoList" v-for="(item, index) in expertList" :key="index">
                     <el-col :span="12" class="twoList" v-for="(item, index) in expertList" :key="index">
                       <el-col :span="4" class="image">
                       <el-col :span="4" class="image">

+ 1 - 0
src/views/market/detail/achiDetail.vue

@@ -280,6 +280,7 @@ export default {
         font-weight: bold;
         font-weight: bold;
         padding: 10px;
         padding: 10px;
         border: 1px solid #ccc;
         border: 1px solid #ccc;
+        text-align: center;
       }
       }
       .otherInfo {
       .otherInfo {
         padding: 10px;
         padding: 10px;

+ 18 - 11
src/views/market/detail/busiDetail.vue

@@ -4,7 +4,8 @@
       <el-col :span="24" class="main">
       <el-col :span="24" class="main">
         <el-col :span="24" class="top">
         <el-col :span="24" class="top">
           <el-col :span="24" class="name">
           <el-col :span="24" class="name">
-            {{ detailInfo.name || '暂无' }}
+            <p class="textOver">{{ detailInfo.name || '暂无' }}</p>
+            <p>{{ detailInfo.meta | getDate }}</p>
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
             <el-col :span="6" class="otherInfo textOver">
             <el-col :span="6" class="otherInfo textOver">
@@ -30,30 +31,30 @@
               {{ detailInfo.contacts || '暂无' }}
               {{ detailInfo.contacts || '暂无' }}
             </el-col>
             </el-col>
           </el-col>
           </el-col>
-          <el-col :span="12">
+          <!-- <el-col :span="12">
             <el-col :span="6" class="otherInfo textOver">
             <el-col :span="6" class="otherInfo textOver">
               发布时间
               发布时间
             </el-col>
             </el-col>
             <el-col :span="18" class="otherInfo textOver">
             <el-col :span="18" class="otherInfo textOver">
               {{ detailInfo.meta | getDate }}
               {{ detailInfo.meta | getDate }}
             </el-col>
             </el-col>
-          </el-col>
+          </el-col> -->
           <el-col :span="12">
           <el-col :span="12">
             <el-col :span="6" class="otherInfo textOver">
             <el-col :span="6" class="otherInfo textOver">
-              QQ/微信
+              联系人
             </el-col>
             </el-col>
             <el-col :span="18" class="otherInfo textOver">
             <el-col :span="18" class="otherInfo textOver">
               {{ detailInfo.qqwx || '暂无' }}
               {{ detailInfo.qqwx || '暂无' }}
             </el-col>
             </el-col>
           </el-col>
           </el-col>
-          <el-col :span="12">
+          <!-- <el-col :span="12">
             <el-col :span="6" class="otherInfo textOver">
             <el-col :span="6" class="otherInfo textOver">
               电子邮箱
               电子邮箱
             </el-col>
             </el-col>
             <el-col :span="18" class="otherInfo textOver">
             <el-col :span="18" class="otherInfo textOver">
               {{ detailInfo.email || '暂无' }}
               {{ detailInfo.email || '暂无' }}
             </el-col>
             </el-col>
-          </el-col>
+          </el-col> -->
         </el-col>
         </el-col>
         <el-col :span="24" class="down">
         <el-col :span="24" class="down">
           <el-col :span="24" class="downInfo">
           <el-col :span="24" class="downInfo">
@@ -184,15 +185,21 @@ export default {
 .main {
 .main {
   margin: 10px 0 0 0;
   margin: 10px 0 0 0;
   .top {
   .top {
-    height: 160px;
+    height: 140px;
     overflow: hidden;
     overflow: hidden;
     margin: 0 0 15px 0;
     margin: 0 0 15px 0;
     .name {
     .name {
-      font-size: 18px;
-      font-weight: bold;
-      padding: 10px;
-      height: 40px;
+      padding: 5px 10px;
       border: 1px solid #ccc;
       border: 1px solid #ccc;
+      text-align: center;
+      p:nth-child(1) {
+        font-size: 18px;
+        font-weight: bold;
+      }
+      p:nth-child(2) {
+        font-size: 12px;
+        padding: 5px 0 0 0;
+      }
     }
     }
     .otherInfo {
     .otherInfo {
       font-size: 16px;
       font-size: 16px;

+ 1 - 0
src/views/market/detail/expeDetail.vue

@@ -215,6 +215,7 @@ export default {
         font-size: 18px;
         font-size: 18px;
         font-weight: bold;
         font-weight: bold;
         padding: 10px;
         padding: 10px;
+        text-align: center;
         border: 1px solid #ccc;
         border: 1px solid #ccc;
       }
       }
       .otherInfo {
       .otherInfo {

+ 12 - 4
src/views/market/detail/techDetail.vue

@@ -24,7 +24,8 @@
               <el-col :span="24" class="a-contacts">联系人:{{ detailInfo.contacts }}</el-col>
               <el-col :span="24" class="a-contacts">联系人:{{ detailInfo.contacts }}</el-col>
             </el-col> -->
             </el-col> -->
             <p>紧急程度</p>
             <p>紧急程度</p>
-            <p>{{ detailInfo.degreeurgency || '暂无' }}</p>
+            <p><el-rate v-model="value" disabled :max="max" :texts="texts" :colors="colors"> </el-rate></p>
+            <!-- <p>{{ detailInfo.degreeurgency || '暂无' }}</p> -->
           </el-col>
           </el-col>
           <el-col :span="17" class="right">
           <el-col :span="17" class="right">
             <el-col :span="24" class="name textOver">
             <el-col :span="24" class="name textOver">
@@ -178,6 +179,10 @@ export default {
       dialogTableVisible: false,
       dialogTableVisible: false,
       room: {},
       room: {},
       achievezb: require('@/assets/3.png'),
       achievezb: require('@/assets/3.png'),
+      value: 2,
+      max: 3,
+      colors: ['#ff0000', '#ff0000', '#ff0000'],
+      texts: ['一般', '紧急', '长期'],
     };
     };
   },
   },
   created() {},
   created() {},
@@ -246,6 +251,7 @@ export default {
         font-weight: bold;
         font-weight: bold;
         padding: 10px;
         padding: 10px;
         border: 1px solid #ccc;
         border: 1px solid #ccc;
+        text-align: center;
       }
       }
       .otherInfo {
       .otherInfo {
         padding: 10px;
         padding: 10px;
@@ -279,10 +285,12 @@ export default {
   }
   }
   .achieveImage {
   .achieveImage {
     height: 305px;
     height: 305px;
-    text-align: center;
-    padding: 60px 0;
+    overflow: hidden;
+    // padding: 60px 0;
     p:nth-child(1) {
     p:nth-child(1) {
-      font-size: 30px;
+      font-size: 25px;
+      text-align: left;
+      padding: 10px 0;
     }
     }
     p:nth-child(2) {
     p:nth-child(2) {
       font-size: 70px;
       font-size: 70px;

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

@@ -90,10 +90,10 @@
                   <el-image :src="iconImage"></el-image>
                   <el-image :src="iconImage"></el-image>
                 </el-col>
                 </el-col>
                 <el-col :span="22" class="txt">
                 <el-col :span="22" class="txt">
-                  <span>商务信息</span>
+                  <span>商务服务</span>
                   <span>B</span>
                   <span>B</span>
                   <span>usiness</span>
                   <span>usiness</span>
-                  <span @click="$router.push({ path: '/market/marketlists', query: { type: '2', column_name: '商务信息' } })">更多</span>
+                  <span @click="$router.push({ path: '/market/marketlists', query: { type: '2', column_name: '商务服务' } })">更多</span>
                 </el-col>
                 </el-col>
               </el-col>
               </el-col>
               <el-col :span="24" class="leftDown">
               <el-col :span="24" class="leftDown">
@@ -102,7 +102,7 @@
                   class="businessList"
                   class="businessList"
                   v-for="(item, index) in businessList"
                   v-for="(item, index) in businessList"
                   :key="index"
                   :key="index"
-                  @click.native="$router.push({ path: '/market/marketlists', query: { type: '2', column_name: '商务信息', id: item._id } })"
+                  @click.native="$router.push({ path: '/market/marketlists', query: { type: '2', column_name: '商务服务', id: item._id } })"
                 >
                 >
                   <el-col :span="10" class="name textOver">
                   <el-col :span="10" class="name textOver">
                     {{ item.name }}
                     {{ item.name }}
@@ -123,10 +123,10 @@
                   <el-image :src="iconImage"></el-image>
                   <el-image :src="iconImage"></el-image>
                 </el-col>
                 </el-col>
                 <el-col :span="22" class="txt">
                 <el-col :span="22" class="txt">
-                  <span>专家服务</span>
+                  <span>专家智库</span>
                   <span>E</span>
                   <span>E</span>
                   <span>xpert</span>
                   <span>xpert</span>
-                  <span @click="$router.push({ path: '/market/marketlists', query: { type: '3', column_name: '专家服务' } })">更多</span>
+                  <span @click="$router.push({ path: '/market/marketlists', query: { type: '3', column_name: '专家智库' } })">更多</span>
                 </el-col>
                 </el-col>
               </el-col>
               </el-col>
               <el-col :span="24" class="rightDown">
               <el-col :span="24" class="rightDown">
@@ -135,10 +135,10 @@
                   class="expertList"
                   class="expertList"
                   v-for="(item, index) in expertList"
                   v-for="(item, index) in expertList"
                   :key="index"
                   :key="index"
-                  @click.native="$router.push({ path: '/market/marketlists', query: { type: '3', column_name: '专家服务', id: item._id } })"
+                  @click.native="$router.push({ path: '/market/marketlists', query: { type: '3', column_name: '专家智库', id: item._id } })"
                 >
                 >
                   <el-col :span="8" class="expertimage">
                   <el-col :span="8" class="expertimage">
-                    <el-image v-if="item.expertimage != ''" :src="item.expertimage"></el-image>
+                    <el-image v-if="item.expertimage != null || undefined" :src="item.expertimage"></el-image>
                     <el-image :src="expertimage" v-else></el-image>
                     <el-image :src="expertimage" v-else></el-image>
                   </el-col>
                   </el-col>
                   <el-col :span="16" class="rightInfo">
                   <el-col :span="16" class="rightInfo">
@@ -583,7 +583,7 @@ export default {
       achieveList: [],
       achieveList: [],
       // 技术
       // 技术
       technologyList: [],
       technologyList: [],
-      // 商务信息
+      // 商务服务
       businessList: [],
       businessList: [],
       // 专家信息
       // 专家信息
       expertList: [],
       expertList: [],

+ 2 - 2
src/views/market/list/business.vue

@@ -65,11 +65,11 @@ export default {
     },
     },
     // 详情
     // 详情
     clickDetail(id) {
     clickDetail(id) {
-      this.$emit('clickDetail', { column_name: '商务信息', id: id });
+      this.$emit('clickDetail', { column_name: '商务服务', id: id });
     },
     },
     // 查询
     // 查询
     searchData() {
     searchData() {
-      this.$emit('searchData', { name: this.infoName, columnName: '商务信息' });
+      this.$emit('searchData', { name: this.infoName, columnName: '商务服务' });
     },
     },
   },
   },
   watch: {
   watch: {

+ 2 - 2
src/views/market/list/expert.vue

@@ -68,11 +68,11 @@ export default {
     },
     },
     // 详情
     // 详情
     clickDetail(id) {
     clickDetail(id) {
-      this.$emit('clickDetail', { column_name: '专家服务', id: id });
+      this.$emit('clickDetail', { column_name: '专家智库', id: id });
     },
     },
     // 查询
     // 查询
     searchData() {
     searchData() {
-      this.$emit('searchData', { name: this.infoName, columnName: '专家服务' });
+      this.$emit('searchData', { name: this.infoName, columnName: '专家智库' });
     },
     },
   },
   },
   watch: {
   watch: {

+ 13 - 13
src/views/market/marketlists.vue

@@ -31,7 +31,7 @@
                     @searchData="searchData"
                     @searchData="searchData"
                   ></achieve>
                   ></achieve>
                 </span>
                 </span>
-                <span v-else-if="column_name == '商务信息'">
+                <span v-else-if="column_name == '商务服务'">
                   <business
                   <business
                     :businessList="businessList"
                     :businessList="businessList"
                     :column_name="column_name"
                     :column_name="column_name"
@@ -40,7 +40,7 @@
                     @searchData="searchData"
                     @searchData="searchData"
                   ></business>
                   ></business>
                 </span>
                 </span>
-                <span v-else-if="column_name == '专家服务'">
+                <span v-else-if="column_name == '专家智库'">
                   <expert :expertList="expertList" :column_name="column_name" :total="expertTotal" @clickDetail="clickDetail" @searchData="searchData"></expert>
                   <expert :expertList="expertList" :column_name="column_name" :total="expertTotal" @clickDetail="clickDetail" @searchData="searchData"></expert>
                 </span>
                 </span>
               </el-col>
               </el-col>
@@ -62,7 +62,7 @@
                   <achiDetail :detailInfo="achiDetail" @onSubmit="techSubmit" :displayBtn="displayBtn"></achiDetail>
                   <achiDetail :detailInfo="achiDetail" @onSubmit="techSubmit" :displayBtn="displayBtn"></achiDetail>
                 </el-col>
                 </el-col>
               </span>
               </span>
-              <span v-else-if="column_name == '商务信息'">
+              <span v-else-if="column_name == '商务服务'">
                 <el-col :span="24" style="text-align:right;">
                 <el-col :span="24" style="text-align:right;">
                   <el-button type="primary" size="mini" @click="display = 'list'">返回</el-button>
                   <el-button type="primary" size="mini" @click="display = 'list'">返回</el-button>
                 </el-col>
                 </el-col>
@@ -70,7 +70,7 @@
                   <busiDetail :detailInfo="busiDetail" @onSubmit="techSubmit" :displayBtn="displayBtn"></busiDetail>
                   <busiDetail :detailInfo="busiDetail" @onSubmit="techSubmit" :displayBtn="displayBtn"></busiDetail>
                 </el-col>
                 </el-col>
               </span>
               </span>
-              <span v-else-if="column_name == '专家服务'">
+              <span v-else-if="column_name == '专家智库'">
                 <el-col :span="24" style="text-align:right;">
                 <el-col :span="24" style="text-align:right;">
                   <el-button type="primary" size="mini" @click="display = 'list'">返回</el-button>
                   <el-button type="primary" size="mini" @click="display = 'list'">返回</el-button>
                 </el-col>
                 </el-col>
@@ -111,10 +111,10 @@ export default {
     // 技术成果
     // 技术成果
     achieve,
     achieve,
     achiDetail,
     achiDetail,
-    // 商务信息
+    // 商务服务
     business,
     business,
     busiDetail,
     busiDetail,
-    // 专家服务
+    // 专家智库
     expert,
     expert,
     expeDetail,
     expeDetail,
   },
   },
@@ -122,7 +122,7 @@ export default {
     return {
     return {
       squareImage: require('@/assets/live/square_big.png'),
       squareImage: require('@/assets/live/square_big.png'),
       // 菜单
       // 菜单
-      menuList: [{ name: '科技需求' }, { name: '技术成果' }, { name: '商务信息' }, { name: '专家服务' }],
+      menuList: [{ name: '科技需求' }, { name: '技术成果' }, { name: '商务服务' }, { name: '专家智库' }],
       menuIndex: '0',
       menuIndex: '0',
       menuColor: 'rgb(254, 149, 14)',
       menuColor: 'rgb(254, 149, 14)',
       // 右侧显示
       // 右侧显示
@@ -141,7 +141,7 @@ export default {
       achieveList: [],
       achieveList: [],
       achieveTotal: 0,
       achieveTotal: 0,
       achiDetail: {},
       achiDetail: {},
-      // 商务信息
+      // 商务服务
       businessList: [],
       businessList: [],
       businessTotal: 0,
       businessTotal: 0,
       busiDetail: {},
       busiDetail: {},
@@ -198,11 +198,11 @@ export default {
         let res = await this.productList({ skip, type: '1', status: '1', name, ...info });
         let res = await this.productList({ skip, type: '1', status: '1', name, ...info });
         if (this.$checkRes(res)) this.$set(this, `achieveList`, res.data);
         if (this.$checkRes(res)) this.$set(this, `achieveList`, res.data);
         this.$set(this, `achieveTotal`, res.total);
         this.$set(this, `achieveTotal`, res.total);
-      } else if (columnName == '商务信息') {
+      } else if (columnName == '商务服务') {
         let res = await this.productList({ skip, type: '2', status: '1', name, ...info });
         let res = await this.productList({ skip, type: '2', status: '1', name, ...info });
         if (this.$checkRes(res)) this.$set(this, `businessList`, res.data);
         if (this.$checkRes(res)) this.$set(this, `businessList`, res.data);
         this.$set(this, `businessTotal`, res.total);
         this.$set(this, `businessTotal`, res.total);
-      } else if (columnName == '专家服务') {
+      } else if (columnName == '专家智库') {
         let res = await this.expertsuserList({ skip, name, ...info });
         let res = await this.expertsuserList({ skip, name, ...info });
         if (this.$checkRes(res)) this.$set(this, `expertList`, res.data);
         if (this.$checkRes(res)) this.$set(this, `expertList`, res.data);
         this.$set(this, `expertTotal`, res.total);
         this.$set(this, `expertTotal`, res.total);
@@ -216,7 +216,7 @@ export default {
       } else if (columnName == '技术成果') {
       } else if (columnName == '技术成果') {
         let res = await this.productFetch(id);
         let res = await this.productFetch(id);
         if (this.$checkRes(res)) this.$set(this, `achiDetail`, res.data);
         if (this.$checkRes(res)) this.$set(this, `achiDetail`, res.data);
-      } else if (columnName == '商务信息') {
+      } else if (columnName == '商务服务') {
         let res = await this.productFetch(id);
         let res = await this.productFetch(id);
         if (this.$checkRes(res)) this.$set(this, `busiDetail`, res.data);
         if (this.$checkRes(res)) this.$set(this, `busiDetail`, res.data);
       } else {
       } else {
@@ -230,7 +230,7 @@ export default {
       this.display = 'detail';
       this.display = 'detail';
       this.searchDetail(column_name, id);
       this.searchDetail(column_name, id);
     },
     },
-    // 科技需求,技术成果,商务信息洽谈
+    // 科技需求,技术成果,商务服务洽谈
     async techSubmit({ data }) {
     async techSubmit({ data }) {
       let form = {
       let form = {
         userid: this.user.uid,
         userid: this.user.uid,
@@ -253,7 +253,7 @@ export default {
         this.$checkRes(res, '购买申请成功', res.errmsg || '购买申请失败');
         this.$checkRes(res, '购买申请成功', res.errmsg || '购买申请失败');
       }
       }
     },
     },
-    // 专家服务
+    // 专家智库
     async expertSuubmit({ data }) {
     async expertSuubmit({ data }) {
       let form = {
       let form = {
         userid: this.user.uid,
         userid: this.user.uid,

+ 2 - 1
src/views/userCenter/productInfo/part/infoRelease.vue

@@ -476,7 +476,7 @@
                 </el-col>
                 </el-col>
               </el-form>
               </el-form>
             </el-tab-pane>
             </el-tab-pane>
-            <el-tab-pane label="商务信息" name="third">
+            <el-tab-pane label="商务服务" name="third">
               <el-form ref="form" :model="form" :rules="rules" label-width="140px">
               <el-form ref="form" :model="form" :rules="rules" label-width="140px">
                 <el-col :span="24" class="form">
                 <el-col :span="24" class="form">
                   <el-col :span="24">
                   <el-col :span="24">
@@ -561,6 +561,7 @@
                         <el-radio-group v-model="form.demand">
                         <el-radio-group v-model="form.demand">
                           <el-radio label="特急"></el-radio>
                           <el-radio label="特急"></el-radio>
                           <el-radio label="一般"></el-radio>
                           <el-radio label="一般"></el-radio>
+                          <el-radio label="长期"></el-radio>
                         </el-radio-group>
                         </el-radio-group>
                       </el-col>
                       </el-col>
                     </el-form-item>
                     </el-form-item>