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

src/layout/enterprise/heads.vue

@@ -12,6 +12,7 @@
           <p>
             <span v-if="user && user.name"
               >{{ user.name }}
+
               <button type="button" class="logininfo" @click="zhuxiao">注销</button>
             </span>
           </p>
@@ -33,7 +34,6 @@
     </div>
   </div>
 </template>
-
 <script>
 import { mapState, createNamespacedHelpers } from 'vuex';
 const { mapActions: login } = createNamespacedHelpers('login');
@@ -59,7 +59,7 @@ export default {
       this.toLogin();
     },
     async toLogin() {
-      this.$router.push({ path: '/' });
+      this.$router.push({ path: '/platlive' });
     },
   },
   computed: {

src/views/detail/semDetail.vue

@@ -14,6 +14,33 @@
               <el-col :span="21" class="right"> [专题] {{ detail.title }} </el-col>
             </el-col>
             <el-col :span="24" class="twoInfo">
+              <el-col class="list">
+                <el-col :span="3" class="left">
+                  <el-col :span="24" class="leftTop">
+                    会员名称
+                  </el-col>
+                  <el-col :span="24" class="leftDown">
+                    <el-image :src="squareImage"></el-image>
+                    <el-col :span="24" class="jobname">
+                      {{ print.name }}
+                    </el-col>
+                  </el-col>
+                </el-col>
+                <el-col :span="21" class="right">
+                  <el-col :span="24" class="date">
+                    <i class="el-icon-user icon"></i>
+                    <span>发表于{{ print.date }}</span>
+                    <span>1楼</span>
+                  </el-col>
+                  <el-col :span="24" class="info">
+                    <p>{{ print.content }}</p>
+                  </el-col>
+                  <el-col :span="24" class="jubao">
+                    <span>举报</span>
+                  </el-col>
+                </el-col>
+              </el-col>
+
               <el-col class="list" v-for="(item, index) in list" :key="index">
                 <el-col :span="3" class="left">
                   <el-col :span="24" class="leftTop">
@@ -30,7 +57,7 @@
                   <el-col :span="24" class="date">
                     <i class="el-icon-user icon"></i>
                     <span>发表于{{ item.date }}</span>
-                    <span>{{ index + 1 }}楼</span>
+                    <span>{{ index + 2 }}楼</span>
                   </el-col>
                   <el-col :span="24" class="info">
                     <p>{{ item.content }}</p>
@@ -92,6 +119,7 @@ export default {
         content: '测试内容',
       },
     ],
+    print: { name: '管理员', date: '2020-05-02', content: '测试内容' },
     total: 0,
     inputInfo: '',
   }),