Skip to content

I
integral-mall
Commit 94282bc7 by damodmg
Options

更新

parent dbd7daf2
Showing with 46 additions and 14 deletions
dist/index.html
......@@ -2,4 +2,4 @@
gio('init','8be12240a3749eab', {});
//custom page code begin here
//custom page code end here
gio('send');</script><link href=./static/css/app.1295daaf5476042f8bd77439aaf798ad.css rel=stylesheet></head><body><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.5.2/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/elementUI/index.2.5.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.33.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.12.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.04.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-linkage.2.0.41.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-new.2.0.11.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.06.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.13.js></script><script src=//web-1251519181.file.myqcloud.com/components/people.2.0.26.js></script><script src=//web-1251519181.file.myqcloud.com/components/delete.2.0.00.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.3c5834cc437c7b2d524e.js></script><script type=text/javascript src=./static/js/app.9ea5ff88e3613a620e30.js></script></body></html>
\ No newline at end of file
gio('send');</script><link href=./static/css/app.f00436ee2920feafbd10a73b86a2a45b.css rel=stylesheet></head><body><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.5.2/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/elementUI/index.2.5.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.33.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.12.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.04.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-linkage.2.0.41.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-new.2.0.11.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.06.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.13.js></script><script src=//web-1251519181.file.myqcloud.com/components/people.2.0.26.js></script><script src=//web-1251519181.file.myqcloud.com/components/delete.2.0.00.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.3c5834cc437c7b2d524e.js></script><script type=text/javascript src=./static/js/app.54756800412bc40f6688.js></script></body></html>
\ No newline at end of file
dist/static/js/app.54756800412bc40f6688.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/app.9ea5ff88e3613a620e30.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
src/views/goods/coupon/info.vue
......@@ -110,13 +110,13 @@
<div class="section-content">
<h3>兑换设置</h3>
<span style="display:none">{{ refash }}</span>
<el-form-item label="适用会员" prop="gradeType">
<el-form-item label="适用会员" prop="gradeType" v-if="cliqueStatus">
<el-radio-group v-model="couponForm.gradeType" @change="handleChange">
<el-radio :label="1">品牌卡</el-radio>
<el-radio :label="2" v-if="cliqueStatus">集团卡</el-radio>
<el-radio :label="2">集团卡</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item prop="memberGrade">
<el-form-item prop="memberGrade" :label="cliqueStatus ? '' : '适用会员'">
<el-select v-model="couponForm.memberGrade" multiple placeholder="请选择" size="small" class="w-600">
<el-option v-for="item in memberGradeList" :key="item.gradeId" :label="item.gradeName" :value="item.gradeId"> </el-option>
</el-select>
......@@ -388,6 +388,10 @@ export default {
// this.getInfo();
// }
},
handleChange() {
this.couponForm.memberGrade = [];
this.getMemberGradeList();
},
// 获取会员等级
getMemberGradeList() {
request.post('/api-integral-mall/load-grade').then(res => {
......
src/views/goods/gift/info.vue
......@@ -112,13 +112,13 @@
</div>
<div class="section-content">
<h3>兑换设置</h3>
<el-form-item label="适用会员" prop="gradeType">
<el-form-item label="适用会员" prop="gradeType" v-if="cliqueStatus">
<el-radio-group v-model="giftForm.gradeType" @change="handleChange">
<el-radio :label="1">品牌卡</el-radio>
<el-radio :label="2" v-if="cliqueStatus">集团卡</el-radio>
<el-radio :label="2">集团卡</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item prop="memberGrade">
<el-form-item prop="memberGrade" :label="cliqueStatus ? '' : '适用会员'">
<el-select v-model="giftForm.memberGrade" multiple placeholder="请选择" size="small" class="w-600">
<el-option v-for="item in memberGradeList" :key="item.gradeId" :label="item.gradeName" :value="item.gradeId"> </el-option>
</el-select>
......
src/views/setting/editDeliver.vue
......@@ -59,7 +59,7 @@
</el-form-item>
<div v-if="form.status">
<el-form-item label="日期类型" prop="timeType">
<el-radio-group v-model="form.timeType">
<el-radio-group v-model="form.dateType">
<el-radio :label="1">动态日期</el-radio>
<el-radio :label="2">固定日期</el-radio>
</el-radio-group>
......@@ -93,7 +93,7 @@
<span>天后，停止自提</span>
</el-form-item>
</div>
<div v-if="form.timeType === 2">
<div v-if="form.dateType === 2">
<el-form-item label="日期设置">
<el-form-item v-for="(item, index) in form.dataRangeList" :key="index" style="margin:0px 0 22px 0" :prop="'dataRangeList.' + index + '.dataRange'" :rules="[{ validator: validateData, trigger: 'change' }]">
<el-date-picker v-model="item.dataRange" is-range format="yy-MM-dd" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" @change="value => limitDataSelect(index, value)"> </el-date-picker>
......@@ -242,6 +242,7 @@ export default {
return {
fixedWidth: document.documentElement.clientWidth - 200,
getHours: getInputVal.getHours,
getTime: getInputVal.getTime,
form: {
shopType: 0,
pickUpPointName: '',
......@@ -251,7 +252,7 @@ export default {
pickUpPointOpenTime: '', //营业开始时间
pickUpPointCloseTime: '', //营业关闭时间
status: false,
timeType: 1,
dateType: 1,
radio: 1,
timeHours: '', //小时
timeMinuter: '', //分钟
......@@ -265,7 +266,7 @@ export default {
},
validateData,
formRules: {
timeType: [{ required: true, message: '请选择时间类型', trigger: 'change' }],
dateType: [{ required: true, message: '请选择时间类型', trigger: 'change' }],
timeHours: [{ validator: timeHoursValidator, trigger: 'blur' }],
timeMinuter: [{ validator: timeMinuterValidator, trigger: 'blur' }],
timeDay: [{ validator: timeDayValidator, trigger: 'blur' }],
......@@ -448,12 +449,15 @@ export default {
this.form.timeHours = res.data.result.settingDTO.delayHour;
this.form.timeMinuter = res.data.result.settingDTO.delayMinute;
this.form.timeDay = res.data.result.settingDTO.delayDay;
this.form.dateType = res.data.result.settingDTO.dateType;
if (res.data.result.settingDTO.canChooseTime === 0) {
//自提时间关闭
// let currentTime = new Date(new Date().valueOf());
// let currentTime1 = new Date(new Date(new Date().getTime() + 1000 * 60).valueOf());
// this.form.timeRangeList[0].timeRange = [currentTime, currentTime1];
this.form.timeRangeList[0].timeRange = '';
this.form.dataRangeList[0].dataRange = '';
} else {
if (res.data.result.settingDTO.choosenTime) {
this.form.timeRangeList = [];
......@@ -466,6 +470,14 @@ export default {
this.form.timeRangeList.push({ timeRange: [time1, time2] });
}
}
if (this.form.dateType === 2) {
//固定时间
for (let item of res.data.result.settingDTO.fixedDate) {
this.form.timeRangeList.push({ timeRange: [item.startTime, item.endTime] });
}
} else {
this.form.timeRangeList[0].dataRange = '';
}
}
this.form.overTime = res.data.result.settingDTO.overTime;
this.form.overTimeType = res.data.result.settingDTO.overTimeType || 1;
......@@ -539,7 +551,8 @@ export default {
delayDay: this.form.timeDay ? Number(this.form.timeDay) : null,
choosenTime: [],
overTime: Number(this.form.overTime),
overTimeType: this.form.overTimeType
overTimeType: this.form.overTimeType,
dateType: this.form.dateType
}
};
......@@ -572,7 +585,8 @@ export default {
delayDay: this.form.timeDay ? Number(this.form.timeDay) : null,
choosenTime: [],
overTime: Number(this.form.overTime),
overTimeType: this.form.overTimeType
overTimeType: this.form.overTimeType,
dateType: this.form.dateType
}
};
let arrObj = [];
......@@ -589,6 +603,20 @@ export default {
} else {
params.settingVo.choosenTime = arrObj;
}
let fixedDate = [];
if (this.form.dateType === 2) {
for (let item of this.form.dataRangeList) {
if (item.dataRange) {
fixedDate.push({
startTime: this.getTime(item.dataRange[0]),
endTime: this.getTime(item.dataRange[1])
});
}
}
params.settingVo.fixedDate = fixedDate;
} else {
params.settingVo.fixedDate = [];
}
url = '/api-integral-mall/update-pick-up-points';
}
request.post(url, params).then(res => {
......
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