Skip to content

I
integral-mall
Commit 09095781 by damodmg
Options

更新合并

parent 33f51dd6
Showing with 209 additions and 129 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.614b44d1b86ea5a225f50867f4c0df71.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.35.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.12.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/store-new.2.0.11.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.06.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.13.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 type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.3c5834cc437c7b2d524e.js></script><script type=text/javascript src=./static/js/app.bf03da701922029fc404.js></script></body></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.04bde472a00b37a2b90cef8d4da75a66.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.35.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.12.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/store-new.2.0.11.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.06.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.13.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.18.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.9072594f61a88f768c70.js></script><script type=text/javascript src=./static/js/app.1e5ee97f5a5605d2f4e9.js></script></body></html>
\ No newline at end of file \ No newline at end of file
dist/static/css/app.04bde472a00b37a2b90cef8d4da75a66.css 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/css/app.614b44d1b86ea5a225f50867f4c0df71.css 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.1e5ee97f5a5605d2f4e9.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.bf03da701922029fc404.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/vendor.3c5834cc437c7b2d524e.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/vendor.9072594f61a88f768c70.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
index.html
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
</head> </head>
<body> <body>
<div id="app"></div> <div id="app"></div>
<!-- 库引用cdn -->
<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/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/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/vuex/3.1.0/vuex.min.js"></script>
...@@ -25,6 +26,7 @@ ...@@ -25,6 +26,7 @@
<script src="//web-1251519181.file.myqcloud.com/components/export-excel.2.0.13.js"></script> <script src="//web-1251519181.file.myqcloud.com/components/export-excel.2.0.13.js"></script>
<script src="//web-1251519181.file.myqcloud.com/components/people.2.0.26.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/delete.2.0.00.js"></script>
<script src="//web-1251519181.file.myqcloud.com/components/store-card.2.0.18.js"></script>
<!-- <script src="//web-1251519181.cos.ap-shanghai.myqcloud.com/components/space.2.0.00.js"></script> --> <!-- <script src="//web-1251519181.cos.ap-shanghai.myqcloud.com/components/space.2.0.00.js"></script> -->
<!-- built files will be auto injected --> <!-- built files will be auto injected -->
</body> </body>
......
src/views/goods/coupon/info.vue
...@@ -135,10 +135,13 @@ ...@@ -135,10 +135,13 @@
<span v-if="sendChildData.storeType === 1" class="store-tip">若选中的门店分组下有新增的门店，系统不会默认选中此新增门店，请重新确认选择并保存礼品</span> <span v-if="sendChildData.storeType === 1" class="store-tip">若选中的门店分组下有新增的门店，系统不会默认选中此新增门店，请重新确认选择并保存礼品</span>
</el-form-item> --> </el-form-item> -->
<span style="display:none">{{ refash }}</span> <span style="display:none">{{ refash }}</span>
<el-form-item label="展现门店" required style="position:relative"> <el-form-item label="展现门店" required style="position:relative" v-if="useNewStoreWidget === 0">
<vue-gic-store-linkage v-if="(mallProId && creatorId) || mallProId == -1" :creatorId="creatorId" :disabled="isInfo" @getDisGroupList="getDisGroupList" :msg="sendChildData" :openFlag="openFlag" ref="selectTree" @sendSelectGroupData="getSelectGroupData"></vue-gic-store-linkage> <vue-gic-store-linkage v-if="(mallProId && creatorId) || mallProId == -1" :creatorId="creatorId" :disabled="isInfo" @getDisGroupList="getDisGroupList" :msg="sendChildData" :openFlag="openFlag" ref="selectTree" @sendSelectGroupData="getSelectGroupData"></vue-gic-store-linkage>
<span v-if="sendChildData.storeType === 1" class="store-tip">若选中的父分组下有新增的门店分组，系统不会默认选中此新增门店分组，请重新确认选择并保存礼品</span> <span v-if="sendChildData.storeType === 1" class="store-tip">若选中的父分组下有新增的门店分组，系统不会默认选中此新增门店分组，请重新确认选择并保存礼品</span>
</el-form-item> </el-form-item>
<el-form-item label="展现门店" v-if="useNewStoreWidget === 1">
<vue-gic-store-card class="pt10" ref="storeCard" :uuid.sync="uuid" scenes="" :isAdd="isAdd" />
</el-form-item>
<el-form-item label="限兑"> <el-form-item label="限兑">
<el-checkbox v-model="couponForm.limitTimesStatus" @change="refashData()">每个会员限制兑换</el-checkbox> <el-checkbox v-model="couponForm.limitTimesStatus" @change="refashData()">每个会员限制兑换</el-checkbox>
<span v-if="couponForm.limitTimesStatus"><el-input-number controls-position="right" v-model="couponForm.limitTimes" :precision="0" :min="0" @change="limitTimeChange"></el-input-number> 次</span> <span v-if="couponForm.limitTimesStatus"><el-input-number controls-position="right" v-model="couponForm.limitTimes" :precision="0" :min="0" @change="limitTimeChange"></el-input-number> 次</span>
...@@ -207,7 +210,7 @@ ...@@ -207,7 +210,7 @@
</div> </div>
<div class="confim-btn" :style="{ width: fixedWidth + 'px' }"> <div class="confim-btn" :style="{ width: fixedWidth + 'px' }">
<el-form-item class="fix-btn"> <el-form-item class="fix-btn">
<el-button type="primary" size="small" @click="submitForm('couponForm')" :disabled="!canEdit">保存</el-button> <el-button type="primary" size="small" @click="submitForm('couponForm')" :disabled="!canEdit" :loading="submitLoading">保存</el-button>
<el-button size="small" @click="goBack">返回</el-button> <el-button size="small" @click="goBack">返回</el-button>
</el-form-item> </el-form-item>
</div> </div>
...@@ -324,9 +327,14 @@ export default { ...@@ -324,9 +327,14 @@ export default {
couponCardStockArr: [], couponCardStockArr: [],
couponStatus: false, //卡券状态 couponStatus: false, //卡券状态
canEdit: true, canEdit: true,
submitLoading: false,
groupIdDisableList: [], groupIdDisableList: [],
proNameLen: 0, proNameLen: 0,
creatorId: '' creatorId: '',
useNewStoreWidget: 1, //1新的卡券门店组件 ，0老的门店组件
// 新版门店卡券选择器
uuid: '',
isAdd: true
// 人群筛选器 // 人群筛选器
// // 可传参数 // // 可传参数
// // projectName: 'integral-mall', // 当前项目名 // // projectName: 'integral-mall', // 当前项目名
...@@ -363,6 +371,7 @@ export default { ...@@ -363,6 +371,7 @@ export default {
if (this.mallProId !== '-1') { if (this.mallProId !== '-1') {
this.getInfo(); this.getInfo();
this.isAdd = false;
} else { } else {
this.getMemberGradeList(); //会员等级列表 this.getMemberGradeList(); //会员等级列表
} }
...@@ -470,29 +479,39 @@ export default { ...@@ -470,29 +479,39 @@ export default {
} }
this.creatorId = res.data.result.creatorId; this.creatorId = res.data.result.creatorId;
this.refash = !this.refash; this.refash = !this.refash;
this.sendChildData.storeType = Number(res.data.result.showStore); this.useNewStoreWidget = res.data.result.useNewStoreWidget;
if (this.sendChildData.storeType === 1) { if (this.useNewStoreWidget === 0) {
let arr = res.data.result.storeGroupIds.split(','); this.sendChildData.storeType = Number(res.data.result.showStore);
for (let i = 0; i < arr.length; i++) {
if (this.groupIdDisableList.indexOf(arr[i]) !== -1) { if (this.sendChildData.storeType === 1) {
//存在 let arr = res.data.result.storeGroupIds.split(',');
// console.log('不可删除的'); for (let i = 0; i < arr.length; i++) {
arr.splice(i, 1); if (this.groupIdDisableList.indexOf(arr[i]) !== -1) {
i--; //存在
// console.log('不可删除的');
arr.splice(i, 1);
i--;
}
} }
this.sendChildData.storeGroupIds = arr.join(',');
// this.sendChildData.storeGroupIds = res.data.result.storeGroupIds || '';
} else if (this.sendChildData.storeType === 2) {
let list = [];
if (res.data.result.storeInfo) {
res.data.result.storeInfo.map(v => {
list.push(v);
});
}
this.sendChildData.storeIds = list;
} }
this.sendChildData.storeGroupIds = arr.join(','); this.getSelectGroupData(this.sendChildData);
// this.sendChildData.storeGroupIds = res.data.result.storeGroupIds || ''; } else if (this.useNewStoreWidget === 1) {
} else if (this.sendChildData.storeType === 2) { this.uuid = res.data.result.storeWidgetId;
let list = []; this.$nextTick(_ => {
if (res.data.result.storeInfo) { // console.log(this.$refs.storeCard);
res.data.result.storeInfo.map(v => { this.$refs.storeCard.init();
list.push(v); });
});
}
this.sendChildData.storeIds = list;
} }
this.getSelectGroupData(this.sendChildData);
//限兑 //限兑
if (res.data.result.limitTimes === -1) { if (res.data.result.limitTimes === -1) {
this.couponForm.limitTimesStatus = false; this.couponForm.limitTimesStatus = false;
...@@ -887,6 +906,8 @@ export default { ...@@ -887,6 +906,8 @@ export default {
memberGrade: this.couponForm.memberGrade.join(','), //适用会员 memberGrade: this.couponForm.memberGrade.join(','), //适用会员
showStore: this.sendChildData.storeType, // 显示门店 0所有 1部分分类 2部分门店 showStore: this.sendChildData.storeType, // 显示门店 0所有 1部分分类 2部分门店
storeIds: '', //展现门店id storeIds: '', //展现门店id
storeWidgetId: '',
useNewStoreWidget: this.useNewStoreWidget,
limitTimes: this.couponForm.limitTimesStatus ? this.couponForm.limitTimes : '-1', //限兑 limitTimes: this.couponForm.limitTimesStatus ? this.couponForm.limitTimes : '-1', //限兑
exchangeDateType: this.couponForm.exchangeDateType, //兑换日期 exchangeDateType: this.couponForm.exchangeDateType, //兑换日期
exchangeFixDateBegin: this.couponForm.exchangeDateType === 2 ? this.getTime(this.couponForm.exchangeFixDate[0]) : '', //固定日期 exchangeFixDateBegin: this.couponForm.exchangeDateType === 2 ? this.getTime(this.couponForm.exchangeFixDate[0]) : '', //固定日期
...@@ -899,21 +920,25 @@ export default { ...@@ -899,21 +920,25 @@ export default {
limitTimeBegin: this.couponForm.releaseType === 2 ? this.getTimeAll(this.couponForm.limitTimeBegin) : '' //定时上架时间 limitTimeBegin: this.couponForm.releaseType === 2 ? this.getTimeAll(this.couponForm.limitTimeBegin) : '' //定时上架时间
}; };
// 门店分类 // 门店分类
if (this.sendChildData.storeType === 1) { if (this.useNewStoreWidget === 0) {
if (this.sendChildData.storeGroupIds) { if (this.sendChildData.storeType === 1) {
params.storeGroupIds = this.sendChildData.storeGroupIds || ''; if (this.sendChildData.storeGroupIds) {
} else { params.storeGroupIds = this.sendChildData.storeGroupIds || '';
this.$message.error('门店分类不能为空'); } else {
return; this.$message.error('门店分类不能为空');
} return;
} else if (this.sendChildData.storeType === 2) { }
if (this.sendChildData.storeIds.length) { } else if (this.sendChildData.storeType === 2) {
params.storeIds = this.sendChildData.storeIds.map(v => v.storeId).join(','); if (this.sendChildData.storeIds.length) {
} else { params.storeIds = this.sendChildData.storeIds.map(v => v.storeId).join(',');
params.storeIds = ''; } else {
this.$message.error('部分门店不能为空'); params.storeIds = '';
return; this.$message.error('部分门店不能为空');
return;
}
} }
} else if (this.useNewStoreWidget === 1) {
params.storeWidgetId = this.uuid;
} }
// 部分时段时间转换 // 部分时段时间转换
......
src/views/order/couponExchange.vue
...@@ -51,8 +51,8 @@ ...@@ -51,8 +51,8 @@
<el-tab-pane label="待付款" name="11" class="goods-table-content"> </el-tab-pane> <el-tab-pane label="待付款" name="11" class="goods-table-content"> </el-tab-pane>
<el-tab-pane label="已付款" name="12" class="goods-table-content"> </el-tab-pane> <el-tab-pane label="已付款" name="12" class="goods-table-content"> </el-tab-pane>
<el-tab-pane label="交易关闭" name="0" class="goods-table-content"> </el-tab-pane> <el-tab-pane label="交易关闭" name="0" class="goods-table-content"> </el-tab-pane>
<div class="goods-list-content"> <div class="goods-list-content" v-loading="loading">
<el-table :data="tableData" ref="multipleTable" style="width: 100%" @sort-change="sortChange" v-loading="loading"> <el-table :data="tableData" ref="multipleTable" style="width: 100%" @sort-change="sortChange">
<!-- <el-table-column type="selection" width="40"> </el-table-column> --> <!-- <el-table-column type="selection" width="40"> </el-table-column> -->
<el-table-column label="礼品信息" width="300px"> <el-table-column label="礼品信息" width="300px">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -133,10 +133,10 @@ ...@@ -133,10 +133,10 @@
</div> </div>
</template> </template>
</el-table> </el-table>
</div> <div class="pagination-conteiner" style="background:#fff;">
<div class="pagination-conteiner" style="background:#fff;margin:-50px 24px 0 24px"> <div class="pagination">
<div class="pagination"> <el-pagination v-if="total != 0" background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="pageNum" :page-sizes="pageSizes" :page-size="pageSize" layout="total, sizes, prev, pager, next" :total="total"> </el-pagination>
<el-pagination v-if="total != 0" background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="pageNum" :page-sizes="pageSizes" :page-size="pageSize" layout="total, sizes, prev, pager, next" :total="total"> </el-pagination> </div>
</div> </div>
</div> </div>
</el-tabs> </el-tabs>
...@@ -193,7 +193,8 @@ export default { ...@@ -193,7 +193,8 @@ export default {
requestProject: 'integral-mall', requestProject: 'integral-mall',
placement: 'top-start', placement: 'top-start',
showSelfStatus: false, showSelfStatus: false,
showFlag: false showFlag: false,
loading: false
}; };
}, },
watch: { watch: {
......
src/views/order/giftExchange.vue
...@@ -55,8 +55,8 @@ ...@@ -55,8 +55,8 @@
<el-tab-pane label="已发货" name="3" class="goods-table-content"> </el-tab-pane> <el-tab-pane label="已发货" name="3" class="goods-table-content"> </el-tab-pane>
<el-tab-pane label="交易成功" name="4" class="goods-table-content"> </el-tab-pane> <el-tab-pane label="交易成功" name="4" class="goods-table-content"> </el-tab-pane>
<el-tab-pane label="交易关闭" name="0" class="goods-table-content"> </el-tab-pane> <el-tab-pane label="交易关闭" name="0" class="goods-table-content"> </el-tab-pane>
<div class="goods-list-content"> <div class="goods-list-content" v-loading="loading">
<el-table :data="tableData" ref="multipleTable" style="width: 100%" @sort-change="sortChange" v-loading="loading"> <el-table :data="tableData" ref="multipleTable" style="width: 100%" @sort-change="sortChange">
<!-- <el-table-column type="selection" width="40"> </el-table-column> --> <!-- <el-table-column type="selection" width="40"> </el-table-column> -->
<el-table-column label="礼品信息" width="300px"> <el-table-column label="礼品信息" width="300px">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -158,10 +158,10 @@ ...@@ -158,10 +158,10 @@
</div> </div>
</template> </template>
</el-table> </el-table>
</div> <div class="pagination-conteiner" style="background:#fff;">
<div class="pagination-conteiner" style="background:#fff;margin:-50px 24px 0 24px"> <div class="pagination">
<div class="pagination"> <el-pagination v-if="total != 0" background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="currentPage" :page-sizes="pageSizes" :page-size="pageSize" layout="total, sizes, prev, pager, next" :total="total"> </el-pagination>
<el-pagination v-if="total != 0" background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="currentPage" :page-sizes="pageSizes" :page-size="pageSize" layout="total, sizes, prev, pager, next" :total="total"> </el-pagination> </div>
</div> </div>
</div> </div>
</el-tabs> </el-tabs>
...@@ -360,6 +360,7 @@ export default { ...@@ -360,6 +360,7 @@ export default {
shopIntegralMallProExchangeId: '', //门店自提订单id shopIntegralMallProExchangeId: '', //门店自提订单id
writeOffCode: '', //核销码 writeOffCode: '', //核销码
submitLoading: false, //门店自提确认按钮 submitLoading: false, //门店自提确认按钮
loading: false,
giftOrderObj: {}, //缓存数据 giftOrderObj: {}, //缓存数据
showSelfStatus: false, showSelfStatus: false,
showFlag: false showFlag: false
......
src/views/order/refundList.vue
...@@ -48,8 +48,8 @@ ...@@ -48,8 +48,8 @@
<el-tab-pane label="待退款" name="0" class="goods-table-content"> </el-tab-pane> <el-tab-pane label="待退款" name="0" class="goods-table-content"> </el-tab-pane>
<el-tab-pane label="退款成功" name="1" class="goods-table-content"> </el-tab-pane> <el-tab-pane label="退款成功" name="1" class="goods-table-content"> </el-tab-pane>
<el-tab-pane label="退款关闭" name="2" class="goods-table-content"> </el-tab-pane> <el-tab-pane label="退款关闭" name="2" class="goods-table-content"> </el-tab-pane>
<div class="goods-list-content"> <div class="goods-list-content" v-loading="loading">
<el-table :data="tableData" ref="multipleTable" style="width: 100%" @sort-change="sortChange" v-loading="loading"> <el-table :data="tableData" ref="multipleTable" style="width: 100%" @sort-change="sortChange">
<el-table-column type="selection" width="50"> </el-table-column> <el-table-column type="selection" width="50"> </el-table-column>
<el-table-column label="礼品信息" min-width="300px"> <el-table-column label="礼品信息" min-width="300px">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -135,10 +135,10 @@ ...@@ -135,10 +135,10 @@
</div> </div>
</template> </template>
</el-table> </el-table>
</div> <div class="pagination-conteiner" style="background:#fff;">
<div class="pagination-conteiner" style="background:#fff;margin:-50px 24px 0 24px"> <div class="pagination">
<div class="pagination"> <el-pagination v-if="total != 0" background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="currentPage" :page-sizes="pageSizes" :page-size="pageSize" layout="total, sizes, prev, pager, next" :total="total"> </el-pagination>
<el-pagination v-if="total != 0" background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="currentPage" :page-sizes="pageSizes" :page-size="pageSize" layout="total, sizes, prev, pager, next" :total="total"> </el-pagination> </div>
</div> </div>
</div> </div>
</el-tabs> </el-tabs>
......
src/views/setting/convenSet.vue
...@@ -13,15 +13,18 @@ ...@@ -13,15 +13,18 @@
</h3> </h3>
</div> </div>
<div class="section"> <div class="section">
<el-form :model="form" ref="form" :rules="formRules" label-width="100px" class="demo-ruleForm" label-position="right"> <el-form :model="form" ref="form" :rules="formRules" label-width="150px" class="demo-ruleForm" label-position="right">
<el-form-item prop="cardType" label="积分消耗卡"> <!-- <el-form-item prop="cardType" label="积分消耗卡">
<el-select v-model="form.cardType" placeholder="积分消耗卡"> <el-select v-model="form.cardType" placeholder="积分消耗卡">
<el-option label="集团卡" :value="2"></el-option> <el-option label="集团卡" :value="2"></el-option>
<el-option label="品牌卡" :value="1"></el-option> <el-option label="品牌卡" :value="1"></el-option>
</el-select> </el-select>
</el-form-item> -->
<el-form-item prop="openAutoShelf" label="礼品无库存自动下架">
<el-switch v-model="form.openAutoShelf"></el-switch>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" @click="handleSubmit('form')">确定</el-button> <el-button type="primary" @click="handleSubmit('form')" :loading="btnLoading">确定</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
...@@ -38,11 +41,14 @@ export default { ...@@ -38,11 +41,14 @@ export default {
data() { data() {
return { return {
form: { form: {
cardType: '' cardType: '',
openAutoShelf: false
}, },
formRules: { formRules: {
cardType: [{ required: true, message: '请选择积分消耗卡', trigger: 'change' }] cardType: [{ required: true, message: '请选择积分消耗卡', trigger: 'change' }],
} openAutoShelf: [{ required: true, message: '请设置无库存自动下架', trigger: 'change' }]
},
btnLoading: false
}; };
}, },
created() { created() {
...@@ -53,6 +59,7 @@ export default { ...@@ -53,6 +59,7 @@ export default {
request.get('/api-integral-mall/get-card-config').then(res => { request.get('/api-integral-mall/get-card-config').then(res => {
if (res.data.errorCode === 0) { if (res.data.errorCode === 0) {
this.form.cardType = res.data.result.cardType || ''; this.form.cardType = res.data.result.cardType || '';
this.form.openAutoShelf = res.data.result.openAutoShelf === 1 ? true : false;
} else { } else {
this.$message.error(res.data.message); this.$message.error(res.data.message);
} }
...@@ -62,10 +69,14 @@ export default { ...@@ -62,10 +69,14 @@ export default {
this.$refs[form].validate(valid => { this.$refs[form].validate(valid => {
if (valid) { if (valid) {
let params = { let params = {
cardType: this.form.cardType // cardType: this.form.cardType,
openAutoShelf: this.form.openAutoShelf ? 1 : 0
}; };
this.btnLoading = true;
request.get('/api-integral-mall/save-card-config', { params }).then(res => { request.get('/api-integral-mall/save-card-config', { params }).then(res => {
if (res.data.errorCode === 0) { if (res.data.errorCode === 0) {
this.$message.success('保存成功');
this.btnLoading = false;
this.getMess(); this.getMess();
} else { } else {
this.$message.error(res.data.message); this.$message.error(res.data.message);
......
src/views/setting/deliverSet.vue
...@@ -37,47 +37,50 @@ ...@@ -37,47 +37,50 @@
</div> </div>
</div> </div>
<div class="fr"> <div class="fr">
<el-button plain @click="exportData"><i class="iconfont icon-icon_yunxiazai" style="margin-right:5px"></i>导出自提点</el-button>
<el-button plain @click="setPicked">自提设置</el-button> <el-button plain @click="setPicked">自提设置</el-button>
<el-button type="primary" @click="addStore('-1')">新增自提点</el-button> <el-button type="primary" @click="addStore('-1')">新增自提点</el-button>
</div> </div>
</div> </div>
<el-table ref="multipleTable" :data="tableDate" style="width: 100%" v-loading="loading" @selection-change="handleSelectAll"> <div v-loading="loading">
<el-table-column type="selection" width="55"> </el-table-column> <el-table ref="multipleTable" :data="tableDate" style="width: 100%" @selection-change="handleSelectAll">
<el-table-column prop="pickUpPointName" label="自提点名称" min-width="200px"> </el-table-column> <el-table-column type="selection" width="55"> </el-table-column>
<el-table-column prop="pickUpPointAddress" label="自提点地址" min-width="200px"> </el-table-column> <el-table-column prop="pickUpPointName" label="自提点名称" min-width="200px"> </el-table-column>
<el-table-column prop="pickUpPointPhone" label="联系电话"> </el-table-column> <el-table-column prop="pickUpPointAddress" label="自提点地址" min-width="200px"> </el-table-column>
<el-table-column prop="canChooseTime" label="自提时间可选"> <el-table-column prop="pickUpPointPhone" label="联系电话"> </el-table-column>
<template slot-scope="scope"> <el-table-column prop="canChooseTime" label="自提时间可选">
<span>{{ scope.row.canChooseTime === 1 ? '是' : '否' }}</span> <template slot-scope="scope">
</template> <span>{{ scope.row.canChooseTime === 1 ? '是' : '否' }}</span>
</el-table-column> </template>
<el-table-column label="操作"> </el-table-column>
<template slot-scope="scope"> <el-table-column label="操作">
<div> <template slot-scope="scope">
<el-button type="text" @click="goAdd(scope.row)">编辑</el-button> <div>
<el-popover placement="top" width="160" v-model="scope.row.visible2" style="margin-left:8px"> <el-button type="text" @click="goAdd(scope.row)">编辑</el-button>
<p style="line-height:1.5;padding: 10px 10px 20px;">确定删除该自提点吗？</p> <el-popover placement="top" width="160" v-model="scope.row.visible2" style="margin-left:8px">
<div style="text-align: right; margin: 0"> <p style="line-height:1.5;padding: 10px 10px 20px;">确定删除该自提点吗？</p>
<el-button size="mini" type="text" @click="scope.row.visible2 = false">取消</el-button> <div style="text-align: right; margin: 0">
<el-button type="primary" size="mini" @click="deletePoint(scope.row, scope.$index)">确定</el-button> <el-button size="mini" type="text" @click="scope.row.visible2 = false">取消</el-button>
</div> <el-button type="primary" size="mini" @click="deletePoint(scope.row, scope.$index)">确定</el-button>
<el-button slot="reference" type="text">删除</el-button> </div>
</el-popover> <el-button slot="reference" type="text">删除</el-button>
</el-popover>
</div>
</template>
</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> </div>
</template> </template>
</el-table-column> </el-table>
<template slot="empty"> <div class="pagination-conteiner" v-show="tableDate.length > 0">
<div class="no-data-wrap"> <div class="pagination">
<div class="no-data-icon"> <el-pagination v-if="total != 0" background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage" :page-sizes="pageSizes" :page-size="pageSize" layout="total, sizes, prev, pager, next" :total="total"> </el-pagination>
<img src="../../../static/img/no-data_icon.png" />
</div>
<p>暂无数据</p>
</div> </div>
</template>
</el-table>
<div class="pagination-conteiner" v-show="tableDate.length > 0">
<div class="pagination">
<el-pagination v-if="total != 0" background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage" :page-sizes="pageSizes" :page-size="pageSize" layout="total, sizes, prev, pager, next" :total="total"> </el-pagination>
</div> </div>
</div> </div>
</div> </div>
...@@ -85,6 +88,8 @@ ...@@ -85,6 +88,8 @@
</div> </div>
<!-- 自提点设置 --> <!-- 自提点设置 -->
<pickedAuto :pickedForm="pickedForm" @getList="getList"></pickedAuto> <pickedAuto :pickedForm="pickedForm" @getList="getList"></pickedAuto>
<!-- 导出自提点 -->
<vue-gic-export-excel :dataArr="tableDate" :dialogVisible.sync="dialogVisible" :type="2" :excelUrl="excelUrl" :params="params" :projectName="projectName"></vue-gic-export-excel>
</div> </div>
</template> </template>
...@@ -113,7 +118,12 @@ export default { ...@@ -113,7 +118,12 @@ export default {
selectIdList: [], //复选框选中的数据的id selectIdList: [], //复选框选中的数据的id
list: [{ timeRange: [] }] //初始数据 list: [{ timeRange: [] }] //初始数据
}, },
enableAccessControl: false enableAccessControl: false,
// 导出
dialogVisible: false,
excelUrl: '/api-integral-mall/pick-up-points-excel',
params: { search: '', dataType: 2, requestProject: 'integral-mall' },
projectName: 'integral-mall'
}; };
}, },
created() { created() {
...@@ -285,6 +295,33 @@ export default { ...@@ -285,6 +295,33 @@ export default {
// 编辑 // 编辑
goAdd(item) { goAdd(item) {
this.$router.push({ name: 'editDeliver', query: { integralMallPickUpPointId: item.integralMallPickUpPointId } }); this.$router.push({ name: 'editDeliver', query: { integralMallPickUpPointId: item.integralMallPickUpPointId } });
},
// 导出数据
exportData() {
let params = {
search: this.searchValue
};
request
.post('/api-integral-mall/pick-up-points-excel', qs.stringify(params))
.then(res => {
if (res.data.errorCode === 0) {
setTimeout(() => {
window.open(window.location.origin + '/mall/#/reportList', '_self');
}, 1000);
} else {
this.$message.error(res.data.message);
return false;
}
})
.catch(error => {
this.$message.error({
duration: 1000,
message: error.message
});
return false;
});
// this.dialogVisible = true;
// this.params.search = this.searchValue;
} }
}, },
components: { components: {
......
src/views/setting/editDeliver.vue
...@@ -631,6 +631,7 @@ export default { ...@@ -631,6 +631,7 @@ export default {
} else { } else {
params.settingVo.fixedDate = []; params.settingVo.fixedDate = [];
} }
this.submitLoading = true;
request.post(url, params).then(res => { request.post(url, params).then(res => {
if (res.data.errorCode === 0) { if (res.data.errorCode === 0) {
this.submitLoading = false; this.submitLoading = false;
......
src/views/setting/recordList.vue
...@@ -24,37 +24,39 @@ ...@@ -24,37 +24,39 @@
</div> </div>
</div> </div>
</div> </div>
<el-table :data="tableDate" style="width: 100%" v-loading="loading"> <div v-loading="loading">
<el-table-column prop="author" label="操作人"> </el-table-column> <el-table :data="tableDate" style="width: 100%">
<el-table-column prop="integralMallProName" label="礼品/卡券名称"> <el-table-column prop="author" label="操作人"> </el-table-column>
<template slot-scope="scope"> <el-table-column prop="integralMallProName" label="礼品/卡券名称">
<P>{{ scope.row.integralMallProName }}</P> <template slot-scope="scope">
<P>{{ scope.row.integralMallProSku }}</P> <P>{{ scope.row.integralMallProName }}</P>
</template> <P>{{ scope.row.integralMallProSku }}</P>
</el-table-column> </template>
<el-table-column prop="createTime" label="操作时间"> </el-table-column>
<template slot-scope="scope"> <el-table-column prop="createTime" label="操作时间">
<p>{{ getTime(scope.row.createTime) }}</p> <template slot-scope="scope">
<p>{{ getSeconds(scope.row.createTime) }}</p> <p>{{ getTime(scope.row.createTime) }}</p>
</template> <p>{{ getSeconds(scope.row.createTime) }}</p>
</el-table-column> </template>
<el-table-column prop="message" label="变更明细"> </el-table-column>
<template slot-scope="scope"> <el-table-column prop="message" label="变更明细">
<p>{{ scope.row.message }}</p> <template slot-scope="scope">
</template> <p>{{ scope.row.message }}</p>
</el-table-column> </template>
<template slot="empty"> </el-table-column>
<div class="no-data-wrap"> <template slot="empty">
<div class="no-data-icon"> <div class="no-data-wrap">
<img src="../../../static/img/no-data_icon.png" /> <div class="no-data-icon">
<img src="../../../static/img/no-data_icon.png" />
</div>
<p>暂无数据</p>
</div> </div>
<p>暂无数据</p> </template>
</el-table>
<div class="pagination-conteiner" v-show="tableDate.length > 0">
<div class="pagination">
<el-pagination v-if="total != 0" background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage" :page-sizes="pageSizes" :page-size="pageSize" layout="total, sizes, prev, pager, next" :total="total"> </el-pagination>
</div> </div>
</template>
</el-table>
<div class="pagination-conteiner" v-show="tableDate.length > 0">
<div class="pagination">
<el-pagination v-if="total != 0" background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage" :page-sizes="pageSizes" :page-size="pageSize" layout="total, sizes, prev, pager, next" :total="total"> </el-pagination>
</div> </div>
</div> </div>
</div> </div>
......
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