Skip to content

I
integral-mall
Commit d1e18f30 by 萱草
Options

update: 更新

parent 78577206
Showing with 132 additions and 48 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.a3fb31dd52b3c310086a4aa401ec84c7.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.635b815cc98f99328df7.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.56a6f39c8d337143110cd4f4aa99302e.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.e1a3f0f3632d1b03fd9c.js></script></body></html>
\ No newline at end of file
dist/static/js/app.635b815cc98f99328df7.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.e1a3f0f3632d1b03fd9c.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
<template>
<el-dialog title="商品链接" :visible.sync="modalData.show" width="450px" @close="cancel()">
<el-dialog title="商品链接" :visible.sync="dialogVisible" width="800px" @close="cancel()">
<div class="dialog-body">
<el-table :data="goodsSkuList" :span-method="objectSpanMethod" border>
<el-table-column width="140px" v-for="(i, k) in skuCols" :label="i" :key="k" :class-name="k == skuCols.length - 1 ? 'pad-l-20' : 'right-border'">
<template slot-scope="scope">{{ JSON.parse(scope.row.giftPropValues)[k].valueName }}</template>
<template slot-scope="scope">{{ scope.row.activitySkuList[k].valueName }}</template>
</el-table-column>
<el-table-column label="当前商品库存" width="130px">
<template slot-scope="scope">
{{ scope.row.stock || '--' }}
{{ scope.row.commonStock }}
</template>
</el-table-column>
<el-table-column label="活动库存">
<template slot-scope="scope">
<el-select v-model="scope.row.stockType" style="width:100px" @change="changeSingleStock(scope.row.giftSkuId, scope.row.stageStock, scope.row.stockType)">
<el-select v-model="scope.row.stockType" style="width:100px">
<el-option label="增加" :value="1"></el-option>
<el-option label="减少" :value="0"></el-option>
<!-- <el-option label="减少" :value="0"></el-option> -->
</el-select>
<el-input-number v-model="scope.row.stageStock" width="140" style="margin-left:-2px;" controls-position="right" @blur="changeSingleStock(scope.row.giftSkuId, scope.row.stageStock, scope.row.stockType)" precision="0" :min="0" :max="999999"></el-input-number>
<el-input-number v-model="scope.row.stageStock" style="margin-left:-5px;width:140px" controls-position="right" @blur="changeSingleStock(scope.row.integralMallProId, scope.row.stageStock, scope.row.stockType)" precision="0" :min="0" :max="999999"></el-input-number>
</template>
</el-table-column>
</el-table>
......@@ -30,6 +30,8 @@
<script>
// import request from '../service/request';
import qs from 'qs';
import request from '../service/request.js';
import copy from '../utils/clone.js';
export default {
props: {
......@@ -41,7 +43,8 @@ export default {
return {
dialogVisible: false,
skuCols: [],
goodsSkuList: []
goodsSkuList: [],
activityProId: ''
// forceIntegralMallProId: '',
// forceType: ''
};
......@@ -56,19 +59,57 @@ export default {
// },
created() {
this.dialogVisible = true;
let giftProStandardJsonCopy = copy(this.skuStockData.giftProStandardJson);
this.goodsSkuList = copy(this.skuStockData.skuJson);
this.goodsSkuList = JSON.parse(this.goodsSkuList);
this.handelSkuData(giftProStandardJsonCopy);
// console.log(this.skuStockData.giftProStandardJson);
// let giftProStandardJsonCopy = copy(this.skuStockData.giftProStandardJson);
// console.log(giftProStandardJsonCopy);
this.handelSkuData(this.skuStockData);
this.goodsSkuList = copy(this.skuStockData.children);
this.handleGoodsSkuList(this.goodsSkuList);
// this.activityProId = this.skuStockData.activityProId;
// this.goodsSkuList = JSON.parse(this.goodsSkuList);
},
methods: {
handelSkuData(value) {
// let arr = [];
this.skuCols = [];
/** ****组合sku的数据*****/
for (let item of value) {
this.skuCols.push(item.standardName);
for (let item of this.skuStockData.children[0].activitySkuList) {
this.skuCols.push(item.proName);
}
console.log(this.skuCols);
},
handleGoodsSkuList(value) {
value.forEach(item => {
item.stockType = 1;
item.stageStock = '';
});
},
changeSingleStock(id, stageStock, stockType) {
console.log(id, stageStock, stockType);
},
submit() {
let list = [];
this.goodsSkuList.forEach(item => {
list.push({
activityProId: item.activityProId,
stockChange: item.stageStock,
changeType: 1
});
});
let params = {
list: list
};
request.post('/api-integral-mall/update-activity-stock', qs.stringify(params)).then(res => {
if (res.data.errorCode === 0) {
this.$message.success('库存修改成功');
this.dialogVisible = false;
setInterval(() => {
this.$emit('closeSkuStock');
}, 10);
} else {
this.$message.error(res.data.message);
}
});
},
combine(arr) {
arr.reverse();
......
src/views/activities/flashSale/detail.vue
......@@ -189,8 +189,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>
......@@ -236,7 +236,8 @@ export default {
disabledDate(time) {
//disabledDate 文档上：设置禁用状态，参数为当前日期，要求返回 Boolean
// return time.getTime() > Date.now()//选当前时间之前的时间
return time.getTime() < Date.now(); //选当前时间之后的时间
//如果没有后面的-8.64e7就是不可以选择今天的
return time.getTime() < Date.now() - 8.64e7; //选当前时间之后的时间
}
},
dialogVisibleImg: false,
......@@ -388,7 +389,9 @@ export default {
level: 1,
mainImageUrl: item.giftImageUrl,
proCode: item.giftCode,
proName: item.proName
activitySkuList: JSON.parse(it.proName),
proName: item.proName,
activityProId: it.activityProId
});
});
}
......@@ -411,7 +414,8 @@ export default {
proReferId: item.proReferId,
exchangeFixDateBegin: item.putBeginDate,
exchangeFixDateEnd: item.putEndDate,
proTitle: item.proSubTitle
proTitle: item.proSubTitle,
activityProId: item.activityProId
// remarks: item.remarks
// proName: item.giftName
});
......@@ -500,6 +504,7 @@ export default {
},
closeSkuStock() {
this.skuStockDialog = false;
this.getMess();
},
changeLimit(value) {
if (value.length) {
......@@ -629,37 +634,75 @@ export default {
submitForm(flashSaleForm) {
if (this.selectList.length) {
console.log(this.selectList);
this.selectList.forEach((item, index) => {
// console.log(111);
this.activityProList.push({
activityExchangeLimit: item.activityExchangeLimit,
activityIntegral: item.activityIntegral,
activityPrice: item.activityPrice,
activityProStatus: 1,
activityStock: item.activityStock,
giftProId: item.integralMallProId,
activityProSkuList: []
});
// console.log(222);
if (item.children && item.children.length) {
// console.log(item.activityProSkuList);
console.log(this.activityProList[index].activityProSkuList);
item.children.forEach(it => {
// console.log(333);
if (!this.isEdit) {
this.activityProList = [];
this.selectList.forEach((item, index) => {
// console.log(111);
this.activityProList.push({
activityExchangeLimit: item.activityExchangeLimit,
activityIntegral: item.activityIntegral,
activityPrice: item.activityPrice,
activityProStatus: 1,
activityStock: item.activityStock,
giftProId: item.integralMallProId,
activityProSkuList: []
});
// console.log(222);
if (item.children && item.children.length) {
// console.log(item.activityProSkuList);
this.activityProList[index].activityProSkuList.push({
activityExchangeLimit: it.activityExchangeLimit,
activityIntegral: it.activityIntegral,
activityPrice: it.activityPrice,
activityProStatus: it.activityProStatus ? '1' : '0',
activityStock: it.activityStock,
giftProId: item.integralMallProId,
giftProSkuId: it.integralMallProId
console.log(this.activityProList[index].activityProSkuList);
item.children.forEach(it => {
// console.log(333);
// console.log(item.activityProSkuList);
this.activityProList[index].activityProSkuList.push({
activityExchangeLimit: it.activityExchangeLimit,
activityIntegral: it.activityIntegral,
activityPrice: it.activityPrice,
activityProStatus: it.activityProStatus ? '1' : '0',
activityStock: it.activityStock,
giftProId: item.integralMallProId,
giftProSkuId: it.integralMallProId
});
console.log(44);
});
console.log(44);
}
});
} else {
this.activityProList = [];
this.selectList.forEach((item, index) => {
// console.log(111);
this.activityProList.push({
activityExchangeLimit: item.activityExchangeLimit,
activityIntegral: item.activityIntegral,
activityPrice: item.activityPrice,
activityProStatus: 1,
activityStock: item.activityStock,
giftProId: item.integralMallProId,
activityProSkuList: [],
activityProId: item.activityProId
});
}
});
// console.log(222);
if (item.children && item.children.length) {
// console.log(item.activityProSkuList);
console.log(this.activityProList[index].activityProSkuList);
item.children.forEach(it => {
// console.log(333);
// console.log(item.activityProSkuList);
this.activityProList[index].activityProSkuList.push({
activityExchangeLimit: it.activityExchangeLimit,
activityIntegral: it.activityIntegral,
activityPrice: it.activityPrice,
activityProStatus: it.activityProStatus ? '1' : '0',
activityStock: it.activityStock,
giftProId: item.integralMallProId,
giftProSkuId: it.integralMallProId,
activityProId: it.activityProId
});
console.log(44);
});
}
});
}
console.log(this.activityProList);
} else {
this.$message.error('请选择参加活动的商品');
......
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