1

src/layout/adminCenter/menuInfo.vue

@@ -121,7 +121,11 @@ export default {
         this.$router.push({ path: '/webLogin' });
       } 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 } });
+        if (res.data.room_id == '1005') {
+          this.$router.push({ path: '/halltwo/directTwo', query: { id: res.data.id, title: res.data.title } });
+        } else {
+          this.$router.push({ path: '/hall/direct', query: { id: res.data.id, title: res.data.title } });
+        }
       } else {
         this.$router.push({ path: '/adminCenter/index', query: { num: key } });
       }

src/views/adminCenter/dockInfo/index.vue

@@ -37,7 +37,9 @@ export default {
     ...authUser({ authUserFetch: 'fetch', authUserUpdate: 'update', authUserDelete: 'delete' }),
     async search() {
       let res = await this.fetch(this.user.uid);
-      this.$set(this, `form`, res.data);
+      if (this.$checkRes(res)) {
+        this.$set(this, `form`, res.data);
+      }
     },
     // 展会信息修改
     async submitForm({ data }) {

src/views/halltwo/parts/achieve.vue

@@ -5,7 +5,7 @@
         <el-col :span="24" class="list" v-for="(item, index) in list" :key="index" @click.native="xmdjBtn(item)">
           <el-col :span="15" class="name textOver"> >{{ item.name }} </el-col>
           <el-col :span="6" class="brief textOver">
-            {{ item.field }}
+            {{ item.field || '暂无' }}
           </el-col>
           <el-col :span="3" class="btn">
             <el-button type="primary" size="mini">对接</el-button>

src/views/halltwo/parts/xmdjachieve.vue

@@ -6,7 +6,7 @@
           {{ detailInfo.name }}
         </el-col>
         <el-col :span="24" class="two">
-          <el-col :span="12" class="twoinfo">技术类型：{{ detailInfo.type == '0' ? '科技需求' : detailInfo == '1' ? '技术成果' : '商务信息' }} </el-col>
+          <el-col :span="12" class="twoinfo">技术类型：{{ detailInfo.type == '0' ? '科技需求' : detailInfo.type == '1' ? '技术成果' : '商务信息' }} </el-col>
           <el-col :span="12" class="twoinfo">行业分类：{{ detailInfo.field || '暂无' }} </el-col>
           <el-col :span="12" class="twoinfo">技术成熟度：{{ detailInfo.achievestatus || '暂无' }} </el-col>
           <el-col :span="12" class="twoinfo">交易方式：{{ detailInfo.cooperation || '暂无' }} </el-col>

src/views/halltwo/xmcg.vue

@@ -54,7 +54,7 @@
                 <el-table :data="list1" stripe style="width: 100%" fit :show-header="false">
                   <el-table-column prop="field" width="300">
                     <template slot-scope="scope">
-                      <span style="margin-left: 20px">{{ scope.row.field }}</span>
+                      <span style="margin-left: 20px">{{ scope.row.field || '暂无' }}</span>
                     </template>
                   </el-table-column>
                   <el-table-column prop="name" width="700">
@@ -137,8 +137,8 @@ export default {
     };
   },
   async created() {
-    await this.searchInfo();
     await this.searchType();
+    await this.searchInfo();
   },
   methods: {
     ...dock({ dockQuery: 'query', dockFetch: 'fetch', goodsquery: 'goodsquery' }),