Skip to content

W
welfare
Commit 4e429b42 by 萱草
Options

Merge branch 'feature/福利中心-礼品管理' into dev 

# Conflicts:
#	dist/css/chunk-06f7197a.f1e0d599.css
#	dist/css/chunk-1348b363.53c7a241.css
#	dist/css/chunk-1348b363.ec65c424.css
#	dist/css/chunk-321ee832.ec265f87.css
#	dist/index.html
#	dist/js/app.f1880fe9.js
#	dist/js/chunk-1348b363.21bb3f8c.js
#	dist/js/chunk-321ee832.927f8bdd.js
#	public/index.html
parents 0509b3df f697f6cf
Showing with 22 additions and 72 deletions
dist/css/chunk-321ee832.ec265f87.css deleted 100644 → 0
.step-text[data-v-572c03b7]{color:#303133;font-size:12px;line-height:24px;font-weight:400}.dash-style[data-v-572c03b7]{border-bottom:1px dashed #2f54eb}.upload-btn[data-v-572c03b7]{height:40px;border:1px dashed #c0c4cc;display:inline-block;font-size:14px;color:#c0c4cc;cursor:pointer;margin-right:10px;width:250px;border-radius:4px}.upload-btn .el-icon-upload2[data-v-572c03b7]{font-size:18px;color:#c0c4cc}.upload-btn[data-v-572c03b7]:hover{border-color:#1890ff}.upload-ele .el-button[data-v-572c03b7]{border:none;color:#c0c4cc}.upload-ele .el-button--small[data-v-572c03b7]{padding:0}.w-630[data-v-572c03b7]{width:630px}.mb56[data-v-572c03b7]{margin-bottom:56px}.from-content[data-v-572c03b7]{position:relative}.from-content .demo-ruleForm .form-section[data-v-572c03b7]{padding:30px 20px}.from-content .demo-ruleForm .form-section h3[data-v-572c03b7]{color:#303133;font-size:14px;font-weight:700;margin-bottom:31px;padding-bottom:9px;border-bottom:1px solid #dfdfdf}.from-content .demo-ruleForm .form-section h3[data-v-572c03b7]:before{clear:both;content:"";display:inline-block;overflow:hidden;width:3px;height:12px;line-height:14px;margin-right:8px;background:#2f54eb}.from-content .demo-ruleForm .form-section .tip-warm[data-v-572c03b7]{color:#909399;font-size:12px}.from-content .demo-ruleForm .form-section .tip-warm i[data-v-572c03b7]{color:#faad14;margin-right:5px}.from-content .demo-ruleForm .fixed-btn[data-v-572c03b7]{width:100%;height:56px;position:fixed;bottom:0;left:200px;background:#fff;border-top:1px solid #e4e7ed;text-align:center;margin-left:-100px;z-index:2;font-size:0}.from-content .demo-ruleForm .fixed-btn .el-button[data-v-572c03b7]{margin-top:12px}.from-content .anchor-link[data-v-572c03b7]{width:120px;position:fixed;right:24px;top:180px;background:#fff}.from-content .anchor-link .link-item[data-v-572c03b7]{height:24px;line-height:24px;color:#606266;font-size:12px;border-left:2px solid #ebeef5;padding-left:18px;cursor:pointer}.from-content .see-btn[data-v-572c03b7]{color:#909399;margin-left:15px}.from-content .see-btn[data-v-572c03b7]:hover{color:#2f54ed}.ml20[data-v-572c03b7]{margin-left:20px}.mr10[data-v-572c03b7]{margin-right:10px}.tips-content[data-v-572c03b7]{position:absolute;left:-4px;top:6px}.store-tips[data-v-572c03b7]{width:200px;position:absolute;left:-10px}.underline[data-v-572c03b7]{text-decoration:underline}.pickup-upload[data-v-572c03b7]{display:inline-block;vertical-align:top}.pickup-upload .upload-trigger[data-v-572c03b7]{border-style:dashed}.pickup-upload .upload-trigger .upload-icon[data-v-572c03b7]{font-size:14px}.pickup-upload .pickup-list[data-v-572c03b7]{margin-top:-10px;margin-left:117px}.pickup-upload .pickup-list .pickup-list-name[data-v-572c03b7]{font-size:14px;font-weight:400;color:#303133;line-height:20px}.pickup-upload .pickup-list .pickup-list-name .file-icon[data-v-572c03b7]{font-size:14px}.upload-tip-text[data-v-572c03b7]{font-size:12px;color:#303133}.template-intro[data-v-572c03b7]{margin-left:33px;background:#f7f8fa;width:400px;height:280px}.template-title[data-v-572c03b7]{font-size:12px;line-height:17px;color:#303133;margin-left:16px;margin-top:16px;font-weight:400}.right-border{border-right:1px solid #ebeef5}.step-style .el-step.is-vertical .el-step__line{top:30px;left:8px;-webkit-transform:scaleX(.5);transform:scaleX(.5)}.step-style .el-step__head.is-finish{color:#2f54eb;border-color:#2f54eb}.step-style .el-step__icon.is-text{border:1px solid}.step-style .el-step__icon{width:16px;height:16px}.step-style .el-step__icon-inner{font-size:12px}
\ No newline at end of file
dist/css/chunk-6bb4435c.a808e4b1.css 0 → 100644
.step-text[data-v-5a3b1a38]{color:#303133;font-size:12px;line-height:24px;font-weight:400}.dash-style[data-v-5a3b1a38]{border-bottom:1px dashed #2f54eb}.upload-btn[data-v-5a3b1a38]{height:40px;border:1px dashed #c0c4cc;display:inline-block;font-size:14px;color:#c0c4cc;cursor:pointer;margin-right:10px;width:250px;border-radius:4px}.upload-btn .el-icon-upload2[data-v-5a3b1a38]{font-size:18px;color:#c0c4cc}.upload-btn[data-v-5a3b1a38]:hover{border-color:#1890ff}.upload-ele .el-button[data-v-5a3b1a38]{border:none;color:#c0c4cc}.upload-ele .el-button--small[data-v-5a3b1a38]{padding:0}.w-630[data-v-5a3b1a38]{width:630px}.mb56[data-v-5a3b1a38]{margin-bottom:56px}.from-content[data-v-5a3b1a38]{position:relative}.from-content .demo-ruleForm .form-section[data-v-5a3b1a38]{padding:30px 20px}.from-content .demo-ruleForm .form-section h3[data-v-5a3b1a38]{color:#303133;font-size:14px;font-weight:700;margin-bottom:31px;padding-bottom:9px;border-bottom:1px solid #dfdfdf}.from-content .demo-ruleForm .form-section h3[data-v-5a3b1a38]:before{clear:both;content:"";display:inline-block;overflow:hidden;width:3px;height:12px;line-height:14px;margin-right:8px;background:#2f54eb}.from-content .demo-ruleForm .form-section .tip-warm[data-v-5a3b1a38]{color:#909399;font-size:12px}.from-content .demo-ruleForm .form-section .tip-warm i[data-v-5a3b1a38]{color:#faad14;margin-right:5px}.from-content .demo-ruleForm .fixed-btn[data-v-5a3b1a38]{width:100%;height:56px;position:fixed;bottom:0;left:200px;background:#fff;border-top:1px solid #e4e7ed;text-align:center;margin-left:-100px;z-index:2;font-size:0}.from-content .demo-ruleForm .fixed-btn .el-button[data-v-5a3b1a38]{margin-top:12px}.from-content .anchor-link[data-v-5a3b1a38]{width:120px;position:fixed;right:24px;top:180px;background:#fff}.from-content .anchor-link .link-item[data-v-5a3b1a38]{height:24px;line-height:24px;color:#606266;font-size:12px;border-left:2px solid #ebeef5;padding-left:18px;cursor:pointer}.from-content .see-btn[data-v-5a3b1a38]{color:#909399;margin-left:15px}.from-content .see-btn[data-v-5a3b1a38]:hover{color:#2f54ed}.ml20[data-v-5a3b1a38]{margin-left:20px}.mr10[data-v-5a3b1a38]{margin-right:10px}.tips-content[data-v-5a3b1a38]{position:absolute;left:-4px;top:6px}.store-tips[data-v-5a3b1a38]{width:200px;position:absolute;left:-10px}.underline[data-v-5a3b1a38]{text-decoration:underline}.pickup-upload[data-v-5a3b1a38]{display:inline-block;vertical-align:top}.pickup-upload .upload-trigger[data-v-5a3b1a38]{border-style:dashed}.pickup-upload .upload-trigger .upload-icon[data-v-5a3b1a38]{font-size:14px}.pickup-upload .pickup-list[data-v-5a3b1a38]{margin-top:-10px;margin-left:117px}.pickup-upload .pickup-list .pickup-list-name[data-v-5a3b1a38]{font-size:14px;font-weight:400;color:#303133;line-height:20px}.pickup-upload .pickup-list .pickup-list-name .file-icon[data-v-5a3b1a38]{font-size:14px}.upload-tip-text[data-v-5a3b1a38]{font-size:12px;color:#303133}.template-intro[data-v-5a3b1a38]{margin-left:33px;background:#f7f8fa;width:400px;height:280px}.template-title[data-v-5a3b1a38]{font-size:12px;line-height:17px;color:#303133;margin-left:16px;margin-top:16px;font-weight:400}.right-border{border-right:1px solid #ebeef5}.step-style .el-step.is-vertical .el-step__line{top:30px;left:8px;-webkit-transform:scaleX(.5);transform:scaleX(.5)}.step-style .el-step__head.is-finish{color:#2f54eb;border-color:#2f54eb}.step-style .el-step__icon.is-text{border:1px solid}.step-style .el-step__icon{width:16px;height:16px}.step-style .el-step__icon-inner{font-size:12px}
\ No newline at end of file
dist/js/chunk-a144d7ae.e9c15fcc.js → dist/js/chunk-a144d7ae.f0ace20d.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/js/chunk-b8184622.b13854c8.js → dist/js/chunk-b8184622.3cbb0717.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/js/chunk-vendors.e1d4da3a.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/js/chunk-vendors.f7b52046.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/js/gic-card.b2ff9e14.js → dist/js/gic-card.41a7fa30.js
This source diff could not be displayed because it is too large. You can view the blob instead.
public/index.html
......@@ -49,7 +49,7 @@
<script src="//web-1251519181.file.myqcloud.com/components/delete.1.1.4.js"></script><!-- 删除轻弹窗 -->
<script src="//web-1251519181.file.myqcloud.com/components/input-number.1.0.12.js"></script><!-- 输入框 -->
<script src="//web-1251519181.file.myqcloud.com/components/welfare-selector.0.0.18.js"></script><!-- 福利选择器 -->
<script src="//web-1251519181.file.myqcloud.com/components/acc-group-select.1.0.5.js"></script><!-- 账号分组组件 -->
<script src="//web-1251519181.file.myqcloud.com/components/acc-group-select.1.0.8.js"></script><!-- 账号分组组件 -->
<script src="//web-1251519181.file.myqcloud.com/components/editor.1.1.13.js"></script><!-- 富文本编辑器 -->
</body>
</html>
src/views/gift-manage/virtual-gift-detail.vue
......@@ -149,7 +149,8 @@
<div class="form-section mb56">
<h3>权限设置</h3>
<el-form-item label="操作人权限" required>
<dm-acc-group-select :etype.sync="goodsForm.operAuthType" :group-ids.sync="goodsForm.operAuthPre" />
<!-- <dm-acc-group-select :etype.sync="goodsForm.operAuthType" :group-ids.sync="goodsForm.operAuthPre" /> -->
<dm-acc-group-select ref="accg" input-width="250px" :scene-type="sceneType" :relation-id="relationId" :is-echo="isEcho" />
</el-form-item>
</div>
<div class="fixed-btn">
......@@ -311,7 +312,10 @@ export default {
correct2: true,
correct3: true,
correct4: true,
template2: ''
template2: '',
relationId: '', // 账号分组relationId
isEcho: false, // 控制操作人权限是否回显数据
sceneType: 10, // 场景值，现在测试使用，后期提供确定的
};
},
mounted() {
......@@ -324,6 +328,8 @@ export default {
this.bread[3].breadName = '编辑礼品';
this.getMess();
this.isEdit = true;
this.isEcho = true;
this.relationId = this.$route.query.giftId;
}else{
this.getGiftId();
}
......@@ -334,6 +340,7 @@ export default {
getGiftId().then(res =>{
if(res.code === '0000'){
this.giftId = res.result;
this.relationId = res.result;
}else{
this.$message.error(res.message);
}
......@@ -342,32 +349,12 @@ export default {
checkUploadDetail(){
this.dialogVisible = true;
this.dialogId = this.giftId;
console.log(this.dialogId);
},
closeUploadDetail(){
this.dialogVisible = false;
},
// uploadFile(file){
// console.log(file);
// },
beforeUploadFile(file, fileList){
this.uploadFile.name = file.name;
// console.log(file);
// console.log(fileList);
// this.fileName = file.name;
// console.log(file.response);
// let result = file.response.result;
// console.log(result);
// let fileUrl = result.url;
// console.log(fileUrl);
// let params = {
// giftId: this.giftId,
// file: file,
// remark: ''
// };
// virtualGiftUpload(params).then(res =>{
// console.log(res);
// });
},
downloadFile() {
if(!this.isEdit){
......@@ -381,23 +368,6 @@ export default {
window.open(`${prev}/static/虚拟礼品卡券模板.xlsx`, '_blank');
}
},
// uploadChange(file){
// console.log(file);
// let params = {
// giftId: this.giftId,
// file: this.fileName
// };
// virtualGiftUpload(params).then(res =>{
// console.log(res);
// });
// },
// templateUpload(){},
// 表头添加必填标识符
// starAdd(obj){
// if(obj.column.label === '库存' || obj.column.label === '成本价(元)') {
// return 'star';
// }
// },
handleChange2(value){
this.goodsForm.template = value;
this.correct = false;
......@@ -405,7 +375,6 @@ export default {
this.correct2 = true;
this.correct3 = true;
this.correct4 = true;
// console.log(this.goodsForm.giftDescrption);
},
// 保存发货内容 校验
saveDescription(){
......@@ -479,7 +448,6 @@ export default {
// },
// 下载模板
downloadTemplate(){
console.log('下载模板');
giftTemplateDownload({ template: this.goodsForm.template }).then(res =>{
if(res.code === '0000'){
console.log(res.result);
......@@ -502,21 +470,6 @@ export default {
this.enterpriseName = res.result.enterpriseName;
});
},
// 操作人权限数据回显
// getOperatorList(){
// let params = {
// typeEnum: 'WELFARE',
// relationId: this.giftId
// };
// getOperatorList(params).then(res =>{
// if(res.code === '0000'){
// console.log(res.result);
// this.goodsForm.operAuthPre = res.result;
// }else{
// this.$message.error(res.message);
// }
// });
// },
getMess() {
let params = {
id: this.giftId
......@@ -557,13 +510,6 @@ export default {
this.$message.error(res.message);
}
}).finally(() => this.$emit('updateLoading'));
// .catch(error => {
// this.$message.error({
// duration: 1000,
// message: error.message
// });
// }).finally(() => this.$emit('updateLoading'));
console.log(222);
},
// 上传前
beforeUpload(file) {
......@@ -615,10 +561,12 @@ export default {
this.$message.error('请上传主图');
return false;
}
if(!this.goodsForm.operAuthType){
this.$message.error('请选择操作人权限');
return false;
}
// if(!this.goodsForm.operAuthType){
// this.$message.error('请选择操作人权限');
// return false;
// }
if(!this.$refs.accg.validate()) return;
this.$refs.accg.save();
this.$refs[goodsForm].validate(valid => {
if (!valid){
PublicMethods.jumpToFormError(); // eslint-disable-line
......@@ -640,8 +588,10 @@ export default {
refundFlag: this.goodsForm.refundFlag, // 是否支持退货
giftSpecInfo: JSON.stringify(this.goodsStandardInfo),
skuList: [],
operAuthType: this.goodsForm.operAuthType, // 操作人权限
operAuth: this.goodsForm.operAuthPre.join(','), // 操作人权限
// operAuthType: this.goodsForm.operAuthType, // 操作人权限
// operAuth: this.goodsForm.operAuthPre.join(','), // 操作人权限
operAuthType: 1, // 操作人权限
operAuth: '', // 操作人权限
deliveryType: '3', // 兑换方式
source: 1, // 新建方式 默认手动发布1
shopSelectType: '', // 门店选择类型
......
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