Merge remote-tracking branch 'origin/dev-circle-eight-20201103' into dev-circle-eight-20201103

src/components/yqrange/ads-manage.vue

@@ -9,7 +9,7 @@
 
 
     <el-form-item label="是否显示广告位" class="required-label">
-      <el-radio-group v-model="formData.adShowFlag" size="small" class="required-label">
+      <el-radio-group v-model="formData.adShowFlag" @change="changeAdShow" size="small" class="required-label">
         <el-radio :label="0">否</el-radio>
         <el-radio :label="1">是</el-radio>
       </el-radio-group>
@@ -50,6 +50,7 @@
     </div>
 
     <el-form-item label="链接类型" class="required-label" v-if="formData.adShowFlag == 1">
+      <el-col :span="18">
       <el-select v-model="formData.adModuleDto.linkType" placeholder="请选择链接类型" style="width:88%">
         <el-option
           v-for="item1 in linkSelect"
@@ -58,9 +59,11 @@
           :value="item1.value">
         </el-option>
       </el-select>
+      </el-col>
     </el-form-item>
     <el-form-item label="选择模块" v-if="formData.adShowFlag == 1 && formData.adModuleDto.linkType == 4" class="required-label">
-      <el-select @focus="moduleIndex(index)" filterable v-model="formData.adModuleDto.name" @change="moduleChange" placeholder="请选择模块" style="width:88%">
+      <el-col :span="18">
+      <el-select filterable v-model="formData.adModuleDto.name" @change="moduleChange" placeholder="请选择模块" style="width:88%">
         <el-option
           v-for="item2 in moduleArray.nameList"
           :key="item2.id"
@@ -68,9 +71,11 @@
           :value="item2.name">
         </el-option>
       </el-select>
+      </el-col>
     </el-form-item>
     <div v-for="(i,j) in formData.adModuleDto.paramList2" :key="j" class="required-label" v-if="formData.adShowFlag == 1 && formData.adModuleDto.linkType == 4">
       <el-form-item label="选择参数" v-if="formData.adModuleDto.paramFlag == 1">
+        <el-col :span="18">
         <el-select v-model="formData.adModuleDto.paramList[j].value" filterable placeholder="请选择参数" style="width:88%">
           <el-option
             v-for="(item3,index3) in i"
@@ -79,6 +84,7 @@
             :value="item3.id + '&'+ item3.name">
           </el-option>
         </el-select>
+        </el-col>
       </el-form-item>
     </div>
 
@@ -311,8 +317,9 @@
 
         if(vm.formData.adShowFlag == 0){
           vm.formData.adImageUrl = "";
+          vm.formData.adModuleDto = null;
         }
-
+        else {
           if(!vm.checkAdImagUrl()){
             return;
           }
@@ -324,6 +331,7 @@
           if(!vm.checkParamList()){
             return;
           }
+        }
 
         saveCircleAds(req).then(function (res) {
           if(res.code == "000000") {
@@ -338,10 +346,10 @@
 
       //上传圈子头像
       beforeUploadPic1(file) {
-        this.currentOption.aspectRatio = 1/1;
-        this.currentOption.cropBoxResizable = true;
-        this.currentOption.minCropBoxWidth = 160;
-        this.currentOption.minCropBoxHeight = 160;
+        // this.currentOption.aspectRatio = 1/1;
+        // this.currentOption.cropBoxResizable = true;
+        // this.currentOption.minCropBoxWidth = 160;
+        // this.currentOption.minCropBoxHeight = 160;
         let fileLimit = {
           width: 690,
           height: 120,
@@ -376,16 +384,16 @@
           image.onload = function () {
             let _this = this;
             // if (_this.width != fileLimit.width || _this.height != fileLimit.height) {
-            if (_this.width < fileLimit.width ||  _this.height < fileLimit.height) {
+            if (_this.width != fileLimit.width ||  _this.height != fileLimit.height) {
               vm.$message.error("图片必须是jpeg或png格式，同时长宽尺寸和图片大小需符合要求");
               return;
             }
-            else if(_this.width > fileLimit.width ||  _this.height > fileLimit.height){
-              vm.showCropper = true;
-              vm.currentOption.cvWidth = _this.width;
-              vm.currentOption.cvHeight = _this.height;
-              return;
-            }
+            // else if(_this.width > fileLimit.width ||  _this.height > fileLimit.height){
+            //   vm.showCropper = true;
+            //   vm.currentOption.cvWidth = _this.width;
+            //   vm.currentOption.cvHeight = _this.height;
+            //   return;
+            // }
             else {
               openLoading(vm);
               doUpload(vm, file, getFilePath(file, null), "preview4", "progress1", 1).then(function (path) {
@@ -622,7 +630,9 @@
       },
 
       checkParamList(){
-        if(vm.formData.adModuleDto.linkType == 4 && vm.formData.adModuleDto.name != ""){
+        if(vm.formData.adModuleDto.linkType == 4
+          && vm.formData.adModuleDto.name != ""
+          && vm.formData.adModuleDto.paramFlag == 1){
 
           if(vm.formData.adModuleDto.paramList.length == 0){
             vm.$message.error("请选择参数！");
@@ -643,6 +653,27 @@
         else {
           return true;
         }
+      },
+      changeAdShow(){
+
+        if(vm.formData.adShowFlag == 1 && vm.formData.adModuleDto == null){
+          vm.formData.adModuleDto = {
+            linkType: 8, // 跳转类型:1 链接，4 模块， 8 无跳转
+            name: "", // 模块名称
+            paramFlag: 0, // 是否有参数标志1为有2为没有参数
+            paramList: [
+              {
+                id: "",
+                seqNo: '',  // 选择参数的索引值
+                value: '',
+                key: '', // 参数名称，默认param
+                type:''  // 模块参数类型:1 int类型字符串 4String类型 8时间戳类型字符串
+              }
+            ],
+            paramList2: [],
+            type: 0 // 类型:1 列表页，4 详情页
+          };
+        }
       }
     }
   }

src/components/yqrange/gp-ranking.vue

@@ -9,38 +9,39 @@
 
 
     <el-form-item label="显示排行榜" class="required-label">
-      <el-radio-group v-model="formData.rankShowFlag" size="small" class="required-label">
+      <el-radio-group v-model="formData.rankShowFlag" size="small" class="required-label" @change="changeRankShow">
         <el-radio :label="0">关闭</el-radio>
         <el-radio :label="1">开启</el-radio>
       </el-radio-group>
     </el-form-item>
 
-    <el-form-item label="最多上榜人数" class="required-label" v-if="formData.rankShowFlag == 1">
+    <el-form-item label="最多上榜人数" class="required-label">
       <el-radio-group v-model="formData.maxQuantity" size="small" class="required-label">
-        <el-radio :label="50"></el-radio>
-        <el-radio :label="100"></el-radio>
-        <el-radio :label="200"></el-radio>
+        <el-radio :label="50" :disabled="styleEditFlag"></el-radio>
+        <el-radio :label="100" :disabled="styleEditFlag"></el-radio>
+        <el-radio :label="200" :disabled="styleEditFlag"></el-radio>
       </el-radio-group>
     </el-form-item>
 
-    <el-form-item label="榜单类型" class="required-label" v-if="formData.rankShowFlag == 1">
+    <el-form-item label="榜单类型" class="required-label">
           <el-checkbox-group v-model="rankTypeList" @change="changeRankType">
             <!--<el-checkbox size="small" :label="1">本院排行</el-checkbox>-->
             <!--<el-checkbox size="small" :label="3">本市排行</el-checkbox>-->
             <!--<el-checkbox size="small" :label="5">本圈排行</el-checkbox>-->
-            <el-checkbox v-for="item in selectedRankTypeList" :key="item.id" :label="item.id">{{item.name}}</el-checkbox>
+            <el-checkbox :disabled="styleEditFlag" v-for="item in selectedRankTypeList" :key="item.id" :label="item.id">{{item.name}}</el-checkbox>
           </el-checkbox-group>
     </el-form-item>
-    <el-form-item label="显示规则" class="required-label" v-if="formData.rankShowFlag == 1">
+    <el-form-item label="显示规则" class="required-label">
       <el-radio-group v-model="formData.ruleShowFlag" size="small" class="required-label">
-        <el-radio :label="0">关闭</el-radio>
-        <el-radio :label="1">开启</el-radio>
+        <el-radio :label="0" :disabled="styleEditFlag">关闭</el-radio>
+        <el-radio :label="1" :disabled="styleEditFlag">开启</el-radio>
       </el-radio-group>
     </el-form-item>
 
 
-    <el-form-item label="规则跳转模块" v-if="formData.rankShowFlag == 1 && formData.ruleShowFlag == 1" class="required-label">
-      <el-select filterable v-model="formData.rankModule.name" @change="moduleChange" placeholder="请选择模块" style="width:88%">
+    <el-form-item label="规则跳转模块" v-if="formData.ruleShowFlag == 1" class="required-label">
+      <el-col :span="18">
+      <el-select filterable :disabled="styleEditFlag" v-model="formData.rankModule.name" @change="moduleChange" placeholder="请选择模块" style="width:88%">
         <el-option
           v-for="item2 in moduleArray.nameList"
           :key="item2.id"
@@ -48,21 +49,25 @@
           :value="item2.name">
         </el-option>
       </el-select>
+      </el-col>
     </el-form-item>
-    <div v-for="(i,j) in formData.rankModule.paramList2" :key="j" class="required-label" v-if="formData.rankShowFlag == 1 && formData.ruleShowFlag == 1">
+    <div v-for="(i,j) in formData.rankModule.paramList2" :key="j" class="required-label" v-if="formData.ruleShowFlag == 1">
       <el-form-item label="选择参数" v-if="formData.rankModule.paramFlag == 1">
-        <el-select v-model="formData.rankModule.paramList[j].value" filterable placeholder="请选择参数" style="width:88%">
+        <el-col :span="18">
+        <el-select :disabled="styleEditFlag" v-model="formData.rankModule.paramList[j].value" filterable placeholder="请选择参数" style="width:88%">
           <el-option
             v-for="(item3,index3) in i"
             :key="index3"
             :label="item3.name"
             :value="item3.id + '&'+ item3.name">
           </el-option>
+
         </el-select>
+        </el-col>
       </el-form-item>
     </div>
 
-    <el-form-item label="不参与排行的成员" v-if="formData.rankShowFlag == 1">
+    <el-form-item label="不参与排行的成员">
       <div v-for="(item, index) in mobilePhonesArray" :key="index">
         <el-row>
           <el-col :span="10">
@@ -71,10 +76,10 @@
                         v-model="item.value"
                         placeholder="请输入手机号"
                         style="width:85%;"
-                        type="text"
+                        type="text" :disabled="styleEditFlag"
               ></el-input>
           </el-col>
-          <el-col :span="2">
+          <el-col :span="2" style="margin-top: 9px;" v-if="!styleEditFlag">
             <img
               @click="addPhone(index)"
               class="edit-img"
@@ -134,6 +139,7 @@
         }
       };
       return {
+        styleEditFlag: false,// 是否可以编辑
         moduleArray: [],
         rankTypeList:[],
         mobilePhonesArray:[],
@@ -186,6 +192,12 @@
         getRankConfig(req).then(function (res) {
           if(res.code == "000000") {
             vm.formData = res.data;
+            if(vm.formData.rankShowFlag == 0){
+              vm.styleEditFlag = true;
+            }
+            else {
+              vm.styleEditFlag = false;
+            }
 
             vm.selectedRankTypeList = new Array();
             vm.rankTypeList = new Array();
@@ -263,11 +275,19 @@
         if(vm.mobilePhonesArray != null){
           vm.formData.mobilePhones = new Array();
           for(let i = 0; i < vm.mobilePhonesArray.length; i++){
+
+            if(vm.formData.rankShowFlag == 1
+              && vm.mobilePhonesArray[i].value != ""
+              &&!vm.checkPhone(vm.mobilePhonesArray[i].value)){
+              vm.$message.error("请输入正确的手机号！");
+              return;
+            }
             vm.formData.mobilePhones.push(vm.mobilePhonesArray[i].value);
           }
         }
 
 
+        if(vm.formData.rankShowFlag == 1){
 
           if(!vm.checkRankTypeList()){
             return;
@@ -280,6 +300,7 @@
           if(!vm.checkParamList()){
             return;
           }
+        }
 
         if(vm.formData.ruleShowFlag == 0){
           vm.formData.rankModule = {
@@ -313,17 +334,24 @@
       changeRankType(value){
 
         if(vm.rankTypeList != null){
-          for(let i = 0; i < vm.rankTypeList.length; i++){
-            if(vm.rankTypeList[i] == 1){
+
+         if(vm.rankTypeList.indexOf(1) > -1){
            vm.formData.orgRankFlag = 1;
           }
-            if(vm.rankTypeList[i] == 3){
+          else {
+           vm.formData.orgRankFlag = 0;
+         }
+          if(vm.rankTypeList.indexOf(3) > -1){
             vm.formData.cityRankFlag = 1;
           }
-
-            if(vm.rankTypeList[i] == 5){
+          else {
+            vm.formData.cityRankFlag = 0;
+          }
+          if(vm.rankTypeList.indexOf(5) > -1){
             vm.formData.groupRankFlag = 1;
           }
+          else {
+            vm.formData.groupRankFlag = 0;
           }
         }
 
@@ -470,29 +498,29 @@
         // }
       },
       addPhone(index){
-        if(vm.formData.mobilePhones == null || vm.formData.mobilePhones.length == 0){
+        if(vm.mobilePhonesArray == null || vm.mobilePhonesArray.length == 0){
           vm.$message.error("请输入正确的手机号！");
           return;
         }
         else {
-          for(let i = 0; i < vm.formData.mobilePhones.length; i++){
-            if(vm.formData.mobilePhones[i] == null || vm.formData.mobilePhones[i] == ""){
+          for(let i = 0; i < vm.mobilePhonesArray.length; i++){
+            if(vm.mobilePhonesArray[i] == null || vm.mobilePhonesArray[i].value == ""){
               vm.$message.error("请输入正确的手机号！");
               return;
             }
             else {
-              if(!vm.checkPhone(vm.formData.mobilePhones[i])){
+              if(!vm.checkPhone(vm.mobilePhonesArray[i].value)){
                 vm.$message.error("请输入正确的手机号！");
                 return;
               }
             }
           }
         }
-        vm.formData.mobilePhones.push("");
+        vm.mobilePhonesArray.push({value: ""});
 
       },
       delPhone(index){
-        vm.formData.mobilePhones.splice(index, 1);
+        vm.mobilePhonesArray.splice(index, 1);
       },
 
       checkPhone(val) {
@@ -523,7 +551,9 @@
         }
       },
       checkParamList(){
-        if(vm.formData.ruleShowFlag == 1 && vm.formData.rankModule.name != ""){
+        if(vm.formData.ruleShowFlag == 1
+          && vm.formData.rankModule.name != ""
+          && vm.formData.rankModule.paramFlag == 1){
 
           if(vm.formData.rankModule.paramList.length == 0){
             vm.$message.error("请选择参数！");
@@ -544,6 +574,14 @@
         else {
           return true;
         }
+      },
+      changeRankShow(){
+        if(vm.formData.rankShowFlag == 1){
+          vm.styleEditFlag = false;
+        }
+        else {
+          vm.styleEditFlag = true;
+        }
       }
     }
   }

src/utils/yqrange/yqrangeApi.js

@@ -266,3 +266,13 @@ export const getOrdersExportUrl = (params) => {
 };
 
 
+export const getExamAwardList = (params) => {
+  return fetch({
+    headers,
+    url: getBaseUrl(`onlineexam/getExamAwardList`),
+    method: 'get',
+    data: params,
+    description: '获取有奖问答关联考试',
+  })
+};
+

src/views/yqrange/create-live.vue

@@ -404,6 +404,26 @@
             <!--<p class="upload-message" v-if="uploadImgMessage2">请选择直播封面</p>-->
           </div>
 
+          <el-form-item label="是否显示有奖问答tab" v-if="idType == 1">
+            <el-radio-group v-model="formData.qa" size="small" @change="changeTab">
+              <el-radio :label="0">否</el-radio>
+              <el-radio :label="1">是</el-radio>
+            </el-radio-group>
+          </el-form-item>
+
+          <el-form-item label="有奖问答关联考试" v-if="idType == 1 && formData.qa == 1" class="required-label">
+            <el-col :span="18">
+            <el-select filterable v-model="formData.qaId" placeholder="请选择有奖问答关联考试" style="width:88%">
+              <el-option
+                v-for="item2 in examAwardList"
+                :key="item2.id"
+                :label="item2.name"
+                :value="item2.id">
+              </el-option>
+            </el-select>
+            </el-col>
+          </el-form-item>
+
 
           <el-form-item label="直播角色" v-if="formData.streamType == 1">
             <div style="color:#666666;font-size:10px;">主播（必填）</div>
@@ -571,7 +591,7 @@
   import { isEmptyUtils, openLoading, closeLoading } from "../../utils/utils";
   import { doUpload, getFilePath, unsubscribe} from "../../utils/qiniu-util";
   import { checkMobile } from '../../utils/patients/checkValid';
-  import { getRtcInfo, getImages, searchDoc} from "../../utils/yqrange/yqrangeApi";
+  import { getRtcInfo, getImages, searchDoc, getExamAwardList} from "../../utils/yqrange/yqrangeApi";
   import Cropper from '@/components/common/cropper.vue';
   import SearchDoctor from "@/components/yqrange/search-doctor";
   // import { ossUpload, getFilePathForOSS } from "@/utils/oss/ossUtil";
@@ -670,8 +690,11 @@
           }],
           isSign: 0,
           signMinute: "",
-          isAppPush: 0
+          isAppPush: 0,
+          qa:0,
+          qaId: ""
         },
+        examAwardList: [],
         checked: false,
         signFlag: false,
         tabFlag: "0",
@@ -679,6 +702,7 @@
         backgroundImageUrlTemp: "",
         backgroundImages: [],
         backgroundImageUrl: "",
+
         introTextNum: 0,
         rtcIntroducesText:[],
         rtcIntroducesImages: [],
@@ -716,14 +740,15 @@
           oriUrl: '', // 原图
         },
         cropperIndex: "",
+        nowInput: 0,
+        idType: "",
         pickerOptions0: {
           disabledDate: time => {
           // 在科学计数法中，为了使公式简便，可以用带“E”的格式表示。例如1.03乘10的8次方，可简写为“1.03e8”的形式
           // 一天是24*60*60*1000 = 86400000 = 8.64e7
           // console.log('this.maxDate',this.maxDate)
           return time.getTime() < Date.now() - 8.64e7
-        },
-        nowInput: 0
+        }
       },
         rules: {
         name: [
@@ -807,7 +832,7 @@
 
       vm = this;
       // 区分内部用户和外部用户
-      let idType = localStorage.getItem('storageIdType');
+      this.idType = localStorage.getItem('storageIdType');
       this.circleId = this.$route.query.circleId;
       this.circleName = this.$route.query.circleName;
       this.curmbSecond = "圈子管理-" + this.circleName;
@@ -828,6 +853,7 @@
         this.curmbThird = "编辑直播";
         this.initRtcInfo(this.rtcId);
       }
+      this.getExamAwardList();
     },
 
     methods: {
@@ -922,6 +948,33 @@
         //   this.$message.warning('正在上传，请稍等')
         // }
       },
+
+      getExamAwardList(){
+
+        let req = null;
+
+        getExamAwardList(req).then(function (res) {
+          if(res.code == "000000") {
+            vm.examAwardList = res.data;
+            // vm.formData = res.data;
+          }
+        }).catch(function (error) {
+          vm.$message.error(error);
+        });
+      },
+
+      checkQaId(){
+
+        if(vm.formData.qa == 1 && vm.formData.qaId == null){
+          vm.$message.error("请选择有奖问答关联考试！");
+          return false;
+        }
+        else {
+          return true;
+        }
+      },
+
+
       //上传直播简介
       beforeUploadPic1(file) {
         vm.cropperIndex = 10;
@@ -1805,6 +1858,17 @@
         if(!this.checkTab()){
           return;
         }
+        // 内部运营人员
+        if(this.idType == 1){
+          // 检查有奖问答关联考试
+          if(!this.checkQaId()){
+            return;
+          }
+
+          if(this.formData.qa == 0){
+            this.formData.qaId = null;
+          }
+        }
 
         // 校验嘉宾姓名和手机号
         if(!this.checkGuests()){

src/views/yqrange/range-manage.vue

@@ -87,8 +87,8 @@ export default {
   },
   created() {
     const {id, name, activeName, roleType} = this.$route.query;
-    // this.idType = localStorage.getItem('storageIdType');
-    this.idType = 1;// TODO
+    this.idType = localStorage.getItem('storageIdType');
+    // this.idType = 1;// TODO
     this.circleId = id;
     this.name = name;
     this.activeName = activeName;

src/views/yqrange/range-setting.vue

@@ -86,29 +86,6 @@ export default {
         if(res.code == "000000") {
           this.settingForm.settingData = res.data;
 
-        } else {
-          this.settingForm.settingData = [];
-        }
-        if(this.settingForm.settingData == [] || this.settingForm.settingData.length == 0){
-
-          this.settingForm.settingData = [{
-            appTag: 1,
-            showOff: 1
-          },
-            {
-              appTag: 2,
-              showOff: 1
-            },
-            {
-              appTag: 3,
-              showOff: 1
-            },
-            {
-              appTag: 4,
-              showOff: 1
-            }];
-        }
-
           for(let i = 0; i < this.settingForm.settingData.length; i++){
             if(this.settingForm.settingData[i].appTag == 1){
               this.settingForm.settingData[i].appTagName = "教培"
@@ -126,6 +103,29 @@ export default {
               this.settingForm.settingData[i].appTagName = "云鹊豆商城"
             }
           }
+        } else {
+          this.$message.error(res.data.message);
+          // this.settingForm.settingData = [];
+        }
+        // if(this.settingForm.settingData == [] || this.settingForm.settingData.length == 0){
+        //
+        //   this.settingForm.settingData = [{
+        //     appTag: 1,
+        //     showOff: 1
+        //   },
+        //     {
+        //       appTag: 2,
+        //       showOff: 1
+        //     },
+        //     {
+        //       appTag: 3,
+        //       showOff: 1
+        //     },
+        //     {
+        //       appTag: 4,
+        //       showOff: 1
+        //     }];
+        // }
 
 
       }).catch((error) => {