guhongwei 4 years ago
parent
commit
46c20de7cf

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

@@ -128,7 +128,7 @@
                   @click.native="$router.push({ path: '/market/marketlists', query: { type: '3', column_name: '专家服务', id: item.id } })"
                 >
                   <el-col :span="8" class="expertimage">
-                    <el-image v-if="item.expertimage != ''" :src="item.expertimage"></el-image>
+                    <el-image v-if="item.expertimage != '' && null" :src="item.expertimage"></el-image>
                     <el-image v-else :src="expertimage"></el-image>
                   </el-col>
                   <el-col :span="16" class="rightInfo">

+ 7 - 11
src/views/market/list/expert.vue

@@ -9,7 +9,10 @@
           <el-col :span="3" class="date">
             {{ item.meta | getDate }}
           </el-col>
-          <el-col :span="24" class="brief"> 科研综述:{{ item.scientific }} </el-col>
+          <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>
       </el-col>
       <el-col :span="24" class="page">
@@ -38,7 +41,7 @@ export default {
   data: function() {
     return {
       currentPage: 1, //默认数据1
-      pageSize: 5, //每页显示数据数量
+      pageSize: 6, //每页显示数据数量
       origin: [], //分割数据
       list: [], //显示数据列表
     };
@@ -102,15 +105,8 @@ export default {
       text-align: center;
     }
     .brief {
-      font-size: 16px;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      -webkit-line-clamp: 2;
-      word-break: break-all;
-      display: -webkit-box;
-      -webkit-box-orient: vertical;
-      margin: 10px 0 0 0;
-      max-height: 42px;
+      font-size: 15px;
+      padding: 5px 0 0 0;
     }
   }
   .list:hover {

+ 0 - 677
src/views/market/marketlists copy.vue

@@ -1,677 +0,0 @@
-<template>
-  <div id="marketlists">
-    <el-col :span="24" class="main">
-      <el-col :span="24">
-        <el-col :span="5" class="menu">
-          <el-image :src="squareImage"></el-image>
-          <span>Menu</span>
-          <el-col class="menuList" :span="24" v-for="(item, index) in menuList" :key="index">
-            <p @click="changeMenu(item.name, index)" :style="`color:${menuIndex == index ? menuColor : ''}`">{{ item.name }}</p>
-          </el-col>
-        </el-col>
-        <el-col :span="19" class="info" v-if="display == '1'">
-          <el-col v-if="menuIndex == '0'" class="leftInfo">
-            <el-col :span="24" class="leftTop">
-              <el-col :span="12">
-                <span>|</span> <span>{{ menuName }}</span>
-              </el-col>
-              <el-col :span="12" class="search">
-                <el-input v-model="chanpinInput" placeholder="请输入内容"></el-input>
-                <el-button type="primary" size="mini" @click="chanpinBtn()">查询</el-button>
-              </el-col>
-            </el-col>
-            <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" @click.native="clickshanpin(item.id)">
-                  {{ item.name }}
-                </el-col>
-                <el-col :span="4" class="date">
-                  {{ item.meta && item.meta.createdAt ? new Date(item.meta.createdAt).toLocaleDateString() : '' || '' }}
-                </el-col>
-                <el-col :span="24" class="introduction"> 简介:{{ item.introduction }} </el-col>
-              </el-col>
-            </el-col>
-          </el-col>
-          <el-col v-if="menuIndex == '1'" class="leftInfo">
-            <el-col :span="24" class="leftTop">
-              <el-col :span="12">
-                <span>|</span> <span>{{ menuName }}</span>
-              </el-col>
-              <el-col :span="12" class="search">
-                <el-input v-model="jishuInput" placeholder="请输入内容"></el-input>
-                <el-button type="primary" size="mini" @click="jishuBtn()">查询</el-button>
-              </el-col>
-            </el-col>
-            <el-col class="infoRightList" :span="24" v-for="(item, index) in jishuList" :key="index">
-              <p>
-                <span class="textOver" @click="clickjishu(item.id)">{{ item.name }}</span>
-                <span class="textOver">
-                  所属领域:{{
-                    `${item.field}` === `0`
-                      ? '先进制造'
-                      : `${item.field}` === `1`
-                      ? '新材料'
-                      : `${item.field}` === `2`
-                      ? '光电子'
-                      : `${item.field}` === `3`
-                      ? '信息技术'
-                      : `${item.field}` === `4`
-                      ? '文化和科技融合'
-                      : '暂无'
-                  }}
-                </span>
-                <span class="textOver">{{ item.meta && item.meta.createdAt ? new Date(item.meta.createdAt).toLocaleDateString() : '' || '' }}</span>
-              </p>
-            </el-col>
-          </el-col>
-          <el-col v-if="menuIndex == '2'" class="leftInfo">
-            <el-col :span="24" class="leftTop">
-              <el-col :span="12">
-                <span>|</span> <span>{{ menuName }}</span>
-              </el-col>
-              <el-col :span="12" class="search">
-                <el-input v-model="fuwuInput" placeholder="请输入内容"></el-input>
-                <el-button type="primary" size="mini" @click="fuwuBtn()">查询</el-button>
-              </el-col>
-            </el-col>
-            <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>
-              </p>
-            </el-col>
-          </el-col>
-          <el-col v-if="menuIndex == '3'" class="leftInfo">
-            <el-col :span="24" class="leftTop">
-              <el-col :span="12">
-                <span>|</span> <span>{{ menuName }}</span>
-              </el-col>
-              <el-col :span="12" class="search">
-                <el-input v-model="exportInput" placeholder="请输入内容"></el-input>
-                <el-button type="primary" size="mini" @click="exportBtn()">查询</el-button>
-              </el-col>
-            </el-col>
-            <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">
-                {{ item.meta && item.meta.createdAt ? new Date(item.meta.createdAt).toLocaleDateString() : '' || '' }}
-              </el-col>
-              <el-col :span="24" class="introduction"> 简介:{{ item.resume }} </el-col>
-            </el-col>
-          </el-col>
-          <el-col class="page">
-            <el-pagination
-              background
-              @current-change="handleCurrentChange"
-              :current-page.sync="currentPage"
-              :page-size="pageSize"
-              layout="total,prev, pager, next, jumper"
-              :total="pageTotal"
-            >
-            </el-pagination>
-          </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>
-        </el-col>
-        <el-col :span="19" v-else-if="display == '3'" class="info">
-          <zhuanjia :zhuanjiainfo="zhuanjiainfo" @zjsubmit="zjsubmit"></zhuanjia>
-        </el-col>
-      </el-col>
-    </el-col>
-  </div>
-</template>
-
-<script>
-import _ from 'lodash';
-import { mapState, createNamespacedHelpers } from 'vuex';
-const { mapActions: product } = createNamespacedHelpers('enterpriseproject');
-const { mapActions: expertsuser } = createNamespacedHelpers('expertsuser');
-const { mapActions: transaction } = createNamespacedHelpers('transaction');
-const { mapActions: tranaudit } = createNamespacedHelpers('tranaudit');
-import zhuanjia from '@/layout/market/zhuanjia.vue';
-import context from '@/layout/market/context.vue';
-
-export default {
-  name: 'marketlists',
-  props: {},
-  components: {
-    context,
-    zhuanjia,
-  },
-  data: () => ({
-    squareImage: require('@/assets/live/square_big.png'),
-    menuList: [{ name: '产品供求' }, { name: '技术供求' }, { name: '服务供求' }, { name: '专家供求' }],
-    menuIndex: '0',
-    menuName: '产品供求',
-    menuColor: 'rgb(254, 149, 14)',
-    currentPage: 1,
-    pageTotal: 0,
-    pageSize: 10,
-    limit: 10,
-    chanpinList: [],
-    jishuList: [],
-    serviceList: [],
-    exportList: [],
-    display: '1',
-    detailInfo: {},
-    zhuanjiainfo: {},
-    // 产品
-    chanpinInput: '',
-    // 技术
-    jishuInput: '',
-    // 服务
-    fuwuInput: '',
-    // 专家
-    exportInput: '',
-  }),
-  created() {
-    this.searchList();
-    this.search();
-  },
-  computed: {
-    ...mapState(['user']),
-    dispaly() {
-      return this.$route.query.display;
-    },
-
-    id() {
-      return this.$route.query.id;
-    },
-    pageTitle() {
-      return `${this.$route.meta.title}`;
-    },
-    totaltype() {
-      return this.$route.query.totaltype;
-    },
-  },
-  metaInfo() {
-    return { title: this.$route.meta.title };
-  },
-
-  methods: {
-    ...product({ list: 'newquery', newfetch: 'newfetch' }),
-    ...expertsuser({ lists: 'query', fetch: 'fetch' }),
-    ...transaction({ transactioncreate: 'create', transactionfetch: 'fetch' }),
-    ...tranaudit({ tranauditcreate: 'create' }),
-    async searchList({ skip = 0, limit = 10, ...info } = {}) {
-      if (this.$route.query.column_name == '产品供求') {
-        this.display = '1';
-        this.changeMenu(this.$route.query.column_name, 0);
-      } else if (this.$route.query.column_name == '技术供求') {
-        this.display = '1';
-        this.changeMenu(this.$route.query.column_name, 1);
-      } else if (this.$route.query.column_name == '服务供求') {
-        this.display = '1';
-        this.changeMenu(this.$route.query.column_name, 2);
-      } else if (this.$route.query.column_name == '专家供求') {
-        this.display = '1';
-        this.changeMenu(this.$route.query.column_name, 3);
-      }
-    },
-    async changeMenu(name, index) {
-      this.menuIndex = index;
-      this.menuColor = 'rgb(254, 149, 14)';
-      this.menuName = name;
-      this.initList({ name });
-    },
-    async initList({ name, skip = 0, limit = 10, ...info } = {}) {
-      this.display = '1';
-      let res = [];
-      this.pageSize = 5;
-      if (name == '产品供求') {
-        let totaltype = '1';
-        res = await this.list({ skip, limit, totaltype, status: 1, ...info });
-        this.$set(this, `chanpinList`, res.data);
-        this.$set(this, `pageTotal`, res.total);
-      } else if (name == '技术供求') {
-        // this.skip = 0;
-        this.limit = 10;
-        this.pageSize = 10;
-        let totaltype = '0';
-        res = await this.list({ skip, limit: 10, totaltype, status: 1, ...info });
-        this.$set(this, `jishuList`, res.data);
-        this.$set(this, `pageTotal`, res.total);
-      } else if (name == '服务供求') {
-        let totaltype = '2';
-        this.skip = 0;
-        this.limit = 10;
-        res = await this.list({ skip, limit, totaltype, status: 1, ...info });
-        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, `exportList`, res.data);
-        this.$set(this, `pageTotal`, res.total);
-      }
-      // this.$set(this, `pageTotal`, res.total);
-    },
-    handleCurrentChange(val) {
-      const name = this.menuName;
-      if (name == '产品供求' || name == '专家供求') {
-        this.limit = 5;
-      }
-      this.initList({ name: name, skip: (val - 1) * this.limit, limit: this.limit });
-    },
-    async clickshanpin(id) {
-      this.display = '2';
-      const res = await this.newfetch(id);
-      this.$set(this, `detailInfo`, res.data);
-    },
-    async clickjishu(id) {
-      this.display = '2';
-      const res = await this.newfetch(id);
-      this.$set(this, `detailInfo`, res.data);
-    },
-    async search() {
-      this.display = this.$route.query.display;
-      if (this.display == '2') {
-        const res = await this.newfetch(this.id);
-        this.$set(this, `detailInfo`, res.data);
-      } else if (this.dispaly == '3') {
-        const res = await this.fetch(this.id);
-        res.data.phone = this.phoneNumFilter(res.data.phone);
-        res.data.cardnumber = this.cardnumberNumFilter(res.data.cardnumber);
-        this.$set(this, `zhuanjiainfo`, res.data);
-      }
-    },
-    phoneNumFilter(phone) {
-      let start = phone.slice(0, 3);
-      let end = phone.slice(-4);
-      return `${start}****${end}`;
-    },
-    cardnumberNumFilter(cardnumber) {
-      let start = cardnumber.slice(0, 4);
-      let end = cardnumber.slice(-3);
-      return `${start}****${end}`;
-    },
-    async clickfuwu(id) {
-      this.display = '2';
-      const res = await this.newfetch(id);
-      this.$set(this, `detailInfo`, res.data);
-    },
-    async clickzhuanjia(id) {
-      this.display = '3';
-      const res = await this.fetch(id);
-      res.data.phone = this.phoneNumFilter(res.data.phone);
-      res.data.cardnumber = this.cardnumberNumFilter(res.data.cardnumber);
-      this.$set(this, `zhuanjiainfo`, res.data);
-    },
-    fabu() {
-      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: '/webLogin' });
-      } else {
-      }
-    },
-    // 专家
-    async zjsubmit() {
-      let form = {};
-      form.userid = this.user.uid;
-      form.username = this.user.name;
-      form.product_id = this.zhuanjiainfo.id;
-      form.product_name = this.zhuanjiainfo.name;
-      form.market_userid = this.zhuanjiainfo.id;
-      form.market_username = this.zhuanjiainfo.name;
-      form.status = '0';
-      form.type = '1';
-      if (!this.user.uid) {
-        // this.$message.error('游客身份无法与卖家对话,请先注册');
-        this.$message({
-          dangerouslyUseHTMLString: true,
-          message: '<strong><a href="http://free.liaoningdoupo.com/platlive/webLogin" style="color:red;">游客身份无法与卖家对话,请先注册</a></strong>',
-          type: 'error',
-        });
-        return;
-      } else {
-        let res = await this.transactioncreate(form);
-        this.$checkRes(res, '购买申请成功', res.errmsg || '购买申请失败');
-      }
-    },
-    // 技术产品服务
-    async onSubmit() {
-      let form = {};
-      form.userid = this.user.uid;
-      form.username = this.user.name;
-      form.product_id = this.detailInfo.id;
-      form.product_name = this.detailInfo.name;
-      form.market_userid = this.detailInfo.userid;
-      form.market_username = this.detailInfo.contact_user;
-      form.status = '0';
-
-      if (!this.user.uid) {
-        // this.$message.error('游客身份无法与卖家对话,请先注册');
-        this.$message({
-          dangerouslyUseHTMLString: true,
-          message: '<strong><a href="http://free.liaoningdoupo.com/platlive/webLogin" style="color:red;">游客身份无法与卖家对话,请先注册</a></strong>',
-          type: 'error',
-        });
-        return;
-      } else {
-        let res = await this.transactioncreate(form);
-        this.$checkRes(res, '购买申请成功', res.errmsg || '购买申请失败');
-      }
-
-      // console.log(this.user.uid);
-      // let form = {};
-      // form.userid = this.user.uid;
-      // form.username = this.user.name;
-      // form.product_id = this.detailInfo.id;
-      // form.product_name = this.detailInfo.name;
-      // form.market_userid = this.detailInfo.userid;
-      // form.market_username = this.detailInfo.contact_user;
-      // form.status = '0';
-      // console.log(form);
-      // let res = await this.transactioncreate(form);
-      // this.$checkRes(res, '发起洽谈成功', '交易失败');
-      // let shenhe = {};
-      // shenhe.result = '0';
-      // console.log(res.data.id);
-
-      // shenhe.transaction_id = res.data.id;
-      // shenhe.userid = this.detailInfo.userid;
-      // shenhe.product_id = this.detailInfo.userid;
-      // console.log(shenhe);
-      // let ress = await this.tranauditcreate(shenhe);
-      // this.$router.push({ path: '/live/hall/dock/dockDetail', query: { id: this.detailInfo.id } });
-    },
-    // 产品查询
-    async chanpinBtn() {
-      const res = await this.list({ name: this.chanpinInput, totaltype: '1', status: 1 });
-      this.$set(this, `chanpinList`, res.data);
-    },
-    // 技术
-    async jishuBtn() {
-      const res = await this.list({ name: this.jishuInput, totaltype: '0', status: 1 });
-      this.$set(this, `jishuList`, res.data);
-    },
-    // 技术
-    async fuwuBtn() {
-      const res = await this.list({ name: this.fuwuInput, totaltype: '2', status: 1 });
-      this.$set(this, `serviceList`, res.data);
-    },
-    // 专家
-    async exportBtn() {
-      const res = await this.lists({ name: this.exportInput });
-      this.$set(this, `exportList`, res.data);
-    },
-  },
-};
-</script>
-
-<style lang="less" scoped>
-.main {
-  width: 80%;
-  margin: 0 auto;
-  float: none;
-}
-.menu {
-  float: left;
-  min-height: 600px;
-  width: 20%;
-  background: no-repeat bottom right;
-  background-image: url(../../assets/live/menu_back.jpg);
-  margin: 30px 0;
-  padding: 10px 0 0 10px;
-  box-sizing: border-box;
-  box-shadow: 0 0 10px #bbbaba;
-}
-.menu .el-image {
-  width: 30px;
-  display: inline-table;
-  margin: 10px 5px;
-}
-.menu span {
-  font-size: 24px;
-  color: #92959a;
-  font-weight: 600;
-  margin-left: 3px;
-  position: relative;
-  top: 10px;
-}
-.menuList p {
-  line-height: 60px;
-  font-size: 18px;
-  cursor: pointer;
-  border-bottom: 1px solid #2d64b3;
-  color: #044b79;
-  font-weight: 600;
-}
-.info {
-  width: 77%;
-  float: right;
-  margin: 30px 0 30px 2px;
-  min-height: 600px;
-  box-shadow: 0 0 10px #2d64b3;
-  overflow: hidden;
-  right: 0px;
-  background: #ffffff;
-}
-.leftInfo {
-  height: 500px;
-  overflow: hidden;
-}
-.leftTop {
-  font-size: 18px;
-  width: 96%;
-  height: 41px;
-  line-height: 35px;
-  border-bottom: 1px solid #e5e5e5;
-  position: relative;
-  bottom: 1px;
-  margin: 10px;
-  font-weight: 600;
-  color: #22529a;
-  .search {
-    .el-input {
-      width: 85%;
-    }
-    .el-button--mini,
-    .el-button--mini.is-round {
-      padding: 12px 15px;
-    }
-  }
-}
-.infoLeftList {
-  float: left;
-  width: 95%;
-  border-bottom: 1px dashed #ccc;
-  padding: 10px 0 10px 10px;
-  height: 87px;
-  margin: 0 0 0 5px;
-}
-.infoLeftList:hover p:last-child span:first-child {
-  -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;
-}
-.infoLeftList p:first-child {
-  float: left;
-  width: 20%;
-  font-size: 15px;
-  background: #044b79;
-  text-align: center;
-  color: #fff;
-  font-weight: bold;
-  padding: 4px 0px;
-  margin: 0 0 0 5px;
-}
-.infoLeftList p:last-child {
-  float: right;
-  width: 70%;
-  padding: 0 0 0 10px;
-}
-.infoLeftList p:last-child span:first-child {
-  float: left;
-  width: 90%;
-  font-size: 18px;
-  margin: 0 0 20px 0;
-}
-.infoLeftList p:last-child span:last-child {
-  float: left;
-  width: 90%;
-  font-size: 16px;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  -webkit-line-clamp: 2;
-  word-break: break-all;
-  display: -webkit-box;
-  -webkit-box-orient: vertical;
-  margin: -20px 0 0 0;
-  color: #666;
-}
-.page {
-  text-align: center;
-  margin: 10px 0;
-}
-.infoRightList {
-  float: left;
-  width: 95%;
-  padding: 7px 0;
-  margin: 0 0 0 5px;
-}
-.infoRightList:nth-child(6) {
-  border-bottom: 1px solid #ccc;
-  padding: 0 0 17px 0;
-}
-.infoRightList:nth-child(7) {
-  padding: 15px 0 0 0;
-}
-.infoRightList:nth-child(11) {
-  border-bottom: 1px solid #ccc;
-  padding: 0 0 15px 0;
-}
-.infoRightList:hover p span:first-child {
-  -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;
-}
-.infoRightList p {
-  font-size: 18px;
-}
-.infoRightList p span:first-child {
-  display: inline-block;
-  width: 60%;
-  margin: 0 20px 0 10px;
-}
-.infoRightList p span:nth-child(2) {
-  display: inline-block;
-  width: 20%;
-  text-align: left;
-  font-size: 16px;
-}
-.infoRightList p span:last-child {
-  display: inline-block;
-  width: 16%;
-  text-align: center;
-  font-size: 16px;
-}
-.marketPublish {
-  position: fixed;
-  background: #0279d5;
-  width: 100px;
-  height: 100px;
-  z-index: 999;
-  left: 2%;
-  top: 80%;
-  border-radius: 20px;
-  box-shadow: 2px 2px 2px #055c9f;
-  text-align: center;
-  line-height: 100px;
-  font-size: 20px;
-  color: #fff;
-  font-weight: bold;
-}
-.marketPublish:hover {
-  background: #f60;
-  cursor: pointer;
-}
-// 新增
-// 技术
-.chanpinList {
-  padding: 0 30px 0 10px;
-  margin: 0px 0 20px 0;
-  .name {
-    font-size: 18px;
-    margin: 0 0 5px 0;
-    color: #22529a;
-    font-weight: bold;
-  }
-  .date {
-    text-align: right;
-    font-size: 18px;
-    margin: 0 0 5px 0;
-  }
-  .introduction {
-    font-size: 14px;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    -webkit-line-clamp: 2;
-    word-break: break-all;
-    display: -webkit-box;
-    -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;
-}
-// 专家
-.exportList {
-  padding: 0 30px 0 10px;
-  margin: 0px 0 11px 0;
-  .name {
-    font-size: 18px;
-    margin: 0 0 10px 0;
-  }
-  .date {
-    text-align: right;
-    font-size: 18px;
-    margin: 0 0 10px 0;
-  }
-  .introduction {
-    font-size: 16px;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    -webkit-line-clamp: 2;
-    word-break: break-all;
-    display: -webkit-box;
-    -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>

+ 13 - 6
src/views/userCenter/basicInfo/index.vue

@@ -48,7 +48,7 @@
                   所属机构
                 </el-col>
                 <el-col :span="24">
-                  <el-input v-model="form.code" placeholder="请输入机构代码"></el-input>
+                  <el-input v-model="form.code" placeholder="请输入机构代码" disabled></el-input>
                 </el-col>
               </el-form-item>
             </el-col>
@@ -94,7 +94,7 @@
                 </el-form-item>
               </el-col>
             </span>
-            <span v-if="form.role == '4'">
+            <!-- <span v-if="form.role == '4'">
               <el-col :span="24" class="langInfo">
                 <el-form-item prop="resume">
                   <el-col :span="21" slot="label">
@@ -112,7 +112,7 @@
                   </el-col>
                 </el-form-item>
               </el-col>
-            </span>
+            </span> -->
             <span v-else-if="form.role == '5'">
               <el-col :span="12">
                 <el-form-item prop="companytype">
@@ -291,7 +291,7 @@
                     出生日期
                   </el-col>
                   <el-col :span="24">
-                    <el-date-picker v-model="form.birthDate" type="date" placeholder="选择日期" value-format="yyyy-MM-dd"> </el-date-picker>
+                    <el-date-picker v-model="form.birthDate" type="date" placeholder="选择日期" value-format="yyyy-MM-dd" style="width:100%;"> </el-date-picker>
                   </el-col>
                 </el-form-item>
               </el-col>
@@ -449,7 +449,14 @@
             </span>
             <el-col :span="24" class="btn">
               <el-button type="primary" @click="authSubmit" v-if="form.status == '0' || form.status == '3'">提交认证</el-button>
-              <el-button type="primary" @click="upgradeSubmit" v-if="user.role == '4'">升级用户</el-button>
+              <el-tooltip
+                class="item"
+                effect="dark"
+                content="个人用户升级成为专家用户时,请点击转换省份提交按钮,等待管理员审核成功,方可成为专家用户"
+                placement="bottom"
+              >
+                <el-button type="primary" @click="upgradeSubmit" v-if="user.role == '4'">转换身份提交</el-button>
+              </el-tooltip>
               <el-button type="primary" @click="onSubmit">提交修改</el-button>
             </el-col>
           </el-form>
@@ -616,7 +623,7 @@ export default {
   /deep/.el-radio-group {
     border: 1px solid #ccc;
     padding: 12px 20px;
-    width: 943px;
+    width: 698px;
   }
   /deep/.el-input__inner {
     border-radius: 0;