Skip to content

P
pica.cloud.web-education-admin
提交 dc3bbdeb 编写于 作者: bo.dang's avatar bo.dang
浏览文件
操作

Merge branch 'dev-circle-eight-20201103' into 'release' 

小生态1.8.0期，Code Review：bo.dang



See merge request !228
上级 82217f05 2c287ca9
展开全部 隐藏空白字符变更
内嵌 并排
正在显示 包含 1666 行增加 和 13 行删除
src/components/yqrange/ads-manage.vue 0 → 100644
浏览文件 @ dc3bbdeb
此差异已折叠。
src/components/yqrange/gp-ranking.vue 0 → 100644
浏览文件 @ dc3bbdeb
此差异已折叠。
src/utils/yqrange/yqrangeApi.js
浏览文件 @ dc3bbdeb
......@@ -171,6 +171,79 @@ export const getCircleDept = (params) => {
})
};
export const getCircleAds = (params) => {
return fetch({
headers,
url: getBaseUrl(`circle/circle/ad/${params.circleId}`),
method: 'get',
data: params,
description: '查询广告栏位信息',
})
};
export const saveCircleAds = (params) => {
return fetch({
headers,
url: getBaseUrl(`circle/circle/ad/save`),
method: 'post',
data: params,
description: 'B端保存广告栏位信息',
})
};
export const getLinkType = (params) => {
return fetch({
headers,
url: getBaseUrl(`contents/commonComstant/selectByTypeCode?code=${params.code}`),
method: 'get',
data: params,
description: '获取链接类型下拉数据',
})
};
export const getModuleData = (params) => {
return fetch({
headers,
url: getBaseUrl(`contents/moduleConfig/selectName`),
method: 'get',
data: params,
description: '获取模块下拉数据',
})
};
export const getParamData = (params) => {
return fetch({
headers,
url: getBaseUrl(`contents/moduleConfig/selectParam?id=${params.id}`),
method: 'get',
data: params,
description: '获取参数下拉数据',
})
};
export const getRankConfig = (params) => {
return fetch({
headers,
url: getBaseUrl(`circle/rank/config?circleId=${params.circleId}`),
method: 'get',
data: params,
description: '获取排行榜配置',
})
};
export const saveRankConfig = (params) => {
return fetch({
headers,
url: getBaseUrl(`circle/rank/config/save`),
method: 'post',
data: params,
description: '保存排行榜配置'
})
};
export const getGoodsExportUrl = (params) => {
return fetch({
headers,
......@@ -193,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/layout/slidebar.vue
浏览文件 @ dc3bbdeb
......@@ -251,6 +251,18 @@ export default {
.then((res) => {
// debugger;
this.isOutsideGetted = true;
// if (res.code == '000000') {
// if (res.data.code == "yes") { // 外部用户，siderbar只展示一个：学分发放管理页面
// // TODO this.isOutsideUser = true;
// this.isOutsideUser = false;
// this.$store.dispatch('cmeStore/updateOutUserStatus', true);
// if (currentPath && currentPath == '/apply-detail') { // 申请明细页面 则刷新时不重定向
// return;
// }
// //TODO this.$router.replace({
// // path: '/credit-send-manage'
// // });
// } else { // 非外部用户 正常展示多路由
if (res.code == "000000") {
console.log("getUserType() : res.data.code = " + res.data.code);
// this.getSlideData();
......@@ -567,6 +579,18 @@ export default {
});
},
// judge/menu
setCircleSlide() {
circleMenu({}).then((res) => {
if (res.data === true) {
this.items[2].subs.push({
title: '新建小圈权限分配',
icon: 'el-icon-setting',
index: 'circle-limit'
})
}
})
},
goToMessageSendPage(checkAuth) {
if (checkAuth) {
utils.checkAuthFunc().then((res) => {
......
src/views/yqrange/create-live.vue
浏览文件 @ dc3bbdeb
......@@ -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
浏览文件 @ dc3bbdeb
......@@ -21,6 +21,12 @@
<el-tab-pane label="应用配置" name="fourth">
<range-setting></range-setting>
</el-tab-pane>
<el-tab-pane label="广告位管理" name="five" v-if="idType == 1">
<ads-manage></ads-manage>
</el-tab-pane>
<el-tab-pane label="排行榜管理" name="six" v-if="idType == 1">
<gp-ranking></gp-ranking>
</el-tab-pane>
</el-tabs>
</div>
<div v-if="active == 4">
......@@ -39,8 +45,12 @@ import { getRangeList,updateRangeStatus, getCircleSettingList, saveCircleSetting
import LiveManage from "./live-manage";
import RangeSetting from "./range-setting";
import Mebman from "../../components/yqrange/mebman";
import AdsManage from "../../components/yqrange/ads-manage";
import GpRanking from "../../components/yqrange/gp-ranking";
export default {
components: {
GpRanking,
AdsManage,
Mebman,
RangeSetting,
LiveManage,
......@@ -71,11 +81,14 @@ export default {
circleId: null,
name: "",
active: 0,
roleType: ''
roleType: '',
idType: ''
}
},
created() {
const {id, name, activeName, roleType} = this.$route.query;
this.idType = localStorage.getItem('storageIdType');
// this.idType = 1;// TODO
this.circleId = id;
this.name = name;
this.activeName = activeName;
......
src/views/yqrange/range-setting.vue
浏览文件 @ dc3bbdeb
......@@ -86,7 +86,9 @@ export default {
if(res.code == "000000") {
this.settingForm.settingData = res.data;
} else {
// this.$message.error(res.data.message);
this.settingForm.settingData = [];
}
if(this.settingForm.settingData == [] || this.settingForm.settingData.length == 0){
......@@ -106,9 +108,14 @@ export default {
{
appTag: 4,
showOff: 1
},
{
appTag: 5,
showOff: 0
}];
}
for(let i = 0; i < this.settingForm.settingData.length; i++){
if(this.settingForm.settingData[i].appTag == 1){
this.settingForm.settingData[i].appTagName = "教培"
......@@ -122,9 +129,11 @@ export default {
else if(this.settingForm.settingData[i].appTag == 4){
this.settingForm.settingData[i].appTagName = "职称培训"
}
else if(this.settingForm.settingData[i].appTag == 5){
this.settingForm.settingData[i].appTagName = "云鹊豆商城"
}
}
}).catch((error) => {
this.$message.error("请重试");
})
......
src/views/yqrange/yq-range.vue
浏览文件 @ dc3bbdeb
......@@ -167,7 +167,8 @@ export default {
settingForm:{
circleId: null,
settingData: []
}
},
idType: ""
}
},
created() {
......@@ -179,21 +180,21 @@ export default {
tabChangeHandler(tab) {},
initPrivilege(){
let idType = localStorage.getItem('storageIdType');
this.idType = localStorage.getItem('storageIdType');
// if(idType == null || idType == ""){
// idType = 2;
// localStorage.setItem('storageIdType', idType);
// }
this.searchForm.userType = idType;
this.searchForm.userType = this.idType;
// 内部用户:运营人员
if(idType == "1"){
if(this.idType == "1"){
this.showAllFlag = true;
this.showNewFlag = true;
this.showApplyFlag = true;
}
// 外部用户
else if(idType == "2"){
else if(this.idType == "2"){
this.showAllFlag = false;
setTimeout(() => {
this.getUserAuth();
......@@ -355,7 +356,7 @@ export default {
id: row.id,
name: row.name,
activeName: 'first',
roleType: row.roleId
roleType: row.roleId,
}
})
},
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或