Merge branch 'master' of dd.tall.wiki:binbin0314/green.v0.3

src/views/NewPlatform/Children/AchDet.vue

@@ -7,46 +7,26 @@
         <div class="d-flex flex-wrap">
           <div class="equ-info-left" style="width: 200px">
             <p>成果名字：</p>
-            <p>学科分类：</p>
+            <p>专利类型：</p>
+            <p>专利号：</p>
             <p>联系人：</p>
             <p>联系方式：</p>
-            <p>转让形式：</p>
-            <p>成果表现形式：</p>
-            <p>成果阶段：</p>
           </div>
           <div style="width: 500px">
-            <p>{{ obj.name }}</p>
+            <p>{{ obj.registerName }}</p>
-            <p>{{ obj.classification === 0 ? '中医药学' : '' }}</p>
+            <p>{{ obj.style }}</p>
+            <p>{{ obj.registerNum }}</p>
             <p>
-              <span :key="index" v-for="(item, index) in obj.selPeoList">{{ item.contactsName }}</span>
+              <span :key="index" v-for="(item, index) in obj.selPeoList">
+                {{ item.contactsName }}
+                <span v-if="index < obj.selPeoList.length - 1">,</span>
+              </span>
             </p>
             <p>
-              <span :key="index" v-for="(item, index) in obj.selPeoList">{{ item.contactsPhone }}</span>
+              <span :key="index" v-for="(item, index) in obj.selPeoList">
-            </p>
+                {{ item.contactsPhone }}
-            <p>
+                <span v-if="index < obj.selPeoList.length - 1">,</span>
-              {{ obj.layout === 0 ? '产权转让' :
+              </span>
-              obj.layout === 1 ? '资金入股' :
-              obj.layout === 2 ? '技术入股' :
-              obj.layout === 3 ? '合作开发' :
-              obj.layout === 0 ? '技术服务' : '其他'}}
-            </p>
-            <p>
-              {{ obj.performance === 0 ? '国际标准' :
-              obj.performance === 1 ? '国家标准' :
-              obj.performance === 2 ? '行业标准' :
-              obj.performance === 3 ? '地方标准' :
-              obj.performance === 4 ? '企业标准' :
-              obj.performance === 5 ? '新技术' :
-              obj.performance === 6 ? '新工艺' :
-              obj.performance === 7 ? '新产品' :
-              obj.performance === 8 ? '新材料' :
-              obj.performance === 9 ? '新装备' :
-              obj.performance === 10 ? '农业、生物新品种' :
-              obj.performance === 11 ? '矿产新品种' : '其他应用技术'}}
-            </p>
-            <p>
-              {{ obj.stage === 0 ? '初期阶段' :
-              obj.stage === 1 ? '中期阶段' : '成熟应用阶段' }}
             </p>
           </div>
         </div>

src/views/NewPlatform/Children/ShareChild/InsDet.vue

@@ -1,11 +1,11 @@
 <template>
   <div class="inner equ-box">
     <div class="equ-info d-flex">
-      <img :src="obj.img" alt v-if="listState === 1" />
+      <img :src="obj.visitLocation" />
-      <img :src="obj.visitLocation" alt v-if="listState === 3" />
+      <!-- <img :src="obj.visitLocation" alt v-if="listState === 3" /> -->
       <div class="equ-info-box">
         <p class="equ-name">{{ obj.name }}</p>
-        <div class="d-flex flex-wrap" v-if="listState === 1">
+        <div style="margin-top: 20px" class="d-flex flex-wrap" v-if="listState === 1">
           <div class="equ-info-left" style="width: 200px">
             <p>仪器名字：</p>
             <p>制造商：</p>
@@ -24,18 +24,18 @@
             <p>
               <span :key="index" v-for="(item, index) in obj.selPeoList">
                 {{ item.contactsName }}
-                <span v-if="index !== obj.selPeoList.length-1">、</span>
+                <span v-if="index !== obj.selPeoList.length - 1">、</span>
               </span>
             </p>
             <p>
               <span :key="index" v-for="(item, index) in obj.selPeoList">
                 {{ item.contactsPhone }}
-                <span v-if="index !== obj.selPeoList.length-1">、</span>
+                <span v-if="index !== obj.selPeoList.length - 1">、</span>
               </span>
             </p>
           </div>
         </div>
-        <div class="d-flex flex-wrap" v-if="listState === 3">
+        <div style="margin-top: 20px" class="d-flex flex-wrap" v-if="listState === 3">
           <div class="equ-info-left" style="width: 200px">
             <p>公司名称：</p>
             <p>产品编号：</p>
@@ -47,16 +47,13 @@
             <p>
               <span :key="index" v-for="(item, index) in obj.selPeoList">
                 {{ item.contactsName }}
-                <span v-if="index !== obj.selPeoList.length-1">、</span>
+                <span v-if="index !== obj.selPeoList.length - 1">、</span>
               </span>
             </p>
           </div>
         </div>
         <p class="equ-btn">
-          <intention-model
+          <intention-model :type-data="listState === 1 ? typeData : typeProductData" style="margin-right: 20px; float: left" />
-            :type-data="listState === 1 ? typeData : typeProductData"
-            style="margin-right: 20px; float: left"
-          />
           <!-- <a-button style="margin-right: 20px">转化意向</a-button> -->
           <!-- <a-button type="primary">加入购物车</a-button> -->
           <add-shopping :type-data="typeData" style="margin-right: 20px; float: right" />