Skip to content

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

Merge remote-tracking branch 'origin/dev-circle-nine-20201231' into dev-circle-nine-20201231

上级 cb184436 77d48f29
展开全部 隐藏空白字符变更
内嵌 并排
正在显示 包含 324 行增加 和 173 行删除
src/components/yqrange/baseinfo.vue
浏览文件 @ 3bf37802
......@@ -406,6 +406,7 @@
},
save(){
debugger
this.submitForm();
},
cancle(){
......
src/utils/activitymanagement/activitymanagementApi.js
浏览文件 @ 3bf37802
......@@ -15,6 +15,25 @@ export const getOnlineCircleList = () => {
})
};
export const getActivityInfoReq = (activityId) => {
return fetch({
headers,
url: getBaseUrl(`circle/sso/activity/info/${activityId}`),
method: 'get',
description: '后台管理--专区活动信息（查看）',
})
};
export const getActivityList = (params) => {
return fetch({
headers,
url: getBaseUrl(`circle/sso/activity/list`),
method: 'get',
params: params,
description: '专区活动列表与搜索',
})
};
export const getActivityDocList = (params) => {
return fetch({
......@@ -46,3 +65,4 @@ export const importDoc = (params) => {
description: '后台管理--专区活动成员导入',
})
};
src/views/activitymanagement/activity-management.vue
浏览文件 @ 3bf37802
......@@ -8,17 +8,17 @@
<el-row :gutter="1" type="flex" style="margin-top: 10px">
<el-col :span="5">
<el-form-item label="活动ID">
<el-input v-model="searchForm.name" size="small" placeholder="请输入活动ID"></el-input>
<el-input v-model="searchForm.activityId" size="small" placeholder="请输入活动ID"></el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="后台标题">
<el-input v-model="searchForm.name" size="small" placeholder="请输入后台标题"></el-input>
<el-input v-model="searchForm.titleManager" size="small" placeholder="请输入后台标题"></el-input>
</el-form-item>
</el-col>
<el-col :span="7">
<el-form-item label="前台主标题">
<el-input v-model="searchForm.name" size="small" placeholder="请输入前台主标题"></el-input>
<el-input v-model="searchForm.titleViewMain" size="small" placeholder="请输入前台主标题"></el-input>
</el-form-item>
</el-col>
<el-col :span="3">
......@@ -162,7 +162,8 @@
<script>
import { openLoading, closeLoading } from "../../utils/utils";
import BreadCrumb from "@/components/breadcrumb.vue";
import { getRangeList,updateRangeStatus, getCircleSettingList, saveCircleSetting} from "../../utils/yqrange/yqrangeApi";
import { updateRangeStatus, getCircleSettingList, saveCircleSetting} from "../../utils/yqrange/yqrangeApi";
import { getActivityList} from '@/utils/activitymanagement/activitymanagementApi';
import ElTabPane from "element-ui/packages/tabs/src/tab-pane";
import RangeApply from "./range-apply";
export default {
......@@ -179,7 +180,10 @@ export default {
showNewFlag: false,
showApplyFlag: false,
searchForm: {
name: '',
activityId:"",//活动id
titleManager: '',//后台标题方便管理
titleViewMain: '',//前端主标题
titleViewSub: '',//前端副标题
createdTime: '',
// endTime: '',
userType: "", // 用户标识 1：内部用户 2：外部用户,
......@@ -195,21 +199,13 @@ export default {
settingData: []
},
statusList: [
{
value: -1,
label: "全部状态"
},
{
value: 0,
label: "已拒绝"
},
{
value: 1,
label: "待审核"
label: "已发布"
},
{
value: 2,
label: "已通过"
label: "未发布"
},
],
idType: ""
......@@ -290,8 +286,8 @@ export default {
openLoading(this);
let params = this.searchForm;
console.log('查询圈子')
getRangeList(params).then((res) => {
console.log('查询活动列表')
getActivityList(params).then((res) => {
closeLoading(this);
if(res.code == "000000") {
this.tableData = res.data.circleList;
......
src/views/activitymanagement/create-activity.vue
浏览文件 @ 3bf37802
......@@ -5,25 +5,12 @@
<el-row class="step-content">
<el-col :span="14">
<p class="p-title">{{curmbSecond}}</p>
<!--<el-steps :active="active" simple class>-->
<!--<span class="step-num" v-bind:class="{ 'on-step': stepData[0] }">1</span>-->
<!--<el-step title="基础信息"></el-step>-->
<!--<span class="step-num" v-bind:class="{ 'on-step': stepData[1] }">2</span>-->
<!--<el-step title="选择成员">2</el-step>-->
<!--</el-steps>-->
</el-col>
<!--<el-col :span="5" :offset="5">-->
<!--<el-button v-if="active<1" size="small" type="primary" @click="nextStep">下一步</el-button>-->
<!--<el-button v-if="active>=1" size="small" type="primary" @click="complete">完成</el-button>-->
<!--</el-col>-->
</el-col>
</el-row>
<div class="first-step" v-if="active === 0">
<base-info :formData="formData" @returnTypeData="returnTypeData" @returnIsNext="returnIsNext" ref="child">
</base-info>
</div>
<!--<div class="second-step" v-else-if="active === 1">-->
<!--<organzation :formData="formData" ref="org"></organzation>-->
<!--</div>-->
</div>
</div>
</template>
......@@ -32,14 +19,13 @@
import BreadCrumb from "@/components/breadcrumb.vue";
import { openLoading, closeLoading } from "../../utils/utils";
import BaseInfo from '@/components/activitymanagement/baseinfo.vue';
import Organzation from '@/components/yqrange/organzation.vue';
import { getCircleInfoReq, getMemberSelectOrgSaveReq } from '@/utils/yqrange/rangeApi';
import { getActivityInfoReq} from '@/utils/activitymanagement/activitymanagementApi';
import {getMemberSelectOrgSaveReq} from "../../utils/yqrange/yqrangeApi";
export default {
name: "create-range",
components: {
BreadCrumb,
BaseInfo,
Organzation
BaseInfo
},
data() {
return {
......@@ -51,26 +37,35 @@
//页面展示位置
stepData: [true, false],
formData: {
id: null,
activityId: 0,//活动ID，新增时为空
titleManager: '',//后台标题方便管理
titleViewMain: '',//前端主标题
titleViewSub: '',//前端副标题
circleId: "",//圈子ID
beginTime:'',//开始时间
endTime:'',//结束时间
headUrl: '',
appModuleDto: {
linkType: 4, // 跳转类型:1 链接，4 模块， 8 无跳转
name: "", // 模块名称
paramFlag: 0, // 是否有参数标志1为有2为没有参数
paramList: [
{
id: "",
seqNo: '', // 选择参数的索引值
value: '',
key: '', // 参数名称，默认param
type:'' // 模块参数类型:1 int类型字符串 4String类型 8时间戳类型字符串
}
],
paramList2: [],
type: 0 // 类型:1 列表页，4 详情页
},
auditFlag:0,
listImage: '',//活动列表页图片
introImage:'',//介绍页图片url
imgUrl1More: {},
imgUrl2More: {},
introduce: '',
dynamicFlag: '',
idType: localStorage.getItem("storageIdType"),
roleType: null,
type: 0,
allowShare: 1
}
},
}
},
created() {
......@@ -109,7 +104,7 @@
//edit
if (this.enterType == 2 && this.id != null) {
this.getCircleInfo();
this.getActivityInfo();
}
},
......@@ -151,21 +146,19 @@
// 修改编辑基础信息
returnIsNext(flag) {
if (flag == true) {
vm.commitQuanziInfo();
vm.commitActivityInfo();
}
},
returnTypeData(item) {
vm.formData[item.name] = item.val
},
//获取圈子详情
getCircleInfo() {
getCircleInfoReq(this.id).then(res => {
//获取活动详情
getActivityInfo() {
getActivityInfoReq(this.id).then(res => {
// closeLoading(this);
if (res.code == "000000") {
this.formData = { ...this.formData, ...res.data };
if(vm.formData.deptId == 0){
vm.formData.deptId = "";
}
} else {
vm.$message(res.message);
}
......@@ -173,11 +166,14 @@
vm.$message.error('请求失败');
});
},
commitQuanziInfo() {
//更新活动信息
commitActivityInfo() {
let req = vm.formData;
console.log("commitQuanziInfo() : name = " + req.name + ", headUrl = " + req.headUrl
+ ", coverUrl = " + req.coverUrl + ", introduce = " + req.introduce + ", dynamicFlag = " + req.dynamicFlag)
vm.POST("circle/circle/save", req).then(res => {
console.log("commitActivityInfo() : name = " + req.titleManager + ", headUrl = " + req.listImage
+ ", coverUrl = " + req.introImage)
vm.POST("circle/sso/activity/save", req).then(res => {
if (res.code == "000000") {
// console.log(res);
// console.log(this.$refs);
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或