Skip to content

I
integral-mall
Commit 1383335b by 萱草
Options

update: 更改

parent 7a1872aa
Showing with 95 additions and 91 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.dc028c60555c6678c4e12970194c0f61.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/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.be8aabf13848b6ca3aa7.js></script><script type=text/javascript src=./static/js/app.36d0186f47ffd4d4b0d9.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.3f904992fc29fd886887532f0caa9222.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/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.be8aabf13848b6ca3aa7.js></script><script type=text/javascript src=./static/js/app.2dbb2a63e4b35531da8b.js></script></body></html>
\ No newline at end of file
dist/static/js/app.2dbb2a63e4b35531da8b.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.36d0186f47ffd4d4b0d9.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
src/components/ladderPrice.vue
......@@ -10,7 +10,8 @@
<span>*若未设置阶梯价则以原价进行兑换，请勿随意填入0积分/现金；</span>
</div> -->
<el-tabs :value="selectTab" type="border-card">
<el-tab-pane :name="index" v-for="(item, index) in ladderMemberGrade" :key="index" :label="item.gradeName" :value="item.gradeId">
<!-- <el-tab-pane :name="index" v-for="(item, index) in ladderMemberGrade" :key="index" :label="item.gradeName" :value="item.gradeId"> -->
<el-tab-pane :name="index" v-for="(item, index) in list3" :key="index" :label="item.gradeName" :value="item.gradeId">
<div class="fr" style="margin-bottom:20px" v-if="list3.length && isTable">
<el-input class="w-100" placeholder="请输入积分" v-model="integral" size="small"></el-input>
<el-input class="w-100" placeholder="请输入金额" v-model="cash" size="small"></el-input>
......@@ -61,7 +62,7 @@ export default {
},
data() {
return {
// selectTab: 0,
selectTab: 0,
loading: false,
dialogVisible: false,
id: '',
......@@ -80,9 +81,7 @@ export default {
created() {
// console.log(this.ladderPriceData);
this.dialogVisible = true;
console.log(this.ladderPriceData.id);
this.id = this.ladderPriceData.id;
console.log(111);
this.getInfo();
},
methods: {
......@@ -92,15 +91,11 @@ export default {
integralMallProId: this.id
};
this.loading = true;
console.log(params);
console.log(qs.stringify(params));
request
.get('/api-integral-mall/get-integral-mall-pro', { params })
.then(res => {
if (res.data.errorCode === 0) {
console.log(res.data.result);
this.skuHeaderList = [];
if (res.data.result.skuJsonList) {
for (let item of JSON.parse(res.data.result.skuJsonList[0].giftPropValues)) {
this.skuHeaderList.push({
......@@ -117,49 +112,49 @@ export default {
});
let giftProStandardJson = res.data.result.giftProStandardJson ? JSON.parse(res.data.result.giftProStandardJson) : [];
this.isTable = giftProStandardJson.length; // giftProStandardJson存在代表有sku
this.gradeType = res.data.result.gradeType;
this.memberGrade = res.data.result.memberGrade;
if (this.gradeType) {
this.getMemberGradeList();
}
// this.gradeType = res.data.result.gradeType;
// this.memberGrade = res.data.result.memberGrade;
// if (this.gradeType) {
// this.getMemberGradeList();
// }
} else {
this.$message.error(res.data.message);
}
})
.finally(() => (this.loading = false));
},
getMemberGradeList() {
console.log(111);
request.post('/api-integral-mall/load-grade').then(res => {
if (res.data.errorCode === 0) {
if (res.data.result) {
this.cliqueStatus = res.data.result.cliqueGrade ? true : false;
if (this.gradeType === 1) {
//品牌卡
this.memberGradeList = res.data.result.enterpriseGrade || [];
} else if (this.gradeType === 2) {
this.memberGradeList = res.data.result.cliqueGrade || [];
}
// if (this.$route.query.proReferId !== '-1') {
let list = this.memberGradeList.filter(item => {
return this.memberGrade.indexOf(item.gradeId) != -1;
});
list.forEach(item => {
this.ladderMemberGrade.push({
gradeId: item.gradeId,
gradeName: item.gradeName
});
});
console.log(this.ladderMemberGrade);
// }
} else {
this.memberGradeList = [];
}
} else {
this.$message.error(res.data.message);
}
});
},
// getMemberGradeList() {
// console.log(111);
// request.post('/api-integral-mall/load-grade').then(res => {
// if (res.data.errorCode === 0) {
// if (res.data.result) {
// this.cliqueStatus = res.data.result.cliqueGrade ? true : false;
// if (this.gradeType === 1) {
// //品牌卡
// this.memberGradeList = res.data.result.enterpriseGrade || [];
// } else if (this.gradeType === 2) {
// this.memberGradeList = res.data.result.cliqueGrade || [];
// }
// // if (this.$route.query.proReferId !== '-1') {
// let list = this.memberGradeList.filter(item => {
// return this.memberGrade.indexOf(item.gradeId) != -1;
// });
// list.forEach(item => {
// this.ladderMemberGrade.push({
// gradeId: item.gradeId,
// gradeName: item.gradeName
// });
// });
// console.log(this.ladderMemberGrade);
// // }
// } else {
// this.memberGradeList = [];
// }
// } else {
// this.$message.error(res.data.message);
// }
// });
// },
handleLadder(value) {
value.forEach(item => {
item.giftProSkuIntegral = this.integral ? this.integral : item.giftProSkuIntegral;
......@@ -169,31 +164,11 @@ export default {
this.cash = '';
},
saveLadderDetail() {
console.log(this.list3);
// this.ladderMemberGrade;
// let list = [];
// this.list3.forEach(item => {
// this.ladderMemberGrade.forEach(it => {
// if (item.gradeId === it.gradeId) {
// item.gradeName = it.gradeName;
// }
// });
// list.push({
// gradeId: item.gradeId,
// gradeName: item.gradeName,
// skuList: []
// });
// item.skuList.forEach(ittt =>{
// list.forEach(ite =>{
// });
// });
// });
let params = {
integralMallProId: this.id,
differentialPricingJson: JSON.stringify(this.list3)
};
request.post('/api-integral-mall/set-differential-pricing', params).then(res => {
request.post('/api-integral-mall/set-differential-pricing', qs.stringify(params)).then(res => {
if (res.data.errorCode === 0) {
console.log(res.data.result);
this.dialogVisible = false;
......@@ -204,7 +179,6 @@ export default {
});
},
cancelSubmit() {
// this.ladderPriceData.show = false;
this.dialogVisible = false;
setInterval(() => {
this.$emit('closeUpdateLadder');
......
src/views/goods/soldStatistics/statistics.vue
......@@ -15,28 +15,38 @@
</h3>
</div>
<div class="section">
<div class="operate-top">
<div style="margin-bottom:22px">
<div>
<el-input v-model="searchValue" placeholder="请输入礼品名称/编码进行搜索" prefix-icon="el-icon-search" clearable class="w-280" @change="getSearchList('1')" @clear="getSearchList('1')"></el-input>
<el-input v-model="query.search" placeholder="请输入礼品名称/编码进行搜索" prefix-icon="el-icon-search" clearable class="w-280" @change="getSearchList('1')" @clear="getSearchList('1')"></el-input>
<div style="display:inline-block;font-size:14px;color:#606266">
<p>1.使用该功能请在常规设置中关闭“无库存自动下架”的设置项；</p>
<p>2.若礼品增加库存后将清空之前的统计数；</p>
</div>
</div>
<!-- <div style="display:inline-block">
<p>1.使用该功能请在常规设置中关闭“无库存自动下架”的设置项；</p>
<p>2.若礼品增加库存后将清空之前的统计数；</p>
</div> -->
</div>
<div v-loading="loading">
<el-table :data="tableData" style="width: 100%" @sort-change="sortChange">
<el-table-column label="礼品">
<template slot-scope="{ row }">
<div class="gift-info">
<img :src="scope.row.mainImageUrl" alt />
<img :src="row.giftProImageUrl" alt />
<div class="info-name">
<p class="pro-ellipsis">{{ row.proName }}</p>
<p class="category-ellipsis">编码：{{ proCode }}</p>
<p class="pro-ellipsis">{{ row.giftProName }}</p>
<p class="category-ellipsis">编码：{{ giftProCode }}</p>
</div>
</div>
</template>
</el-table-column>
<el-table-column label="统计开始时间"></el-table-column>
<el-table-column label="当前人数" prop="people" sortable="custom" :render-header="renderHeader">
<el-table-column label="统计开始时间">
<template slot-scope="{ row }">{{ formatDate(row.createTime) }}</template>
</el-table-column>
<el-table-column label="当前人数" prop="count" sortable="custom" :render-header="renderHeader">
<template slot-scope="{ row }"
><span @click="removeMutil(row)">{{ row.people }}</span></template
><span @click="removeMutil(row)">{{ row.count }}</span></template
>
</el-table-column>
<el-table-column label="操作">
......@@ -60,10 +70,24 @@
</div>
<el-dialog title="查看分布" :visible.sync="dialogVisible" width="40%">
<div v-loading="dialogLoading">
<span>这是一段信息</span>
<span slot="footer" class="dialog-footer">
<el-table :data="DistributionData" style="width: 100%" @sort-change="sortChange2">
<el-table-column :label="item" v-for="(item, index) in columns" :key="index" :prop="columns[index]">
<!-- <template slot-scope="{ row }">{{ row }}</template> -->
</el-table-column>
<!-- <el-table-column label="尺码"></el-table-column>
<el-table-column sortable="custom" prop="count" label="当前人数"></el-table-column> -->
<template slot="empty">
<div class="no-data-wrap">
<div class="no-data-icon">
<img src="../../../../static/img/no-data_icon.png" />
</div>
<p>暂无数据</p>
</div>
</template>
</el-table>
<div slot="footer" style="text-align:right;margin-top:10px">
<el-button type="primary" @click="dialogVisible = false">关闭</el-button>
</span>
</div>
</div>
</el-dialog>
</div>
......@@ -73,22 +97,25 @@
<script>
// import qs from 'qs';
import request from '../../../service/request.js';
import getInputVal from '../../../utils/common.js';
export default {
data() {
return {
formatDate: getInputVal.formatDate,
loading: false,
dialogLoading: false,
query: {
searchValue: '',
search: '',
pageSize: 20,
currentPage: 1,
sortType: '',
sortColumn: ''
sort: ''
},
pageSizes: '',
total: '',
tableData: [],
dialogVisible: false
dialogVisible: false,
DistributionData: [],
columns: []
};
},
created() {
......@@ -123,7 +150,7 @@ export default {
console.log(value);
this.dialogVisible = true;
let params = {
id: value.id
giftProId: value.giftProId
};
this.dialogLoading = true;
request
......@@ -131,6 +158,9 @@ export default {
.then(res => {
if (res.data.errorCode === 0) {
console.log(res.data.result);
this.DistributionData = res.data.result.data;
this.columns = res.data.result.columns;
console.log(this.DistributionData);
}
})
.finally(() => (this.dialogLoading = false));
......@@ -138,7 +168,7 @@ export default {
removeMutil(value) {
console.log(value);
let params = {
id: value.id
giftProId: value.giftProId
};
request.get('/api-integral-mall/distinct-subscribe', { params }).then(res => {
if (res.data.errorCode === 0) {
......@@ -147,11 +177,11 @@ export default {
});
},
sortChange(value) {
this.sortColumn = value.prop;
// this.sortColumn = value.prop;
if (value.order == 'ascending') {
this.sortType = 'asc';
this.query.sort = 'asc';
} else if (value.order == 'descending') {
this.sortType = 'desc';
this.query.sort = 'desc';
}
this.getSearchList();
}
......@@ -172,8 +202,8 @@ export default {
width: 140px;
}
.gift-info img {
width: 75px;
height: 75px;
width: 60px;
height: 60px;
border-radius: 4px;
padding: 4px;
border: 1px solid #dcdfe6;
......
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