Skip to content

I
integral-mall
Commit b6925ffb by damodmg
Options

存储列表进入详情返回到具体的搜索条件

parent 2e98c36b
Showing with 51 additions and 6 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.9f4a9cf59beaa9cc2f94146f07d9fbfb.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.20.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.05.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-linkage.2.0.01.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.03.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.04.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.bf93010d9b9b1322a27b.js></script><script type=text/javascript src=./static/js/app.df6c34561c3c603300c6.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.339b50b94fa272434db9e4007cd7859f.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.20.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.05.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-linkage.2.0.01.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.03.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.04.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.bf93010d9b9b1322a27b.js></script><script type=text/javascript src=./static/js/app.453006b88ebc816a3f86.js></script></body></html>
\ No newline at end of file
dist/static/js/app.453006b88ebc816a3f86.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.df6c34561c3c603300c6.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
src/views/order/giftExchange.vue
......@@ -136,7 +136,7 @@
</div>
<div class="pagination-conteiner" style="background:#fff;margin:-50px 24px 0 24px">
<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="currentPage" :page-sizes="pageSizes" :page-size="pageSize" layout="total, sizes, prev, pager, next" :total="total"> </el-pagination>
</div>
</div>
</el-tabs>
......@@ -333,7 +333,8 @@ export default {
shopDialogVisible: false, //门店自提
shopIntegralMallProExchangeId: '', //门店自提订单id
writeOffCode: '', //核销码
submitLoading: false //门店自提确认按钮
submitLoading: false, //门店自提确认按钮
giftOrderObj: {} //缓存数据
};
},
watch: {
......@@ -345,12 +346,36 @@ export default {
created() {
this.getNumber();
this.integralMallProId = this.$route.query.integralMallProId;
if (localStorage.getItem('giftOrderObj')) {
this.giftOrderObj = JSON.parse(localStorage.getItem('giftOrderObj'));
this.currentPage = this.giftOrderObj.currentPage;
this.pageSize = this.giftOrderObj.pageSize;
this.total = this.giftOrderObj.total;
this.changeType = this.giftOrderObj.changeType; //配送方式
this.orderStatus = this.giftOrderObj.orderStatus; //-1:全部 1、待发货 11、待付款 3、已发货 0 、已取消 4、交易成功
this.searchParams = this.giftOrderObj.searchValue; //搜索
this.pageType = this.giftOrderObj.pageType; //1、代表优惠券订单列表 2、礼品订单
this.beginTime = this.giftOrderObj.beginTime;
this.endTime = this.giftOrderObj.endTime;
if (this.beginTime) {
this.dateValue[0] = this.beginTime;
this.dateValue[1] = this.endTime;
} else {
this.dateValue = null;
}
this.sortType = this.giftOrderObj.sortType;
this.integralMallProId = this.giftOrderObj.integralMallProId;
localStorage.removeItem('giftOrderObj'); //使用完就清除缓存
}
this.getList();
},
methods: {
// tab切换
handleClick(tab) {
this.orderStatus = tab.name;
this.currentPage = 1;
this.getList();
},
// 搜索
......@@ -404,8 +429,8 @@ export default {
// 时间改变
changeTime() {
if (this.dateValue) {
this.beginTime = this.getTimeAll(this.dateValue[0]);
this.endTime = this.getTimeAll(this.dateValue[1]);
this.beginTime = this.dateValue[0] ? this.getTimeAll(this.dateValue[0]) : '';
this.endTime = this.dateValue[1] ? this.getTimeAll(this.dateValue[1]) : '';
} else {
this.beginTime = '';
this.endTime = '';
......@@ -415,6 +440,7 @@ export default {
},
//获取列表
getList() {
// console.log(this.dateValue)
this.beginTime = this.dateValue ? this.getTimeAll(this.dateValue[0]) : '';
this.endTime = this.dateValue ? this.getTimeAll(this.dateValue[1]) : '';
let params = {
......@@ -707,6 +733,21 @@ export default {
},
// 进入订单详情
goDetail(item) {
//列表筛选条件存缓存
this.giftOrderObj = {
currentPage: this.currentPage,
pageSize: this.pageSize,
total: this.total,
changeType: this.changeType, //配送方式
orderStatus: this.orderStatus, //-1:全部 1、待发货 11、待付款 3、已发货 0 、已取消 4、交易成功
searchParams: this.searchValue, //搜索
pageType: 2, //1、代表优惠券订单列表 2、礼品订单
beginTime: this.beginTime,
endTime: this.endTime,
sortType: this.sortType,
integralMallProId: this.integralMallProId ? this.integralMallProId : ''
};
window.localStorage.setItem('giftOrderObj', JSON.stringify(this.giftOrderObj));
this.$router.push({ name: 'orderDetail', query: { integralMallProExchangeId: item.integralMallProExchangeId } });
}
},
......
src/views/order/orderDetail.vue
......@@ -308,6 +308,10 @@ export default {
};
},
created() {
window.onbeforeunload = function(e) {
var storage = window.localStorage;
storage.clear();
};
this.integralMallProExchangeId = this.$route.query.integralMallProExchangeId;
this.getOrderDetail();
},
......
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