Skip to content

I
integral-mall
Commit 08f3062d by chenxin
Options

fix: gift增加新客可见checkbox

parent c25152d7
Showing with 62 additions and 21 deletions
dist/index.html
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel=stylesheet type=text/css href=./static/css/iconfont.css><link rel=stylesheet type=text/css href=./static/css/common.css><link rel="shortcut icon" type=image/x-icon href=./static/img/favicon.ico><title>积分商城</title><link href=./static/css/app.486c5bb09435721488d99cbc7cca45c4.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.35.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.15.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 src=//web-1251519181.file.myqcloud.com/components/store-card.2.0.18.js></script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.4809b2320b3f3d3aa326.js></script><script type=text/javascript src=./static/js/app.00d95c6b64fdfce715c4.js></script></body></html>
\ No newline at end of file
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel=stylesheet type=text/css href=./static/css/iconfont.css><link rel=stylesheet type=text/css href=./static/css/common.css><link rel="shortcut icon" type=image/x-icon href=./static/img/favicon.ico><title>积分商城</title><link href=./static/css/app.e1844d9085d54f6a2974d7adc0c47791.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.35.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.15.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 src=//web-1251519181.file.myqcloud.com/components/store-card.2.0.18.js></script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.c675686ec8a78233a281.js></script><script type=text/javascript src=./static/js/app.2103b85cf158b3db6291.js></script></body></html>
\ No newline at end of file
dist/static/css/app.486c5bb09435721488d99cbc7cca45c4.css deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/css/app.e1844d9085d54f6a2974d7adc0c47791.css 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/app.00d95c6b64fdfce715c4.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/app.2103b85cf158b3db6291.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/vendor.4809b2320b3f3d3aa326.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/vendor.c675686ec8a78233a281.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
src/components/store/store-group.vue
......@@ -190,8 +190,14 @@ export default {
removeSelect(item, index) {
// item.disabled = false;
// this.$set(this.leftList, 'item', false);
this.selectRightList.splice(copy(this.selectRightList).findIndex(i => i.storeGroupId === item.storeGroupId), 1);
this.selectLeftList.splice(this.selectLeftList.findIndex(i => i.storeGroupId === item.storeGroupId), 1);
this.selectRightList.splice(
copy(this.selectRightList).findIndex(i => i.storeGroupId === item.storeGroupId),
1
);
this.selectLeftList.splice(
this.selectLeftList.findIndex(i => i.storeGroupId === item.storeGroupId),
1
);
this.selectIdList = [];
for (let item of this.selectLeftList) {
this.selectIdList.push(item.storeGroupId);
......
src/components/store/store-part.vue
......@@ -185,7 +185,10 @@ export default {
// 移除
removeItem(item, index) {
this.selectRightList.splice(index, 1);
this.selectLeftList.splice(this.selectLeftList.findIndex(i => i.integralMallPickUpPointId === item.integralMallPickUpPointId), 1);
this.selectLeftList.splice(
this.selectLeftList.findIndex(i => i.integralMallPickUpPointId === item.integralMallPickUpPointId),
1
);
//取消表格选中数据
let obj = this.tableData.find(i => {
return i.integralMallPickUpPointId === item.integralMallPickUpPointId;
......
src/views/goods/coupon/info.vue
......@@ -34,9 +34,7 @@
</template>
</el-table-column>
<el-table-column label="领取限制">
<template slot-scope="scope">
{{ scope.row.cardLimit }}张/人
</template>
<template slot-scope="scope"> {{ scope.row.cardLimit }}张/人 </template>
</el-table-column>
<el-table-column label="适用门店">
<template slot-scope="scope">
......@@ -346,7 +344,10 @@ export default {
couponRules: {
integralCost: [{ required: true, message: '请输入积分费用', trigger: 'blur' }],
cashCost: [{ required: true, message: '请输入现金费用', trigger: 'blur' }],
virtualStock: [{ required: true, message: '请输入库存', trigger: 'blur' }, { validator: stockValidator, trigger: 'blur' }],
virtualStock: [
{ required: true, message: '请输入库存', trigger: 'blur' },
{ validator: stockValidator, trigger: 'blur' }
],
gradeType: [{ required: true, message: '请选择适用会员', trigger: 'change' }],
memberGrade: [{ required: true, message: '请选择适用会员', trigger: 'change' }],
exchangeFixDate: [{ required: true, message: '请选择时间', trigger: 'change' }],
......
src/views/goods/gift/info.vue
......@@ -203,6 +203,10 @@
<el-radio :label="1">上架状态就显示</el-radio>
<el-radio :label="2">兑换状态下显示</el-radio>
</el-radio-group>
<div v-if="giftForm.proShowStatus == 1" style="margin-left:20px;">
<el-checkbox v-model="giftForm.isNewGuestVisible" :true-label="1" :false-label="0">新客可见</el-checkbox>
<span class="tips">开启新客可见，则无门店所属的游客满足会员等级均可见</span>
</div>
</el-form-item>
<el-form-item label="上架时间" prop="releaseType">
<el-radio-group v-model="giftForm.releaseType">
......@@ -220,7 +224,7 @@
<el-checkbox label="2">快递发货</el-checkbox>
<el-checkbox v-if="giftForm.changeType === 1" label="1">微信兑换券</el-checkbox>
<el-checkbox v-if="giftForm.changeType !== 1" label="4" @change="handleStatus" @click="selfRaising">门店自提</el-checkbox>
<span style="font-size: 12px;color: rgb(144, 147, 153);margin-left:10px;display: inline-block;vertical-align: middle;">公众号积分商城不支持此功能，小程序积分商城请升级至V3.5.8及以上版本</span>
<span class="tips">公众号积分商城不支持此功能，小程序积分商城请升级至V3.5.8及以上版本</span>
</el-checkbox-group>
</el-form-item>
<el-form-item label="自提点" v-if="giftForm.changeTypeList.indexOf('4') != -1">
......@@ -273,9 +277,7 @@
</template>
</el-table-column>
<el-table-column label="领取限制">
<template slot-scope="scope"
>{{ scope.row.cardLimit }}张/人</template
>
<template slot-scope="scope">{{ scope.row.cardLimit }}张/人</template>
</el-table-column>
<el-table-column label="适用门店">
<template slot-scope="scope">{{ scope.row.storeMode === 0 ? '所有门店' : scope.row.storeMode === 1 ? '部分分组' : '部分门店' }}</template>
......@@ -401,7 +403,8 @@ export default {
integralCost: '', //积分
cashCost: '', //现金
virtualStock: '', //库存
proCodeQuery: '' //条形码
proCodeQuery: '', //条形码
isNewGuestVisible: 0 // 0：新客不可见、1：新客可见
},
limitTimes: 0,
limitTimesNum: 0,
......@@ -732,6 +735,7 @@ export default {
this.giftForm.costValue = res.data.result.costValue; //礼品成本
this.giftForm.marketPrice = res.data.result.marketPrice; //市场价
this.giftForm.detailDescription = res.data.result.detailDescription; //图文详情
this.giftForm.isNewGuestVisible = res.data.result.isNewGuestVisible || 0; //新客是否可见
// if (res.data.result.searchParams) {
// this.searchParams = res.data.result.searchParams; //会员筛选
// } else {
......@@ -1748,7 +1752,8 @@ export default {
giftProStandardJson: this.giftProStandardJson ? JSON.stringify(this.giftProStandardJson) : '', //规格列表
skuJson: this.submitSkuJson.length ? JSON.stringify(this.submitSkuJson) : '', //sku数据
pickUpPointType: this.giftForm.changeTypeList.indexOf('4') != -1 ? this.pickUpPointType : '', //门店自提数据
pickUpPointExtra: this.giftForm.changeTypeList.indexOf('4') != -1 ? JSON.stringify(this.selectedStoreData) : '' //门店自提数据
pickUpPointExtra: this.giftForm.changeTypeList.indexOf('4') != -1 ? JSON.stringify(this.selectedStoreData) : '', //门店自提数据
isNewGuestVisible: this.giftForm.proShowStatus == 1 ? this.giftForm.isNewGuestVisible : 0 // 新客是否可见 0：新客不可见、1：新客可见'
};
if (this.pickUpPointType === 4) {
params.pickUpPoint = this.pickUpPointStr;
......@@ -2100,6 +2105,14 @@ export default {
left: 430px;
top: 0px;
}
.tips {
font-size: 12px;
color: rgb(144, 147, 153);
margin-left:10px;
display: inline-block;
vertical-align: middle;
line-height: 32px;
}
/* 人群筛选器 */
/* .gic-people--button {
background: #f2f3f4;
......
src/views/order/agreeRefund.vue
......@@ -59,8 +59,14 @@ export default {
refundPoint: '',
refundMoney: '',
modalRules: {
refundPoint: [{ required: true, message: '请输入积分', trigger: 'blur' }, { validator: refundPointValidator, trigger: 'blur' }],
refundMoney: [{ required: true, message: '请输入金额', trigger: 'blur' }, { validator: refundMoneyValidator, trigger: 'blur' }]
refundPoint: [
{ required: true, message: '请输入积分', trigger: 'blur' },
{ validator: refundPointValidator, trigger: 'blur' }
],
refundMoney: [
{ required: true, message: '请输入金额', trigger: 'blur' },
{ validator: refundMoneyValidator, trigger: 'blur' }
]
},
submitLoading: false //按钮禁止重复提交
};
......
src/views/setting/editDeliver.vue
......@@ -277,8 +277,14 @@ export default {
timeHours: [{ validator: timeHoursValidator, trigger: 'blur' }],
timeMinuter: [{ validator: timeMinuterValidator, trigger: 'blur' }],
timeDay: [{ validator: timeDayValidator, trigger: 'blur' }],
orderTimeHours: [{ required: true, message: '请输入时间', trigger: 'blur' }, { validator: orderTimeHoursValidator, trigger: 'blur' }],
overTime: [{ required: true, message: '请输入提货有效期', trigger: 'blur' }, { validator: overTimeValidator, trigger: 'blur' }]
orderTimeHours: [
{ required: true, message: '请输入时间', trigger: 'blur' },
{ validator: orderTimeHoursValidator, trigger: 'blur' }
],
overTime: [
{ required: true, message: '请输入提货有效期', trigger: 'blur' },
{ validator: overTimeValidator, trigger: 'blur' }
]
},
validateTime,
// 门店控件
......
src/views/setting/pickedAuto.vue
......@@ -218,8 +218,14 @@ export default {
timeHours: [{ validator: timeHoursValidator, trigger: 'blur' }],
timeMinuter: [{ validator: timeMinuterValidator, trigger: 'blur' }],
timeDay: [{ validator: timeDayValidator, trigger: 'blur' }],
orderTimeHours: [{ required: true, message: '请输入时间', trigger: 'blur' }, { validator: orderTimeHoursValidator, trigger: 'blur' }],
overTime: [{ required: true, message: '请输入提货有效期', trigger: 'blur' }, { validator: overTimeValidator, trigger: 'blur' }]
orderTimeHours: [
{ required: true, message: '请输入时间', trigger: 'blur' },
{ validator: orderTimeHoursValidator, trigger: 'blur' }
],
overTime: [
{ required: true, message: '请输入提货有效期', trigger: 'blur' },
{ validator: overTimeValidator, trigger: 'blur' }
]
},
submitLoading: false,
clearableBtn: false,
......
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