更新

public/home.html

@@ -419,7 +419,7 @@
   </script>
   <script>
     function noticeBtn() {
-      window.location.href="../notice/index"
+      window.location.href="../platlive/notice/index"
       }
   </script>
 </body>

src/layout/direct/directDetail.vue

@@ -22,7 +22,7 @@
             <el-col :span="12" class="otherInfo textOver"> 注册类型：{{ directInfo.companytype }} </el-col>
             <el-col :span="12" class="otherInfo textOver"> 企业网址{{ directInfo.companyweb }} </el-col>
             <el-col :span="12" class="otherInfo textOver"> 联系人：{{ directInfo.contacts }} </el-col>
-            <el-col :span="12" class="otherInfo textOver"> QQ&微信：{{ directInfo.qqwx }} </el-col>
+            <el-col :span="12" class="otherInfo textOver"> QQ/微信：{{ directInfo.qqwx }} </el-col>
             <el-col :span="12" class="otherInfo textOver"> 电子邮箱：{{ directInfo.email }} </el-col>
           </el-col>
         </el-col>
@@ -70,7 +70,7 @@
             <el-col :span="12" class="otherInfo textOver"> 企业名称：{{ directInfo.company }} </el-col>
             <el-col :span="12" class="otherInfo textOver"> 企业网址{{ directInfo.companyweb }} </el-col>
             <el-col :span="12" class="otherInfo textOver"> 联系人：{{ directInfo.contacts }} </el-col>
-            <el-col :span="12" class="otherInfo textOver"> QQ&微信：{{ directInfo.qqwx }} </el-col>
+            <el-col :span="12" class="otherInfo textOver"> QQ/微信：{{ directInfo.qqwx }} </el-col>
             <el-col :span="12" class="otherInfo textOver"> 电子邮箱：{{ directInfo.email }} </el-col>
           </el-col>
         </el-col>
@@ -116,7 +116,7 @@
           <el-col :span="12" class="otherInfo">需求程度：{{ directInfo.demand }} </el-col>
           <el-col :span="12" class="otherInfo">联系人：{{ directInfo.contacts }} </el-col>
           <el-col :span="12" class="otherInfo">发布时间：{{ directInfo.meta | getDate }} </el-col>
-          <el-col :span="12" class="otherInfo">QQ&微信：{{ directInfo.qqwx }} </el-col>
+          <el-col :span="12" class="otherInfo">QQ/微信：{{ directInfo.qqwx }} </el-col>
           <el-col :span="12" class="otherInfo">电子邮箱：{{ directInfo.email }} </el-col>
         </el-col>
         <el-col :span="24" class="down">

src/layout/direct/exportDetail.vue

@@ -15,7 +15,7 @@
             <el-col :span="12" class="otherInfo textOver"> 最高学历：{{ exportInfo.education }} </el-col>
             <el-col :span="12" class="otherInfo textOver"> 出生日期：{{ exportInfo.birthDate }} </el-col>
             <el-col :span="12" class="otherInfo textOver"> 工作单位：{{ exportInfo.company }} </el-col>
-            <el-col :span="12" class="otherInfo textOver"> QQ&微信：{{ exportInfo.qqwx }} </el-col>
+            <el-col :span="12" class="otherInfo textOver"> QQ/微信：{{ exportInfo.qqwx }} </el-col>
             <el-col :span="12" class="otherInfo textOver"> 电子邮箱：{{ exportInfo.email }} </el-col>
             <el-col :span="12" class="otherInfo textOver"> 职务职称：{{ exportInfo.zwzc }} </el-col>
             <el-col :span="12" class="otherInfo textOver"> 擅长领域：{{ exportInfo.expertise }} </el-col>

src/layout/enterprise/contextfabu.vue

@@ -22,8 +22,8 @@
                 <el-form-item label="联系电话">
                   <el-input v-model="form.phone" placeholder="请输入联系电话"></el-input>
                 </el-form-item>
-                <el-form-item label="QQ&微信">
-                  <el-input v-model="form.qqwx" placeholder="请输入QQ&微信"></el-input>
+                <el-form-item label="QQ/微信">
+                  <el-input v-model="form.qqwx" placeholder="请输入QQ/微信"></el-input>
                 </el-form-item>
                 <el-form-item label="电子邮箱">
                   <el-input v-model="form.email" placeholder="请输入电子邮箱"></el-input>

src/layout/login/webLogin.vue

@@ -117,8 +117,8 @@
                     <el-form-item label="出生日期">
                       <el-date-picker v-model="forms.birthDate" type="date" placeholder="选择日期" value-format="yyyy-MM-dd"> </el-date-picker>
                     </el-form-item>
-                    <el-form-item label="QQ&微信">
-                      <el-input v-model="forms.qqwx" placeholder="请输入QQ&微信"></el-input>
+                    <el-form-item label="QQ/微信">
+                      <el-input v-model="forms.qqwx" placeholder="请输入QQ/微信"></el-input>
                     </el-form-item>
                     <el-form-item label="电子邮箱">
                       <el-input v-model="forms.email" placeholder="请输入电子邮箱"></el-input>

src/views/adminCenter/applyInfo/index.vue

@@ -48,8 +48,8 @@
         <el-form-item label="联系电话">
           <el-input v-model="form.phone" placeholder="请输入联系电话"></el-input>
         </el-form-item>
-        <el-form-item label="QQ&微信">
-          <el-input v-model="form.qqwx" placeholder="请输入QQ&微信"></el-input>
+        <el-form-item label="QQ/微信">
+          <el-input v-model="form.qqwx" placeholder="请输入QQ/微信"></el-input>
         </el-form-item>
         <el-form-item label="电子邮箱">
           <el-input v-model="form.email" placeholder="请输入电子邮箱"></el-input>

src/views/adminCenter/vipInfo/index.vue

@@ -11,13 +11,16 @@
             <el-table :data="list" border style="width: 100%">
               <el-table-column prop="vipname" label="姓名" align="center"> </el-table-column>
               <el-table-column prop="vipphone" label="联系电话" align="center"> </el-table-column>
-              <el-table-column prop="company" label="单位名称" align="center"> </el-table-column>
+              <!-- <el-table-column prop="company" label="单位名称" align="center"> </el-table-column> -->
               <el-table-column prop="email" label="email" align="center"> </el-table-column>
               <el-table-column label="操作" align="center">
                 <template slot-scope="scope">
                   <el-button size="mini" type="primary" @click="editViP(scope.row)">
                     修改
                   </el-button>
+                  <el-button size="mini" type="primary" @click="deleteViP(scope.row)">
+                    删除
+                  </el-button>
                 </template>
               </el-table-column>
             </el-table>
@@ -47,9 +50,9 @@
           <!-- <el-form-item label="密码" :label-width="formLabelWidth">
             <el-input v-model="form.passwd" autocomplete="off" placeholder="请输入密码" show-password :disabled="disabled"></el-input>
           </el-form-item> -->
-          <el-form-item label="单位名称" :label-width="formLabelWidth">
+          <!-- <el-form-item label="单位名称" :label-width="formLabelWidth">
             <el-input v-model="form.company" autocomplete="off" placeholder="请输入单位名称"></el-input>
-          </el-form-item>
+          </el-form-item> -->
           <el-form-item label="email" :label-width="formLabelWidth">
             <el-input v-model="form.email" autocomplete="off" placeholder="请输入email"></el-input>
           </el-form-item>
@@ -97,7 +100,7 @@ export default {
   methods: {
     ...dock({ dockquery: 'query', dockFetch: 'fetch', dockUpdate: 'update', dockupdateVip: 'updateVip', createvipuser: 'createvipuser' }),
     ...apply({ applyUpdate: 'update' }),
-    ...authUser({ authUserQuery: 'query', authUserCreate: 'create', authUserUpdate: 'update' }),
+    ...authUser({ authUserQuery: 'query', authUserCreate: 'create', authUserUpdate: 'update', authUserDelete: 'delete' }),
     async search() {
       let res = await this.dockFetch(this.user.uid);
       if (this.$checkRes(res)) {
@@ -196,6 +199,20 @@ export default {
       this.disabled = true;
       this.$set(this, `form`, newDate);
     },
+    // 删除
+    async deleteViP(data) {
+      const res = await this.authUserDelete(data._id);
+      if (this.$checkRes(res)) {
+        const res = await this.authUserDelete(data.uid);
+        if (this.$checkRes(arr)) {
+          this.$message({
+            message: '删除用户成功',
+            type: 'success',
+          });
+          this.search();
+        }
+      }
+    },
     // 取消
     handleClose(done) {
       done();

src/views/hall/direct.vue

@@ -312,7 +312,7 @@
                         </el-col>
                         <el-col :span="12" class="txt"> 毕业院校：{{ item.school }} </el-col>
                         <el-col :span="12" class="txt"> 最高学历：{{ item.education }} </el-col>
-                        <el-col :span="12" class="txt"> QQ&微信：{{ item.qqwx }} </el-col>
+                        <el-col :span="12" class="txt"> QQ/微信：{{ item.qqwx }} </el-col>
                         <el-col :span="12" class="txt"> 电子邮箱：{{ item.email }} </el-col>
                       </el-col>
                     </el-col>

src/views/hall/dock/dockDetail.vue

@@ -34,7 +34,7 @@
                     <el-col :span="12" class="otherInfo textOver"> 注册类型：{{ detailInfo.companytype }} </el-col>
                     <el-col :span="12" class="otherInfo textOver"> 企业网址{{ detailInfo.companyweb }} </el-col>
                     <el-col :span="12" class="otherInfo textOver"> 联系人：{{ detailInfo.contacts }} </el-col>
-                    <el-col :span="12" class="otherInfo textOver"> QQ&微信：{{ detailInfo.qqwx }} </el-col>
+                    <el-col :span="12" class="otherInfo textOver"> QQ/微信：{{ detailInfo.qqwx }} </el-col>
                     <el-col :span="12" class="otherInfo textOver"> 电子邮箱：{{ detailInfo.email }} </el-col>
                   </el-col>
                 </el-col>
@@ -82,7 +82,7 @@
                     <el-col :span="12" class="otherInfo textOver"> 企业名称：{{ detailInfo.company }} </el-col>
                     <el-col :span="12" class="otherInfo textOver"> 企业网址{{ detailInfo.companyweb }} </el-col>
                     <el-col :span="12" class="otherInfo textOver"> 联系人：{{ detailInfo.contacts }} </el-col>
-                    <el-col :span="12" class="otherInfo textOver"> QQ&微信：{{ detailInfo.qqwx }} </el-col>
+                    <el-col :span="12" class="otherInfo textOver"> QQ/微信：{{ detailInfo.qqwx }} </el-col>
                     <el-col :span="12" class="otherInfo textOver"> 电子邮箱：{{ detailInfo.email }} </el-col>
                   </el-col>
                 </el-col>
@@ -128,7 +128,7 @@
                   <el-col :span="12" class="otherInfo">需求程度：{{ detailInfo.demand }} </el-col>
                   <el-col :span="12" class="otherInfo">联系人：{{ detailInfo.contacts }} </el-col>
                   <el-col :span="12" class="otherInfo">发布时间：{{ detailInfo.meta | getDate }} </el-col>
-                  <el-col :span="12" class="otherInfo">QQ&微信：{{ detailInfo.qqwx }} </el-col>
+                  <el-col :span="12" class="otherInfo">QQ/微信：{{ detailInfo.qqwx }} </el-col>
                   <el-col :span="12" class="otherInfo">电子邮箱：{{ detailInfo.email }} </el-col>
                 </el-col>
                 <el-col :span="24" class="down">

src/views/hall/dock/zhanjiaduijie.vue

@@ -26,7 +26,7 @@
                   <el-col :span="12" class="otherInfo textOver"> 最高学历：{{ detailInfo.education }} </el-col>
                   <el-col :span="12" class="otherInfo textOver"> 出生日期：{{ detailInfo.birthDate }} </el-col>
                   <el-col :span="12" class="otherInfo textOver"> 工作单位：{{ detailInfo.company }} </el-col>
-                  <el-col :span="12" class="otherInfo textOver"> QQ&微信：{{ detailInfo.qqwx }} </el-col>
+                  <el-col :span="12" class="otherInfo textOver"> QQ/微信：{{ detailInfo.qqwx }} </el-col>
                   <el-col :span="12" class="otherInfo textOver"> 电子邮箱：{{ detailInfo.email }} </el-col>
                   <el-col :span="12" class="otherInfo textOver"> 职务职称：{{ detailInfo.zwzc }} </el-col>
                   <el-col :span="12" class="otherInfo textOver"> 擅长领域：{{ detailInfo.expertise }} </el-col>

src/views/hall/liveApply.vue

@@ -35,8 +35,8 @@
                   <el-form-item label="联系电话">
                     <el-input v-model="demandForm.phone" placeholder="请输入联系电话"></el-input>
                   </el-form-item>
-                  <el-form-item label="QQ&微信">
-                    <el-input v-model="demandForm.qqwx" placeholder="请输入QQ&微信"></el-input>
+                  <el-form-item label="QQ/微信">
+                    <el-input v-model="demandForm.qqwx" placeholder="请输入QQ/微信"></el-input>
                   </el-form-item>
                   <el-form-item label="电子邮箱">
                     <el-input v-model="demandForm.email" placeholder="请输入电子邮箱"></el-input>

src/views/market/detail/achiDetail.vue

@@ -3,61 +3,109 @@
     <el-row>
       <el-col :span="24" class="main">
         <el-col :span="24" class="top">
-          <el-col :span="8" class="left">
-            <el-carousel trigger="click" height="250px" :autoplay="false">
+          <el-col :span="7" class="left">
+            <el-carousel trigger="click" height="230px" :autoplay="false">
               <el-carousel-item v-for="(item, index) in detailInfo.image" :key="index">
-                <el-image :src="item.url" style="width:100%;height:240px;"></el-image>
+                <el-image :src="item.url" style="width:99%;height:220px;border: 1px solid #ccc;"></el-image>
               </el-carousel-item>
             </el-carousel>
           </el-col>
-          <el-col :span="16" class="right">
+          <el-col :span="17" class="right">
             <el-col :span="24" class="name textOver">
               {{ detailInfo.name }}
             </el-col>
+            <el-col :span="12" class="otherInfo textOver"> 成果单位：{{ detailInfo.company }} </el-col>
+            <el-col :span="12" class="otherInfo textOver"> 单位网址：{{ detailInfo.cooperation }} </el-col>
             <el-col :span="12" class="otherInfo textOver"> 所属领域：{{ detailInfo.field }} </el-col>
-            <el-col :span="12" class="otherInfo textOver"> 合作方式：{{ detailInfo.cooperation }} </el-col>
             <el-col :span="12" class="otherInfo textOver"> 成果状态：{{ detailInfo.achievestatus }} </el-col>
-            <el-col :span="12" class="otherInfo textOver"> 成果权属：{{ detailInfo.achieveown }} </el-col>
-            <el-col :span="12" class="otherInfo textOver"> 成果来源：{{ detailInfo.achievesource }} </el-col>
-            <el-col :span="12" class="otherInfo textOver"> 项目路演：{{ detailInfo.roadshow }} </el-col>
-            <el-col :span="12" class="otherInfo textOver"> 意向价格：{{ detailInfo.intentionprice }}万元 </el-col>
-            <el-col :span="12" class="otherInfo textOver"> 企业名称：{{ detailInfo.company }} </el-col>
-            <el-col :span="12" class="otherInfo textOver"> 企业网址{{ detailInfo.companyweb }} </el-col>
             <el-col :span="12" class="otherInfo textOver"> 联系人：{{ detailInfo.contacts }} </el-col>
-            <el-col :span="12" class="otherInfo textOver"> QQ&微信：{{ detailInfo.qqwx }} </el-col>
+            <el-col :span="12" class="otherInfo textOver"> 项目路演：{{ detailInfo.roadshow }} </el-col>
+            <el-col :span="12" class="otherInfo textOver"> QQ/微信：{{ detailInfo.qqwx }} </el-col>
             <el-col :span="12" class="otherInfo textOver"> 电子邮箱：{{ detailInfo.email }} </el-col>
           </el-col>
         </el-col>
         <el-col :span="24" class="down">
           <el-col :span="24" class="downInfo">
-            <h2>成果简介：</h2>
-            <p>
-              {{ detailInfo.achievebrief }}
-            </p>
+            <el-col :span="4" class="tit">
+              <h2>成果简介</h2>
+            </el-col>
+            <el-col :span="20" class="info">
+              {{ detailInfo.achievebrief || '暂无' }}
+            </el-col>
           </el-col>
           <el-col :span="24" class="downInfo">
-            <h2>技术特点：</h2>
-            <p>
-              {{ detailInfo.features }}
-            </p>
+            <el-col :span="4" class="tit">
+              <h2>技术特点</h2>
+            </el-col>
+            <el-col :span="20" class="info">
+              {{ detailInfo.features || '暂无' }}
+            </el-col>
           </el-col>
           <el-col :span="24" class="downInfo">
-            <h2>技术团队：</h2>
-            <p>
-              {{ detailInfo.team }}
-            </p>
+            <el-col :span="4" class="tit">
+              <h2>技术团队</h2>
+            </el-col>
+            <el-col :span="20" class="info">
+              {{ detailInfo.team || '暂无' }}
+            </el-col>
+          </el-col>
+          <el-col :span="12" class="downInfo">
+            <el-col :span="8" class="tit" style="height:30px;line-height:30px">
+              <h2>成果权属</h2>
+            </el-col>
+            <el-col :span="16" class="info" style="height:30px;line-height:30px;padding:0 10px"> {{ detailInfo.achieveown || '暂无' }} </el-col>
+          </el-col>
+          <el-col :span="12" class="downInfo">
+            <el-col :span="8" class="tit" style="height:30px;line-height:30px;padding:0 10px">
+              <h2>成果来源</h2>
+            </el-col>
+            <el-col :span="16" class="info" style="height:30px;line-height:30px;padding:0 10px">
+              {{ detailInfo.achievesource || '暂无' }}
+            </el-col>
+          </el-col>
+          <el-col :span="12" class="downInfo">
+            <el-col :span="8" class="tit" style="height:30px;line-height:30px">
+              <h2>专利信息</h2>
+            </el-col>
+            <el-col :span="16" class="info" style="height:30px;line-height:30px;padding:0 10px"> {{ detailInfo.patentinfo || '暂无' }} </el-col>
+          </el-col>
+          <el-col :span="12" class="downInfo">
+            <el-col :span="8" class="tit" style="height:30px;line-height:30px;padding:0 10px">
+              <h2>专利状态</h2>
+            </el-col>
+            <el-col :span="16" class="info" style="height:30px;line-height:30px;padding:0 10px">
+              {{ detailInfo.patentstatus || '暂无' }}
+            </el-col>
           </el-col>
           <el-col :span="24" class="downInfo">
-            <h2>商业预期：</h2>
-            <p>
-              {{ detailInfo.expectations }}
-            </p>
+            <el-col :span="4" class="tit">
+              <h2>商业预期</h2>
+            </el-col>
+            <el-col :span="20" class="info">
+              {{ detailInfo.expectations || '暂无' }}
+            </el-col>
+          </el-col>
+          <el-col :span="12" class="downInfo">
+            <el-col :span="8" class="tit" style="height:40px;line-height:40px;padding:0 10px">
+              <h2>意向价格</h2>
+            </el-col>
+            <el-col :span="16" class="info" style="height:40px;line-height:40px;padding:0 10px"> {{ detailInfo.intentionprice || '暂无' }}万元 </el-col>
+          </el-col>
+          <el-col :span="12" class="downInfo">
+            <el-col :span="8" class="tit" style="height:40px;line-height:40px;padding:0 10px">
+              <h2>合作方式</h2>
+            </el-col>
+            <el-col :span="16" class="info" style="height:40px;line-height:40px;padding:0 10px">
+              {{ detailInfo.cooperation || '暂无' }}
+            </el-col>
           </el-col>
           <el-col :span="24" class="downInfo">
-            <h2>合作要求：</h2>
-            <p>
-              {{ detailInfo.present }}
-            </p>
+            <el-col :span="4" class="tit">
+              <h2>合作要求</h2>
+            </el-col>
+            <el-col :span="20" class="info">
+              {{ detailInfo.condition || '暂无' }}
+            </el-col>
           </el-col>
         </el-col>
         <el-col :span="24" class="anniu">
@@ -141,31 +189,39 @@ export default {
 
 <style lang="less" scoped>
 .main {
+  margin: 10px 0 0 0;
   .top {
-    height: 250px;
+    height: 230px;
     overflow: hidden;
-    border-bottom: 1px dashed #ccc;
-    // .left {
-    // }
     .right {
-      padding: 0 10px;
+      padding: 0 0 0 10px;
       .name {
         font-size: 18px;
         font-weight: bold;
-        padding: 10px 0;
+        padding: 10px;
+        border: 1px solid #ccc;
       }
       .otherInfo {
         font-size: 16px;
-        padding: 5px 0;
+        padding: 10px;
+        border: 1px solid #ccc;
       }
     }
   }
   .down {
+    margin: 0 0 15px 0;
     .downInfo {
-      padding: 10px 0;
-      p {
+      border: 1px solid #ccc;
+      .tit {
+        height: 150px;
+        line-height: 150px;
+        text-align: center;
+        border-right: 1px solid #ccc;
+      }
+      .info {
         font-size: 16px;
-        text-indent: 2rem;
+        padding: 10px;
+        height: 150px;
       }
     }
   }

src/views/market/detail/busiDetail.vue

@@ -10,33 +10,41 @@
           <el-col :span="12" class="otherInfo">需求程度：{{ detailInfo.demand }} </el-col>
           <el-col :span="12" class="otherInfo">联系人：{{ detailInfo.contacts }} </el-col>
           <el-col :span="12" class="otherInfo">发布时间：{{ detailInfo.meta | getDate }} </el-col>
-          <el-col :span="12" class="otherInfo">QQ&微信：{{ detailInfo.qqwx }} </el-col>
+          <el-col :span="12" class="otherInfo">QQ/微信：{{ detailInfo.qqwx }} </el-col>
           <el-col :span="12" class="otherInfo">电子邮箱：{{ detailInfo.email }} </el-col>
         </el-col>
         <el-col :span="24" class="down">
           <el-col :span="24" class="downInfo">
-            <h2>信息描述：</h2>
-            <p>
-              {{ detailInfo.informationdesc }}
-            </p>
+            <el-col :span="4" class="tit">
+              <h2>信息描述</h2>
+            </el-col>
+            <el-col :span="20" class="info">
+              {{ detailInfo.informationdesc || '暂无' }}
+            </el-col>
           </el-col>
           <el-col :span="24" class="downInfo">
-            <h2>核心要素：</h2>
-            <p>
-              {{ detailInfo.coreelements }}
-            </p>
+            <el-col :span="4" class="tit">
+              <h2>核心要素</h2>
+            </el-col>
+            <el-col :span="20" class="info">
+              {{ detailInfo.coreelements || '暂无' }}
+            </el-col>
           </el-col>
           <el-col :span="24" class="downInfo">
-            <h2>价格信息：</h2>
-            <p>
-              {{ detailInfo.priceinfo }}
-            </p>
+            <el-col :span="4" class="tit">
+              <h2>价格信息</h2>
+            </el-col>
+            <el-col :span="20" class="info">
+              {{ detailInfo.priceinfo || '暂无' }}
+            </el-col>
           </el-col>
           <el-col :span="24" class="downInfo">
-            <h2>商务预期：</h2>
-            <p>
-              {{ detailInfo.businessexpect }}
-            </p>
+            <el-col :span="4" class="tit">
+              <h2>商务预期</h2>
+            </el-col>
+            <el-col :span="20" class="info">
+              {{ detailInfo.businessexpect || '暂无' }}
+            </el-col>
           </el-col>
         </el-col>
         <el-col :span="24" class="anniu">
@@ -131,26 +139,39 @@ export default {
 
 <style lang="less" scoped>
 .main {
+  margin: 10px 0 0 0;
   .top {
     height: 160px;
     overflow: hidden;
-    border-bottom: 1px dashed #ccc;
+    margin: 0 0 15px 0;
     .name {
       font-size: 18px;
       font-weight: bold;
-      padding: 10px 0;
+      padding: 10px;
+      height: 40px;
+      border: 1px solid #ccc;
     }
     .otherInfo {
       font-size: 16px;
-      padding: 5px 0;
+      padding: 5px 10px;
+      height: 40px;
+      border: 1px solid #ccc;
     }
   }
   .down {
+    margin: 0 0 15px 0;
     .downInfo {
-      padding: 10px 0;
-      p {
+      border: 1px solid #ccc;
+      .tit {
+        height: 150px;
+        line-height: 150px;
+        text-align: center;
+        border-right: 1px solid #ccc;
+      }
+      .info {
         font-size: 16px;
-        text-indent: 2rem;
+        padding: 10px;
+        height: 150px;
       }
     }
   }

src/views/market/detail/expeDetail.vue

@@ -15,7 +15,7 @@
             <el-col :span="12" class="otherInfo textOver"> 最高学历：{{ detailInfo.education }} </el-col>
             <el-col :span="12" class="otherInfo textOver"> 出生日期：{{ detailInfo.birthDate }} </el-col>
             <el-col :span="12" class="otherInfo textOver"> 工作单位：{{ detailInfo.company }} </el-col>
-            <el-col :span="12" class="otherInfo textOver"> QQ&微信：{{ detailInfo.qqwx }} </el-col>
+            <el-col :span="12" class="otherInfo textOver"> QQ/微信：{{ detailInfo.qqwx }} </el-col>
             <el-col :span="12" class="otherInfo textOver"> 电子邮箱：{{ detailInfo.email }} </el-col>
             <el-col :span="12" class="otherInfo textOver"> 职务职称：{{ detailInfo.zwzc }} </el-col>
             <el-col :span="12" class="otherInfo textOver"> 擅长领域：{{ detailInfo.expertise }} </el-col>
@@ -23,34 +23,44 @@
         </el-col>
         <el-col :span="24" class="down">
           <el-col :span="24" class="downInfo">
-            <h2>工作经历：</h2>
-            <p>
+            <el-col :span="4" class="tit">
+              <h2>工作经历</h2>
+            </el-col>
+            <el-col :span="20" class="info">
               {{ detailInfo.workexperience || '暂无' }}
-            </p>
+            </el-col>
           </el-col>
           <el-col :span="24" class="downInfo">
-            <h2>科研综述：</h2>
-            <p>
+            <el-col :span="4" class="tit">
+              <h2>科研综述</h2>
+            </el-col>
+            <el-col :span="20" class="info">
               {{ detailInfo.scientific || '暂无' }}
-            </p>
+            </el-col>
           </el-col>
           <el-col :span="24" class="downInfo">
-            <h2>承担项目：</h2>
-            <p>
+            <el-col :span="4" class="tit">
+              <h2>承担项目</h2>
+            </el-col>
+            <el-col :span="20" class="info">
               {{ detailInfo.undertakingproject || '暂无' }}
-            </p>
+            </el-col>
           </el-col>
           <el-col :span="24" class="downInfo">
-            <h2>科技奖励：</h2>
-            <p>
+            <el-col :span="4" class="tit">
+              <h2>科技奖励</h2>
+            </el-col>
+            <el-col :span="20" class="info">
               {{ detailInfo.scienceaward || '暂无' }}
-            </p>
+            </el-col>
           </el-col>
           <el-col :span="24" class="downInfo">
-            <h2>社会任职：</h2>
-            <p>
+            <el-col :span="4" class="tit">
+              <h2>社会任职</h2>
+            </el-col>
+            <el-col :span="20" class="info">
               {{ detailInfo.social || '暂无' }}
-            </p>
+            </el-col>
           </el-col>
         </el-col>
         <el-col :span="24" class="anniu">
@@ -138,31 +148,39 @@ export default {
 
 <style lang="less" scoped>
 .main {
+  margin: 10px 0 0 0;
   .top {
     height: 230px;
     overflow: hidden;
-    border-bottom: 1px dashed #ccc;
-    // .left {
-    // }
     .right {
-      padding: 0 10px;
+      padding: 0 0 0 10px;
       .name {
         font-size: 18px;
         font-weight: bold;
-        padding: 10px 0;
+        padding: 10px;
+        border: 1px solid #ccc;
       }
       .otherInfo {
         font-size: 16px;
-        padding: 10px 0;
+        padding: 10px;
+        border: 1px solid #ccc;
       }
     }
   }
   .down {
+    margin: 0 0 15px 0;
     .downInfo {
-      padding: 10px 0;
-      p {
+      border: 1px solid #ccc;
+      .tit {
+        height: 150px;
+        line-height: 150px;
+        text-align: center;
+        border-right: 1px solid #ccc;
+      }
+      .info {
         font-size: 16px;
-        text-indent: 2rem;
+        padding: 10px;
+        height: 150px;
       }
     }
   }

src/views/market/detail/techDetail.vue

@@ -3,47 +3,59 @@
     <el-row>
       <el-col :span="24" class="main">
         <el-col :span="24" class="top">
-          <el-col :span="8" class="left">
-            <el-carousel trigger="click" height="250px" :autoplay="false">
+          <el-col :span="7" class="left">
+            <el-carousel trigger="click" height="230px" :autoplay="false">
               <el-carousel-item v-for="(item, index) in detailInfo.image" :key="index">
-                <el-image :src="item.url" style="width:100%;height:240px;"></el-image>
+                <el-image :src="item.url" style="width:99%;height:220px;border: 1px solid #ccc;"></el-image>
               </el-carousel-item>
             </el-carousel>
           </el-col>
-          <el-col :span="16" class="right">
+          <el-col :span="17" class="right">
             <el-col :span="24" class="name textOver">
               {{ detailInfo.name }}
             </el-col>
+            <el-col :span="12" class="otherInfo textOver"> 所属企业：{{ detailInfo.company }} </el-col>
             <el-col :span="12" class="otherInfo textOver"> 所属领域：{{ detailInfo.field }} </el-col>
-            <el-col :span="12" class="otherInfo textOver"> 合作方式：{{ detailInfo.cooperation }} </el-col>
-            <el-col :span="12" class="otherInfo textOver"> 投资预算：{{ detailInfo.budget }}万元 </el-col>
             <el-col :span="12" class="otherInfo textOver"> 需求紧急程度：{{ detailInfo.degreeurgency }} </el-col>
-            <el-col :span="12" class="otherInfo textOver"> 企业名称：{{ detailInfo.company }} </el-col>
-            <el-col :span="12" class="otherInfo textOver"> 注册类型：{{ detailInfo.companytype }} </el-col>
-            <el-col :span="12" class="otherInfo textOver"> 企业网址{{ detailInfo.companyweb }} </el-col>
+            <el-col :span="12" class="otherInfo textOver"> 投资预算：{{ detailInfo.budget }}万元 </el-col>
+            <el-col :span="12" class="otherInfo textOver"> 合作方式：{{ detailInfo.cooperation }} </el-col>
             <el-col :span="12" class="otherInfo textOver"> 联系人：{{ detailInfo.contacts }} </el-col>
-            <el-col :span="12" class="otherInfo textOver"> QQ&微信：{{ detailInfo.qqwx }} </el-col>
+            <el-col :span="12" class="otherInfo textOver"> QQ/微信：{{ detailInfo.qqwx }} </el-col>
             <el-col :span="12" class="otherInfo textOver"> 电子邮箱：{{ detailInfo.email }} </el-col>
           </el-col>
         </el-col>
         <el-col :span="24" class="down">
           <el-col :span="24" class="downInfo">
-            <h2>技术难题&难题说明：</h2>
-            <p>
-              {{ detailInfo.requirementdesc }}
-            </p>
+            <el-col :span="4" class="tit">
+              <h2>技术说明</h2>
+            </el-col>
+            <el-col :span="20" class="info">
+              {{ detailInfo.requirementdesc || '暂无' }}
+            </el-col>
           </el-col>
           <el-col :span="24" class="downInfo">
-            <h2>预期技术目标描述：</h2>
-            <p>
-              {{ detailInfo.expect }}
-            </p>
+            <el-col :span="4" class="tit">
+              <h2>预期目标</h2>
+            </el-col>
+            <el-col :span="20" class="info">
+              {{ detailInfo.expect || '暂无' }}
+            </el-col>
           </el-col>
           <el-col :span="24" class="downInfo">
-            <h2>需求现状及应对措施：</h2>
-            <p>
-              {{ detailInfo.present }}
-            </p>
+            <el-col :span="4" class="tit">
+              <h2>需求措施</h2>
+            </el-col>
+            <el-col :span="20" class="info">
+              {{ detailInfo.present || '暂无' }}
+            </el-col>
+          </el-col>
+          <el-col :span="24" class="downInfo">
+            <el-col :span="4" class="tit">
+              <h2>合作要求</h2>
+            </el-col>
+            <el-col :span="20" class="info">
+              {{ detailInfo.condition || '暂无' }}
+            </el-col>
           </el-col>
         </el-col>
         <el-col :span="24" class="anniu">
@@ -133,31 +145,39 @@ export default {
 
 <style lang="less" scoped>
 .main {
+  margin: 10px 0 0 0;
   .top {
-    height: 250px;
+    height: 230px;
     overflow: hidden;
-    border-bottom: 1px dashed #ccc;
-    // .left {
-    // }
     .right {
-      padding: 0 10px;
+      padding: 0 0 0 10px;
       .name {
         font-size: 18px;
         font-weight: bold;
-        padding: 10px 0;
+        padding: 10px;
+        border: 1px solid #ccc;
       }
       .otherInfo {
         font-size: 16px;
-        padding: 8px 0;
+        padding: 10px;
+        border: 1px solid #ccc;
       }
     }
   }
   .down {
+    margin: 0 0 15px 0;
     .downInfo {
-      padding: 10px 0;
-      p {
+      border: 1px solid #ccc;
+      .tit {
+        height: 150px;
+        line-height: 150px;
+        text-align: center;
+        border-right: 1px solid #ccc;
+      }
+      .info {
         font-size: 16px;
-        text-indent: 2rem;
+        padding: 10px;
+        height: 150px;
       }
     }
   }

src/views/notice/productForm.vue

@@ -100,10 +100,10 @@
                       </el-col>
                       <el-col :span="12" class="txt">
                         <el-col :span="4" class="left">
-                          QQ&微信：
+                          QQ/微信：
                         </el-col>
                         <el-col :span="20" class="right">
-                          <el-input v-model="technologyForm.qqwx" placeholder="请输入QQ&微信"></el-input>
+                          <el-input v-model="technologyForm.qqwx" placeholder="请输入QQ/微信"></el-input>
                         </el-col>
                       </el-col>
                       <el-col :span="12" class="txt">
@@ -322,10 +322,10 @@
                       </el-col>
                       <el-col :span="12" class="txt">
                         <el-col :span="4" class="left">
-                          QQ&微信：
+                          QQ/微信：
                         </el-col>
                         <el-col :span="20" class="right">
-                          <el-input v-model="achieveForm.qqwx" placeholder="请输入QQ&微信"></el-input>
+                          <el-input v-model="achieveForm.qqwx" placeholder="请输入QQ/微信"></el-input>
                         </el-col>
                       </el-col>
                       <el-col :span="12" class="txt">

src/views/superAdminCenter/enterpriseProduct/index.vue

@@ -49,8 +49,8 @@
             <el-form-item label="联系电话">
               <el-input v-model="form.phone" placeholder="请输入联系电话"></el-input>
             </el-form-item>
-            <el-form-item label="QQ&微信">
-              <el-input v-model="form.qqwx" placeholder="请输入QQ&微信"></el-input>
+            <el-form-item label="QQ/微信">
+              <el-input v-model="form.qqwx" placeholder="请输入QQ/微信"></el-input>
             </el-form-item>
             <el-form-item label="电子邮箱">
               <el-input v-model="form.email" placeholder="请输入电子邮箱"></el-input>

src/views/superAdminCenter/productSolicit/index.vue

@@ -30,7 +30,7 @@
             <el-form-item label="名称"> <el-input v-model="form.name" placeholder="请输入名称"></el-input> </el-form-item>
             <el-form-item label="联系人"> <el-input v-model="form.contacts" placeholder="请输入联系人"></el-input> </el-form-item>
             <el-form-item label="联系电话"> <el-input v-model="form.phone" placeholder="请输入联系电话"></el-input> </el-form-item>
-            <el-form-item label="QQ&微信"> <el-input v-model="form.qqwx" placeholder="请输入QQ&微信"></el-input> </el-form-item>
+            <el-form-item label="QQ/微信"> <el-input v-model="form.qqwx" placeholder="请输入QQ/微信"></el-input> </el-form-item>
             <el-form-item label="电子邮箱"> <el-input v-model="form.email" placeholder="请输入电子邮箱"></el-input> </el-form-item>
             <span v-if="form.type == '0' || form.type == '1'">
               <el-form-item label="所属领域">

src/views/superAdminCenter/user/index.vue

@@ -91,8 +91,8 @@
               <el-form-item label="出生日期">
                 <el-date-picker v-model="form.birthDate" type="date" placeholder="选择日期" value-format="yyyy-MM-dd"> </el-date-picker>
               </el-form-item>
-              <el-form-item label="QQ&微信">
-                <el-input v-model="form.qqwx" placeholder="请输入QQ&微信"></el-input>
+              <el-form-item label="QQ/微信">
+                <el-input v-model="form.qqwx" placeholder="请输入QQ/微信"></el-input>
               </el-form-item>
               <el-form-item label="电子邮箱">
                 <el-input v-model="form.email" placeholder="请输入电子邮箱"></el-input>

src/views/userCenter/basicInfo/index.vue

@@ -86,8 +86,8 @@
               <el-form-item label="出生日期">
                 <el-date-picker v-model="form.birthDate" type="date" placeholder="选择日期" value-format="yyyy-MM-dd"> </el-date-picker>
               </el-form-item>
-              <el-form-item label="QQ&微信">
-                <el-input v-model="form.qqwx" placeholder="请输入QQ&微信"></el-input>
+              <el-form-item label="QQ/微信">
+                <el-input v-model="form.qqwx" placeholder="请输入QQ/微信"></el-input>
               </el-form-item>
               <el-form-item label="电子邮箱">
                 <el-input v-model="form.email" placeholder="请输入电子邮箱"></el-input>

src/views/userCenter/dockInfo/part/nextLive.vue

@@ -45,8 +45,8 @@
             <el-form-item label="联系电话">
               <el-input v-model="demandForm.phone" placeholder="请输入联系电话"></el-input>
             </el-form-item>
-            <el-form-item label="QQ&微信">
-              <el-input v-model="demandForm.qqwx" placeholder="请输入QQ&微信"></el-input>
+            <el-form-item label="QQ/微信">
+              <el-input v-model="demandForm.qqwx" placeholder="请输入QQ/微信"></el-input>
             </el-form-item>
             <el-form-item label="电子邮箱">
               <el-input v-model="demandForm.email" placeholder="请输入电子邮箱"></el-input>

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

@@ -23,8 +23,8 @@
             <el-form-item label="联系电话">
               <el-input v-model="form.phone" placeholder="请输入联系电话"></el-input>
             </el-form-item>
-            <el-form-item label="QQ&微信">
-              <el-input v-model="form.qqwx" placeholder="请输入QQ&微信"></el-input>
+            <el-form-item label="QQ/微信">
+              <el-input v-model="form.qqwx" placeholder="请输入QQ/微信"></el-input>
             </el-form-item>
             <el-form-item label="电子邮箱">
               <el-input v-model="form.email" placeholder="请输入电子邮箱"></el-input>