Skip to content

I
integral-mall
Commit 9f38cdf2 by wangyusheng
Options

Merge branch 'dev' into 'master' 

Dev

See merge request !60
parents c25152d7 c98895a2
Showing with 47 additions and 18 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
<<<<<<< HEAD
<!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.d353ec5244eea5186c6af13a1266a31b.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.be8aabf13848b6ca3aa7.js></script><script type=text/javascript src=./static/js/app.e71869436db0c30adebd.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.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>
>>>>>>> master
dist/static/css/app.d353ec5244eea5186c6af13a1266a31b.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.e71869436db0c30adebd.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.be8aabf13848b6ca3aa7.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
......@@ -273,9 +273,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>
......
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