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

src/views/hall/direct.vue

@@ -151,52 +151,6 @@
             </el-col>
             <el-col :span="24" class="tabsData">
               <el-tabs type="border-card" @tab-click="handleClick">
-                <el-tab-pane label="科技需求">
-                  <el-col :span="24" class="one">
-                    <el-row class="jishulist">
-                      <el-col :span="24" class="topList">
-                        <el-col :span="24" class="list" v-for="(item, index) in jishulist" :key="index">
-                          <el-col :span="16" class="name">
-                            <p>
-                              <span class="inname"> {{ item.name }}</span>
-                            </p>
-                          </el-col>
-                          <el-col :span="4" class="names">
-                            <p>
-                              <span>
-                                所属领域：
-                                {{ item.field }}</span
-                              >
-                            </p>
-                          </el-col>
-                          <el-col :span="4" class="click">
-                            <el-button size="mini" type="primary" @click="oneBtnDetail(item)">详情</el-button>
-                            <el-button
-                              size="mini"
-                              type="success"
-                              @click="
-                                $router.push({
-                                  path: '/live/hall/dock/dockDetail',
-                                  query: { id: item._id, dockid: dock_id, user_id: user_id, type: item.type },
-                                })
-                              "
-                              >对接</el-button
-                            >
-                          </el-col>
-                        </el-col>
-                      </el-col>
-                      <el-col :span="24" class="btn">
-                        <el-button
-                          type="primary"
-                          size="mini"
-                          @click="$router.push({ path: '/hall/productList/technologyList', query: { column_name: '技术', dockid: dock_id } })"
-                          v-if="jishulist.length > 10"
-                          >查看所有项目</el-button
-                        >
-                      </el-col>
-                    </el-row>
-                  </el-col>
-                </el-tab-pane>
                 <el-tab-pane label="技术成果">
                   <el-col :span="24" class="one">
                     <el-row>
@@ -250,6 +204,52 @@
                     </el-row>
                   </el-col>
                 </el-tab-pane>
+                <el-tab-pane label="科技需求">
+                  <el-col :span="24" class="one">
+                    <el-row class="jishulist">
+                      <el-col :span="24" class="topList">
+                        <el-col :span="24" class="list" v-for="(item, index) in jishulist" :key="index">
+                          <el-col :span="16" class="name">
+                            <p>
+                              <span class="inname"> {{ item.name }}</span>
+                            </p>
+                          </el-col>
+                          <el-col :span="4" class="names">
+                            <p>
+                              <span>
+                                所属领域：
+                                {{ item.field }}</span
+                              >
+                            </p>
+                          </el-col>
+                          <el-col :span="4" class="click">
+                            <el-button size="mini" type="primary" @click="oneBtnDetail(item)">详情</el-button>
+                            <el-button
+                              size="mini"
+                              type="success"
+                              @click="
+                                $router.push({
+                                  path: '/live/hall/dock/dockDetail',
+                                  query: { id: item._id, dockid: dock_id, user_id: user_id, type: item.type },
+                                })
+                              "
+                              >对接</el-button
+                            >
+                          </el-col>
+                        </el-col>
+                      </el-col>
+                      <el-col :span="24" class="btn">
+                        <el-button
+                          type="primary"
+                          size="mini"
+                          @click="$router.push({ path: '/hall/productList/technologyList', query: { column_name: '技术', dockid: dock_id } })"
+                          v-if="jishulist.length > 10"
+                          >查看所有项目</el-button
+                        >
+                      </el-col>
+                    </el-row>
+                  </el-col>
+                </el-tab-pane>
                 <el-tab-pane label="商务服务">
                   <el-col :span="24" class="one">
                     <el-row>
@@ -294,7 +294,7 @@
                   <el-col :span="24" class="two">
                     <el-col :span="12" class="twoList" v-for="(item, index) in expertList" :key="index">
                       <el-col :span="4" class="image">
-                        <el-image :src="item.expertimage" style="height: 92px;" v-if="item.expertimage != '' && null"></el-image>
+                        <el-image :src="item.expertimage" style="height: 92px;" v-if="item.expertimage != ''"></el-image>
                         <el-image :src="expertimage" style="height: 92px;" v-else></el-image>
                       </el-col>
                       <el-col :span="20" class="info">
@@ -313,7 +313,7 @@
                         <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"> 电子邮箱：{{ item.email || '暂无' }} </el-col>
+                        <el-col :span="12" class="txt textOver"> 电子邮箱：{{ item.email || '暂无' }} </el-col>
                       </el-col>
                     </el-col>
                     <el-col :span="24" class="onmore">
@@ -409,7 +409,7 @@
       <directDetail :directInfo="directInfo"></directDetail>
     </el-dialog>
     <el-dialog title="专家信息" :visible.sync="dialogExport" width="60%" :before-close="handleCloseExport">
-      <expeDetail :detailInfo="directInfo" :displayBtn="displayBtn"></expeDetail>
+      <expeDetail :detailInfo="exportInfo" :displayBtn="displayBtn"></expeDetail>
     </el-dialog>
   </div>
 </template>

src/views/superAdminCenter/enterpriseProduct/index.vue

@@ -433,14 +433,22 @@ export default {
     },
     // 刪除
     async handleDelete(id) {
-      const res = await this.delete(id);
-      if (this.$checkRes(res)) {
-        this.$message({
-          message: '删除信息成功',
-          type: 'success',
-        });
-        this.search();
-      }
+      this.$confirm('您确定要删除此信息吗?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(async () => {
+          const res = await this.delete(id);
+          if (this.$checkRes(res)) {
+            this.$message({
+              message: '删除信息成功',
+              type: 'success',
+            });
+            this.search();
+          }
+        })
+        .catch(() => {});
     },
     // 图片
     uploadSuccess({ type, data }) {