guhongwei 4 years ago
parent
commit
126b3b6ed3

+ 1 - 1
src/layout/adminCenter/menuInfo.vue

@@ -119,7 +119,7 @@ export default {
           type: 'success',
         });
         this.$router.push({ path: '/webLogin' });
-      } else if (key == '10') {
+      } else if (key == '9') {
         let res = await this.fetch(this.user.uid);
         this.$router.push({ path: '/hall/direct', query: { id: res.data.id, title: res.data.title } });
       } else {

+ 1 - 0
src/views/adminCenter/xmly/index.vue

@@ -113,6 +113,7 @@ export default {
     ...newsroadshow(['query', 'create', 'update', 'delete']),
     async search({ skip = 0, limit = 10, ...info } = {}) {
       let res = await this.fetch(this.user.uid);
+      console.log(res);
       this.$set(this, `dock_id`, res.data.id);
       let arr = await this.query({ skip, limit, dock_id: this.dock_id, ...info });
       this.$set(this, `list`, arr.data);

+ 8 - 3
src/views/hallList/parts/productlist.vue

@@ -7,8 +7,8 @@
           <el-col :span="24" class="other">
             <p class="textOver">{{ item.title }}</p>
             <p class="textOver">
-              <span><i class="el-icon-location-outline"></i>{{ getprovince(item.province) }}-{{ getplace(item.place) }}</span>
-              <span><i class="el-icon-time"></i>{{ item.start_time }}-{{ item.end_time }}</span>
+              <span class="textOver"><i class="el-icon-location-outline"></i>{{ getprovince(item.province) }}-{{ getplace(item.place) }}</span>
+              <span class="textOver"><i class="el-icon-time"></i>{{ item.start_time }}-{{ item.end_time }}</span>
             </p>
             <p>
               <el-button type="warning" size="mini" @click="dockBtn()" v-if="user.role == '3' || user.role == '7'">管理进入</el-button>
@@ -116,8 +116,13 @@ export default {
       }
       p:nth-child(2) {
         padding: 5px;
+        span:nth-child(1) {
+          display: inline-block;
+          width: 40%;
+        }
         span:nth-child(2) {
-          float: right;
+          display: inline-block;
+          width: 60%;
         }
       }
       p:nth-child(3) {