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

src/layout/direct/directDetail.vue

@@ -16,18 +16,24 @@
             {{ directInfo.name }}
           </p>
           <p>
-            <span
-              >产品类型:{{
-                directInfo.totaltype === '0' ? '技术' : directInfo.totaltype === '1' ? '产品' : directInfo.totaltype === '2' ? '服务' : '暂无'
-              }}</span
-            >
-            <span>收费标准:{{ directInfo.price || '暂无' }}/{{ directInfo.priceunit || '暂无' }}</span>
-          </p>
-          <p>
             <span>
-              交易方式:{{ directInfo.business === '0' ? '公用' : directInfo.business === '1' ? '转让' : directInfo.business === '2' ? '竞价' : '暂无' }}
+              产品类型:{{ directInfo.totaltype === '0' ? '技术' : directInfo.totaltype === '1' ? '产品' : directInfo.totaltype === '2' ? '服务' : '暂无' }}
+            </span>
+            <span>
+              所属领域:{{
+                `${directInfo.field}` === `0`
+                  ? '先进制造'
+                  : `${directInfo.field}` === `1`
+                  ? '新材料'
+                  : `${directInfo.field}` === `2`
+                  ? '光电子'
+                  : `${directInfo.field}` === `3`
+                  ? '信息技术'
+                  : `${directInfo.field}` === `4`
+                  ? '文化和科技融合'
+                  : '暂无'
+              }}
             </span>
-            <span>研发阶段:{{ directInfo.phase == 1 ? '阶段成果' : directInfo.phase == 2 ? '最终成果' : '暂无' }}</span>
           </p>
           <p>
             <span>联系人:{{ directInfo.contact_user || '暂无' }}</span>
@@ -35,10 +41,6 @@
           </p>
         </el-col>
         <el-col :span="24" class="oneDown">
-          <div>
-            <p>应用领域：</p>
-            <p>{{ directInfo.field || '暂无' }}</p>
-          </div>
           <div>
             <!-- <p><span>产品参数:</span><span @click="argsBtn(directInfo.product_args)">查看详情</span></p> -->
           </div>
@@ -122,10 +124,10 @@ export default {
       font-weight: bold;
       padding: 20px 0;
     }
-    p:nth-child(2) span:last-child {
-      color: red;
-      font-weight: bold;
-    }
+    // p:nth-child(2) span:last-child {
+    //   color: red;
+    //   font-weight: bold;
+    // }
   }
   .oneDown {
     border-top: 1px dashed #ccc;

src/views/hall/dock/dockDetail.vue

@@ -27,16 +27,26 @@
                         {{ detailInfo.name }}
                       </p>
                       <p>
-                        <span>产品类型:{{ detailInfo.product_type_name || '暂无' }}</span>
-                        <span>收费标准:{{ detailInfo.price || '暂无' }}/{{ detailInfo.priceunit || '暂无' }}</span>
-                      </p>
-                      <p>
                         <span>
-                          交易方式:{{
-                            detailInfo.business === '0' ? '公用' : detailInfo.business === '1' ? '转让' : detailInfo.business === '2' ? '竞价' : '暂无'
+                          产品类型:{{
+                            detailInfo.totaltype === '0' ? '技术' : detailInfo.totaltype === '1' ? '产品' : detailInfo.totaltype === '2' ? '服务' : '暂无'
+                          }}
+                        </span>
+                        <span>
+                          所属领域:{{
+                            `${detailInfo.field}` === `0`
+                              ? '先进制造'
+                              : `${detailInfo.field}` === `1`
+                              ? '新材料'
+                              : `${detailInfo.field}` === `2`
+                              ? '光电子'
+                              : `${detailInfo.field}` === `3`
+                              ? '信息技术'
+                              : `${detailInfo.field}` === `4`
+                              ? '文化和科技融合'
+                              : '暂无'
                           }}
                         </span>
-                        <span>研发阶段:{{ detailInfo.phase == 1 ? '阶段成果' : detailInfo.phase == 2 ? '最终成果' : '暂无' }}</span>
                       </p>
                       <p>
                         <span>联系人:{{ detailInfo.contact_user || '暂无' }}</span>
@@ -44,13 +54,9 @@
                       </p>
                     </el-col>
                     <el-col :span="24" class="oneDown">
-                      <div>
-                        <p>应用领域：</p>
-                        <p>{{ detailInfo.field || '暂无' }}</p>
-                      </div>
-                      <div>
+                      <!-- <div>
                         <p><span>产品参数:</span><span @click="argsBtn(detailInfo.product_args)">查看详情</span></p>
-                      </div>
+                      </div> -->
                       <div>
                         <p>服务范围:</p>
                         <p class="moreScope" v-if="scope != ''">{{ detailInfo.scope || '暂无' }}</p>
@@ -346,10 +352,10 @@ p {
           font-weight: bold;
           padding: 20px 0;
         }
-        p:nth-child(2) span:last-child {
-          color: red;
-          font-weight: bold;
-        }
+        // p:nth-child(2) span:last-child {
+        //   color: red;
+        //   font-weight: bold;
+        // }
       }
       .oneDown {
         border-top: 1px dashed #ccc;