Merge branch 'dev-circle-seven-1-20200929' of...

Merge branch 'dev-circle-seven-1-20200929' of http://192.168.110.53/com.pica.cloud.education.frontend/pica.cloud.web-education-admin into dev-circle-seven-1-20200929

src/App.vue

@@ -167,14 +167,16 @@ export default {
       localStorage.removeItem('mainManager');
       localStorage.removeItem('manager');
       localStorage.removeItem('ordinary');
+      localStorage.removeItem('createCircle');
       getCircleRole({}).then((res) => {
         if(res.code == '000000') {
           //mainManager主管理员，manager管理员，ordinary普通人
-          const { highMainManager, mainManager, manager, ordinary} = res.data;
+          const { highMainManager, mainManager, manager, ordinary, createCircle} = res.data;
           localStorage.setItem('highMainManager', vm.setStoreData(highMainManager))
           localStorage.setItem('mainManager', vm.setStoreData(mainManager))
           localStorage.setItem('manager', vm.setStoreData(manager))
           localStorage.setItem('ordinary', vm.setStoreData(ordinary))
+          localStorage.setItem('createCircle', vm.setStoreData(createCircle))
         } else {
           vm.$message.info(res.message)
         }

src/views/layout/slidebar.vue

@@ -236,13 +236,15 @@
           localStorage.removeItem('mainManager');
           localStorage.removeItem('manager');
           localStorage.removeItem('ordinary');
+          localStorage.removeItem('createCircle');
           if(res.code == '000000') {
             //mainManager主管理员，manager管理员，ordinary普通人
-            const { highMainManager, mainManager, manager, ordinary} = res.data;
+            const { highMainManager, mainManager, manager, ordinary, createCircle} = res.data;
             localStorage.setItem('highMainManager', vm.setStoreData(highMainManager))
             localStorage.setItem('mainManager', vm.setStoreData(mainManager))
             localStorage.setItem('manager', vm.setStoreData(manager))
             localStorage.setItem('ordinary', vm.setStoreData(ordinary))
+            localStorage.setItem('createCircle', vm.setStoreData(createCircle))
             if (highMainManager || mainManager || manager) {
               // vm.items.push(yqRange);
               vm.setCircleSize();

src/views/yqrange/live-manage.vue

@@ -210,7 +210,7 @@
             <!--<el-col :span="1">-->
 
             <!--</el-col>-->
-            <el-button type="text" size="small" style="margin-top: -10px;" v-if="fileFlag"><img style="vertical-align: middle;width: 13%;height: 13%;" src="../../assets/image/icon_upload.png" />上传（仅支持mp4,限制大小800M）</el-button>
+            <el-button type="text" size="small" style="margin-top: -10px;" v-if="fileFlag"><img style="vertical-align: middle;width: 13%;height: 13%;" src="../../assets/image/icon_upload.png" />上传（仅支持mp4,限制大小2G）</el-button>
             <!--<video class="video-mg-url" controls preload :src="cleatBroadcast.liveInfo.mgUrl"></video>-->
             <!-- <img v-if="!cleatBroadcast.liveInfo.mgUrl" class="video-bg-img" src="../../../static/img/small.png"> -->
           </el-upload>
@@ -718,8 +718,8 @@ export default {
       let fileLimit = {
         // width: 750,
         // height: 3000,
-        size: 800,
-        sizeText: "800Mb",
+        size: 2048,
+        sizeText: "2048Mb",
         key: "imageContent",
         more: "imgUrl1More",
         show: "uploadImgMessage1"
@@ -830,14 +830,15 @@ export default {
     submitPlayback(canPlayback){
 
 
-      if(vm.videoSource == 1 && (vm.playbackForm.originalUrls != null && vm.playbackForm.originalUrls.length > 0)){
+      if(vm.playbackForm.videoSource == 1 && (vm.playbackForm.originalUrls != null && vm.playbackForm.originalUrls.length > 0)){
           this.$message.warning("原视频地址不正确，请确认");
           return;
       }
 
 
       if(vm.uploadFlag && canPlayback == 1){
-        if(vm.playbackForm.videos == null || vm.playbackForm.videos.length == 0){
+        if(vm.playbackForm.videos == null || vm.playbackForm.videos.length == 0 ||
+          (vm.playbackForm.videos != null && vm.playbackForm.videos[0].videoSize == null)){
           this.$message.warning("请上传回放视频");
           return;
         }

src/views/yqrange/yq-range.vue

@@ -50,7 +50,10 @@
         </el-table-column>
         <el-table-column prop="status" label="圈子状态" min-width="100" align="center">
           <template slot-scope="scope">
-            <span>{{ scope.row.status | rangeStatus }}</span>
+            <!--<span>{{ scope.row.status | rangeStatus }}</span>-->
+            <span v-if="scope.row.status == 10 || scope.row.status == 40" style="color: #FAAD14">{{ scope.row.status | rangeStatus }}</span>
+            <span v-if="scope.row.status == 30" style="color: #1890FF">{{ scope.row.status | rangeStatus }}</span>
+            <span v-if="scope.row.status == 0 || scope.row.status == 50" style="color: #c7c8c9">{{ scope.row.status | rangeStatus }}</span>
           </template>
         </el-table-column>
         <el-table-column label="操作" min-width="370" align="center">
@@ -205,13 +208,23 @@ export default {
       let mainManager = localStorage.getItem('mainManager');
       let manager = localStorage.getItem('manager');
       let ordinary = localStorage.getItem('ordinary');
+      let createCircle = localStorage.getItem('createCircle');
 
-      if(highMainManager == "1" || mainManager == "1"){
+      // 新建小圈权限
+      if(createCircle == "1"){
         this.showNewFlag = true;
+      }
+      else {
+        this.showNewFlag = false;
+      }
+
+      // 是否显示审核列表
+      if(highMainManager == "1" || mainManager == "1"){
+        // this.showNewFlag = true;
         this.showApplyFlag = true;
       }
       else if(manager == "1"){
-        this.showNewFlag = false;
+        // this.showNewFlag = false;
         this.showApplyFlag = true;
       }
       else if(ordinary == "1"){