Skip to content

I
integral-mall
Commit 5df17f51 by 萱草
Options

update: bug修复

parent 26341222
Showing with 26 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.a55410cb5909447a80bf8d22b8e3a212.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.45.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.19.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.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.28.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.175ccdf2bfbfc0694b7c.js></script><script type=text/javascript src=./static/js/app.2aa66bc116e98385c171.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.ef066be840a504af5f7c5d3fa6db444c.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.45.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.19.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.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.28.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.175ccdf2bfbfc0694b7c.js></script><script type=text/javascript src=./static/js/app.46a36ac3e36856c8ee56.js></script></body></html>
\ No newline at end of file
dist/static/js/app.2aa66bc116e98385c171.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.46a36ac3e36856c8ee56.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
src/views/activities/flashSale/detail.vue
......@@ -648,12 +648,14 @@ export default {
},
// 保存当前模板,对接保存接口
limitStock(stock, all, item) {
if (!Number(stock)) {
item.activityStock = '';
this.$message.error('库存为必填项');
} else if (Number(stock) && Number(stock) > Number(all)) {
item.activityStock = '';
this.$message.error('活动库存不得大于当前库存');
if (item.activityProStatus) {
if (!Number(stock)) {
item.activityStock = '';
this.$message.error('库存为必填项');
} else if (Number(stock) && Number(stock) > Number(all)) {
item.activityStock = '';
this.$message.error('活动库存不得大于当前库存');
}
}
},
// 预览
......@@ -713,20 +715,22 @@ export default {
if (this.isCorrect) {
if (arr.children && arr.children.length) {
for (let j = 0; j < arr.children.length; j++) {
if (!arr.children[j].activityIntegral && !arr.children[j].activityPrice) {
this.isCorrect = false;
this.$message.error('积分和现金必填一个');
break;
}
if (!arr.children[j].activityStock) {
this.isCorrect = false;
this.$message.error('库存为必填项');
break;
}
if (arr.children[j].activityStock > arr.children[j].virtualStock) {
this.isCorrect = false;
this.$message.error('活动库存不得大于当前库存');
break;
if (arr.children[j].activityProStatus) {
if (!arr.children[j].activityIntegral && !arr.children[j].activityPrice) {
this.isCorrect = false;
this.$message.error('积分和现金必填一个');
break;
}
if (!arr.children[j].activityStock) {
this.isCorrect = false;
this.$message.error('库存为必填项');
break;
}
if (arr.children[j].activityStock > arr.children[j].virtualStock) {
this.isCorrect = false;
this.$message.error('活动库存不得大于当前库存');
break;
}
}
}
} else {
......
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