Skip to content

I
integral-mall
Commit 8a501e82 by 萱草
Options

update: 更新bug

parent d3af4d29
Showing with 21 additions and 13 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.cf8d90dc01b2473e126a952c2320802b.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.50138775304b0cb7dd2a.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.d498b9dc9bbcc26338ea08bd3cb2fc04.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.c60c78141f948212626c.js></script></body></html>
\ No newline at end of file
dist/static/js/app.50138775304b0cb7dd2a.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.c60c78141f948212626c.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
src/components/updateSkuStock.vue
......@@ -65,8 +65,10 @@ export default {
},
handleGoodsSkuList(value) {
value.forEach(item => {
item.stockType = 1;
item.stageStock = '';
// item.stockType = 1;
// item.stageStock = '';
this.$set(item, 'stockType', 1);
this.$set(item, 'stageStock', 0);
});
},
changeSingleStock(id, stageStock, stockType) {
......
src/views/activities/flashSale/detail.vue
......@@ -36,7 +36,7 @@
<el-radio v-model="flashSaleForm.memberSearchType" :disabled="isEdit" :label="3">会员筛选</el-radio>
</el-form-item>
<el-form-item v-if="flashSaleForm.memberSearchType === 2">
<vue-gic-member-group style="padding-left:0" :defaltSelected="defaltSelected" :height="height" :projectName="projectName" :headerList="headerList" :effectiveStatus="effectiveStatus" @handleDataTransferred="handleDataTransferred" @handleDataLeft="handleDataLeft"> </vue-gic-member-group>
<vue-gic-member-group style="padding-left:0" :readonly="readonly" :defaltSelected="defaltSelected" :height="height" :projectName="projectName" :headerList="headerList" :effectiveStatus="effectiveStatus" @handleDataTransferred="handleDataTransferred" @handleDataLeft="handleDataLeft"> </vue-gic-member-group>
</el-form-item>
<el-form-item v-if="flashSaleForm.memberSearchType === 3">
<div v-if="channel === 0">
......@@ -149,13 +149,13 @@
<template slot-scope="{ row }">
<div style="font-size:0px">
<el-button type="text" v-if="row.giftType && row.children && row.children.length && !row.isShow && isEdit && !overStatus" class="mr20" @click="updateSkuStock(row)">调整库存</el-button>
<el-popover placement="top" trigger="click" :ref="row.integralMallProId" @show="getStockDetail(row.activityProId)">
<el-popover placement="top" trigger="click" :ref="row.integralMallProId" @show="getStockDetail(row.activityProId, row.commonStock)">
<div>
<el-select v-model="stockType" style="width:100px;">
<el-option label="增加" :value="1"></el-option>
<!-- <el-option label="减少" :value="0"></el-option> -->
</el-select>
<el-input-number v-model="stock" style="margin-left:-6px;width:140px" controls-position="right" :min="0" :max="row.commonStock"></el-input-number>
<el-input-number v-model="testStock" style="margin-left:-6px;width:140px" controls-position="right" :min="0" :max="maxStock"></el-input-number>
</div>
<p style="color:#606266;font-size:12px;line-height:17px;font-weight:400;margin-top:10px">当前商品库存：{{ row.commonStock }}</p>
<div class="popver-button" style="margin-top:18px;text-align:right">
......@@ -165,13 +165,13 @@
</div>
<el-button slot="reference" type="text" v-if="!row.giftType && isEdit && !overStatus" class="mr20">调整库存</el-button>
</el-popover>
<el-popover placement="top" trigger="click" :ref="row.activityProId" @show="getStockDetail(row.activityProId)">
<el-popover placement="top" trigger="click" :ref="row.activityProId" @show="getStockDetail(row.activityProId, row.commonStock)">
<div>
<el-select v-model="stockType" style="width:100px;">
<el-option label="增加" :value="1"></el-option>
<!-- <el-option label="减少" :value="0"></el-option> -->
</el-select>
<el-input-number v-model="stock" style="margin-left:-6px;;width:140px" controls-position="right" :min="0" :max="row.commonStock"></el-input-number>
<el-input-number v-model="testStock" style="margin-left:-6px;;width:140px" controls-position="right" :min="0" :max="maxStock"></el-input-number>
</div>
<p style="color:#606266;font-size:12px;line-height:17px;font-weight:400;margin-top:10px">当前商品库存：{{ row.commonStock }}</p>
<div class="popver-button" style="margin-top:18px;text-align:right">
......@@ -235,7 +235,9 @@ export default {
},
dialogVisibleImg: false,
stockType: 1,
stock: '',
stock: 0,
testStock: 0,
maxStock: '',
isEdit: false,
loading: false,
getTimeAll: getInputVal.formatDate,
......@@ -263,6 +265,7 @@ export default {
projectName: 'integral-mall',
defaltSelected: [], // 默认穿梭窗已选入数据
memberLabelId: [],
readonly: false,
height: 543, // 穿梭窗高度， 默认是543
// projectName: 'mall', // 默认是memberTag
headerList: ['isRealTime', 'latestUpdateTime', 'updateType', 'effectiveStatus', 'effectiveDate'], // 表头配置，默认全部，分组名称默认显示不可配置
......@@ -350,6 +353,7 @@ export default {
// this.flashSaleForm.activityName = resResult.memberSearchType ,
if (resResult.memberSearchType === 2) {
this.defaltSelected = resResult.memberSearchParams;
this.readonly = true;
} else if (resResult.memberSearchType === 3) {
this.searchParams = resResult.memberSearchParams;
this.useId = resResult.activityId;
......@@ -578,14 +582,16 @@ export default {
});
},
// 无sku或卡券修改库存
getStockDetail(id) {
getStockDetail(id, stock) {
this.testStock = 0;
this.activityProId = id;
this.maxStock = stock;
},
handleStock(id, item) {
let list = [];
list.push({
activityProId: this.activityProId,
stockChange: this.stock,
stockChange: this.testStock,
changeType: 1
});
let params = {
......@@ -858,7 +864,7 @@ export default {
// } else if (this.flashSaleForm.memberLabelType === 3) {
// memberLabelId = '';
// }
if (this.flashSaleForm.memberLabelType === 2) {
if (this.flashSaleForm.memberSearchType === 2) {
let memberLabelIds = [];
for (let item of this.defaltSelected) {
memberLabelIds.push(item.memberTagGroupId);
......
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