wxy 4 rokov pred
rodič
commit
05b4e37230

+ 2 - 1
src/components/supermaket/supermarketlistDetail.vue

@@ -18,7 +18,7 @@
         <div class="w_1200">
           <el-col :span="24" class="rightcont">
             <listcontext v-on="$listeners" :contentList="contentList" :columnName="columnName" v-if="display === 'list'" :total="total"></listcontext>
-            <detali v-else :detailInfo="policyInfo" v-on="$listeners"> </detali>
+            <detali v-else :detailInfo="policyInfo" :totaltype="totaltype" v-on="$listeners"> </detali>
           </el-col>
         </div>
       </el-col>
@@ -48,6 +48,7 @@ export default {
     total: null,
     display: { type: String, default: 'list' },
     policyInfo: null,
+    totaltype: null,
   },
   components: {
     top, //头部

+ 406 - 45
src/layout/supermarket/detali.vue

@@ -2,7 +2,7 @@
   <div id="policyrightcont">
     <el-row>
       <el-col :span="24" class="info">
-        <el-col :span="24" class="top">
+        <el-col :span="24" class="top" style="line-height: 60px">
           <el-col :span="12" class="txt">
             <span>详情页面</span>
           </el-col>
@@ -10,7 +10,7 @@
             <el-button type="primary" size="mini" @click="back()">返回</el-button>
           </el-col>
         </el-col>
-        <el-col :span="24" class="infoMiddle">
+        <el-col :span="24" class="infoMiddle" v-if="totaltype === '0'">
           <el-col :span="24" class="infotop">
             <el-col :span="7" class="left">
               <el-carousel trigger="click" height="345px" :autoplay="false">
@@ -140,15 +140,270 @@
             </el-col>
           </el-col>
         </el-col>
+        <el-col :span="24" class="main" v-else-if="totaltype === '1'">
+          <el-col :span="24" class="top">
+            <el-col :span="7" class="left">
+              <el-carousel trigger="click" height="345px" :autoplay="false">
+                <el-carousel-item v-for="(item, index) in detailInfo.image" :key="index">
+                  <el-image :src="item.url" style="width:99%;height:345px;border: 1px solid #ccc;"></el-image>
+                </el-carousel-item>
+              </el-carousel>
+            </el-col>
+            <el-col :span="17" class="right">
+              <el-col :span="24" class="name textOver">
+                {{ detailInfo.name || '暂无' }}
+              </el-col>
+              <el-col :span="24">
+                <el-col :span="4" class="otherInfo textOver">
+                  成果单位
+                </el-col>
+                <el-col :span="20" class="otherInfo textOver">
+                  {{ detailInfo.company }}
+                  <el-link v-if="detailInfo.companyweb != null || ''" :href="detailInfo.companyweb" :underline="false" target="_blank"
+                    >({{ detailInfo.companyweb }})</el-link
+                  >
+                </el-col>
+              </el-col>
+              <el-col :span="12">
+                <el-col :span="8" class="otherInfo textOver">
+                  所属领域
+                </el-col>
+                <el-col :span="16" class="otherInfo textOver">
+                  {{ detailInfo.field || '暂无' }}
+                </el-col>
+              </el-col>
+              <el-col :span="12">
+                <el-col :span="8" class="otherInfo textOver">
+                  合作方式
+                </el-col>
+                <el-col :span="16" class="otherInfo textOver">
+                  {{ detailInfo.cooperation || '暂无' }}
+                </el-col>
+              </el-col>
+              <el-col :span="12">
+                <el-col :span="8" class="otherInfo textOver">
+                  成果状态
+                </el-col>
+                <el-col :span="16" class="otherInfo textOver">
+                  {{ detailInfo.achievestatus || '暂无' }}
+                </el-col>
+              </el-col>
+              <el-col :span="12">
+                <el-col :span="8" class="otherInfo textOver">
+                  成果来源
+                </el-col>
+                <el-col :span="16" class="otherInfo textOver">
+                  {{ detailInfo.achievesource || '暂无' }}
+                </el-col>
+              </el-col>
+              <el-col :span="12">
+                <el-col :span="8" class="otherInfo textOver">
+                  成果权属
+                </el-col>
+                <el-col :span="16" class="otherInfo textOver">
+                  {{ detailInfo.achieveown || '暂无' }}
+                </el-col>
+              </el-col>
+              <el-col :span="12">
+                <el-col :span="8" class="otherInfo textOver">
+                  意向价格
+                </el-col>
+                <el-col :span="16" class="otherInfo textOver">
+                  {{ detailInfo.intentionprice || '暂无' }}
+                </el-col>
+              </el-col>
+              <el-col :span="12">
+                <el-col :span="8" class="otherInfo textOver">
+                  联系人
+                </el-col>
+                <el-col :span="16" class="otherInfo textOver">
+                  {{ detailInfo.contacts || '暂无' }}
+                </el-col>
+              </el-col>
+              <el-col :span="12">
+                <el-col :span="8" class="otherInfo textOver">
+                  电子邮箱
+                </el-col>
+                <el-col :span="16" class="otherInfo textOver">
+                  {{ detailInfo.email || '暂无' }}
+                </el-col>
+              </el-col>
+              <el-col :span="24">
+                <el-col :span="4" class="otherInfo textOver">
+                  项目路演
+                </el-col>
+                <el-col :span="20" class="otherInfo textOver">
+                  {{ detailInfo.roadshow || '暂无' }}
+                </el-col>
+              </el-col>
+              <el-col :span="12">
+                <el-col :span="8" class="otherInfo textOver">
+                  专利信息
+                </el-col>
+                <el-col :span="16" class="otherInfo textOver">
+                  {{ detailInfo.patentinfo || '暂无' }}
+                </el-col>
+              </el-col>
+              <el-col :span="12">
+                <el-col :span="8" class="otherInfo textOver">
+                  专利状态
+                </el-col>
+                <el-col :span="16" class="otherInfo textOver">
+                  {{ detailInfo.patentstatus || '暂无' }}
+                </el-col>
+              </el-col>
+            </el-col>
+          </el-col>
+          <el-col :span="24" class="down">
+            <el-col :span="24" class="downInfo">
+              <el-col :span="4" class="tit">
+                <h2>成果简介</h2>
+              </el-col>
+              <el-col :span="20" class="info">
+                {{ detailInfo.achievebrief || '暂无' }}
+              </el-col>
+            </el-col>
+            <el-col :span="24" class="downInfo">
+              <el-col :span="4" class="tit">
+                <h2>技术特点</h2>
+              </el-col>
+              <el-col :span="20" class="info">
+                {{ detailInfo.features || '暂无' }}
+              </el-col>
+            </el-col>
+            <el-col :span="24" class="downInfo">
+              <el-col :span="4" class="tit">
+                <h2>技术团队</h2>
+              </el-col>
+              <el-col :span="20" class="info">
+                {{ detailInfo.team || '暂无' }}
+              </el-col>
+            </el-col>
+            <el-col :span="24" class="downInfo">
+              <el-col :span="4" class="tit">
+                <h2>商业预期</h2>
+              </el-col>
+              <el-col :span="20" class="info">
+                {{ detailInfo.expectations || '暂无' }}
+              </el-col>
+            </el-col>
+            <el-col :span="24" class="downInfo">
+              <el-col :span="4" class="tit">
+                <h2>合作要求</h2>
+              </el-col>
+              <el-col :span="20" class="info">
+                {{ detailInfo.condition || '暂无' }}
+              </el-col>
+            </el-col>
+          </el-col>
+          <!-- <el-col :span="24" class="anniu" v-if="displayBtn">
+              <el-button type="primary" size="mini" v-if="this.user.uid != detailInfo.userid" @click="btnPhone()">交流洽谈</el-button>
+              <el-button type="success" size="mini" v-if="this.user.uid != detailInfo.userid" @click="onSubmit()">供求对接</el-button>
+            </el-col> -->
+        </el-col>
+        <el-col :span="24" class="main1" v-else-if="totaltype === '2'">
+          <el-col :span="24" class="top">
+            <el-col :span="24" class="name">
+              {{ detailInfo.name || '暂无' }}
+            </el-col>
+            <el-col :span="12">
+              <el-col :span="6" class="otherInfo textOver">
+                信息属性
+              </el-col>
+              <el-col :span="18" class="otherInfo textOver">
+                {{ detailInfo.messattribute || '暂无' }}
+              </el-col>
+            </el-col>
+            <el-col :span="12">
+              <el-col :span="6" class="otherInfo textOver">
+                需求程度
+              </el-col>
+              <el-col :span="18" class="otherInfo textOver">
+                {{ detailInfo.demand || '暂无' }}
+              </el-col>
+            </el-col>
+            <el-col :span="12">
+              <el-col :span="6" class="otherInfo textOver">
+                联系人
+              </el-col>
+              <el-col :span="18" class="otherInfo textOver">
+                {{ detailInfo.contacts || '暂无' }}
+              </el-col>
+            </el-col>
+            <el-col :span="12">
+              <el-col :span="6" class="otherInfo textOver">
+                发布时间
+              </el-col>
+              <el-col :span="18" class="otherInfo textOver">
+                {{ detailInfo.meta | getDate }}
+              </el-col>
+            </el-col>
+            <el-col :span="12">
+              <el-col :span="6" class="otherInfo textOver">
+                QQ/微信
+              </el-col>
+              <el-col :span="18" class="otherInfo textOver">
+                {{ detailInfo.qqwx || '暂无' }}
+              </el-col>
+            </el-col>
+            <el-col :span="12">
+              <el-col :span="6" class="otherInfo textOver">
+                电子邮箱
+              </el-col>
+              <el-col :span="18" class="otherInfo textOver">
+                {{ detailInfo.email || '暂无' }}
+              </el-col>
+            </el-col>
+          </el-col>
+          <el-col :span="24" class="down">
+            <el-col :span="24" class="downInfo">
+              <el-col :span="4" class="tit">
+                <h2>信息描述</h2>
+              </el-col>
+              <el-col :span="20" class="info">
+                {{ detailInfo.informationdesc || '暂无' }}
+              </el-col>
+            </el-col>
+            <el-col :span="24" class="downInfo">
+              <el-col :span="4" class="tit">
+                <h2>核心要素</h2>
+              </el-col>
+              <el-col :span="20" class="info">
+                {{ detailInfo.coreelements || '暂无' }}
+              </el-col>
+            </el-col>
+            <el-col :span="24" class="downInfo">
+              <el-col :span="4" class="tit">
+                <h2>价格信息</h2>
+              </el-col>
+              <el-col :span="20" class="info">
+                {{ detailInfo.priceinfo || '暂无' }}
+              </el-col>
+            </el-col>
+            <el-col :span="24" class="downInfo">
+              <el-col :span="4" class="tit">
+                <h2>商务预期</h2>
+              </el-col>
+              <el-col :span="20" class="info">
+                {{ detailInfo.businessexpect || '暂无' }}
+              </el-col>
+            </el-col>
+          </el-col>
+          <!-- <el-col :span="24" class="anniu" v-if="displayBtn">
+              <el-button type="primary" size="mini" v-if="this.user.uid != detailInfo.userid" @click="btnPhone()">交流洽谈</el-button>
+              <el-button type="success" size="mini" v-if="this.user.uid != detailInfo.userid" @click="onSubmit()">供求对接</el-button>
+            </el-col> -->
+        </el-col>
       </el-col>
     </el-row>
   </div>
 </template>
 
 <script>
+import _ from 'lodash';
 export default {
   name: 'policyrightcont',
-  props: { detailInfo: { type: Object, required: true, default: () => {} } },
+  props: { detailInfo: { type: Object, required: true, default: () => {} }, totaltype: { type: String } },
   components: {},
   data: () => ({}),
   created() {},
@@ -158,68 +413,174 @@ export default {
       history.back(-1);
     },
   },
+  filters: {
+    getDate(meta) {
+      let createdAt = _.get(meta, `createdAt`);
+      let date = new Date(createdAt)
+        .toLocaleDateString()
+        .replace('/', '-')
+        .replace('/', '-');
+      return date;
+    },
+  },
 };
 </script>
 
 <style lang="less" scoped>
-.top {
-  height: 60px;
-  line-height: 60px;
-  border-bottom: 1px solid #215299;
-  .txt {
-    span {
-      display: inline-block;
-      padding: 0 30px;
-      background-color: #215299;
-      color: #fff;
+.info {
+  .top {
+    height: 60px;
+    // line-height: 60px;
+    border-bottom: 1px solid #215299;
+    .txt {
+      span {
+        display: inline-block;
+        padding: 0 30px;
+        background-color: #215299;
+        color: #fff;
+      }
+    }
+    .btn {
+      text-align: right;
+      padding: 0 10px;
     }
   }
-  .btn {
-    text-align: right;
-    padding: 0 10px;
+  .infoMiddle {
+    padding: 10px 15px;
+    .infotop {
+      height: 360px;
+      overflow: hidden;
+      .right {
+        padding: 0 0 0 10px;
+        .name {
+          font-size: 18px;
+          font-weight: bold;
+          padding: 10px;
+          border: 1px solid #ccc;
+        }
+        .otherInfo {
+          padding: 10px;
+          font-size: 16px;
+          border: 1px solid #ccc;
+        }
+      }
+    }
+    .down {
+      margin: 0 0 15px 0;
+      .downInfo {
+        border: 1px solid #ccc;
+        .tit {
+          // height: 150px;
+          line-height: 150px;
+          text-align: center;
+          border-right: 1px solid #ccc;
+        }
+        .info {
+          font-size: 16px;
+          padding: 10px;
+          min-height: 150px;
+        }
+      }
+    }
+    .anniu {
+      text-align: center;
+      /deep/.el-button {
+        margin: 0 10px;
+      }
+    }
   }
-}
-.infoMiddle {
-  padding: 10px 15px;
-  .infotop {
-    height: 360px;
-    overflow: hidden;
-    .right {
-      padding: 0 0 0 10px;
+  .main {
+    margin: 10px 0 0 0;
+    .top {
+      height: 360px;
+      overflow: hidden;
+      .right {
+        padding: 0 0 0 10px;
+        .name {
+          font-size: 18px;
+          font-weight: bold;
+          padding: 10px;
+          border: 1px solid #ccc;
+        }
+        .otherInfo {
+          padding: 10px;
+          font-size: 16px;
+          border: 1px solid #ccc;
+        }
+      }
+    }
+    .down {
+      margin: 0 0 15px 0;
+      .downInfo {
+        border: 1px solid #ccc;
+        .tit {
+          height: 150px;
+          line-height: 150px;
+          text-align: center;
+          border-right: 1px solid #ccc;
+        }
+        .info {
+          font-size: 16px;
+          padding: 10px;
+          min-height: 150px;
+        }
+      }
+    }
+    .anniu {
+      text-align: center;
+      /deep/.el-button {
+        margin: 0 10px;
+      }
+    }
+  }
+  .main1 {
+    margin: 10px 0 0 0;
+    .top {
+      height: 160px;
+      overflow: hidden;
+      margin: 0 0 15px 0;
       .name {
         font-size: 18px;
         font-weight: bold;
         padding: 10px;
+        height: 40px;
         border: 1px solid #ccc;
       }
       .otherInfo {
-        padding: 10px;
         font-size: 16px;
+        padding: 5px 10px;
+        height: 40px;
         border: 1px solid #ccc;
+
+        //  .otherInfo {
+        //   padding: 10px;
+        //   font-size: 16px;
+        //   border: 1px solid #ccc;
+        // }
       }
     }
-  }
-  .down {
-    margin: 0 0 15px 0;
-    .downInfo {
-      border: 1px solid #ccc;
-      .tit {
-        // height: 150px;
-        line-height: 150px;
-        text-align: center;
-        border-right: 1px solid #ccc;
-      }
-      .info {
-        font-size: 16px;
-        padding: 10px;
-        min-height: 150px;
+    .down {
+      margin: 0 0 15px 0;
+      .downInfo {
+        border: 1px solid #ccc;
+        .tit {
+          height: 150px;
+          line-height: 150px;
+          text-align: center;
+          border-right: 1px solid #ccc;
+        }
+        .info {
+          font-size: 16px;
+          padding: 10px;
+          min-height: 150px;
+        }
       }
     }
-  }
-  .anniu {
-    text-align: center;
-    /deep/.el-button {
-      margin: 0 10px;
+    .anniu {
+      text-align: center;
+      /deep/.el-button {
+        margin: 0 10px;
+      }
     }
   }
 }

+ 4 - 3
src/views/supermaket/supermarketdetail.vue

@@ -9,6 +9,7 @@
       @fetch="fetchInfo"
       :display="display"
       :policyInfo="policyInfo"
+      :totaltype="totaltype1"
       @onSubmit="onSubmit"
     ></supermarketlist-detail>
   </div>
@@ -37,11 +38,12 @@ export default {
     contentList: [],
     total: 1,
     skip: '',
+    totaltype1: '',
   }),
   async created() {
     this.searchSite();
-
     this.searchinfos();
+    this.$set(this, `totaltype1`, this.totaltype);
   },
   computed: {
     id() {
@@ -69,8 +71,7 @@ export default {
     },
     fetchInfo() {},
     async searchinfos() {
-      console.log(this.id);
-
+      // console.log(this.totaltype);
       this.display = 'detail';
       const res = await this.fetch(this.id);
       this.$set(this, `policyInfo`, res.data);