Commit 01cf5180 authored by 琉璃丶c's avatar 琉璃丶c

1.添加点击事件

parent 8cdd79ef
...@@ -15,7 +15,7 @@ Vue.use(Router) ...@@ -15,7 +15,7 @@ Vue.use(Router)
const routerList = [ const routerList = [
{ {
path: '/', path: '/',
redirect: '/todo' redirect: '/myOrder'
}, },
...todo, ...todo,
...saleSituation, ...saleSituation,
......
<template> <template>
<div id="stepLayout"> <div id="stepLayout">
<slot :state="'history'"></slot> <slot></slot>
</div> </div>
</template> </template>
......
...@@ -72,9 +72,19 @@ export default { ...@@ -72,9 +72,19 @@ export default {
rightIcon: false, rightIcon: false,
title: '', title: '',
leftText: '物流详情', leftText: '物流详情',
leftClick: null, leftClick: this.onBrowserBack,
rightClick: null rightClick: null
}) })
window.addEventListener('popstate', this.onBrowserBack, false)
},
destroyed() {
// 当页面销毁必须要移除这个事件,vue不刷新页面,不移除会重复执行这个事件
window.removeEventListener('popstate', this.onBrowserBack, false)
},
methods: {
onBrowserBack() {
this.$router.go(-1)
}
} }
} }
</script> </script>
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
</div> </div>
<!-- 订单物流信息 --> <!-- 订单物流信息 -->
<div class="order-common order-logistics"> <div class="order-common order-logistics">
<div class="logistics-content"> <div class="logistics-content" @click="openPager('logisticsDetail')">
<van-icon :name="icons.inDelivery" class="order-icon logistics-icon"/> <van-icon :name="icons.inDelivery" class="order-icon logistics-icon"/>
<div class="logistics-text"> <div class="logistics-text">
<div style="display:flex"> <div style="display:flex">
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
</div> </div>
<!-- 订单商品 --> <!-- 订单商品 -->
<div class="order-common order-goods"> <div class="order-common order-goods">
<div class="goods-all"> <div class="goods-all" @click="openPager('goodsInfo')">
<span class="all-title">商品信息</span> <span class="all-title">商品信息</span>
全部 全部
<van-icon class="title-arrow" name="arrow"/> <van-icon class="title-arrow" name="arrow"/>
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
</div> </div>
<!-- 订单发票信息 --> <!-- 订单发票信息 -->
<div class="order-common order-invoice"> <div class="order-common order-invoice">
<div class="invoice-all"> <div class="invoice-all" @click="openPager('myInvoice')">
<span class="all-title">发票信息</span> <span class="all-title">发票信息</span>
全部 全部
<van-icon class="title-arrow" name="arrow"/> <van-icon class="title-arrow" name="arrow"/>
...@@ -111,6 +111,15 @@ export default { ...@@ -111,6 +111,15 @@ export default {
methods: { methods: {
onBrowserBack() { onBrowserBack() {
this.$router.go(-1) this.$router.go(-1)
},
openPager(path) {
this.$router.push({
path: path,
query: this.$store.state.linkInfo
})
},
openLogistics() {
this.openPager('logisticsDetail')
} }
} }
} }
......
...@@ -51,15 +51,15 @@ export default { ...@@ -51,15 +51,15 @@ export default {
moreSearchShow: false, moreSearchShow: false,
activeTab: 'home', activeTab: 'home',
moreSearchInfo: { moreSearchInfo: {
//接收搜索更多回传的数据 // 接收搜索更多回传的数据
supplier: { comPartyId: "" }, //供应商ID supplier: { comPartyId: '' }, // 供应商ID
goods: { comGoodsId: "" }, //商品ID goods: { comGoodsId: '' }, // 商品ID
orderNo: "", //订单编号 orderNo: '', // 订单编号
time: { time: {
//起始时间 // 起始时间
start: getFormateDate(new Date(), "yyyy-MM-dd"), start: getFormateDate(new Date(), 'yyyy-MM-dd'),
end: getFormateDate(new Date(), "yyyy-MM-dd"), end: getFormateDate(new Date(), 'yyyy-MM-dd')
}, }
} }
} }
}, },
...@@ -99,21 +99,21 @@ export default { ...@@ -99,21 +99,21 @@ export default {
orderItemAction(model) { orderItemAction(model) {
console.log(model) console.log(model)
switch (true) { switch (true) {
case model.actionType === "invoice": case model.actionType === 'invoice':
//查看发票 // 查看发票
this.gotoOrderInvoice(model); this.gotoOrderInvoice(model)
break; break
case model.actionType === "logistics": case model.actionType === 'logistics':
// 查看物流 // 查看物流
break; break
case model.actionType === "clearance": case model.actionType === 'clearance':
// 清货单 // 清货单
this.gotoOrderClearance(model) this.gotoOrderClearance(model)
break; break
case model.actionType === "details": case model.actionType === 'details':
// 订单详情 // 订单详情
this.gotoOrderDetail(model) this.gotoOrderDetail(model)
break; break
} }
}, },
// 查看订单详情 // 查看订单详情
...@@ -121,7 +121,7 @@ export default { ...@@ -121,7 +121,7 @@ export default {
this.$router.push({ this.$router.push({
path: '/orderDetail', path: '/orderDetail',
query: this.$store.state.linkInfo query: this.$store.state.linkInfo
}); })
}, },
// 查看发票 // 查看发票
gotoOrderInvoice (model) { gotoOrderInvoice (model) {
...@@ -129,14 +129,14 @@ export default { ...@@ -129,14 +129,14 @@ export default {
this.$router.push({ this.$router.push({
path: '/orderInvoice', path: '/orderInvoice',
query: this.$store.state.linkInfo query: this.$store.state.linkInfo
}); })
}, },
// 查看 清货单 // 查看 清货单
gotoOrderClearance(model) { gotoOrderClearance(model) {
this.$router.push({ this.$router.push({
path: '/clearance', path: '/clearance',
query: this.$store.state.linkInfo query: this.$store.state.linkInfo
}); })
}, },
onBrowserBack() { onBrowserBack() {
if (this.moreSearchShow) { if (this.moreSearchShow) {
...@@ -160,7 +160,7 @@ export default { ...@@ -160,7 +160,7 @@ export default {
}, },
// 高级搜索取消 // 高级搜索取消
moreSearchClean(data) { moreSearchClean(data) {
this.moreSearchInfo = data; this.moreSearchInfo = data
}, },
addNextTab(pos) { addNextTab(pos) {
// 加载下一个页面 // 加载下一个页面
......
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