Commit 43b49298 by chenyu

update: dist

parent 38c1d1aa
<!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.99cd2d40d855d6baf704701b9276f482.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.58.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.15.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/activity-select.1.0.2.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-new.2.0.71.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.21.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.24.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.30.js></script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js></script><script src=//web-1251519181.file.myqcloud.com/components/member-group.2.2.32.js></script><script src=//web-1251519181.file.myqcloud.com/components/track.1.0.4.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.d1221ae0119a2c13c63a.js></script><script type=text/javascript src=./static/js/app.56af9ea55bc386a64f97.js></script></body></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.c3724f3684277233912959672a391370.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.58.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.15.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/activity-select.1.0.2.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-new.2.0.71.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.21.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.24.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.30.js></script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js></script><script src=//web-1251519181.file.myqcloud.com/components/member-group.2.2.32.js></script><script src=//web-1251519181.file.myqcloud.com/components/track.1.0.4.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.5afd826b1895cd06227c.js></script><script type=text/javascript src=./static/js/app.c4d8ca13cc94cfe6701d.js></script></body></html>
\ No newline at end of file \ No newline at end of file
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -190,8 +190,14 @@ export default { ...@@ -190,8 +190,14 @@ export default {
removeSelect(item, index) { removeSelect(item, index) {
// item.disabled = false; // item.disabled = false;
// this.$set(this.leftList, 'item', false); // this.$set(this.leftList, 'item', false);
this.selectRightList.splice(copy(this.selectRightList).findIndex(i => i.storeGroupId === item.storeGroupId), 1); this.selectRightList.splice(
this.selectLeftList.splice(this.selectLeftList.findIndex(i => i.storeGroupId === item.storeGroupId), 1); copy(this.selectRightList).findIndex(i => i.storeGroupId === item.storeGroupId),
1
);
this.selectLeftList.splice(
this.selectLeftList.findIndex(i => i.storeGroupId === item.storeGroupId),
1
);
this.selectIdList = []; this.selectIdList = [];
for (let item of this.selectLeftList) { for (let item of this.selectLeftList) {
this.selectIdList.push(item.storeGroupId); this.selectIdList.push(item.storeGroupId);
......
...@@ -186,7 +186,10 @@ export default { ...@@ -186,7 +186,10 @@ export default {
// 移除 // 移除
removeItem(item, index) { removeItem(item, index) {
this.selectRightList.splice(index, 1); 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 => { let obj = this.tableData.find(i => {
return i.integralMallPickUpPointId === item.integralMallPickUpPointId; return i.integralMallPickUpPointId === item.integralMallPickUpPointId;
......
...@@ -120,9 +120,7 @@ ...@@ -120,9 +120,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="原价" v-if="!isEdit"> <el-table-column label="原价" v-if="!isEdit">
<template slot-scope="{ row }" <template slot-scope="{ row }">{{ row.integralCost }}积分+{{ row.cashCost }}</template>
>{{ row.integralCost }}积分+{{ row.cashCost }}</template
>
</el-table-column> </el-table-column>
<el-table-column label="当前库存" v-if="!isEdit"> <el-table-column label="当前库存" v-if="!isEdit">
<template slot-scope="{ row }">{{ row.virtualStock }}</template> <template slot-scope="{ row }">{{ row.virtualStock }}</template>
......
...@@ -45,9 +45,7 @@ ...@@ -45,9 +45,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="状态" prop="activityStatus"> <el-table-column label="状态" prop="activityStatus">
<template slot-scope="{ row }"> <template slot-scope="{ row }"> <span :class="[row.activityStatus === 0 ? 'dm-status--warning' : row.activityStatus === 1 ? 'dm-status--primary--flash' : 'dm-status--info']"> </span>{{ row.activityStatus === 0 ? '未开始' : row.activityStatus === 1 ? '进行中' : '已结束' }} </template>
<span :class="[row.activityStatus === 0 ? 'dm-status--warning' : row.activityStatus === 1 ? 'dm-status--primary--flash' : 'dm-status--info']"> </span>{{ row.activityStatus === 0 ? '未开始' : row.activityStatus === 1 ? '进行中' : '已结束' }}
</template>
</el-table-column> </el-table-column>
<el-table-column label="商品数量"> <el-table-column label="商品数量">
<template slot-scope="{ row }"> <template slot-scope="{ row }">
......
...@@ -46,9 +46,7 @@ ...@@ -46,9 +46,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="领取限制"> <el-table-column label="领取限制">
<template slot-scope="scope"> <template slot-scope="scope"> {{ scope.row.cardLimit }}张/人 </template>
{{ scope.row.cardLimit }}张/人
</template>
</el-table-column> </el-table-column>
<el-table-column label="适用门店"> <el-table-column label="适用门店">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -430,7 +428,10 @@ export default { ...@@ -430,7 +428,10 @@ export default {
couponRules: { couponRules: {
integralCost: [{ required: true, message: '请输入积分费用', trigger: 'blur' }], integralCost: [{ required: true, message: '请输入积分费用', trigger: 'blur' }],
cashCost: [{ 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' }], gradeType: [{ required: true, message: '请选择适用会员', trigger: 'change' }],
memberGrade: [{ required: true, message: '请选择适用会员', trigger: 'change' }], memberGrade: [{ required: true, message: '请选择适用会员', trigger: 'change' }],
exchangeFixDate: [{ required: true, message: '请选择时间', trigger: 'change' }], exchangeFixDate: [{ required: true, message: '请选择时间', trigger: 'change' }],
......
...@@ -337,9 +337,7 @@ ...@@ -337,9 +337,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="领取限制"> <el-table-column label="领取限制">
<template slot-scope="scope" <template slot-scope="scope">{{ scope.row.cardLimit }}张/人</template>
>{{ scope.row.cardLimit }}张/人</template
>
</el-table-column> </el-table-column>
<el-table-column label="适用门店"> <el-table-column label="适用门店">
<template slot-scope="scope">{{ scope.row.storeMode === 0 ? '所有门店' : scope.row.storeMode === 1 ? '部分分组' : '部分门店' }}</template> <template slot-scope="scope">{{ scope.row.storeMode === 0 ? '所有门店' : scope.row.storeMode === 1 ? '部分分组' : '部分门店' }}</template>
......
...@@ -59,8 +59,14 @@ export default { ...@@ -59,8 +59,14 @@ export default {
refundPoint: '', refundPoint: '',
refundMoney: '', refundMoney: '',
modalRules: { modalRules: {
refundPoint: [{ required: true, message: '请输入积分', trigger: 'blur' }, { validator: refundPointValidator, trigger: 'blur' }], refundPoint: [
refundMoney: [{ required: true, message: '请输入金额', trigger: 'blur' }, { validator: refundMoneyValidator, trigger: 'blur' }] { required: true, message: '请输入积分', trigger: 'blur' },
{ validator: refundPointValidator, trigger: 'blur' }
],
refundMoney: [
{ required: true, message: '请输入金额', trigger: 'blur' },
{ validator: refundMoneyValidator, trigger: 'blur' }
]
}, },
submitLoading: false //按钮禁止重复提交 submitLoading: false //按钮禁止重复提交
}; };
......
...@@ -276,8 +276,14 @@ export default { ...@@ -276,8 +276,14 @@ export default {
timeHours: [{ validator: timeHoursValidator, trigger: 'blur' }], timeHours: [{ validator: timeHoursValidator, trigger: 'blur' }],
timeMinuter: [{ validator: timeMinuterValidator, trigger: 'blur' }], timeMinuter: [{ validator: timeMinuterValidator, trigger: 'blur' }],
timeDay: [{ validator: timeDayValidator, trigger: 'blur' }], timeDay: [{ validator: timeDayValidator, trigger: 'blur' }],
orderTimeHours: [{ required: true, message: '请输入时间', trigger: 'blur' }, { validator: orderTimeHoursValidator, trigger: 'blur' }], orderTimeHours: [
overTime: [{ required: true, message: '请输入提货有效期', trigger: 'blur' }, { validator: overTimeValidator, trigger: 'blur' }] { required: true, message: '请输入时间', trigger: 'blur' },
{ validator: orderTimeHoursValidator, trigger: 'blur' }
],
overTime: [
{ required: true, message: '请输入提货有效期', trigger: 'blur' },
{ validator: overTimeValidator, trigger: 'blur' }
]
}, },
validateTime, validateTime,
// 门店控件 // 门店控件
......
...@@ -218,8 +218,14 @@ export default { ...@@ -218,8 +218,14 @@ export default {
timeHours: [{ validator: timeHoursValidator, trigger: 'blur' }], timeHours: [{ validator: timeHoursValidator, trigger: 'blur' }],
timeMinuter: [{ validator: timeMinuterValidator, trigger: 'blur' }], timeMinuter: [{ validator: timeMinuterValidator, trigger: 'blur' }],
timeDay: [{ validator: timeDayValidator, trigger: 'blur' }], timeDay: [{ validator: timeDayValidator, trigger: 'blur' }],
orderTimeHours: [{ required: true, message: '请输入时间', trigger: 'blur' }, { validator: orderTimeHoursValidator, trigger: 'blur' }], orderTimeHours: [
overTime: [{ required: true, message: '请输入提货有效期', trigger: 'blur' }, { validator: overTimeValidator, trigger: 'blur' }] { required: true, message: '请输入时间', trigger: 'blur' },
{ validator: orderTimeHoursValidator, trigger: 'blur' }
],
overTime: [
{ required: true, message: '请输入提货有效期', trigger: 'blur' },
{ validator: overTimeValidator, trigger: 'blur' }
]
}, },
submitLoading: false, submitLoading: false,
clearableBtn: 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