Merge branch 'master' of http://182.92.203.7:2001/r/xiehe_website

qiyunfeng-create

2 天以前 5f00696dfb25bc90034448ceb634ed1ef256681a

 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",
    },
  });
};