Merge branch 'hcb' of SH-Arbitrate/Arbitrate-FrontendH5 into master

src/api/room.js

@@ -49,11 +49,22 @@ export function secretaryRoleByUserId(userId, caseId) {
 }
 // 获取证据列表
 export function selectById(caseId) {
-    return axios.get(`tjformal/caseApplication/selectById?id=${caseId}`);
+    let appType = sessionStorage.getItem('type');
+    if (appType == 'tiaojie') {
+        return axios.get(`tjformal/caseApplication/selectById?id=${caseId}`);
+    } else {
+        return axios.get(`zhongcai/caseApplication/selectById?id=${caseId}`);
+    }
 }
 // 根据案件id查询登录人是否为申请人被申请人
 export function selectRoleMenuByCaseId(caseId) {
-    return axios.get(`tjformal/video/selectRoleMenuByCaseId?caseId=${caseId}`);
+    let appType = sessionStorage.getItem('type');
+    if (appType == 'tiaojie') {
+        return axios.get(`tjformal/video/selectRoleMenuByCaseId?caseId=${caseId}`);
+    } else {
+        return axios.get(`zhongcai/video/selectRoleMenuByCaseId?caseId=${caseId}`);
+    }
+    
 }
 // 保存onlyOffice文档
 export function saveOnlyOfficeFile(data) {
@@ -61,7 +72,12 @@ export function saveOnlyOfficeFile(data) {
 }
 //获取当前用户的操作权限
 export function getMenuPermsByUser(caseId) {
-    return axios.get(`tjformal/system/menu/getMenuPermsByUser`);
+    let appType = sessionStorage.getItem('type');
+    if (appType == 'tiaojie') {
+        return axios.get(`tjformal/system/menu/getMenuPermsByUser`);
+    } else {
+        return axios.get(`zhongcai/system/menu/getMenuPermsByUser`);
+    }
 }
 // 上传文件
 export function videoUpload(data) {

src/views/room.vue

@@ -2,7 +2,6 @@
   <div class="page">
     <div class="iconImg" v-if="!modileFlag && rightType && rightTypeall" @click="checkList(1)">
       <i class="el-icon-d-arrow-left" style="font-size: 30px;color: aqua;"></i>
-      <!-- <i class="el-icon-d-arrow-right"></i> -->
     </div>
     <div class="roompage" @mouseover="mouseHover" v-if="modileFlag">
       <div class="txtContent">
@@ -27,7 +26,7 @@
         </roomFooter>
       </div>
     </div>
-    <div class="roomPhone">
+    <div class="roomPhone" v-if="!modileFlag">
       <div class="videoPage">
         <div :class="sharingType" id="screenShare">
         </div>
@@ -40,8 +39,6 @@
           </div>
           <i class="el-icon-d-arrow-right" style="font-size: 30px;color: aqua;" @click="checkList(2)"
             v-if="!rightType && rightTypeall"></i>
-          <!-- <i class="el-icon-d-arrow-left" style="font-size: 30px;color: aqua;" @click="checkList(2)"
-            v-if="!rightType && !rightTypeall"></i> -->
         </div>
         <div class="footerPhone">
           <roomFooterPhone @exitRoom="exitRoom" @micClickOn="micClickOn" @micClickOff="micClickOff"
@@ -50,17 +47,6 @@
             :videoFlag="videoFlag" :sharFlag="sharFlag"></roomFooterPhone>
         </div>
       </div>
-      <!-- <div class="header">
-        <roomFooterPhone @exitRoom="exitRoom"></roomFooterPhone>
-      </div>
-      <div class="bodyVideo">
-        <div :class="userClassPhone" id="localStream">
-          <div class="userNamePhone">{{ userId }}</div>
-        </div>
-        <div :class="userClassPhone" v-for="(item, index) in userList" :key="index" :id="item">
-          <div class="userNamePhone">{{ item }}</div>
-        </div>
-      </div> -->
     </div>
     <!-- 语音转文字弹窗 -->
     <el-drawer title="会议内容" :visible.sync="textVisible" :modal="false">
@@ -935,14 +921,6 @@ export default {
   color: #ffffff;
 }
 
-/* .header {
-  width: 100%;
-  height: 8%;
-  background-color: #716c6c;
-  display: flex;
-  flex-direction: row-reverse;
-  align-items: center;
-} */
 /* 移动端样式 */
 .roomPhone {
   width: 100%;
@@ -1033,10 +1011,6 @@ export default {
   bottom: 8px;
 }
 
-.fileList {
-  /* max-height: 300px; */
-  /* overflow-y: scroll; */
-}
 
 .list {
   display: flex;