From ea813913d98599b47ccc106a2063dfc7e1b55268 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期一, 01 九月 2025 17:36:50 +0800
Subject: [PATCH] 订单列表问题，以及跳转问题
---
manager/src/views/Main.vue | 2 ++
manager/src/views/order/order/orderList.vue | 25 +++++++++++++++++++++----
manager/src/views/member/list/memberDetail.vue | 10 ++++++++++
manager/src/views/order/order/orderDetail.vue | 10 +++++++++-
4 files changed, 42 insertions(+), 5 deletions(-)
diff --git a/manager/src/views/Main.vue b/manager/src/views/Main.vue
index 5bd6a79..370075b 100644
--- a/manager/src/views/Main.vue
+++ b/manager/src/views/Main.vue
@@ -75,7 +75,9 @@
<div class="single-page-con" :style="{ 'top': setting.isUseTabsRouter ? '100px' : '60px', height: setting.isUseTabsRouter ? 'calc(100% - 110px)' : 'calc(100% - 70px)' }">
<div class="single-page">
<!-- <keep-alive :include="cachePage"> -->
+ <keep-alive include="orderList">
<router-view></router-view>
+ </keep-alive>
<!-- </keep-alive> -->
</div>
</div>
diff --git a/manager/src/views/member/list/memberDetail.vue b/manager/src/views/member/list/memberDetail.vue
index ad305c6..c04056c 100644
--- a/manager/src/views/member/list/memberDetail.vue
+++ b/manager/src/views/member/list/memberDetail.vue
@@ -1130,6 +1130,16 @@
},
},
+ watch: {
+ $route (to, from) {
+ // 姝ｇ‘鎵撳嵃璺敱瀵硅薄鐨勬柟娉�
+ if(from.fullPath === "/member" && to.fullPath.includes("/orderList")){
+ this.id = this.$route.query.id;
+ this.init();
+
+ }
+ },
+ },
mounted() {
this.id = this.$route.query.id;
this.init();
diff --git a/manager/src/views/order/order/orderDetail.vue b/manager/src/views/order/order/orderDetail.vue
index 0007005..28bf76a 100644
--- a/manager/src/views/order/order/orderDetail.vue
+++ b/manager/src/views/order/order/orderDetail.vue
@@ -713,7 +713,14 @@
},
watch: {
$route (to, from) {
- this.$router.go(0);
+ console.log("to:",to.fullPath)
+ console.log("form:",from.fullPath)
+ // 姝ｇ‘鎵撳嵃璺敱瀵硅薄鐨勬柟娉�
+ if(from.fullPath === "/orderList" && to.fullPath.includes("/order-detail")){
+ this.sn = this.$route.query.sn;
+ this.getDataList();
+ this.getOrderPackage();
+ }
},
},
methods: {
@@ -910,6 +917,7 @@
},
},
mounted () {
+ console.log("鍔犺浇鏁版嵁")
this.sn = this.$route.query.sn;
this.getDataList();
this.getOrderPackage();
diff --git a/manager/src/views/order/order/orderList.vue b/manager/src/views/order/order/orderList.vue
index 1bc82ef..78dc30c 100644
--- a/manager/src/views/order/order/orderList.vue
+++ b/manager/src/views/order/order/orderList.vue
@@ -95,7 +95,20 @@
:data="data"
ref="table"
sortable="custom"
- ></Table>
+ >
+ <template slot="sn" slot-scope="{ row }">
+ <div style="width: 100%" @click="detail(row)">
+ <span>{{row.sn}}</span>
+ </div>
+ </template>
+ <template slot="nickName" slot-scope="{ row }">
+ <div style="width: 100%" @click="handleNickNameClick(row)">
+ <span >{{row.nickName}}</span>
+ </div>
+
+ </template>
+
+ </Table>
<Row type="flex" justify="end" class="mt_10">
<Page
@@ -180,6 +193,7 @@
key: "sn",
minWidth: 240,
tooltip: true,
+ slot: 'sn'
},
{
@@ -230,9 +244,10 @@
},
{
title: "涔板鍚嶇О",
- key: "memberName",
+ key: "nickName",
minWidth: 130,
tooltip: true,
+ slot:'nickName'
},
{
@@ -343,6 +358,9 @@
};
},
methods: {
+ handleNickNameClick(row){
+ this.$options.filters.customRouterPush({ name: "member-detail", query: { id: row.memberId } })
+ },
// 鍒濆鍖栨暟鎹�
init() {
this.getDataList();
@@ -387,11 +405,10 @@
// 璺宠浆璇︽儏椤甸潰
detail(v) {
let sn = v.sn;
- this.$options.filters.customRouterPush({
+ this.$router.push({
name: "order-detail",
query: { sn: sn },
})
-
},
// 瀵煎嚭璁㈠崟
async exportOrder() {
--
Gitblit v1.8.0