Skip to content

M
marketing-opeartion
Commit c014e804 by crushh
Options

update: 修复

parent fd442cd4
Showing with 31 additions and 24 deletions
src/styles/component.less
......@@ -16,6 +16,9 @@
.ml10 {
margin-left: 10px;
}
.mt6 {
margin-top: 6px;
}
.mt10 {
margin-top: 10px;
}
......@@ -56,13 +59,7 @@
.border-bottom{
border-bottom: 1px solid #E4E7ED;
}
.image-tip {
margin: 6px 0 14px;
font-size: 12px;
color: #909399;
line-height: 17px;
cursor: default;
}
[class^="dm-status--"]::before {
display: inline-block;
width: 6px;
......
src/utils/request.js
......@@ -6,7 +6,6 @@ import { origin } from '@/config/index.js';
axios.defaults.baseURL = origin;
const request = (opt, params) => {
console.log(opt, params);
params = typeof params === 'object' ? JSON.parse(JSON.stringify(params)) : params;
opt = Object.assign({}, opt);
let requestConfig = {
......
src/views/activity/component/NewActivity.vue
......@@ -214,6 +214,13 @@ export default {
color: #303133;
}
}
.image-tip {
margin: 6px 0 14px;
font-size: 12px;
color: #909399;
line-height: 17px;
cursor: default;
}
/deep/.el-input-number.is-controls-right:hover .el-input-number__decrease,
/deep/.el-input-number.is-controls-right:hover .el-input-number__increase {
......
src/views/activity/template-detail.vue
......@@ -7,7 +7,7 @@
<el-breadcrumb-item>{{($route.query.id?'编辑':'新增')+'模板'}}</el-breadcrumb-item>
</el-breadcrumb>
</div>
<div style="padding: 20px">
<div style="padding: 20px 20px 35px 20px">
<el-form :rules="rules" size="small" :model="form" ref="form" label-width="120px">
<dm-sub-title type="fill">基础信息</dm-sub-title>
<div class="section">
......@@ -17,12 +17,12 @@
<el-form-item label="游戏首页背景" prop="backImageUrl.materialValue" :rules="[{ required: true, message: '请上传' } ]">
<vue-gic-upload-image :project-name="projectName" is-yw :action-url="actionUrl" :image-list="imageList.backImageUrlList" max-image-length="1" accept="image/jpg,image/jpeg,image/png,image/gif" :before-upload="(file) => beforeUpload(file, 2)" @uploadOnSuccess="(data) => uploadOnSuccess(data, 'backImageUrl')" @deleteImage="deleteImage('backImageUrl')" preview-append-to-body>
</vue-gic-upload-image>
<p class="image-tip">图片建议尺寸 750*1800px，格式 jpg/jpeg/png/gif，大小 2M 以内。</p>
<p class="tips mt6">图片建议尺寸 750*1800px，格式 jpg/jpeg/png/gif，大小 2M 以内。</p>
</el-form-item>
<el-form-item label="游戏规则背景" prop="ruleImageUrl.materialValue" :rules="[{ required: true, message: '请上传' } ]">
<vue-gic-upload-image :project-name="projectName" is-yw :action-url="actionUrl" :image-list="imageList.ruleImageUrlList" max-image-length="1" accept="image/jpg,image/jpeg,image/png,image/gif" :before-upload="(file) => beforeUpload(file, 2)" @uploadOnSuccess="(data) => uploadOnSuccess(data, 'ruleImageUrl')" @deleteImage="deleteImage('ruleImageUrl')" preview-append-to-body>
</vue-gic-upload-image>
<p class="image-tip">图片建议尺寸 750*1800px，格式 jpg/jpeg/png/gif，大小 2M 以内；图片还适用于我的奖品、分享助力等页面。</p>
<p class="tips mt6">图片建议尺寸 750*1800px，格式 jpg/jpeg/png/gif，大小 2M 以内；图片还适用于我的奖品、分享助力等页面。</p>
</el-form-item>
<el-form-item label="游戏背景音乐" prop="backMusicUrl">
<el-checkbox-group v-model="musicSelectList" @change="handleChange" class="checkBoxContainer">
......@@ -73,9 +73,9 @@
</el-form-item>
</div>
</div>
<p class="image-tip">图片格式 jpg/jpeg/png/gif，大小 1M 以内。</p>
<p class="tips mt6">图片格式 jpg/jpeg/png/gif，大小 1M 以内。</p>
</el-form-item>
<!-- <el-form-item label="更换奖项样式"> <el-switch v-model="form.canChangePrizeStyle"></el-switch><span class="tips ml18">开启则表示支持用户更换此处模板内默认奖项样式</span> </el-form-item> -->
<!-- <el-form-item label="更换奖项样式"> <el-switch v-model="form.canChangePrizeStyle"></el-switch><span class="tipss ml18">开启则表示支持用户更换此处模板内默认奖项样式</span> </el-form-item> -->
</div>
<dm-sub-title type="fill">首页“参与游戏”按钮图</dm-sub-title>
<div class="section">
......@@ -94,14 +94,14 @@
<el-form-item label="默认图" prop="noticeImageUrl.materialValue" :rules="[{required:true,message:'请上传'}]">
<vue-gic-upload-image :project-name="projectName" is-yw :action-url="actionUrl" :image-list="imageList.noticeImageUrlList" max-image-length="1" accept="image/jpg,image/jpeg,image/png,image/gif" :before-upload="(file) => beforeUpload(file)" @uploadOnSuccess="(data) => uploadOnSuccess(data, 'noticeImageUrl')" @deleteImage="deleteImage('noticeImageUrl')" preview-append-to-body>
</vue-gic-upload-image>
<p class="image-tip">图片格式 jpg/jpeg/png/gif，大小 1M 以内。</p>
<p class="tips mt6">图片格式 jpg/jpeg/png/gif，大小 1M 以内。</p>
</el-form-item>
</div>
<dm-sub-title type="fill">首页其它按钮图</dm-sub-title>
<div class="section">
<el-form-item :label="item.label" v-for="item in btnImgList" :rules="[{ required: true, message: '请上传' } ]" :key="item.prop" :prop="item.prop+'.materialValue'">
<vue-gic-upload-image :project-name="projectName" is-yw :action-url="actionUrl" :image-list="imageList[item.prop+'List']" max-image-length="1" accept="image/jpg,image/jpeg,image/png,image/gif" :before-upload="(file) => beforeUpload(file)" @uploadOnSuccess="(data) => uploadOnSuccess(data, item.prop)" @deleteImage="deleteImage(item.prop)" preview-append-to-body> </vue-gic-upload-image>
<p class="image-tip">{{ item.tips }}</p>
<p class="tips mt6">{{ item.tips }}</p>
</el-form-item>
</div>
<dm-sub-title type="fill">模板奖品数量与奖品默认样式设计</dm-sub-title>
......@@ -119,7 +119,7 @@
</el-form-item>
<el-form-item label="模板奖品图片" required>
<p class="tips">图片建议尺寸 300*300px，格式 jpg/jpeg/png/gif，大小 1M 以内。</p>
<p class="tips">图片建议尺寸 300*300px，格式 jpg/jpeg/png/gif，大小 1M 以内。</p>
<div class="flex-gap">
<div v-for="item in prizeImgList" :key="item.prop">
<el-form-item :rules="[{ required: true, message: '请上传' } ]" :prop="item.prop+'.materialValue'" label-width="0">
......@@ -137,7 +137,7 @@
<div class="section">
<el-form-item :label="item.label" :rules="[{ required: true, message: '请上传' } ]" :prop="item.prop+'.materialValue'" v-for="item in shareImgList" :key="item.prop">
<vue-gic-upload-image :project-name="projectName" is-yw :action-url="actionUrl" :image-list="imageList[item.prop+'List']" max-image-length="1" accept="image/jpg,image/jpeg,image/png,image/gif" :before-upload="(file) => beforeUpload(file)" @uploadOnSuccess="(data) => uploadOnSuccess(data, item.prop)" @deleteImage="deleteImage(item.prop)" preview-append-to-body> </vue-gic-upload-image>
<p class="image-tip">{{ item.tips }}</p>
<p class="tips mt6">{{ item.tips }}</p>
</el-form-item>
</div>
<div class="dm-form-bottom">
......@@ -175,6 +175,7 @@ export default {
c(new Error('请输入不大于20的数字'));
return;
}
this.$refs.form.validateField('prizeMax');
c();
};
......@@ -192,6 +193,7 @@ export default {
c(new Error('请输入不大于20的数字'));
return;
}
this.$refs.form.validateField('prizeMin');
c();
};
......@@ -660,7 +662,9 @@ export default {
font-size: 12px;
color: #909399;
line-height: 17px;
cursor: default;
}
.dm-form-bottom {
display: flex;
justify-content: center;
......
src/views/activity/template-list.vue
......@@ -53,7 +53,8 @@ export default {
return {
searchParams: {
templateName: '',
statusFlag: ''
statusFlag: '',
templateType: this.$route.query.type
},
loading: false,
list: [],
......@@ -118,21 +119,20 @@ export default {
sort.option('sort', isSortIcon);
},
onEnd({ newIndex, oldIndex }) {
console.log(newIndex);
// const currRow = that.list.splice(oldIndex, 1)[0];
// that.list.splice(newIndex, 0, currRow);
// console.log(newIndex);
const currRow = that.list.splice(oldIndex, 1)[0];
that.list.splice(newIndex, 0, currRow);
console.log( that.list);
const arr = that.list.map((item, index) => {
return { sort: index, templateId: item.templateId };
});
console.log(arr);
// that.batchupdateTemplateSort({ sort: newIndex, templateId: currRow.templateId });
// console.log(arr);
that.batchupdateTemplateSort(arr);
}
});
},
batchupdateTemplateSort(arr) {
fetch.batchupdateTemplateSort(arr).then((res) => {
console.log(res);
this.getList();
});
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment