From 5f00696dfb25bc90034448ceb634ed1ef256681a Mon Sep 17 00:00:00 2001 From: qiyunfeng-create <1940665526@qq.com> Date: 星期四, 21 八月 2025 21:13:35 +0800 Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/xiehe_website --- src/views/personalCenter/myOrder.vue | 114 +++++++++------------------------------------------------ 1 files changed, 18 insertions(+), 96 deletions(-) diff --git a/src/views/personalCenter/myOrder.vue b/src/views/personalCenter/myOrder.vue index fa053cd..ca88aa5 100644 --- a/src/views/personalCenter/myOrder.vue +++ b/src/views/personalCenter/myOrder.vue @@ -149,10 +149,9 @@ import { ElMessage } from "element-plus"; import { getPublicImage } from "@/assets/js/middleGround/tool.js"; import { useRouter } from "vue-router"; -import { useBreadcrumbStore, useUserStore } from "@/store"; +import { useUserStore } from "@/store"; import bookCover from "@/assets/images/personalCenter/book-cover.png"; const router = useRouter(); -const crumbStore = useBreadcrumbStore(); const userStore = useUserStore(); const MG: any = inject("MG"); let order = ref("all"); @@ -239,53 +238,17 @@ let parentData = null; let bookId = id; if (refCode == "digitalCourses") { - let crumbs = [ - { - name, - isCrumbs: true, - type: "digitalCourses", - path: "digitalCoursesDetails", - }, - ]; - // 鍦ㄥ叏灞�鏁版嵁涓缃潰鍖呭睉 - crumbStore.setCrumbs({ - type: "digitalCourses", - data: crumbs, - callback: (key: any) => { - router.push({ - name: "digitalCoursesDetails", - query: { - crumbsKey: key, - bookId: bookId, - bookName: name, - type: "digitalCourses", - }, - }); + router.push({ + path: "/bookdetail", + query: { + bookId: bookId, }, }); } else if (refCode == "digitalTextbooks") { - let crumbs = [ - { - name, - isCrumbs: true, - type: "digitalTextbooks", - path: "digitalTextbooksDetails", - }, - ]; - // 鍦ㄥ叏灞�鏁版嵁涓缃潰鍖呭睉 - crumbStore.setCrumbs({ - type: "digitalTextbooks", - data: crumbs, - callback: (key: any) => { - router.push({ - name: "digitalTextbooksDetails", - query: { - crumbsKey: key, - bookId: bookId, - bookName: name, - type: "digitalTextbooks", - }, - }); + router.push({ + path: "/bookdetail", + query: { + bookId: bookId, }, }); } else { @@ -295,62 +258,21 @@ if (parentData.parentProduct.length > 0) { bookId = parentData.parentProduct[parentData.parentProduct.length - 1].id; } - console.log(bookId, "bookId"); - let crumbs = [ - { - name, - isCrumbs: true, - type: "bookService", - path: "/bookService/details", - }, - ]; - // 鍦ㄥ叏灞�鏁版嵁涓缃潰鍖呭睉 - crumbStore.setCrumbs({ - type: "bookService", - data: crumbs, - callback: (key: any) => { - router.push({ - name: "bookDetails", - query: { - crumbsKey: key, - bookId: bookId, - bookName: name, - type: "bookService", - }, - }); + router.push({ + path: "/bookdetail", + query: { + bookId: bookId, }, }); } }; //绔嬪嵆鏀粯 const toPay = (orderNo) => { - let crumbs: any[] = [ - { - name: "鎴戠殑璁㈠崟", // 闈㈠寘灞戝悕绉� - pathName: "myOrder", // 闈㈠寘灞戣烦杞矾鐢憋紝鍙紶閫� pathName 鎴� path - isCrumbs: true, // 闈㈠寘灞戠偣鍑昏烦杞椂鏄惁鍒涘缓鏂扮殑闈㈠寘灞戣褰� - type: "personalCenter", // 濡傛灉闇�瑕佸垱寤烘柊鐨勯潰鍖呭睉璁板綍锛屽垱寤虹殑type - query: { - type: "personalCenter", - }, - }, - ]; - crumbs.push({ - name: "璁㈠崟璇︽儏", - }); - // 鍦ㄥ叏灞�鏁版嵁涓缃潰鍖呭睉 - crumbStore.setCrumbs({ - type: "personalCenter", - data: crumbs, - callback: (key: any) => { - router.push({ - path: "/paymentPage", //瑕佽烦杞殑椤甸潰 - query: { - crumbsKey: key, - orderNum: orderNo, - type: "personalCenter", - }, - }); + router.push({ + path: "/paymentPage", //瑕佽烦杞殑椤甸潰 + query: { + orderNum: orderNo, + type: "personalCenter", }, }); }; -- Gitblit v1.9.1