11

src/layout/adminCenter/menuInfo.vue

@@ -14,67 +14,67 @@
                 <span>{{ item.title }}</span>
               </template>
             </el-menu-item> -->
-            <el-menu-item index="1">
+            <!-- <el-menu-item index="1">
               <template slot="title">
                 <i class="el-icon-pie-chart"></i>
                 <span>绑定微信</span>
               </template>
-            </el-menu-item>
-            <el-menu-item index="2">
+            </el-menu-item> -->
+            <el-menu-item index="1">
               <template slot="title">
                 <i class="el-icon-pie-chart"></i>
                 <span>展会管理</span>
               </template>
             </el-menu-item>
-            <el-menu-item index="3">
+            <el-menu-item index="2">
               <template slot="title">
                 <i class="el-icon-pie-chart"></i>
                 <span>申请管理</span>
               </template>
             </el-menu-item>
-            <el-menu-item index="4">
+            <el-menu-item index="3">
               <template slot="title">
                 <i class="el-icon-pie-chart"></i>
                 <span>VIP用户</span>
               </template>
             </el-menu-item>
-            <el-menu-item index="5">
+            <el-menu-item index="4">
               <template slot="title">
                 <i class="el-icon-notebook-1"></i>
                 <span>交易备案</span>
               </template>
             </el-menu-item>
-            <el-menu-item index="6">
+            <el-menu-item index="5">
               <template slot="title">
                 <i class="el-icon-notebook-1"></i>
                 <span>嘉宾访谈</span>
               </template>
             </el-menu-item>
-            <el-menu-item index="7">
+            <el-menu-item index="6">
               <template slot="title">
                 <i class="el-icon-notebook-1"></i>
                 <span>项目路演</span>
               </template>
             </el-menu-item>
-            <el-menu-item index="8">
+            <el-menu-item index="7">
               <template slot="title">
                 <i class="el-icon-notebook-1"></i>
                 <span>统计报表</span>
               </template>
             </el-menu-item>
-            <el-menu-item index="9">
+            <el-menu-item index="8">
               <template slot="title">
                 <i class="el-icon-notebook-1"></i>
                 <span>动态监测</span>
               </template>
             </el-menu-item>
-            <el-menu-item index="10">
+            <el-menu-item index="9">
               <template slot="title">
                 <i class="el-icon-refresh-right"></i>
                 <span>返回</span>
               </template>
             </el-menu-item>
-            <el-menu-item index="11">
+            <el-menu-item index="10">
               <template slot="title">
                 <i class="el-icon-circle-close"></i>
                 <span>退出登录</span>
@@ -112,14 +112,14 @@ export default {
     ...dock(['fetch', 'query', 'delete', 'update', 'fetch']),
     // 菜单跳转
     async selectMenu(key) {
-      if (key == '11') {
+      if (key == '10') {
         this.logout();
         this.$message({
           message: '退出登录成功',
           type: 'success',
         });
         this.$router.push({ path: '/webLogin' });
-      } else if (key == '10') {
+      } else if (key == '9') {
         let res = await this.fetch(this.user.uid);
         this.$router.push({ path: '/hall/direct', query: { id: res.data.id, title: res.data.title } });
       } else {

src/views/adminCenter/index.vue

@@ -11,31 +11,31 @@
               <menuInfo></menuInfo>
             </el-col>
             <el-col :span="19" class="mainMess">
-              <span v-if="num == '1'">
+              <!-- <span v-if="num == '1'">
                 <basicInfo></basicInfo>
-              </span>
-              <span v-else-if="num == '2'">
+              </span> -->
+              <span v-if="num == '1'">
                 <dockInfo></dockInfo>
               </span>
-              <span v-else-if="num == '3'">
+              <span v-else-if="num == '2'">
                 <applyInfo></applyInfo>
               </span>
-              <span v-else-if="num == '4'">
+              <span v-else-if="num == '3'">
                 <vipInfo></vipInfo>
               </span>
-              <span v-else-if="num == '5'">
+              <span v-else-if="num == '4'">
                 <transaction></transaction>
               </span>
-              <span v-else-if="num == '6'">
+              <span v-else-if="num == '5'">
                 <zxzd></zxzd>
               </span>
-              <span v-else-if="num == '7'">
+              <span v-else-if="num == '6'">
                 <xmly></xmly>
               </span>
-              <span v-else-if="num == '8'">
+              <span v-else-if="num == '7'">
                 <statisInfo></statisInfo>
               </span>
-              <span v-else-if="num == '9'">
+              <span v-else-if="num == '8'">
                 <dynamicInfo></dynamicInfo>
               </span>
               <span v-else>
@@ -73,7 +73,7 @@ export default {
     heads,
     menuInfo,
     foot,
-    basicInfo, //绑定微信
+    // basicInfo, //绑定微信
     dockInfo, //展会管理
     applyInfo, //申请管理
     vipInfo, //VIP用户

src/views/adminCenter/xmly/index.vue

@@ -113,6 +113,7 @@ export default {
     ...newsroadshow(['query', 'create', 'update', 'delete']),
     async search({ skip = 0, limit = 10, ...info } = {}) {
       let res = await this.fetch(this.user.uid);
+      console.log(res);
       this.$set(this, `dock_id`, res.data.id);
       let arr = await this.query({ skip, limit, dock_id: this.dock_id, ...info });
       this.$set(this, `list`, arr.data);

src/views/hallList/parts/productlist.vue

@@ -7,8 +7,8 @@
           <el-col :span="24" class="other">
             <p class="textOver">{{ item.title }}</p>
             <p class="textOver">
-              <span><i class="el-icon-location-outline"></i>{{ getprovince(item.province) }}-{{ getplace(item.place) }}</span>
-              <span><i class="el-icon-time"></i>{{ item.start_time }}-{{ item.end_time }}</span>
+              <span class="textOver"><i class="el-icon-location-outline"></i>{{ getprovince(item.province) }}-{{ getplace(item.place) }}</span>
+              <span class="textOver"><i class="el-icon-time"></i>{{ item.start_time }}-{{ item.end_time }}</span>
             </p>
             <p>
               <el-button type="warning" size="mini" @click="dockBtn()" v-if="user.role == '3' || user.role == '7'">管理进入</el-button>
@@ -116,8 +116,13 @@ export default {
       }
       p:nth-child(2) {
         padding: 5px;
+        span:nth-child(1) {
+          display: inline-block;
+          width: 40%;
+        }
         span:nth-child(2) {
-          float: right;
+          display: inline-block;
+          width: 60%;
         }
       }
       p:nth-child(3) {

src/views/market/detail/expeDetail.vue

@@ -56,7 +56,7 @@
                 QQ/微信
               </el-col>
               <el-col :span="16" class="otherInfo textOver">
-                {{ detailInfo.qqwx || '暂无' }}
+                {{ getphone(detailInfo.qqwx) || '暂无' }}
               </el-col>
             </el-col>
             <el-col :span="12">
@@ -190,6 +190,24 @@ export default {
     onSubmit() {
       this.$emit('onSubmit', { data: this.detailInfo });
     },
+    // 隐藏手机号
+    getphone(value) {
+      if (value == undefined) {
+        return '暂无';
+      } else {
+        if (value.length === 11 || value.length === 12) {
+          let start = value.slice(0, 4);
+          let end = value.slice(-3);
+          return `${start}****${end}`;
+        } else if (value.length === 20) {
+          let start = value.slice(0, 13);
+          let end = value.slice(-3);
+          return `${start}****${end}`;
+        } else {
+          return value;
+        }
+      }
+    },
   },
   computed: {
     ...mapState(['user']),

src/views/market/detail/techDetail.vue

@@ -100,15 +100,19 @@
                 联系人
               </el-col>
               <el-col :span="16" class="otherInfo textOver">
-                {{ detailInfo.contacts || '暂无' }}
+                {{ getphone(detailInfo.contacts) || '暂无' }}
               </el-col>
             </el-col>
             <el-col :span="12">
               <el-col :span="8" class="otherInfo textOver">
-                电子邮箱
+                联系方式
               </el-col>
               <el-col :span="16" class="otherInfo textOver">
-                {{ detailInfo.email || '暂无' }}
+                <!-- {{ detailInfo.qqwx || '暂无' }} -->
+                <el-tooltip class="item" effect="dark" placement="top">
+                  <div slot="content">{{ getphone(detailInfo.qqwx) || '暂无' }}</div>
+                  <p class="textOver">{{ getphone(detailInfo.qqwx) || '暂无' }}</p>
+                </el-tooltip>
               </el-col>
             </el-col>
           </el-col>
@@ -231,6 +235,20 @@ export default {
       else if (data.degreeurgency == '特急') this.$set(this, `value`, 1);
       else this.$set(this, `value`, 0);
     },
+    // 隐藏手机号
+    getphone(value) {
+      if (value == undefined) {
+        return '暂无';
+      } else {
+        if (value.length === 11) {
+          let start = value.slice(0, 4);
+          let end = value.slice(-3);
+          return `${start}****${end}`;
+        } else {
+          return value;
+        }
+      }
+    },
   },
   watch: {
     detailInfo: {

src/views/market/list/achieve.vue

@@ -49,7 +49,7 @@ export default {
   data: function() {
     return {
       currentPage: 1, //默认数据1
-      pageSize: 5, //每页显示数据数量
+      pageSize: 6, //每页显示数据数量
       origin: [], //分割数据
       list: [], //显示数据列表
       infoName: '',
@@ -77,8 +77,12 @@ export default {
       immediate: true,
       deep: true,
       handler(val) {
-        if (val && val.length > 0) this.$set(this, `origin`, _.chunk(val, this.pageSize));
-        this.searchPage();
+        if (val && val.length > 0) {
+          this.$set(this, `origin`, _.chunk(val, this.pageSize));
+          this.searchPage();
+        } else {
+          this.$set(this, `list`, []);
+        }
       },
     },
   },
@@ -108,10 +112,12 @@ export default {
 <style lang="less" scoped>
 .main {
   padding: 0 10px;
+  min-height: 620px;
   .list {
     padding: 10px 0;
     .name {
       font-size: 18px;
+      font-weight: bold;
     }
     .date {
       font-size: 16px;

src/views/market/list/business.vue

@@ -49,7 +49,7 @@ export default {
   data: function() {
     return {
       currentPage: 1, //默认数据1
-      pageSize: 10, //每页显示数据数量
+      pageSize: 12, //每页显示数据数量
       origin: [], //分割数据
       list: [], //显示数据列表
       infoName: '',
@@ -77,8 +77,12 @@ export default {
       immediate: true,
       deep: true,
       handler(val) {
-        if (val && val.length > 0) this.$set(this, `origin`, _.chunk(val, this.pageSize));
-        this.searchPage();
+        if (val && val.length > 0) {
+          this.$set(this, `origin`, _.chunk(val, this.pageSize));
+          this.searchPage();
+        } else {
+          this.$set(this, `list`, []);
+        }
       },
     },
   },
@@ -108,10 +112,12 @@ export default {
 <style lang="less" scoped>
 .main {
   padding: 0 10px;
+  min-height: 620px;
   .list {
     padding: 12px 0;
     .name {
       font-size: 18px;
+      font-weight: bold;
     }
     .field {
       font-size: 16px;
@@ -121,7 +127,7 @@ export default {
       font-size: 16px;
     }
   }
-  .list:nth-child(5) {
+  .list:nth-child(7) {
     border-bottom: 1px solid #ccc;
   }
   .list:hover {

src/views/market/list/expert.vue

@@ -12,8 +12,28 @@
             </el-input>
           </el-col>
         </el-col>
-        <el-col :span="24" class="list" v-for="(item, index) in list" :key="index">
-          <el-col :span="21" class="name" @click.native="clickDetail(item.id)">
+        <el-col :span="12" class="list" v-for="(item, index) in list" :key="index">
+          <el-col :span="5" class="image">
+            <el-image v-if="item.expertimage != null || undefined" :src="item.expertimage"></el-image>
+            <el-image :src="expertimage" v-else></el-image>
+          </el-col>
+          <el-col :span="19" class="other">
+            <p class="name textOver" @click="clickDetail(item.id)">{{ item.name }}</p>
+            <p class="textOver">
+              工作单位：{{ item.company || '暂无' }}
+              <!-- <el-tooltip class="item" effect="dark" placement="top">
+                <div slot="content">{{ item.company || '暂无' }}</div>
+                <span class="textOver">工作单位：{{ item.company || '暂无' }}</span>
+              </el-tooltip>
+              <span class="textOver">最高学历：{{ item.education || '暂无' }}</span> -->
+              <!-- <span class="textOver">工作单位：{{ item.company || '暂无' }}</span> -->
+            </p>
+            <p class="textOver">
+              擅长领域：{{ item.expertise || '暂无' }}
+              <!-- <span class="textOver">擅长领域：{{ item.expertise || '暂无' }}</span> -->
+            </p>
+          </el-col>
+          <!-- <el-col :span="21" class="name" @click.native="clickDetail(item.id)">
             {{ item.name }}
           </el-col>
           <el-col :span="3" class="date">
@@ -22,7 +42,7 @@
           <el-col :span="12" class="brief textOver"> 工作单位:{{ item.company || '暂无' }} </el-col>
           <el-col :span="12" class="brief textOver"> 学历:{{ item.education || '暂无' }} </el-col>
           <el-col :span="12" class="brief textOver"> 职务职称:{{ item.zwzc || '暂无' }} </el-col>
-          <el-col :span="12" class="brief textOver"> 擅长领域:{{ item.expertise || '暂无' }} </el-col>
+          <el-col :span="12" class="brief textOver"> 擅长领域:{{ item.expertise || '暂无' }} </el-col> -->
         </el-col>
       </el-col>
       <el-col :span="24" class="page">
@@ -52,10 +72,11 @@ export default {
   data: function() {
     return {
       currentPage: 1, //默认数据1
-      pageSize: 6, //每页显示数据数量
+      pageSize: 10, //每页显示数据数量
       origin: [], //分割数据
       list: [], //显示数据列表
       infoName: '',
+      expertimage: require('@/assets/live/222.png'),
     };
   },
   created() {},
@@ -80,8 +101,12 @@ export default {
       immediate: true,
       deep: true,
       handler(val) {
-        if (val && val.length > 0) this.$set(this, `origin`, _.chunk(val, this.pageSize));
-        this.searchPage();
+        if (val && val.length > 0) {
+          this.$set(this, `origin`, _.chunk(val, this.pageSize));
+          this.searchPage();
+        } else {
+          this.$set(this, `list`, []);
+        }
       },
     },
   },
@@ -111,31 +136,59 @@ export default {
 <style lang="less" scoped>
 .main {
   padding: 0 10px;
+  min-height: 620px;
   .list {
     padding: 10px 0;
-    .name {
-      font-size: 18px;
-    }
-    .date {
-      font-size: 16px;
-      text-align: center;
+    border-bottom: 1px dashed #ccc;
+    .image {
+      .el-image {
+        border-radius: 90px;
+        width: 90px;
+        height: 90px;
+      }
     }
-    .brief {
-      font-size: 15px;
-      padding: 5px 0 0 0;
+    .other {
+      padding: 0 10px;
+      p {
+        font-size: 16px;
+        color: #666;
+        padding: 0 0 5px 0;
+        span {
+          display: inline-block;
+          width: 50%;
+        }
+      }
+      p:nth-child(1) {
+        font-size: 18px;
+        font-weight: bold;
+        color: #000;
+      }
     }
+    // .name {
+    //   font-size: 18px;
+    // }
+    // .date {
+    //   font-size: 16px;
+    //   text-align: center;
+    // }
+    // .brief {
+    //   font-size: 15px;
+    //   padding: 5px 0 0 0;
+    // }
   }
   .list:hover {
     cursor: pointer;
-    .name {
-      -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: #0085d2;
+    .other {
+      .name {
+        -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: #0085d2;
+      }
     }
   }
   .listTop {

src/views/market/list/technology.vue

@@ -49,7 +49,7 @@ export default {
   data: function() {
     return {
       currentPage: 1, //默认数据1
-      pageSize: 10, //每页显示数据数量
+      pageSize: 12, //每页显示数据数量
       origin: [], //分割数据
       list: [], //显示数据列表
       infoName: '',
@@ -77,8 +77,12 @@ export default {
       immediate: true,
       deep: true,
       handler(val) {
-        if (val && val.length > 0) this.$set(this, `origin`, _.chunk(val, this.pageSize));
-        this.searchPage();
+        if (val && val.length > 0) {
+          this.$set(this, `origin`, _.chunk(val, this.pageSize));
+          this.searchPage();
+        } else {
+          this.$set(this, `list`, []);
+        }
       },
     },
   },
@@ -107,11 +111,13 @@ export default {
 
 <style lang="less" scoped>
 .main {
+  min-height: 620px;
   padding: 0 10px;
   .list {
     padding: 12px 0;
     .name {
       font-size: 18px;
+      font-weight: bold;
     }
     .field {
       font-size: 16px;
@@ -121,7 +127,7 @@ export default {
       font-size: 16px;
     }
   }
-  .list:nth-child(5) {
+  .list:nth-child(7) {
     border-bottom: 1px solid #ccc;
   }
   .list:hover {

src/views/market/marketlists.vue

@@ -189,7 +189,6 @@ export default {
     },
     // 查看列表
     async searchInfo({ skip = 0, limit = 10, columnName, name, ...info } = {}) {
-      console.log(columnName, name);
       if (columnName == '科技需求') {
         let res = await this.productList({ skip, type: '0', status: '1', name, ...info });
         if (this.$checkRes(res)) this.$set(this, `technologyList`, res.data);

src/views/superAdminCenter/enterpriseProduct/index.vue

@@ -33,13 +33,6 @@
                 <el-option label="商务服务" value="2"></el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="产品类型" prop="totaltype">
-              <el-select v-model="form.type" placeholder="请选择产品类型">
-                <el-option label="科技需求" value="0"></el-option>
-                <el-option label="技术成果" value="1"></el-option>
-                <el-option label="商务服务" value="2"></el-option>
-              </el-select>
-            </el-form-item>
             <el-form-item label="名称">
               <el-input v-model="form.name" placeholder="请输入名称"></el-input>
             </el-form-item>
@@ -278,6 +271,7 @@
                 <el-radio-group v-model="form.demand">
                   <el-radio label="特急"></el-radio>
                   <el-radio label="一般"></el-radio>
+                  <el-radio label="长期"></el-radio>
                 </el-radio-group>
               </el-form-item>
               <el-form-item label="信息描述">

src/views/superAdminCenter/enterpriseTrans/index.vue

@@ -61,7 +61,7 @@ export default {
         {
           label: '状态',
           prop: 'status',
-          format: i => (i == '0' ? '未交易' : i == '1' ? '交易中' : i == '2' ? '交易成功' : i == '3' ? '交易失败' : i == '3' ? '合同待确定' : '暂无'),
+          format: i => (i == '0' ? '未交易' : i == '1' ? '交易中' : i == '2' ? '交易成功' : i == '3' ? '交易失败' : i == '4' ? '合同待确定' : '暂无'),
         },
       ],
       list: [],
@@ -74,7 +74,7 @@ export default {
     this.search();
   },
   methods: {
-    ...transactions({ transactionsfetch: 'fetch', transactionslist: 'query', transactiondetele: 'detele' }),
+    ...transactions({ transactionsfetch: 'fetch', transactionslist: 'query', transactiondetele: 'detele', transactionupdate: 'update' }),
     ...productpact({ transactionQuery: 'query', productpactFetch: 'findpact', productpactUpdate: 'update' }),
     async search({ skip = 0, limit = 10, ...info } = {}) {
       const res = await this.transactionslist({ skip, limit, ...info });
@@ -84,8 +84,12 @@ export default {
       }
     },
     // 审核
-    toEdit({ data }) {
-      this.$set(this, 'form', data);
+    async toEdit({ data }) {
+      const res = await this.productpactFetch(data.id);
+      if (this.$checkRes(res)) {
+        this.$set(this, 'form', res.data);
+      }
+
       this.dialog = true;
     },
     // 提交

src/views/userCenter/basicInfo/index.vue

@@ -506,7 +506,7 @@ export default {
       }
     },
     async onSubmit() {
-      if (this.form.role == '4' || this.form.role == '5' || this.form.role == '7') {
+      if (this.form.role == '4' || this.form.role == '5') {
         let res;
         let msg;
         res = await this.update(this.form);

src/views/userCenter/productInfo/part/infoRelease.vue

@@ -79,7 +79,7 @@
                         <el-select v-model="form.degreeurgency" placeholder="请选择需求紧急程度">
                           <el-option label="特急" value="特急"></el-option>
                           <el-option label="一般" value="一般"></el-option>
-                          <el-option label="储备" value="储备"></el-option>
+                          <el-option label="长期" value="长期"></el-option>
                         </el-select>
                       </el-col>
                     </el-form-item>