guhongwei 4 years ago
parent
commit
e9b8ff8560
2 changed files with 123 additions and 117 deletions
  1. 0 2
      src/views/index.vue
  2. 123 115
      src/views/live/roomDetail.vue

+ 0 - 2
src/views/index.vue

@@ -214,8 +214,6 @@ export default {
       }
       .text {
         padding: 0 5px;
-        p:first-child {
-        }
         p:nth-child(2) {
           font-size: 14px;
           padding: 5px 0;

+ 123 - 115
src/views/live/roomDetail.vue

@@ -1,129 +1,135 @@
 <template>
   <div id="roomsDetail">
     <el-row>
-      <el-col :span="24" class="video" :style="{ height: oheight }"> </el-col>
-    </el-row>
-    <van-overlay :show="show" :style="{ height: oheight, width: '100%' }">
-      <div id="transformid" class="wrapper" :style="{ transform: transform, height: vheight, width: vwidth, padding: vpadding, position: 'absolute' }">
-        <van-col id="look-video-left" :span="stremlist.length == 2 ? 16 : 0" :style="{ height: oheight }"> </van-col>
-        <van-col id="look-video-right" :style="{ height: oheight }" :span="stremlist.length == 1 ? 24 : 8"> </van-col>
-      </div>
-      <div id="othediv" v-show="othedivshow" :style="{ transform: transform, height: otheheight, width: vwidth, padding: othepadding, position: 'absolute' }">
-        <div id="otheplaydiv" :style="{ height: otheheight, width: vwidth, background: background_ }">
-          <div id="othe-video-1" :style="{ height: otheheight, width: othewidth }" class="video-box col-div othe-video-left"></div>
-          <div id="othe-video-2" :style="{ height: otheheight, width: othewidth }" class="video-box col-div othe-video-left"></div>
-          <div id="othe-video-3" :style="{ height: otheheight, width: othewidth }" class="video-box col-div othe-video-left"></div>
-          <div id="othe-video-4" :style="{ height: otheheight, width: othewidth }" class="video-box col-div othe-video-left"></div>
-          <div id="othe-video-5" :style="{ height: otheheight, width: othewidth }" class="video-box col-div othe-video-left"></div>
+      <el-col :span="24">
+        <el-col :span="24" class="video" :style="{ height: oheight }"> </el-col>
+      </el-col>
+      <van-overlay :show="show" :style="{ height: oheight, width: '100%' }">
+        <div id="transformid" class="wrapper" :style="{ transform: transform, height: vheight, width: vwidth, padding: vpadding, position: 'absolute' }">
+          <van-col id="look-video-left" :span="stremlist.length == 2 ? 16 : 0" :style="{ height: oheight }"> </van-col>
+          <van-col id="look-video-right" :style="{ height: oheight }" :span="stremlist.length == 1 ? 24 : 8"> </van-col>
         </div>
-      </div>
-      <div class="videoBtn" id="videobtnid" :style="{ top: btop, right: bright, transform: transform }">
-        <el-button type="warning" round @click="full()" size="mini"><i class="el-icon-rank"></i></el-button>
-      </div>
-    </van-overlay>
-    <el-row class="chatrow">
-      <el-col :span="24" class="info">
-        <el-col :span="12" class="num">
-          <span>观看:{{ total }}</span>
-        </el-col>
-        <el-col :span="12" class="meetBtn">
-          <el-button v-show="switchbtn" type="warning" round size="small" @click="roomMeetBtn()">小程序<i class="el-icon-camera el-icon--right"></i></el-button>
+        <div id="othediv" v-show="othedivshow" :style="{ transform: transform, height: otheheight, width: vwidth, padding: othepadding, position: 'absolute' }">
+          <div id="otheplaydiv" :style="{ height: otheheight, width: vwidth, background: background_ }">
+            <div id="othe-video-1" :style="{ height: otheheight, width: othewidth }" class="video-box col-div othe-video-left"></div>
+            <div id="othe-video-2" :style="{ height: otheheight, width: othewidth }" class="video-box col-div othe-video-left"></div>
+            <div id="othe-video-3" :style="{ height: otheheight, width: othewidth }" class="video-box col-div othe-video-left"></div>
+            <div id="othe-video-4" :style="{ height: otheheight, width: othewidth }" class="video-box col-div othe-video-left"></div>
+            <div id="othe-video-5" :style="{ height: otheheight, width: othewidth }" class="video-box col-div othe-video-left"></div>
+          </div>
+        </div>
+      </van-overlay>
+      <el-row class="chatrow">
+        <el-col :span="24" class="info">
+          <el-col :span="12" class="num">
+            <span>观看:{{ total }}</span>
+          </el-col>
+          <el-col :span="12" class="meetBtn">
+            <el-button v-show="switchbtn" type="warning" round size="small" @click="roomMeetBtn()"
+              >小程序<i class="el-icon-camera el-icon--right"></i
+            ></el-button>
+          </el-col>
         </el-col>
-      </el-col>
-    </el-row>
-    <van-tabs type="card" @click="tabsClick">
-      <van-tab title="会议简介">
-        <van-col :span="24">
-          <van-col class="content">{{ roomInfos.content }}</van-col>
-        </van-col>
-        <van-col :span="24">
-          <van-swipe :autoplay="3000">
-            <van-swipe-item v-for="(advert, index) in roomInfos.adverts" :key="index">
-              <img width="100%" height="100px" v-lazy="advert.imgdir" @click="imgclick(advert.imgurl)" />
-            </van-swipe-item>
-          </van-swipe>
-        </van-col>
-      </van-tab>
-      <van-tab title="互动留言">
-        <el-row>
-          <el-col :span="24" class="info">
-            <el-col :span="24" class="chat">
-              <el-col :span="24" class="chatInfo" id="chatSell">
-                <el-col :span="24" class="list" v-for="(item, index) in dataList" :key="index">
-                  <p>
-                    <span :class="item.sendname == user.name ? 'selfColor' : ''">{{ item.sendname }}:</span>
-                    <span>{{ item.content }}</span>
-                  </p>
+      </el-row>
+      <van-tabs type="card" @click="tabsClick">
+        <van-tab title="会议简介">
+          <van-col :span="24">
+            <van-col class="content">{{ roomInfos.content }}</van-col>
+          </van-col>
+          <van-col :span="24">
+            <van-swipe :autoplay="3000">
+              <van-swipe-item v-for="(advert, index) in roomInfos.adverts" :key="index">
+                <img width="100%" height="100px" v-lazy="advert.imgdir" @click="imgclick(advert.imgurl)" />
+              </van-swipe-item>
+            </van-swipe>
+          </van-col>
+        </van-tab>
+        <van-tab title="互动留言">
+          <el-row>
+            <el-col :span="24" class="info">
+              <el-col :span="24" class="chat">
+                <el-col :span="24" class="chatInfo" id="chatSell">
+                  <el-col :span="24" class="list" v-for="(item, index) in dataList" :key="index">
+                    <p>
+                      <span :class="item.sendname == user.name ? 'selfColor' : ''">{{ item.sendname }}:</span>
+                      <span>{{ item.content }}</span>
+                    </p>
+                  </el-col>
                 </el-col>
               </el-col>
-            </el-col>
-            <el-col :span="24" class="submit">
-              <el-col :span="19" class="input">
-                <el-input type="textarea" maxlength="5000" show-word-limit v-model="content"></el-input>
-              </el-col>
-              <el-col :span="5" class="btn">
-                <el-button type="primary" size="mini" @click="chatCreate">发送</el-button>
+              <el-col :span="24" class="submit">
+                <el-col :span="19" class="input">
+                  <el-input type="textarea" maxlength="5000" show-word-limit v-model="content"></el-input>
+                </el-col>
+                <el-col :span="5" class="btn">
+                  <el-button type="primary" size="mini" @click="chatCreate">发送</el-button>
+                </el-col>
               </el-col>
             </el-col>
-          </el-col>
-        </el-row>
-      </van-tab>
-      <van-tab title="参与成员">
-        <van-col :span="24" class="userList">
-          <van-grid :column-num="3">
-            <van-grid-item v-for="(item, index) in userList" :key="index" icon="manager" :text="item.username" />
-          </van-grid>
-        </van-col>
-      </van-tab>
-      <van-tab title="申请评分">
-        <van-col :span="24">
-          <van-field v-model="form.hosname" left-icon="wap-home-o" name="hosname" label="单位" placeholder="请填写单位名称" />
-        </van-col>
-        <van-col :span="24">
-          <van-field v-model="form.deptname" left-icon="apps-o" name="deptname" label="科室" placeholder="请填写科室名称" />
+          </el-row>
+        </van-tab>
+        <van-tab title="参与成员">
+          <van-col :span="24" class="userList">
+            <van-grid :column-num="3">
+              <van-grid-item v-for="(item, index) in userList" :key="index" icon="manager" :text="item.username" />
+            </van-grid>
+          </van-col>
+        </van-tab>
+        <van-tab title="申请评分">
+          <van-col :span="24">
+            <van-field v-model="form.hosname" left-icon="wap-home-o" name="hosname" label="单位" placeholder="请填写单位名称" />
+          </van-col>
+          <van-col :span="24">
+            <van-field v-model="form.deptname" left-icon="apps-o" name="deptname" label="科室" placeholder="请填写科室名称" />
+          </van-col>
+          <van-col :span="24">
+            <van-field v-model="form.level" left-icon="gem-o" name="level" label="职称" placeholder="请填写职称" />
+          </van-col>
+          <van-col :span="24">
+            <van-field v-model="form.major" left-icon="user-o" name="major" label="专业" placeholder="请填写专业" />
+          </van-col>
+          <van-col :span="24">
+            <van-field v-model="form.isxf" name="isxf" left-icon="star-o" label="学分" type="number" placeholder="请填写需要授予学分" />
+          </van-col>
+          <van-col :span="24" style="text-align:center">
+            <van-button icon="star-o" type="primary" @click="sqClick">
+              申请
+            </van-button>
+          </van-col>
+        </van-tab>
+      </van-tabs>
+      <van-popup v-model="showQuest" position="bottom">
+        <van-col :span="24" class="questtitle">
+          <span>{{ questInfo.name }}</span>
         </van-col>
-        <van-col :span="24">
-          <van-field v-model="form.level" left-icon="gem-o" name="level" label="职称" placeholder="请填写职称" />
+        <van-col class="questpopup" :span="24" v-for="(item, index) in questInfo.question" :key="index">
+          <p style="margin:5px 0;">
+            {{ index + 1 }}({{ item.type == '0' ? '单选' : item.type == '1' ? '多选' : item.type == '2' ? '问答' : '未识别' }})、{{ item.topic }}
+          </p>
+          <span v-if="item.type == '0'">
+            <van-radio-group v-model="item.answer">
+              <van-radio v-for="(i, ri) in item.option" :key="`${index}-${ri}`" :name="i.opname">{{ i.opname }}</van-radio>
+            </van-radio-group>
+          </span>
+          <span v-if="item.type == '1'">
+            <van-checkbox-group v-model="item.answer">
+              <van-checkbox shape="square" v-for="(i, ci) in item.option" :key="`${index}-${ci}`" :name="i.opname">{{ i.opname }}</van-checkbox>
+            </van-checkbox-group>
+          </span>
+          <span v-if="item.type == '2'">
+            <van-field v-model="item.answer" type="textarea" rows="2" autosize placeholder="请输入" maxlength="200" show-word-limit />
+          </span>
         </van-col>
-        <van-col :span="24">
-          <van-field v-model="form.major" left-icon="user-o" name="major" label="专业" placeholder="请填写专业" />
+        <van-col :span="24" class="questbtn">
+          <van-button color="linear-gradient(to right, #4bb0ff, #6149f6)" @click="submitQuest">提交</van-button>
         </van-col>
-        <van-col :span="24">
-          <van-field v-model="form.isxf" name="isxf" left-icon="star-o" label="学分" type="number" placeholder="请填写需要授予学分" />
-        </van-col>
-        <van-col :span="24" style="text-align:center">
-          <van-button icon="star-o" type="primary" @click="sqClick">
-            申请
-          </van-button>
-        </van-col>
-      </van-tab>
-    </van-tabs>
-    <van-popup v-model="showQuest" position="bottom">
-      <van-col :span="24" class="questtitle">
-        <span>{{ questInfo.name }}</span>
-      </van-col>
-      <van-col class="questpopup" :span="24" v-for="(item, index) in questInfo.question" :key="index">
-        <p style="margin:5px 0;">
-          {{ index + 1 }}({{ item.type == '0' ? '单选' : item.type == '1' ? '多选' : item.type == '2' ? '问答' : '未识别' }})、{{ item.topic }}
-        </p>
-        <span v-if="item.type == '0'">
-          <van-radio-group v-model="item.answer">
-            <van-radio v-for="(i, ri) in item.option" :key="`${index}-${ri}`" :name="i.opname">{{ i.opname }}</van-radio>
-          </van-radio-group>
-        </span>
-        <span v-if="item.type == '1'">
-          <van-checkbox-group v-model="item.answer">
-            <van-checkbox shape="square" v-for="(i, ci) in item.option" :key="`${index}-${ci}`" :name="i.opname">{{ i.opname }}</van-checkbox>
-          </van-checkbox-group>
-        </span>
-        <span v-if="item.type == '2'">
-          <van-field v-model="item.answer" type="textarea" rows="2" autosize placeholder="请输入" maxlength="200" show-word-limit />
-        </span>
-      </van-col>
-      <van-col :span="24" class="questbtn">
-        <van-button color="linear-gradient(to right, #4bb0ff, #6149f6)" @click="submitQuest">提交</van-button>
-      </van-col>
-    </van-popup>
+      </van-popup>
+    </el-row>
+    <el-col :span="24" class="videoBtn">
+      <div id="videobtnid" :style="{ top: btop, right: bright, transform: transform }">
+        <el-button type="warning" round @click="full()" size="mini"><i class="el-icon-rank"></i></el-button>
+      </div>
+    </el-col>
   </div>
 </template>
 
@@ -1028,8 +1034,10 @@ export default {
   background-color: rgba(0, 0, 0, 0.7);
 }
 .videoBtn {
-  z-index: 999;
   position: absolute;
+  z-index: 999;
+  bottom: 10px;
+  left: 10px;
 }
 .userList {
   height: 300px;