Skip to content

I
integral-mall
Commit bacda0ac by 萱草
Options

update: 更新库存

parent 718bf212
Showing with 49 additions and 10 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.cc514eccbaaea45aadc90b92b9c66066.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.d4d8b07d847885231972.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.8348f9e55405f263551c26bff3651fb6.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.51437b7455ea80432382.js></script></body></html>
\ No newline at end of file
dist/static/js/app.51437b7455ea80432382.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/app.d4d8b07d847885231972.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
src/components/updateSkuStock.vue
......@@ -97,7 +97,7 @@ export default {
});
});
let params = {
list: list
data: JSON.stringify(list)
};
request.post('/api-integral-mall/update-activity-stock', qs.stringify(params)).then(res => {
if (res.data.errorCode === 0) {
......
src/views/activities/flashSale/detail.vue
......@@ -161,8 +161,8 @@
</div>
<p>当前商品库存：{{ row.commonStock }}</p>
<div class="popver-button" style="margin-top:18px;text-align:right">
<el-button type="dafault" size="small" @click="$refs.popover2.showPopper = false">取消</el-button>
<el-button type="primary" size="small" class="ml10 ml10" @click="handleCostPrice">确认</el-button>
<el-button type="dafault" size="small" @click="closePopover('popover2')">取消</el-button>
<el-button type="primary" size="small" class="ml10 ml10" @click="handleStock">确认</el-button>
</div>
<el-button slot="reference" type="text" v-if="!row.giftType && isEdit && !overStatus" class="mr20">调整库存</el-button>
</el-popover>
......@@ -182,8 +182,8 @@
</div>
<p>当前商品库存：{{ row.commonStock }}</p>
<div class="popver-button" style="margin-top:18px;text-align:right">
<el-button type="dafault" size="small" @click="$refs.popover3.showPopper = false">取消</el-button>
<el-button type="primary" size="small" class="ml10 ml10" @click="handleCostPrice">确认</el-button>
<el-button type="dafault" size="small" @click="closePopover('popover3')">取消</el-button>
<el-button type="primary" size="small" class="ml10 ml10" @click="handleStock">确认</el-button>
</div>
<el-button slot="reference" type="text" v-if="row.giftType && row.children && !row.children.length && !row.isShow && isEdit && !overStatus" class="mr20">调整库存</el-button>
</el-popover>
......@@ -303,7 +303,8 @@ export default {
skuStockData: [], // 修改实物礼品过规格数据
activityProList: [],
activityId: '',
overStatus: false // 编辑时判断活动是否已结束，true为结束，false为未结束
overStatus: false, // 编辑时判断活动是否已结束，true为结束，false为未结束
activityProId: '' // 调整库存卡券或无sku库存时id，
};
},
created() {
......@@ -330,6 +331,7 @@ export default {
if (res.data.errorCode === 0) {
let resResult = res.data.result;
this.flashSaleForm.activityName = resResult.activityName;
this.goodsLimit(this.flashSaleForm.activityName);
// this.flashSaleForm.dataTalkId = resResult.dataTalkId;
this.flashSaleForm.dataTalkId = '';
this.flashSaleForm.memberSearchType = resResult.memberSearchType;
......@@ -350,6 +352,11 @@ export default {
this.defaltSelected = resResult.memberSearchParams;
} else if (resResult.memberSearchType === 3) {
this.searchParams = resResult.memberSearchParams;
this.useId = resResult.activityId;
// this.searchParams = res.data.result.searchParams;
// this.responseParams = resResult.responseParams;
this.hasSearchData = resResult.memberSearchParams;
this.searchBackTxt = JSON.parse(resResult.memberSearchParams);
}
if (resResult.activityProList) {
this.selectList = [];
......@@ -521,7 +528,31 @@ export default {
},
// 无sku或卡券修改库存
getStockDetail(id) {
console.log(id);
this.activityProId = id;
},
handleStock() {
let list = [];
list.push({
activityProId: this.activityProId,
stockChange: this.stock,
changeType: 1
});
let params = {
data: JSON.stringify(list)
};
request.post('/api-integral-mall/update-activity-stock', qs.stringify(params)).then(res => {
if (res.data.errorCode === 0) {
this.$message.success('库存修改成功');
this.stock = '';
this.getMess();
} else {
this.$message.error(res.data.message);
}
});
},
closePopover() {
console.log(111);
this.$refs.popover2.showPopper = false;
},
handleDataTransferred(data) {
this.defaltSelected = data;
......
src/views/goods/gift/gift.vue
......@@ -66,12 +66,13 @@
<div class="info-name">
<!-- integralMallProId -->
<el-tooltip :content="'礼品id：' + scope.row.integralMallProId" effect="dark" placement="top-start">
<p class="pro-ellipsis intergral-edit">
<p class="intergral-edit" :class="[scope.row.hasActivity ? 'pro-ellipsis2' : 'pro-ellipsis']">
{{ scope.row.proName }}
<i class="el-icon-edit" @click="editProName(scope.row)"></i>
</p>
</el-tooltip>
<p class="category-ellipsis">编码：{{ scope.row.proCode }}</p>
<div v-if="scope.row.hasActivity" style="font-size:14px;background-color:#fba7ab;color:#fff;line-height:20px;width:35px;text-align:center">秒杀</div>
</div>
</div>
</template>
......@@ -792,6 +793,13 @@ export default {
/* width: 230px; */
font-size: 14px;
}
.pro-ellipsis2 {
color: #303133;
height: 40px;
line-height: 18px;
/* width: 230px; */
font-size: 14px;
}
.category-ellipsis {
color: #909399;
font-size: 13px;
......
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