Skip to content

I
integral-mall
Commit 3a65b698 by 萱草
Options

update: 积分现金库存限制及bug修复

parent f21b1873
Showing with 63 additions and 50 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.13ffeac7d06a984efe4e142ee976e2bd.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.152fbbc1c5621def3f8a.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.1a103d53064771a1968a84ecb005d16e.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.3a3078cbcfd62adbb7cf.js></script></body></html>
\ No newline at end of file
dist/static/js/app.152fbbc1c5621def3f8a.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.3a3078cbcfd62adbb7cf.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
src/components/giftLadderPrice.vue
......@@ -136,25 +136,29 @@ export default {
this.isCorrect = true;
for (let i = 0; i < this.list3.length; i++) {
let skuList = this.list3[i].skuList;
for (let j = 0; j < skuList.length; j++) {
if (skuList[j].giftProSkuCash && skuList[j].giftProSkuIntegral === '') {
this.isCorrect = false;
this.$message.error('已填入现金，则必填积分');
break;
}
if (skuList[j].giftProSkuCash === '' && skuList[j].giftProSkuIntegral) {
this.isCorrect = false;
this.$message.error('已填入积分，则必填现金');
break;
}
if (skuList[j].giftProSkuCash !== '' && skuList[j].giftProSkuIntegral !== '') {
let itemPlus = Number(skuList[j].giftProSkuCash) + Number(skuList[j].giftProSkuIntegral);
if (!itemPlus) {
if (this.isCorrect) {
for (let j = 0; j < skuList.length; j++) {
if (skuList[j].giftProSkuCash && skuList[j].giftProSkuIntegral === '') {
this.isCorrect = false;
this.$message.error('积分和现金相加不可为0');
this.$message.error('已填入现金，则必填积分');
break;
}
if (skuList[j].giftProSkuCash === '' && skuList[j].giftProSkuIntegral) {
this.isCorrect = false;
this.$message.error('已填入积分，则必填现金');
break;
}
if (skuList[j].giftProSkuCash !== '' && skuList[j].giftProSkuIntegral !== '') {
let itemPlus = Number(skuList[j].giftProSkuCash) + Number(skuList[j].giftProSkuIntegral);
if (!itemPlus) {
this.isCorrect = false;
this.$message.error('积分和现金相加不可为0');
break;
}
}
}
} else {
break;
}
}
if (this.isCorrect) {
......
src/components/goodsSelect.vue
......@@ -78,10 +78,10 @@
</div>
</template>
</el-table>
<div class="pagination-conteiner" v-show="tableData.length > 0">
<div class="pagination-conteiner" v-if="tableData.length > 0">
<div class="pagination">
<!-- <el-pagination v-if="total != 0" small @current-change="getInfo('1')" hide-on-single-page layout="prev, pager, next" :total="total"></el-pagination> -->
<el-pagination v-if="total != 0" small @current-change="changeCurrent" hide-on-single-page layout="prev, pager, next" :total="total"></el-pagination>
<el-pagination small @current-change="changeCurrent" hide-on-single-page :page-size="5" layout="prev, pager, next" :total="total"></el-pagination>
</div>
</div>
<div style="margin-top: 20px;text-align:right">
......@@ -125,7 +125,7 @@ export default {
selectArr: [], // 全选数据
selectArr2: [], // 全选数据
val: [],
total: 0
total: 999
};
},
created() {
......@@ -185,6 +185,7 @@ export default {
} else {
this.tableData = [];
}
this.total = res.data.result.total;
this.loading = false;
} else {
this.$message.error(res.data.message);
......
src/views/goods/coupon/info.vue
......@@ -563,25 +563,29 @@ export default {
this.isCorrect = true;
for (let i = 0; i < this.list3.length; i++) {
let skuList = this.list3[i].skuList;
for (let j = 0; j < skuList.length; j++) {
if (skuList[j].giftProSkuCash && skuList[j].giftProSkuIntegral === '') {
this.isCorrect = false;
this.$message.error('已填入现金，则必填积分');
break;
}
if (skuList[j].giftProSkuCash === '' && skuList[j].giftProSkuIntegral) {
this.isCorrect = false;
this.$message.error('已填入积分，则必填现金');
break;
}
if (skuList[j].giftProSkuCash !== '' && skuList[j].giftProSkuIntegral !== '') {
let itemPlus = Number(skuList[j].giftProSkuCash) + Number(skuList[j].giftProSkuIntegral);
if (!itemPlus) {
if (this.isCorrect) {
for (let j = 0; j < skuList.length; j++) {
if (skuList[j].giftProSkuCash && skuList[j].giftProSkuIntegral === '') {
this.isCorrect = false;
this.$message.error('已填入现金，则必填积分');
break;
}
if (skuList[j].giftProSkuCash === '' && skuList[j].giftProSkuIntegral) {
this.isCorrect = false;
this.$message.error('积分和现金相加不可为0');
this.$message.error('已填入积分，则必填现金');
break;
}
if (skuList[j].giftProSkuCash !== '' && skuList[j].giftProSkuIntegral !== '') {
let itemPlus = Number(skuList[j].giftProSkuCash) + Number(skuList[j].giftProSkuIntegral);
if (!itemPlus) {
this.isCorrect = false;
this.$message.error('积分和现金相加不可为0');
break;
}
}
}
} else {
break;
}
}
if (this.isCorrect) {
......
src/views/goods/gift/info.vue
......@@ -788,25 +788,29 @@ export default {
this.isCorrect = true;
for (let i = 0; i < this.list3.length; i++) {
let skuList = this.list3[i].skuList;
for (let j = 0; j < skuList.length; j++) {
if (skuList[j].giftProSkuCash && skuList[j].giftProSkuIntegral === '') {
this.isCorrect = false;
this.$message.error('已填入现金，则必填积分');
break;
}
if (skuList[j].giftProSkuCash === '' && skuList[j].giftProSkuIntegral) {
this.isCorrect = false;
this.$message.error('已填入积分，则必填现金');
break;
}
if (skuList[j].giftProSkuCash !== '' && skuList[j].giftProSkuIntegral !== '') {
let itemPlus = Number(skuList[j].giftProSkuCash) + Number(skuList[j].giftProSkuIntegral);
if (!itemPlus) {
if (this.isCorrect) {
for (let j = 0; j < skuList.length; j++) {
if (skuList[j].giftProSkuCash && skuList[j].giftProSkuIntegral === '') {
this.isCorrect = false;
this.$message.error('已填入现金，则必填积分');
break;
}
if (skuList[j].giftProSkuCash === '' && skuList[j].giftProSkuIntegral) {
this.isCorrect = false;
this.$message.error('积分和现金相加不可为0');
this.$message.error('已填入积分，则必填现金');
break;
}
if (skuList[j].giftProSkuCash !== '' && skuList[j].giftProSkuIntegral !== '') {
let itemPlus = Number(skuList[j].giftProSkuCash) + Number(skuList[j].giftProSkuIntegral);
if (!itemPlus) {
this.isCorrect = false;
this.$message.error('积分和现金相加不可为0');
break;
}
}
}
} else {
break;
}
}
if (this.isCorrect) {
......
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