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

src/layout/live/head.vue

@@ -12,7 +12,7 @@
           <p class="username">
             <span v-if="user.uid">
               {{ user.name }}
-              <button type="text" style="color:#999999;font-weight: bold;" @click="stnmae" v-if="user.role == '2' || user.role == '3'">
+              <button type="text" class="userCenter" @click="stnmae" v-if="user.role == '2' || user.role == '3'">
                 个人中心
               </button>
               <button type="button" class="logininfo" @click="zhuxiao">注销</button>
@@ -130,4 +130,16 @@ export default {
 /deep/ button {
   cursor: pointer;
 }
+.userCenter {
+  font-size: 16px;
+  color: #fff;
+  padding: 3px 10px;
+  border-radius: 5px;
+  font-weight: bold;
+  border: 2px solid transparent;
+}
+.userCenter:hover {
+  color: #fe950e;
+  // border-color: #fe950e;
+}
 </style>

src/views/detail/semDetail copy.vue

@@ -1,153 +0,0 @@
-<template>
-  <div id="semDetail">
-    <el-row>
-      <div class="w_1200">
-        <el-col :span="24" class="semDetail">
-          <el-col :soan="24"> <el-image :src="gongqiuImage" class="gongqiuImage" style="width:100%;height:160px;"></el-image></el-col>
-          <el-col :span="24" class="title"
-            ><span>浏览次数:{{ plany.cishu }}</span
-            ><span>{{ plany.title }}</span></el-col
-          >
-          <el-col :span="24" v-for="(item, index) in fabiaolist" :key="index" class="list">
-            <el-col :span="4" class="lefts">
-              <el-col :span="24" class="name">会员名称</el-col>
-              <el-image :src="squareImage" style="width:65%;height: 128px;padding:5px 0 0 0;"></el-image>
-              <p>
-                <span>{{ item.name }}</span>
-              </p>
-            </el-col>
-            <el-col :span="19" class="under">
-              <el-col :span="24" class="underspan"
-                ><span style="color:green"><i class="el-icon-user-solid"></i></span><span>{{ item.ceng }}&nbsp;&nbsp;{{ item.date }}</span></el-col
-              >
-              <p>{{ item.context }}</p>
-            </el-col>
-          </el-col>
-          <el-col :span="24" class="chatInfo">
-            <el-col :span="24" class="message">
-              <el-col :span="24" class="info chat_frame" id="chat"> </el-col>
-            </el-col>
-            <el-col :span="24" class="input">
-              <el-col :span="24" class="title"><i class="el-icon-edit"></i> 发布评论 </el-col>
-              <wang-editor v-model="inputInfo" ref="editor" class="huifu"></wang-editor>
-              <el-button type="primary">发布评论</el-button>
-            </el-col>
-          </el-col>
-        </el-col>
-      </div>
-    </el-row>
-  </div>
-</template>
-
-<script>
-import wangEditor from '@/components/wang-editor.vue';
-import { mapState, createNamespacedHelpers } from 'vuex';
-const { mapActions: news } = createNamespacedHelpers('news');
-export default {
-  name: 'semDetail',
-  props: {},
-  components: {
-    wangEditor,
-  },
-  data: () => ({
-    plany: { cishu: '100', title: '2020年度中德医疗项目顺利进行' },
-
-    detailinfo: {},
-    gongqiuImage: require('@/assets/live/111.png'),
-    squareImage: require('@/assets/live/222.png'),
-    inputInfo: '',
-    fabiaolist: [{ name: '测试1', context: '测试内容', ceng: '1楼', date: '2020-03-05' }],
-  }),
-  created() {
-    this.search();
-  },
-  computed: {
-    id() {
-      return this.$route.query.id;
-    },
-    ...mapState(['user']),
-    pageTitle() {
-      return `${this.$route.meta.title}`;
-    },
-  },
-  methods: {
-    ...news(['fetch']),
-    async search() {
-      const res = await this.fetch(this.id);
-      this.$set(this, `detailinfo`, res.data);
-    },
-  },
-};
-</script>
-
-<style lang="less" scoped>
-.w_1200 {
-  width: 80%;
-  margin: 0 auto;
-}
-.semDetail {
-  float: left;
-  width: 100%;
-  min-height: 600px;
-  margin: 30px 0;
-}
-.semDetail .title {
-  height: 60px;
-  border-bottom: 10px solid #5096d2;
-}
-.semDetail .title span:first-child {
-  background-color: #a5d2f5;
-  height: 50px;
-  display: inline-block;
-  color: #5096d2;
-  line-height: 50px;
-  padding: 0 0 0 30px;
-  width: 14%;
-  border-bottom: 10px solid #5096d2;
-}
-.semDetail .title span:nth-child(2) {
-  height: 40px;
-  display: inline-block;
-  line-height: 40px;
-  text-align: center;
-  width: 80%;
-  font-size: 20px;
-  font-weight: bold;
-  letter-spacing: 8px;
-}
-
-.semDetail .list .lefts {
-  background-color: #a5d2f5;
-  height: 220px;
-  text-align: center;
-  overflow: hidden;
-}
-.semDetail .list .lefts .name {
-  padding: 20px 0 5px 0;
-  color: #fff;
-  font-weight: bold;
-  font-size: 18px;
-  border-bottom: 1px dashed #fff;
-}
-.semDetail .list .lefts span {
-  padding: 5px 0 5px 0;
-  color: #fff;
-  font-size: 18px;
-  font-weight: bold;
-}
-
-.under .underspan {
-  font-size: 16px;
-  margin: 0 20px 0 20px;
-  border-bottom: 1px dashed red;
-  margin: 0 0 10px 0;
-}
-.under p {
-  height: 170px;
-  margin: 30px 10px 20px 10px !important;
-  border: 1px dashed #000000;
-}
-.chatInfo .input .el-button {
-  margin: 20px 0 0 0;
-}
-</style>

src/views/dynamic/dealDetail.vue

@@ -16,7 +16,30 @@
                 <p><span></span></p>
               </el-col>
               <el-col :span="22" class="infoMess">
-                中間
+                <el-col :span="6" class="infoMessStep">
+                  <el-steps direction="vertical" :active="dealDetails.status">
+                    <el-step title="正在洽谈"></el-step>
+                    <el-step title="达成意向"></el-step>
+                    <el-step title="交易成功"></el-step>
+                  </el-steps>
+                </el-col>
+                <el-col :span="18" class="infoMessInfo">
+                  <el-image :src="infoUrl"></el-image>
+                  <el-col :span="24" class="message">
+                    <el-col :span="12" class="content">
+                      <p>项目名称</p>
+                      <p>产品名称：{{ dealDetails.product_name }}</p>
+                      <p>发布时间：{{ dealDetails.meta | getDate }}</p>
+                      <p>产品说明：{{ dealDetails.description }}</p>
+                    </el-col>
+                    <el-col :span="12" class="image">
+                      <el-col :span="24" class="user"> 购买人:{{ dealDetails.username }} </el-col>
+                      <el-col :span="24" class="images" v-if="dealDetails.pic">
+                        <el-image style="width:100%;height:400px;" :src="dealDetails.pic"></el-image>
+                      </el-col>
+                    </el-col>
+                  </el-col>
+                </el-col>
               </el-col>
               <el-col :span="1" class="infoDown">
                 <p><span></span></p>
@@ -121,13 +144,15 @@ export default {
   height: 120px;
   text-align: center;
   padding: 0 12px;
+  color: #003e70;
+  font-weight: bold;
 }
 .main .two .info .infoTop p:last-child {
   text-align: center;
 }
 .main .two .info .infoTop p:last-child span {
   display: inline-block;
-  background: red;
+  background: #003e70;
   width: 1px;
   height: 580px;
 }
@@ -142,7 +167,7 @@ export default {
 }
 .main .two .info .infoDown p:first-child span {
   display: inline-block;
-  background: red;
+  background: #003e70;
   width: 1px;
   height: 580px;
 }
@@ -151,10 +176,94 @@ export default {
   height: 120px;
   text-align: center;
   padding: 0 12px;
+  color: #003e70;
+  font-weight: bold;
 }
 // 中间内容
 .main .two .info .infoMess {
   height: 700px;
   overflow: hidden;
 }
+.main .two .info .infoMess .infoMessStep {
+  padding: 130px 39px;
+  height: 700px;
+}
+.main .two .info .infoMess .infoMessInfo {
+  height: 700px;
+  padding: 35px 0;
+  position: relative;
+}
+.main .two .info .infoMess .infoMessInfo .el-image {
+  width: auto;
+  height: auto;
+  max-width: 100%;
+  max-height: 100%;
+}
+.main .two .info .infoMess .infoMessInfo .message {
+  position: absolute;
+  top: 13%;
+  left: 13%;
+  height: 490px;
+  overflow: hidden;
+  width: 73%;
+}
+.main .two .info .infoMess .infoMessInfo .message .content {
+  height: 490px;
+  overflow: hidden;
+  p:first-child {
+    float: left;
+    width: 100%;
+    font-size: 20px;
+    text-align: center;
+    padding: 20px 0;
+  }
+  p:nth-child(2) {
+    float: left;
+    width: 100%;
+    font-size: 20px;
+    text-align: left;
+    padding: 0 0 15px 0;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+  p:nth-child(3) {
+    float: left;
+    width: 100%;
+    font-size: 20px;
+    text-align: left;
+    padding: 0 0 15px 0;
+  }
+  p:nth-child(4) {
+    float: left;
+    width: 100%;
+    font-size: 20px;
+    text-align: left;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    -webkit-line-clamp: 12;
+    word-break: break-all;
+    display: -webkit-box;
+    -webkit-box-orient: vertical;
+    line-height: 27px;
+  }
+}
+.main .two .info .infoMess .infoMessInfo .message .image {
+  height: 490px;
+  overflow: hidden;
+  .user {
+    font-size: 20px;
+    text-align: center;
+    padding: 20px 0;
+  }
+}
+/deep/.el-step__title {
+  font-size: 30px;
+}
+/deep/.el-step__title.is-process {
+  color: #c3c3c3;
+}
+/deep/.el-step__title.is-finish {
+  color: #1c81bf;
+}
 </style>