Skip to content

I
integral-mall
Commit 17904ffc by 萱草
Options

update: sku商品名称调整，不参与活动时输入框禁用，过滤出有库存礼品及优惠券

parent da63ff35
Showing with 23 additions and 12 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.c6179cf5dd5af481b81bbe20a20b9a20.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.17242df30d9a09fe8586.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.b4a8d53f4fc299a30eca77b6a586d295.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.fd2c4dc8c36c38ae32b1.js></script></body></html>
\ No newline at end of file
dist/static/js/app.17242df30d9a09fe8586.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.fd2c4dc8c36c38ae32b1.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
......@@ -117,7 +117,8 @@ export default {
sortType: '',
currentPage: 1,
pageSize: 5,
giftName: ''
giftName: '',
stockStatus: 1
},
giftType: '', // 商品分类
stockStatus: '', // 礼品库存状态
......@@ -152,7 +153,6 @@ export default {
...this.query,
shelf: this.shelf ? this.shelf : -1, // 上下架状态
giftType: this.giftType ? this.giftType : -1,
stockStatus: -1,
showSelfFlag: 0
};
request.post('/api-integral-mall/page-gift', qs.stringify(params)).then(res => {
......
src/views/activities/flashSale/detail.vue
......@@ -124,15 +124,15 @@
</el-table-column>
<el-table-column label="活动价格">
<template slot-scope="{ row }">
<div v-if="!(row.giftType && row.children && row.children.length) && !isEdit"><el-input v-model.trim="row.activityIntegral" placeholder="输入积分" size="small" class="w-110"></el-input></div>
<div v-if="!(row.giftType && row.children && row.children.length) && !isEdit" class="mt10"><el-input v-model.trim="row.activityPrice" placeholder="输入现金" size="small" class="w-110"></el-input></div>
<div v-if="!(row.giftType && row.children && row.children.length) && !isEdit"><el-input v-model.trim="row.activityIntegral" :disabled="!row.activityProStatus" placeholder="输入积分" size="small" class="w-110"></el-input></div>
<div v-if="!(row.giftType && row.children && row.children.length) && !isEdit" class="mt10"><el-input v-model.trim="row.activityPrice" :disabled="!row.activityProStatus" placeholder="输入现金" size="small" class="w-110"></el-input></div>
<span v-if="isEdit">{{ row.activityIntegral ? row.activityIntegral : '0' }}积分+{{ row.activityPrice ? row.activityPrice : '0' }}元</span>
</template>
</el-table-column>
<el-table-column label="活动库存" :render-header="isEdit ? renderHeader : renderHeader2">
<template slot-scope="{ row }">
<div v-if="!(row.giftType && row.children && row.children.length) && !isEdit"><el-input v-model.trim="row.activityStock" placeholder="输入库存" size="small" class="w-110" @blur="limitStock(row.activityStock, row.virtualStock, row)"></el-input></div>
<div v-if="!(row.giftType && row.children && row.children.length) && !isEdit" class="mt10"><el-input v-model.trim="row.activityExchangeLimit" placeholder="输入限兑数量" size="small" class="w-110"></el-input></div>
<div v-if="!(row.giftType && row.children && row.children.length) && !isEdit"><el-input v-model.trim="row.activityStock" :disabled="!row.activityProStatus" placeholder="输入库存" size="small" class="w-110" @blur="limitStock(row.activityStock, row.virtualStock, row)"></el-input></div>
<div v-if="!(row.giftType && row.children && row.children.length) && !isEdit" class="mt10"><el-input v-model.trim="row.activityExchangeLimit" :disabled="!row.activityProStatus" placeholder="输入限兑数量" size="small" class="w-110"></el-input></div>
<span v-if="isEdit">{{ row.activityStock }}/{{ row.activityTotalStock }}</span>
</template>
</el-table-column>
......@@ -182,8 +182,8 @@
</el-popover>
<el-button type="text" v-if="!row.giftType && !overStatus" @click="deleteSelectList(row)">删除</el-button>
<el-button type="text" v-if="row.giftType && !row.isShow && !overStatus" class="mr12" @click="deleteSelectList(row)">删除</el-button>
<el-button type="text" v-if="row.giftType && row.children && row.children.length && !row.isExpand" @click="changeExpand(row)">收起</el-button>
<el-button type="text" v-if="row.giftType && row.children && row.children.length && row.isExpand" @click="changeExpand(row)">展开</el-button>
<el-button type="text" v-if="row.giftType && row.children && row.children.length && row.isExpand" @click="changeExpand(row)">收起</el-button>
<el-button type="text" v-if="row.giftType && row.children && row.children.length && !row.isExpand" @click="changeExpand(row)">展开</el-button>
</div>
</template>
</el-table-column>
......@@ -326,6 +326,7 @@ export default {
let params = {
activityId: this.activityId
};
this.loading = true;
request.post('/api-integral-mall/get-activity-detail', qs.stringify(params)).then(res => {
if (res.data.errorCode === 0) {
let resResult = res.data.result;
......@@ -381,6 +382,11 @@ export default {
});
if (item.activityProSkuList && item.activityProSkuList.length) {
item.activityProSkuList.forEach(it => {
let giftPropValues = JSON.parse(it.proName);
let skuName = [];
giftPropValues.forEach(it2 => {
skuName.push(it2.valueName);
});
this.selectList[index].children.push({
isShow: true,
activityProStatus: it.activityProStatus ? true : false,
......@@ -397,7 +403,7 @@ export default {
mainImageUrl: item.giftImageUrl,
proCode: item.giftCode,
activitySkuList: JSON.parse(it.proName),
proName: item.proName,
proName: skuName.join(','),
activityProId: it.activityProId
});
});
......@@ -457,7 +463,12 @@ export default {
item.children = JSON.parse(item.skuJson);
item.children.forEach(it => {
it.mainImageUrl = item.mainImageUrl;
it.proName = item.proName;
let giftPropValues = JSON.parse(it.giftPropValues);
let skuName = [];
giftPropValues.forEach(it2 => {
skuName.push(it2.valueName);
});
it.proName = skuName.join(',');
it.proCode = it.giftProSkuStandCode;
it.integralCost = it.giftProSkuIntegral;
it.cashCost = it.giftProSkuCash;
......
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