Explorar el Código

Merge branch 'master' of http://git.cc-lotus.info/service-platform/mobile-official into master

wxy hace 4 años
padre
commit
455ffc4ee0
Se han modificado 1 ficheros con 5 adiciones y 7 borrados
  1. 5 7
      src/views/live/parts/liveList.vue

+ 5 - 7
src/views/live/parts/liveList.vue

@@ -3,7 +3,7 @@
     <el-row>
       <el-col :span="24" class="info">
         <el-col class="list" v-for="(item, index) in list" :key="index">
-          <el-col :span="18" class="left">
+          <el-col :span="24" class="left">
             <p class="textOver">{{ item.title }}</p>
             <p>
               举办城市:<span>{{ getprovince(item.province) }}-{{ getplace(item.place) }}</span>
@@ -12,12 +12,10 @@
               直播时间:<span>{{ item.start_time }}</span>
             </p>
           </el-col>
-          <el-col :span="6" class="right">
-            <p @click="$router.push({ path: '/live/roomDetail', query: { id: item.id, roomname: item.roomname } })" v-if="item.roomname && item.status != '2'">
-              进入房间
-            </p>
-            <p @click="$router.push({ path: '/live/detail', query: { id: item.id } })" v-else-if="item.roomname == undefined && item.status != '2'">进入房间</p>
-            <p @click="$router.push({ path: '/onlive/roomInfo', query: { roomname: item.roomname } })" v-if="item.roomname">房间详情</p>
+          <el-col :span="24" style="text-align:center">
+            <el-button type="primary" size="mini" @click="$router.push({ path: '/live/detail', query: { id: item.id } })" v-if="item.status == '1'"
+              >进入房间</el-button
+            >
           </el-col>
         </el-col>
       </el-col>