Skip to content

W
welfare
Commit 6aaa6f9f by 萱草
Options

update: 更新bug

parent 4a785987
Showing with 70 additions and 34 deletions
dist/css/chunk-0860f57a.d0a8384e.css 0 → 100644
.hidden-limit .dm-input__counter{display:none}.popver-button .el-button:not(.el-button--text){min-width:50px}.right-border{border-right:1px solid #ebeef5}.w360[data-v-60ceb8dc]{width:360px}.w-160[data-v-60ceb8dc]{width:160px}.w140[data-v-60ceb8dc]{width:140px}.w350[data-v-60ceb8dc]{width:350px}.tab-top[data-v-60ceb8dc]{height:32px;margin:20px 20px 0 20px}.tab-top .fl[data-v-60ceb8dc],.tab-top[data-v-60ceb8dc]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.table-content[data-v-60ceb8dc]{margin:20px;padding-bottom:20px}.table-content .img-text[data-v-60ceb8dc]{height:60px}.table-content .img-text img[data-v-60ceb8dc]{width:60px;height:60px;border:1px solid #dcdfe6;padding:4px;border-radius:2px}.table-content .img-text .text[data-v-60ceb8dc]{display:inline-block;vertical-align:top;width:75%;height:60px;margin-left:3px;font-size:13px;line-height:14px;position:relative}.table-content .img-text .text .goods-descript[data-v-60ceb8dc]{display:-webkit-box;display:-ms-flexbox;display:flex;color:#606266;line-height:18px;font-size:14px}.table-content .img-text .text .goods-code[data-v-60ceb8dc]{color:#909399;font-size:12px;line-height:16px;margin-bottom:2px;position:absolute;bottom:2px}.table-content .img-text .el-icon-edit-outline[data-v-60ceb8dc]{display:none;cursor:pointer}.table-content .img-text :hover .el-icon-edit-outline[data-v-60ceb8dc]{display:inline-block;cursor:pointer}.table-content .img-text .el-icon-edit-outline[data-v-60ceb8dc]:hover{color:#2f54ed}.table-content .stock-box .el-icon-edit-outline[data-v-60ceb8dc]{display:none;cursor:pointer}.table-content .stock-box:hover .el-icon-edit-outline[data-v-60ceb8dc]{display:inline-block;cursor:pointer}.el-icon-edit-outline[data-v-60ceb8dc]:hover{color:#2f54ed}.undeline-dash[data-v-60ceb8dc]{border-bottom:1px dashed #2f54eb;font-weight:500}.spanclass[data-v-60ceb8dc]{display:inline-block;line-height:32px}.hidden-data[data-v-60ceb8dc]{max-width:180px;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}.stock-box .el-tooltip__popper{width:150px}
\ No newline at end of file
dist/css/chunk-28cb370c.c4067039.css deleted 100644 → 0
.w-280[data-v-1b2ddbf4]{width:280px}
\ No newline at end of file
dist/css/chunk-2cc4ec9a.aec30b1f.css 0 → 100644
.w-480[data-v-47eb2695]{width:480px}
\ No newline at end of file
dist/css/chunk-36765440.86f18b01.css 0 → 100644
.w-280[data-v-83f2f180]{width:280px}.w600[data-v-7f217284]{width:600px}
\ No newline at end of file
dist/css/chunk-842b928e.3a0d41da.css deleted 100644 → 0
.w-280[data-v-1b2ddbf4]{width:280px}.w600[data-v-7f217284]{width:600px}
\ No newline at end of file
dist/css/chunk-8a64bbc2.87b68e95.css deleted 100644 → 0
.right-border{border-right:1px solid #ebeef5}.hidden-limit .dm-input__counter{display:none}.popver-button .el-button:not(.el-button--text){min-width:50px}.file-style:hover .upload-trigger[data-v-30465c69]{border-color:#1890ff}.upload-ele .el-button[data-v-30465c69]{border:none;color:#c0c4cc}.upload-ele .el-button--small[data-v-30465c69]{padding:0}.uploadText p[data-v-30465c69]{line-height:26px}.pickup-upload[data-v-30465c69]{display:inline-block;vertical-align:top}.pickup-upload .upload-trigger[data-v-30465c69]{border-style:dashed;margin-right:10px}.pickup-upload .upload-trigger .upload-icon[data-v-30465c69]{font-size:14px}.pickup-upload .pickup-list[data-v-30465c69]{margin-top:18px}.pickup-upload .pickup-list .pickup-list-name[data-v-30465c69]{font-size:14px;font-weight:400;color:#303133;line-height:20px}.pickup-upload .pickup-list .pickup-list-name .file-icon[data-v-30465c69]{font-size:14px}.w360[data-v-440ea296]{width:360px}.w-160[data-v-440ea296]{width:160px}.w140[data-v-440ea296]{width:140px}.w350[data-v-440ea296]{width:350px}.tab-top[data-v-440ea296]{height:32px;margin:20px 20px 0 20px}.tab-top .fl[data-v-440ea296],.tab-top[data-v-440ea296]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.table-content[data-v-440ea296]{margin:20px;padding-bottom:20px}.table-content .img-text[data-v-440ea296]{height:60px}.table-content .img-text img[data-v-440ea296]{width:60px;height:60px;border:1px solid #dcdfe6;padding:4px;border-radius:2px}.table-content .img-text .text[data-v-440ea296]{display:inline-block;vertical-align:top;width:75%;height:60px;margin-left:3px;font-size:13px;line-height:14px;position:relative}.table-content .img-text .text .goods-descript[data-v-440ea296]{display:-webkit-box;display:-ms-flexbox;display:flex;color:#606266;line-height:18px;font-size:14px}.table-content .img-text .text .goods-code[data-v-440ea296]{color:#909399;font-size:12px;line-height:16px;margin-bottom:2px;position:absolute;bottom:2px}.table-content .img-text .el-icon-edit-outline[data-v-440ea296]{display:none;cursor:pointer}.table-content .img-text :hover .el-icon-edit-outline[data-v-440ea296]{display:inline-block;cursor:pointer}.table-content .img-text .el-icon-edit-outline[data-v-440ea296]:hover{color:#2f54ed}.table-content .stock-box .el-icon-edit-outline[data-v-440ea296]{display:none;cursor:pointer}.table-content .stock-box:hover .el-icon-edit-outline[data-v-440ea296]{display:inline-block;cursor:pointer}.el-icon-edit-outline[data-v-440ea296]:hover{color:#2f54ed}.undeline-dash[data-v-440ea296]{border-bottom:1px dashed #2f54eb;font-weight:500}.spanclass[data-v-440ea296]{display:inline-block;line-height:32px}.hidden-data[data-v-440ea296]{max-width:180px;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}.stock-box .el-tooltip__popper{width:150px}
\ No newline at end of file
dist/css/chunk-96e064be.d701ab59.css 0 → 100644
.w-280[data-v-83f2f180]{width:280px}
\ No newline at end of file
dist/css/chunk-a3d44a22.669940f7.css 0 → 100644
.right-border{border-right:1px solid #ebeef5}.hidden-limit .dm-input__counter{display:none}.popver-button .el-button:not(.el-button--text){min-width:50px}.file-style:hover .upload-trigger[data-v-30465c69]{border-color:#1890ff}.upload-ele .el-button[data-v-30465c69]{border:none;color:#c0c4cc}.upload-ele .el-button--small[data-v-30465c69]{padding:0}.uploadText p[data-v-30465c69]{line-height:26px}.pickup-upload[data-v-30465c69]{display:inline-block;vertical-align:top}.pickup-upload .upload-trigger[data-v-30465c69]{border-style:dashed;margin-right:10px}.pickup-upload .upload-trigger .upload-icon[data-v-30465c69]{font-size:14px}.pickup-upload .pickup-list[data-v-30465c69]{margin-top:18px}.pickup-upload .pickup-list .pickup-list-name[data-v-30465c69]{font-size:14px;font-weight:400;color:#303133;line-height:20px}.pickup-upload .pickup-list .pickup-list-name .file-icon[data-v-30465c69]{font-size:14px}.w360[data-v-093160e1]{width:360px}.w-160[data-v-093160e1]{width:160px}.w140[data-v-093160e1]{width:140px}.w350[data-v-093160e1]{width:350px}.tab-top[data-v-093160e1]{height:32px;margin:20px 20px 0 20px}.tab-top .fl[data-v-093160e1],.tab-top[data-v-093160e1]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.table-content[data-v-093160e1]{margin:20px;padding-bottom:20px}.table-content .img-text[data-v-093160e1]{height:60px}.table-content .img-text img[data-v-093160e1]{width:60px;height:60px;border:1px solid #dcdfe6;padding:4px;border-radius:2px}.table-content .img-text .text[data-v-093160e1]{display:inline-block;vertical-align:top;width:75%;height:60px;margin-left:3px;font-size:13px;line-height:14px;position:relative}.table-content .img-text .text .goods-descript[data-v-093160e1]{display:-webkit-box;display:-ms-flexbox;display:flex;color:#606266;line-height:18px;font-size:14px}.table-content .img-text .text .goods-code[data-v-093160e1]{color:#909399;font-size:12px;line-height:16px;margin-bottom:2px;position:absolute;bottom:2px}.table-content .img-text .el-icon-edit-outline[data-v-093160e1]{display:none;cursor:pointer}.table-content .img-text :hover .el-icon-edit-outline[data-v-093160e1]{display:inline-block;cursor:pointer}.table-content .img-text .el-icon-edit-outline[data-v-093160e1]:hover{color:#2f54ed}.table-content .stock-box .el-icon-edit-outline[data-v-093160e1]{display:none;cursor:pointer}.table-content .stock-box:hover .el-icon-edit-outline[data-v-093160e1]{display:inline-block;cursor:pointer}.el-icon-edit-outline[data-v-093160e1]:hover{color:#2f54ed}.undeline-dash[data-v-093160e1]{border-bottom:1px dashed #2f54eb;font-weight:500}.spanclass[data-v-093160e1]{display:inline-block;line-height:32px}.hidden-data[data-v-093160e1]{max-width:180px;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}.stock-box .el-tooltip__popper{width:150px}
\ No newline at end of file
dist/css/chunk-db3598a0.7f821c04.css deleted 100644 → 0
.hidden-limit .dm-input__counter{display:none}.popver-button .el-button:not(.el-button--text){min-width:50px}.right-border{border-right:1px solid #ebeef5}.w360[data-v-0928da8c]{width:360px}.w-160[data-v-0928da8c]{width:160px}.w140[data-v-0928da8c]{width:140px}.w350[data-v-0928da8c]{width:350px}.tab-top[data-v-0928da8c]{height:32px;margin:20px 20px 0 20px}.tab-top .fl[data-v-0928da8c],.tab-top[data-v-0928da8c]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.table-content[data-v-0928da8c]{margin:20px;padding-bottom:20px}.table-content .img-text[data-v-0928da8c]{height:60px}.table-content .img-text img[data-v-0928da8c]{width:60px;height:60px;border:1px solid #dcdfe6;padding:4px;border-radius:2px}.table-content .img-text .text[data-v-0928da8c]{display:inline-block;vertical-align:top;width:75%;height:60px;margin-left:3px;font-size:13px;line-height:14px;position:relative}.table-content .img-text .text .goods-descript[data-v-0928da8c]{display:-webkit-box;display:-ms-flexbox;display:flex;color:#606266;line-height:18px;font-size:14px}.table-content .img-text .text .goods-code[data-v-0928da8c]{color:#909399;font-size:12px;line-height:16px;margin-bottom:2px;position:absolute;bottom:2px}.table-content .img-text .el-icon-edit-outline[data-v-0928da8c]{display:none;cursor:pointer}.table-content .img-text :hover .el-icon-edit-outline[data-v-0928da8c]{display:inline-block;cursor:pointer}.table-content .img-text .el-icon-edit-outline[data-v-0928da8c]:hover{color:#2f54ed}.table-content .stock-box .el-icon-edit-outline[data-v-0928da8c]{display:none;cursor:pointer}.table-content .stock-box:hover .el-icon-edit-outline[data-v-0928da8c]{display:inline-block;cursor:pointer}.el-icon-edit-outline[data-v-0928da8c]:hover{color:#2f54ed}.undeline-dash[data-v-0928da8c]{border-bottom:1px dashed #2f54eb;font-weight:500}.spanclass[data-v-0928da8c]{display:inline-block;line-height:32px}.hidden-data[data-v-0928da8c]{max-width:180px;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}.stock-box .el-tooltip__popper{width:150px}
\ No newline at end of file
dist/js/chunk-2cc4ec9a.29d1ee03.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/js/chunk-34bff564.d2801cb5.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
src/views/gift-manage/address-lib-form.vue
......@@ -13,15 +13,20 @@
<el-input v-model="ruleForm.contact" :maxlength="20" show-word-limit></el-input>
</el-form-item>
<el-form-item prop="phone" label="手机号">
<dm-input-phone style="width:100%;" v-model="ruleForm.phone" show-word-limit></dm-input-phone>
<!-- <dm-input-phone style="width:100%;" v-model="ruleForm.phone" show-word-limit></dm-input-phone> -->
<el-input v-model="ruleForm.phone" type="text" class="w-480">
<el-select v-model="areaCode" slot="prepend" placeholder="请选择" style="width:90px">
<el-option :label="`+` + `${item.code}`" :value="item.code" v-for="(item, index) in areaCodeList" :key="index"></el-option>
</el-select>
</el-input>
</el-form-item>
<el-form-item prop="tel" label="电话">
<el-form-item label="电话">
<el-input v-model="tel1" :maxlength="20" style="width:120px;" placeholder="请填写区号"></el-input><span class="ml5 mr5 gray02">-</span>
<el-input v-model="tel2" :maxlength="20" style="width:120px;" placeholder="请填写座机号"></el-input><span class="ml5 mr5 gray02">-</span>
<el-input v-model="tel3" :maxlength="20" style="width:120px;" placeholder="请填写分机号"></el-input>
</el-form-item>
<el-form-item prop="cityIds" label="所在地区">
<el-cascader v-model="cityIds" style="width:100%;" :options="cityList"></el-cascader>
<el-form-item label="所在地区">
<el-cascader v-model="cityIds" style="width:100%;" :options="cityList" @change="change"></el-cascader>
</el-form-item>
<el-form-item prop="address" label="详细地址">
<el-input type="textarea" placeholder="请不要重复填写省市区" v-model="ruleForm.address" :maxlength="50" show-word-limit></el-input>
......@@ -36,6 +41,7 @@
<script>
import api from '@/api/gift.js';
import cityList from '@/assets/city.json';
import areaCodeList from '@/assets/areaCode.json';
import { isEmpty } from '@/utils/index';
const { getAddressDetails, insertOrUpdateAddress } = api;
export default {
......@@ -81,12 +87,14 @@ export default {
return {
loading: false,
addressId: this.$route.query.id,
areaCodeList: areaCodeList,
areaCode: '86',
ruleForm: {
type: 1,
defaultFlag: 0,
contact: '',
phone: '',
address: ''
address: '',
},
rules: {
contact: [ { required: true, message: '联系人不能为空', trigger: 'blur' } ],
......@@ -111,6 +119,10 @@ export default {
this.$emit('updateBread', [ { breadName: '福利中心' }, { breadName: '通用设置' }, { breadName: '地址库管理', breadPath: '/setting/address-lib-list' }, { breadName: (this.addressId ? '编辑' : '新建') + '地址库' } ]);
},
methods: {
change(value){
console.log(value);
// this.cityIds;
},
submitForm() {
this.$refs.ruleForm.validate((valid) => {
if (!valid) {
......@@ -131,7 +143,8 @@ export default {
provinceId: this.cityIds[0],
cityId: this.cityIds[1],
countyId: this.cityIds[2],
tel: this.tel1 ? `${this.tel1},${this.tel2},${this.tel3}` : ''
tel: this.tel1 ? `${this.tel1},${this.tel2},${this.tel3}` : '',
areaNo: this.areaCode,
};
if(this.addressId) {
params.addressId = this.addressId;
......@@ -158,8 +171,11 @@ export default {
this.ruleForm[key] = info[key];
}
});
if(info.areaNo){
this.areaCode = info.areaNo || '';
}
if(info.tel) {
const tel = info.tel.join(',');
const tel = info.tel.split(',');
this.tel1 = tel[0];
this.tel2 = tel[1];
this.tel3 = tel[2];
......@@ -173,3 +189,8 @@ export default {
}
};
</script>
<style scoped>
.w-480 {
width: 480px;
}
</style>
\ No newline at end of file
src/views/gift-manage/module/pickup-form-content.vue
......@@ -2,7 +2,8 @@
<div>
<el-form-item label="买家可选自提时间">
<el-switch v-model="ruleForm.chooseTimeFlag" :active-value="1" :inactive-value="0"></el-switch>
<p>开启表示买家可选择自提时间，商户需按约定时间备货完成</p>
<p>若不开启，则默认会员可在任意时间提货</p>
<p>若开启，表示买家可选择自提时间，商户需按约定时间备货完成</p>
</el-form-item>
<template v-if="ruleForm.chooseTimeFlag">
<el-form-item label="日期类型" required>
......
src/views/gift-manage/pickup-list.vue
......@@ -95,7 +95,18 @@ export default {
}
if(val == 1) {
// 批量删除
this.del(this.selectList.map(v => v.pickupId).join(','));
this.$confirm('<div>是否批量删除？</div>', '批量删除', {
closeOnClickModal: false,
showClose: false,
type: 'warning',
customClass: 'show-title',
dangerouslyUseHTMLString: true,
confirmButtonText: '批量删除',
})
.then(() => {
this.del(this.selectList.map(v => v.pickupId).join(','));
});
// this.del(this.selectList.map(v => v.pickupId).join(','));
}
},
del(pickupIds) {
......
src/views/gift-manage/real-gift.vue
......@@ -384,33 +384,33 @@ export default {
type: value
};
if(value == 2){
this.$confirm('<div>禁用礼品将在福利组件不展示，并且该礼品参加的活动将全部失效，确认禁用？</div>', '批量禁用', {
this.$confirm('<div>确认禁用该礼品吗？</div><div>禁用礼品将在福利组件不展示，并且该礼品参加的活动将全部失效。', '', {
closeOnClickModal: false,
showClose: false,
type: 'warning',
customClass: 'show-title',
dangerouslyUseHTMLString: true,
confirmButtonText: '确认',
confirmButtonText: '批量禁用',
})
.then(() => {
this.batchRequest(params);
console.log('批量禁用');
});
}else if(value == 0){
this.$confirm('<div>是否隐藏?</div>', '批量隐藏', {
this.$confirm('<div>是否批量隐藏?</div>', '批量隐藏', {
closeOnClickModal: false,
showClose: false,
type: 'warning',
customClass: 'show-title',
dangerouslyUseHTMLString: true,
confirmButtonText: '确认',
confirmButtonText: '批量隐藏',
})
.then(() => {
this.batchRequest(params);
console.log('批量隐藏');
});
}else if(value == 1){
this.$confirm('<div>是否取消隐藏?</div>', '批量取消隐藏', {
this.$confirm('<div>是否批量取消隐藏?</div>', '批量取消隐藏', {
closeOnClickModal: false,
showClose: false,
type: 'warning',
......@@ -423,13 +423,13 @@ export default {
console.log('批量取消隐藏');
});
}else if(value == 3){
this.$confirm('<div>是否启用?</div>', '批量启用', {
this.$confirm('<div>是否批量启用?</div>', '批量启用', {
closeOnClickModal: false,
showClose: false,
type: 'warning',
customClass: 'show-title',
dangerouslyUseHTMLString: true,
confirmButtonText: '确认',
confirmButtonText: '批量启用',
})
.then(() => {
this.batchRequest(params);
......@@ -488,7 +488,7 @@ export default {
type: 'warning',
customClass: 'show-title',
dangerouslyUseHTMLString: true,
confirmButtonText: '确认',
confirmButtonText: '取消隐藏',
}).then(() =>{
let params = {
giftIdList: [ item.giftId ],
......@@ -527,11 +527,11 @@ export default {
};
this.batchRequest(params);
}else{
this.$confirm('<div>禁用礼品将在福利组件不展示，并且该礼品参加的活动将全部失效，确认禁用？</div>', '禁用', {
this.$confirm('<div>确认禁用该礼品吗？</div><div>禁用礼品将在福利组件不展示，并且该礼品参加的活动将全部失效。</div>', '', {
closeOnClickModal: false,
showClose: false,
type: 'warning',
customClass: 'show-title',
// customClass: 'show-title',
dangerouslyUseHTMLString: true,
confirmButtonText: '禁用',
}).then(() => {
......
src/views/gift-manage/virtual-gift.vue
......@@ -457,13 +457,13 @@ export default {
type: value
};
if(value == 2){
this.$confirm('<div>已添加被禁用礼品的活动将会失效，确认禁用?</div>', '批量禁用', {
this.$confirm('<div>确认禁用该礼品吗？</div><div>禁用礼品将在福利组件不展示，并且该礼品参加的活动将全部失效。</div>', '', {
closeOnClickModal: false,
showClose: false,
type: 'warning',
customClass: 'show-title',
dangerouslyUseHTMLString: true,
confirmButtonText: '禁用',
confirmButtonText: '批量禁用',
})
.then(() => {
this.batchRequest(params);
......@@ -476,7 +476,7 @@ export default {
type: 'warning',
customClass: 'show-title',
dangerouslyUseHTMLString: true,
confirmButtonText: '隐藏',
confirmButtonText: '批量隐藏',
})
.then(() => {
this.batchRequest(params);
......@@ -502,7 +502,7 @@ export default {
type: 'warning',
customClass: 'show-title',
dangerouslyUseHTMLString: true,
confirmButtonText: '启用',
confirmButtonText: '批量启用',
})
.then(() => {
this.batchRequest(params);
......@@ -561,7 +561,7 @@ export default {
type: 'warning',
customClass: 'show-title',
dangerouslyUseHTMLString: true,
confirmButtonText: '确认',
confirmButtonText: '取消隐藏',
}).then(() =>{
let params = {
giftIdList: [ item.giftId ],
......@@ -599,11 +599,11 @@ export default {
};
this.batchRequest(params);
}else{
this.$confirm('<div>禁用礼品将在福利组件不展示，并且该礼品参加的活动将全部失效，确认禁用？</div>', '禁用', {
this.$confirm('<div>确认禁用该礼品吗？</div><div>禁用礼品将在福利组件不展示，并且该礼品参加的活动将全部失效。</div>', '', {
closeOnClickModal: false,
showClose: false,
type: 'warning',
customClass: 'show-title',
// customClass: 'show-title',
dangerouslyUseHTMLString: true,
confirmButtonText: '禁用',
}).then(() => {
......
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