Skip to content

I
integral-mall
Commit 4ed01487 by 萱草
Options

update: 更新

parent 9446a270
Showing with 50 additions and 29 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.1a88eded1c7da35430cf4b88ac435193.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.a59bf78729dd9eef658b.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.1fe90c18445d8f299529929d8b6d18b0.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.aaa5590675e9591e1e01.js></script></body></html>
\ No newline at end of file
dist/static/js/app.a59bf78729dd9eef658b.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.aaa5590675e9591e1e01.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
src/components/goodsSelect.vue
......@@ -58,10 +58,10 @@
</el-table-column>
<el-table-column label="商品状态">
<template slot-scope="{ row }">
<span class="dm-status--info" v-if="row.status === 2 && row.canEdit && row.releaseType === 1">已下架</span>
<span class="dm-status--primary" v-if="row.status === 2 && row.canEdit && row.releaseType === 2 && row.isShelves === 1">已上架</span>
<span class="dm-status--info" v-if="row.status === 2 && row.canEdit && row.releaseType === 2 && row.isShelves === 0">已下架</span>
<span class="dm-status--primary" v-if="row.status === 1 && row.canEdit">已上架</span>
<span class="dm-status--info" v-if="row.status === 2 && row.canEdit && row.releaseType === 1">已上架</span>
<span class="dm-status--primary" v-if="row.status === 2 && row.canEdit && row.releaseType === 2 && row.isShelves === 1">已下架</span>
<span class="dm-status--info" v-if="row.status === 2 && row.canEdit && row.releaseType === 2 && row.isShelves === 0">已上架</span>
<span class="dm-status--primary" v-if="row.status === 1 && row.canEdit">已下架</span>
</template>
</el-table-column>
<el-table-column label="积分" prop="integralCost"></el-table-column>
......@@ -142,6 +142,7 @@ export default {
this.query.currentPage = value;
}
this.getInfo();
this.requestData();
},
getInfo() {
let params;
......
src/views/activities/flashSale/detail.vue
......@@ -476,6 +476,27 @@ export default {
});
}
});
if (this.selectList.length) {
this.selectList.forEach(item => {
this.selectListCopy.forEach(it => {
if (item.integralMallProId === it.integralMallProId) {
if (item.children && item.children.length) {
item.children.forEach((item2, index) => {
it.children[index].activityExchangeLimit = item2.activityExchangeLimit;
it.children[index].activityIntegral = item2.activityIntegral;
it.children[index].activityPrice = item2.activityPrice;
it.children[index].activityStock = item2.activityStock;
});
} else {
it.activityExchangeLimit = item.activityExchangeLimit;
it.activityIntegral = item.activityIntegral;
it.activityPrice = item.activityPrice;
it.activityStock = item.activityStock;
}
}
});
});
}
this.selectList = copy(this.selectListCopy);
// console.log(this.selectList);
}
......
src/views/goods/coupon/info.vue
......@@ -501,16 +501,16 @@ export default {
},
methods: {
memberChange() {
this.ladderMemberGradeChange = [];
let lists = this.memberGradeList.filter(item => {
return this.couponForm.memberGrade.join(',').indexOf(item.gradeId) != -1;
});
lists.forEach(item => {
this.ladderMemberGradeChange.push({
gradeId: item.gradeId,
gradeName: item.gradeName
});
});
// this.ladderMemberGradeChange = [];
// let lists = this.memberGradeList.filter(item => {
// return this.couponForm.memberGrade.join(',').indexOf(item.gradeId) != -1;
// });
// lists.forEach(item => {
// this.ladderMemberGradeChange.push({
// gradeId: item.gradeId,
// gradeName: item.gradeName
// });
// });
// console.log(this.ladderMemberGradeChange);
this.setLadder();
this.submitLadderList = copy(this.list3);
......
src/views/goods/gift/info.vue
......@@ -674,16 +674,16 @@ export default {
// },
methods: {
memberChange() {
this.ladderMemberGradeChange = [];
let lists = this.memberGradeList.filter(item => {
return this.giftForm.memberGrade.join(',').indexOf(item.gradeId) != -1;
});
lists.forEach(item => {
this.ladderMemberGradeChange.push({
gradeId: item.gradeId,
gradeName: item.gradeName
});
});
// this.ladderMemberGradeChange = [];
// let lists = this.memberGradeList.filter(item => {
// return this.giftForm.memberGrade.join(',').indexOf(item.gradeId) != -1;
// });
// lists.forEach(item => {
// this.ladderMemberGradeChange.push({
// gradeId: item.gradeId,
// gradeName: item.gradeName
// });
// });
this.setLadder();
this.submitLadderList = copy(this.list3);
},
......@@ -782,7 +782,6 @@ export default {
});
});
}
console.log(222);
},
saveLadderDetail() {
this.isCorrect = true;
......@@ -1724,6 +1723,8 @@ export default {
// return;
this.handleSku();
this.setLadder();
this.submitLadderList = copy(this.list3);
if (this.giftProStandardJson.length > 0) {
if (this.skuList.length > 0) {
//spu库存是否可输入
......@@ -1784,8 +1785,6 @@ export default {
});
}
}
this.setLadder();
this.submitLadderList = copy(this.list3);
// let arr = [];
// for (let item of this.submitSkuJson) {
// arr.push(item.giftPropValues);
......
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