wuhongyu 5 лет назад
Родитель
Сommit
0d34baab39
4 измененных файлов с 94 добавлено и 12 удалено
  1. BIN
      src/assets/live/circle.png
  2. 84 7
      src/views/detail/semDetail.vue
  3. 2 2
      src/views/login.vue
  4. 8 3
      src/views/service/index.vue

BIN
src/assets/live/circle.png


+ 84 - 7
src/views/detail/semDetail.vue

@@ -17,10 +17,26 @@
           </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 :span="24" v-for="(item, index) in fabiaolist" :key="index" class="list">
+                  <el-col :span="4" class="lefts">
+                    <el-image :src="squareImage" style="width:65%;height: 128px;"></el-image>
+                    <p>
+                      <span>{{ item.name }}</span>
+                    </p></el-col
+                  ><el-col :span="19" class="under">
+                    <p>{{ item.context }}</p>
+                    <p>
+                      <span class="date">{{ item.ceng }}&nbsp;&nbsp;{{ item.date }}&nbsp;&nbsp;{{ item.time }}</span>
+                    </p></el-col
+                  >
+                  <el-col></el-col
+                ></el-col>
+              </el-col>
             </el-col>
             <el-col :span="24" class="input">
-              <wang-editor v-model="inputInfo" ref="editor"></wang-editor>
+              <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>
@@ -43,7 +59,21 @@ export default {
   data: () => ({
     detailinfo: {},
     pic: require('@/assets/live/1.jpg'),
+    squareImage: require('@/assets/live/circle.png'),
     inputInfo: '',
+    fabiaolist: [
+      { name: '测试1', context: 'ddasdadssssssssssssssssssssssssssssssssssssssssssssssssad', ceng: '1楼', time: '23:11', date: '2020-03-05' },
+      { name: '测试1', context: 'dasdsadasd', ceng: '2楼', time: '23:11', date: '2020-03-05' },
+      { name: '测试1', context: 'dasdsadasd', ceng: '2楼', time: '23:11', date: '2020-03-05' },
+      { name: '测试1', context: 'dasdsadasd', ceng: '2楼', time: '23:11', date: '2020-03-05' },
+
+      { name: '测试1', context: 'dasdsadasd', ceng: '2楼', time: '23:11', date: '2020-03-05' },
+      { name: '测试1', context: 'dasdsadasd', ceng: '2楼', time: '23:11', date: '2020-03-05' },
+      { name: '测试1', context: 'dasdsadasd', ceng: '2楼', time: '23:11', date: '2020-03-05' },
+      { name: '测试1', context: 'dasdsadasd', ceng: '2楼', time: '23:11', date: '2020-03-05' },
+      { name: '测试1', context: 'dasdsadasd', ceng: '2楼', time: '23:11', date: '2020-03-05' },
+      { name: '测试1', context: 'dasdsadasd', ceng: '2楼', time: '23:11', date: '2020-03-05' },
+    ],
   }),
   created() {
     this.search();
@@ -83,13 +113,14 @@ export default {
   width: 100%;
   height: 400px;
   overflow: hidden;
-  border-bottom: 1px solid #ccc;
 }
 .messInfo .left p {
   float: left;
   width: 100%;
   font-size: 18px;
   padding: 5px 0 10px 0;
+  color: gold;
+  letter-spacing: 0;
 }
 .messInfo .left p:nth-child(2) {
   font-weight: bold;
@@ -105,6 +136,9 @@ export default {
   display: -webkit-box;
   -webkit-box-orient: vertical;
   padding: 0 30px;
+  border-bottom: 1px solid red;
+  border-right: 1px solid red;
+  height: 380px;
 }
 .semDetail .chatInfo {
   float: left;
@@ -113,17 +147,60 @@ export default {
 }
 .chatInfo .message {
   float: left;
-  border: 1px solid red;
-  height: 400px;
-  overflow: hidden;
+
+  min-height: 400px;
   margin: 0 0 30px 0;
 }
+.list {
+  border-bottom: 1px solid #fff;
+  border-left: 1px solid #fff;
+  min-height: 200px;
+  background-color: #e5e5e5;
+  /* width: 99.9%; */
+  padding: 15px 0 0 0;
+
+  margin: 1px 0 0 1px;
+}
+.lefts {
+  padding: 20px 0 0 20px;
+}
+.lefts p {
+  text-align: center;
+  width: 70%;
+}
+
+.under {
+  padding: 20px 0 20px 20px;
+  width: 80%;
+  background-color: #fff;
+  min-height: 160px;
+}
+.date {
+  text-align: center;
+  position: relative;
+  width: 100%;
+  font-size: 18px;
+  top: 80px;
+  left: 1050px;
+}
 .chatInfo .input {
   float: left;
-  height: 290px;
+  // height: 290px;
+  height: 340px;
+
   overflow: hidden;
   text-align: center;
   padding: 0 10%;
+  background-color: #e5e5e5;
+}
+.huifu {
+  background-color: #ffffff;
+}
+.title {
+  text-align: left;
+  padding: 5px 0 10px 0;
+  background-color: #e5e5e5;
+  color: #ff7f42;
 }
 .chatInfo .input .el-button {
   margin: 20px 0 0 0;

+ 2 - 2
src/views/login.vue

@@ -28,9 +28,9 @@ export default {
     async submitLogin(form) {
       let res = await this.toLogin({ user: form });
       if (res.uid) {
-        if (res.role == '2' || res.role == '3') this.$router.push('/market/index');
+        if (res.role == '2' || res.role == '3') this.$router.push('/enterprise/enterprisejb');
         else if (res.role == '5') this.$router.push('/hallList/index');
-        else this.$router.push('/enterprise/enterprisejb');
+        else this.$router.push('/market/index');
       }
     },
     async submitRegister(forms) {

+ 8 - 3
src/views/service/index.vue

@@ -46,7 +46,7 @@
 </template>
 
 <script>
-import { mapState, createNamespacedHelpers } from 'vuex';
+import { createNamespacedHelpers, mapGetters, mapState } from 'vuex';
 export default {
   name: 'index',
   props: {},
@@ -145,8 +145,13 @@ export default {
       if (item.title == '智慧推荐') {
       } else if (item.title == '展会预约') {
         console.log('d');
-
-        this.$router.push({ path: '/exhibition/appointment' });
+        if (this.user.role == 2 || this.user.role == 3) {
+          this.$router.push({ path: '/enterprise/appointment' });
+        } else if (this.user == undefined) {
+          this.$router.push({ path: '/login' });
+        } else {
+          this.$router.push({ path: '/login' });
+        }
       } else if (item.title == '科技评估') {
       } else if (item.title == '合同在线') {
       } else if (item.title == '信誉认证') {