Skip to content

I
integral-mall
Commit a0724b13 by wangyusheng
Options

Merge branch 'bugfix' into 'master' 

Bugfix

See merge request !63
parents 6037bdd7 227e193f
Showing with 49 additions and 22 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.f455486dbdd6037d78b15cfd7a073295.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.40.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.141.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 src=//web-1251519181.file.myqcloud.com/components/track.1.0.3.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.1e319b804422103ac0da.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.531d886a23a13ce370e73e3d82de3f11.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.40.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/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 src=//web-1251519181.file.myqcloud.com/components/track.1.0.3.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.9d68253c9a038dd54e36.js></script></body></html>
\ No newline at end of file \ No newline at end of file
dist/static/css/app.531d886a23a13ce370e73e3d82de3f11.css 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/css/app.f455486dbdd6037d78b15cfd7a073295.css 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.1e319b804422103ac0da.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.9d68253c9a038dd54e36.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.
index.html
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
<script src="//web-1251519181.file.myqcloud.com/lib/elementUI/index.2.5.4.js"></script> <script src="//web-1251519181.file.myqcloud.com/lib/elementUI/index.2.5.4.js"></script>
<!-- 组件引用cdn --> <!-- 组件引用cdn -->
<script src="//web-1251519181.file.myqcloud.com/components/header.2.0.40.js"></script> <script src="//web-1251519181.file.myqcloud.com/components/header.2.0.40.js"></script>
<script src="//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.141.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/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-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/store-new.2.0.11.js"></script>
......
src/components/store/store-group.vue
...@@ -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);
......
src/components/store/store-part.vue
...@@ -185,7 +185,10 @@ export default { ...@@ -185,7 +185,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;
......
src/views/goods/coupon/info.vue
...@@ -34,9 +34,7 @@ ...@@ -34,9 +34,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">
...@@ -351,7 +349,10 @@ export default { ...@@ -351,7 +349,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' }],
......
src/views/goods/gift/info.vue
...@@ -277,9 +277,7 @@ ...@@ -277,9 +277,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>
......
src/views/order/agreeRefund.vue
...@@ -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 //按钮禁止重复提交
}; };
......
src/views/order/couponExchange.vue
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
<div class="goods-list-content" v-loading="loading"> <div class="goods-list-content" v-loading="loading">
<el-table :data="tableData" ref="multipleTable" style="width: 100%" @sort-change="sortChange"> <el-table :data="tableData" ref="multipleTable" style="width: 100%" @sort-change="sortChange">
<!-- <el-table-column type="selection" width="40"> </el-table-column> --> <!-- <el-table-column type="selection" width="40"> </el-table-column> -->
<el-table-column label="礼品信息" width="300px"> <el-table-column label="礼品信息" width="405px">
<template slot-scope="scope"> <template slot-scope="scope">
<div class="gift-info"> <div class="gift-info">
<!-- <img v-if="scope.row.cardType === 2" src="../../../static/img/dui.png" alt="" /> --> <!-- <img v-if="scope.row.cardType === 2" src="../../../static/img/dui.png" alt="" /> -->
...@@ -72,6 +72,7 @@ ...@@ -72,6 +72,7 @@
<img v-if="scope.row.cardType === 1 && !scope.row.giftMainPic" src="../../../static/img/quan03.png" alt="" /> <img v-if="scope.row.cardType === 1 && !scope.row.giftMainPic" src="../../../static/img/quan03.png" alt="" />
<div class="info-name"> <div class="info-name">
<p class="pro-ellipsis">{{ scope.row.giftName }}</p> <p class="pro-ellipsis">{{ scope.row.giftName }}</p>
<p style="font-size:13px;color:#909399" v-if="scope.row.proReferId.indexOf(',') === -1">卡券编号：{{ scope.row.proReferId }}</p>
<p style="font-size:13px;color:#909399" v-if="scope.row.proReferId.indexOf(',') === -1"><span v-if="scope.row.status === 2">已领取</span><span v-if="scope.row.status <= 1">未领取</span> / <span v-if="scope.row.useStatus === 5">已使用</span><span v-if="scope.row.useStatus === 0">未使用</span><span v-if="scope.row.useStatus === 7">已销毁</span></p> <p style="font-size:13px;color:#909399" v-if="scope.row.proReferId.indexOf(',') === -1"><span v-if="scope.row.status === 2">已领取</span><span v-if="scope.row.status <= 1">未领取</span> / <span v-if="scope.row.useStatus === 5">已使用</span><span v-if="scope.row.useStatus === 0">未使用</span><span v-if="scope.row.useStatus === 7">已销毁</span></p>
</div> </div>
</div> </div>
...@@ -100,7 +101,7 @@ ...@@ -100,7 +101,7 @@
</el-dropdown> </el-dropdown>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="会员"> <el-table-column label="会员" width="150px">
<template slot-scope="scope"> <template slot-scope="scope">
<memberInfo :memberObj="scope.row" :requestProject="requestProject" :placement="placement"></memberInfo> <memberInfo :memberObj="scope.row" :requestProject="requestProject" :placement="placement"></memberInfo>
</template> </template>
...@@ -440,7 +441,7 @@ export default { ...@@ -440,7 +441,7 @@ export default {
.pro-ellipsis { .pro-ellipsis {
color: #303133; color: #303133;
line-height: 18px; line-height: 18px;
height: 36px; height: 22px;
font-size: 14px; font-size: 14px;
} }
.category-ellipsis { .category-ellipsis {
......
src/views/setting/editDeliver.vue
...@@ -277,8 +277,14 @@ export default { ...@@ -277,8 +277,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,
// 门店控件 // 门店控件
......
src/views/setting/pickedAuto.vue
...@@ -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