wuhongyu 5 سال پیش
والد
کامیت
e6e63ce0d2
2فایلهای تغییر یافته به همراه49 افزوده شده و 39 حذف شده
  1. 40 32
      src/views/direct.vue
  2. 9 7
      src/views/hall/dock/dockDetail.vue

+ 40 - 32
src/views/direct.vue

@@ -115,18 +115,19 @@
                         </p>
 
                         <p class="newp">
-                          <span class="name"><i class="el-icon-user-solid"></i>{{ item.contact_user }}</span
-                          ><span> <i class="el-icon-phone"></i>{{ item.contact_tel }}</span>
+                          <span class="name"><i class="el-icon-user-solid"></i>{{ item.contact_user || '暂无' }}</span
+                          ><span> <i class="el-icon-phone"></i>{{ item.contact_tel || '暂无' }}</span>
                         </p>
                         <p>
-                          <span class="pspan">类型:{{ item.product_type_name }}</span
-                          ><span class="pspan">研发阶段:{{ item.phase == '0' ? '阶段成果' : '最终成果' }}</span
-                          ><span class="pspan">交易方式:{{ item.business == '0' ? '公用' : item.business == '1' ? '转让' : '竞价' }} </span
-                          ><span class="pspan">交易价格:{{ item.price }}{{ item.priceunit }}</span>
+                          <span class="pspan">类型:{{ item.product_type_name || '暂无' }}</span
+                          ><span class="pspan">研发阶段:{{ item.phase == '0' ? '阶段成果' : item.phase == '1' ? '阶段成果' : '暂无' }}</span
+                          ><span class="pspan"
+                            >交易方式:{{ item.business == '0' ? '公用' : item.business == '1' ? '转让' : item.business == '2' ? '竞价' : '暂无' }} </span
+                          ><span class="pspan">交易价格:{{ item.price || '暂无' }}{{ item.priceunit || '暂无' }}</span>
                         </p>
                       </el-col>
                       <el-col :span="10" class="liright">
-                        <p>摘要:{{ item.introduction }}</p>
+                        <p>摘要:{{ item.introduction || '暂无' }}</p>
                       </el-col>
                     </li>
                   </ul>
@@ -141,20 +142,23 @@
                           <el-col :span="24" class="detail" v-if="policyInfo.totaltype">
                             <el-col :span="24" class="infoMess">
                               <el-col :span="24" class="info"> 名称:{{ policyInfo.name }} </el-col>
-                              <el-col :span="24" class="info"> 类型:{{ policyInfo.product_type_name }} </el-col>
-                              <el-col :span="24" class="info"> 单价:{{ policyInfo.price }} </el-col>
-                              <el-col :span="24" class="info"> 单位:{{ policyInfo.priceunit }} </el-col>
+                              <el-col :span="24" class="info"> 类型:{{ policyInfo.product_type_name || '暂无' }} </el-col>
+                              <el-col :span="24" class="info"> 单价:{{ policyInfo.price || '暂无' }} </el-col>
+                              <el-col :span="24" class="info"> 单位:{{ policyInfo.priceunit || '暂无' }} </el-col>
                               <el-col :span="24">
                                 <span class="tupian"> 图片:</span>
                                 <el-col :span="6" class="info" v-for="(acm, index) in policyInfo.image" :key="index">
-                                  <span><el-image class="newclassimage" style="width:100px;height:100px" :src="acm.url"></el-image></span>
+                                  <span v-if="policyInfo.image.length > 0"
+                                    ><el-image class="newclassimage" style="width:100px;height:100px" :src="acm.url"></el-image
+                                  ></span>
+                                  <span v-else>暂无</span>
                                 </el-col>
                               </el-col>
-                              <el-col :span="24" class="info"> 服务范围:{{ policyInfo.scope }} </el-col>
-                              <el-col :span="24" class="infos"> 描述:{{ policyInfo.description }} </el-col>
-                              <el-col :span="24" class="info"> 知识产权:{{ policyInfo.property }} </el-col>
+                              <el-col :span="24" class="info"> 服务范围:{{ policyInfo.scope || '暂无' }} </el-col>
+                              <el-col :span="24" class="infos"> 描述:{{ policyInfo.description || '暂无' }} </el-col>
+                              <el-col :span="24" class="info"> 知识产权:{{ policyInfo.property || '暂无' }} </el-col>
 
-                              <el-col :span="24" class="infos"> 简介:{{ policyInfo.introduction }} </el-col>
+                              <el-col :span="24" class="infos"> 简介:{{ policyInfo.introduction || '暂无' }} </el-col>
 
                               <el-col :span="24" class="info">
                                 <el-button type="primary" class="duijie" @click="technology(policyInfo.id)">对接</el-button>
@@ -167,12 +171,12 @@
                         <el-button type="primary" size="mini" @click="technologyBtn(item.id)" class="duijie">对接</el-button>
                       </p>
                       <p>
-                        <span>研发阶段:{{ item.phase == '0' ? '阶段成果' : '最终成果' }}</span>
+                        <span>研发阶段:{{ item.phase == '0' ? '阶段成果' : item.phase == '1' ? '最终成果' : '暂无' }}</span>
                         <span>发布时间:{{ item.meta | getDate }}</span>
                       </p>
                       <p>
-                        <span>需求类型:{{ item.product_type_name }}</span>
-                        <span>{{ item.address }}</span>
+                        <span>需求类型:{{ item.product_type_name || '暂无' }}</span>
+                        <span>{{ item.address || '暂无地址' }}</span>
                       </p>
                     </li>
                   </ul>
@@ -187,18 +191,21 @@
                           <el-col :span="24" class="detail" v-if="policyInfo.totaltype">
                             <el-col :span="24" class="infoMess">
                               <el-col :span="24" class="info"> 名称:{{ policyInfo.name }} </el-col>
-                              <el-col :span="24" class="info"> 类型:{{ policyInfo.product_type_name }} </el-col>
-                              <el-col :span="24" class="info"> 单价:{{ policyInfo.price }} </el-col>
-                              <el-col :span="24" class="info"> 单位:{{ policyInfo.priceunit }} </el-col>
+                              <el-col :span="24" class="info"> 类型:{{ policyInfo.product_type_name || '暂无' }} </el-col>
+                              <el-col :span="24" class="info"> 单价:{{ policyInfo.price || '暂无' }} </el-col>
+                              <el-col :span="24" class="info"> 单位:{{ policyInfo.priceunit || '暂无' }} </el-col>
                               <el-col :span="24">
                                 <span class="tupian"> 图片:</span>
                                 <el-col :span="6" class="infos" v-for="(acm, index) in policyInfo.image" :key="index">
-                                  <span><el-image class="newclassimage" style="width:100px;height:100px" :src="acm.url"></el-image></span>
+                                  <span v-if="policyInfo.image.length > 0"
+                                    ><el-image class="newclassimage" style="width:100px;height:100px" :src="acm.url"></el-image
+                                  ></span>
+                                  <span v-else>暂无</span>
                                 </el-col>
                               </el-col>
-                              <el-col :span="24" class="info"> 服务范围:{{ policyInfo.scope }} </el-col>
-                              <el-col :span="24" class="info"> 描述{{ policyInfo.description }} </el-col>
-                              <el-col :span="24" class="info"> 知识产权:{{ policyInfo.property }} </el-col>
+                              <el-col :span="24" class="info"> 服务范围:{{ policyInfo.scope || '暂无' }} </el-col>
+                              <el-col :span="24" class="info"> 描述{{ policyInfo.description || '暂无' }} </el-col>
+                              <el-col :span="24" class="info"> 知识产权:{{ policyInfo.property || '暂无' }} </el-col>
 
                               <el-col :span="24" class="infos"> 简介:{{ policyInfo.introduction }} </el-col>
 
@@ -211,15 +218,16 @@
                         </el-popover>
                       </p>
                       <div class="serviceDown">
-                        <el-image :src="item.image[0].url"></el-image>
-                        <p>联系人:{{ item.contact_user }}</p>
+                        <span v-if="item.image.length > 0"> <el-image :src="item.image[0].url"></el-image></span>
+                        <span v-else>暂无</span>
+                        <p>联系人:{{ item.contact_user || '暂无' }}</p>
                         <p>
                           <span>服务类型:</span>
-                          <span class="type2">{{ item.product_type_name }}</span>
+                          <span class="type2">{{ item.product_type_name || '暂无' }}</span>
                         </p>
-                        <p>电话:{{ item.contact_tel }}</p>
-                        <p>单价:{{ item.price }} 单位:{{ item.priceunit }}</p>
-                        <p>知识产权:{{ item.property }}</p>
+                        <p>电话:{{ item.contact_tel || '暂无' }}</p>
+                        <p>单价:{{ item.price || '暂无' }} 单位:{{ item.priceunit || '暂无' }}</p>
+                        <p>知识产权:{{ item.property || '暂无' }}</p>
                       </div>
                     </li>
                   </ul>
@@ -478,7 +486,7 @@ export default {
     this.searchInfo();
   },
   methods: {
-    ...mapProduct({ mapProductQuery: 'query' }),
+    ...mapProduct({ mapProductQuery: 'newquery' }),
     ...market({ marketFetch: 'fetch' }),
     ...dock({ dockQuery: 'query' }),
     ...talentExperts({ expertQuery: 'query' }),

+ 9 - 7
src/views/hall/dock/dockDetail.vue

@@ -26,21 +26,23 @@
                   <p class="name textOver">{{ productInfo.name }}</p>
                   <div class="brief">
                     <p>
-                      <span>应用领域:{{ productInfo.field }}</span>
-                      <span>服务范围:{{ productInfo.scope }}</span>
+                      <span>应用领域:{{ productInfo.field || '暂无' }}</span>
+                      <span>服务范围:{{ productInfo.scope || '暂无' }}</span>
                     </p>
                     <p>
-                      <span>产品类型:{{ productInfo.product_type_name }}</span>
-                      <span>研发阶段:{{ productInfo.phase == 1 ? '阶段成果' : '最终成果' }}</span>
+                      <span>产品类型:{{ productInfo.product_type_name || '暂无' }}</span>
+                      <span>研发阶段:{{ productInfo.phase == 1 ? '阶段成果' : productInfo.phase == 2 ? '最终成果' : '暂无' }}</span>
                     </p>
                     <p>
-                      <span>{{ productInfo.business == '0' ? '公用' : productInfo.business == '1' ? '转让' : '竞价' }}</span>
-                      <span>交易价格:{{ productInfo.price }}/{{ productInfo.priceunit }}</span>
+                      <span>{{
+                        productInfo.business == '0' ? '公用' : productInfo.business == '1' ? '转让' : productInfo.business == '2' ? '竞价' : '暂无'
+                      }}</span>
+                      <span>交易价格:{{ productInfo.price || '暂无'  }}/{{ productInfo.priceunit || '暂无'  }}</span>
                     </p>
                   </div>
                   <p class="intro">
                     <span><i class="el-icon-date"></i>项目简介</span>
-                    <span>{{ productInfo.introduction }}</span>
+                    <span>{{ productInfo.introduction || '暂无'  }}</span>
                   </p>
                 </el-col>
                 <el-col :span="24" v-if="display === '2'" class="contact">