diff --git a/main/src/utils/permission.js b/main/src/utils/permission.js index 8880f74..1d1b323 100644 --- a/main/src/utils/permission.js +++ b/main/src/utils/permission.js @@ -48,11 +48,14 @@ router.beforeEach(async (to, from, next) => { } } } else { - if (whiteList.indexOf(to.path) !== -1) { - next(); - } else { - next(`/login?redirect=${to.path}`); - } + + next(); + + // if (whiteList.indexOf(to.path) !== -1) { + // next(); + // } else { + // next(`/login?redirect=${to.path}`); + // } } }); diff --git a/sub-government-affairs-service/src/utils/permission.js b/sub-government-affairs-service/src/utils/permission.js index 2abbd21..7a41171 100644 --- a/sub-government-affairs-service/src/utils/permission.js +++ b/sub-government-affairs-service/src/utils/permission.js @@ -42,14 +42,17 @@ router.beforeEach(async (to, from, next) => { } else { NProgress.done(); if (whiteList.indexOf(to.path) !== -1) { - next(); + // next(); + window.location.href = `/login?redirect=${encodeURIComponent(to.fullPath)}`; } else { - if (qiankunWindow.__POWERED_BY_QIANKUN__) { - window.location.href = VITE_APP_MIAN_URL; - return; - } - next(`/login?redirect=${to.path}`); + // if (qiankunWindow.__POWERED_BY_QIANKUN__) { + // window.location.href = VITE_APP_MIAN_URL; + // return; + // } + // next(`/login?redirect=${to.path}`); + window.location.href = `/login?redirect=${encodeURIComponent(to.fullPath)}`; } + } }); diff --git a/sub-operation-service/src/layouts/component/Header/index.vue b/sub-operation-service/src/layouts/component/Header/index.vue index 834ba95..f964112 100644 --- a/sub-operation-service/src/layouts/component/Header/index.vue +++ b/sub-operation-service/src/layouts/component/Header/index.vue @@ -17,7 +17,7 @@ - 购物车 + 采购车 diff --git a/sub-operation-service/src/utils/permission.js b/sub-operation-service/src/utils/permission.js index 68d91ec..ea14692 100644 --- a/sub-operation-service/src/utils/permission.js +++ b/sub-operation-service/src/utils/permission.js @@ -48,7 +48,8 @@ router.beforeEach(async (to, from, next) => { } } else { if (whiteList.indexOf(to.path) !== -1) { - next(); + // next(); + window.location.href = `/login?redirect=${encodeURIComponent(to.fullPath)}`; } else { next(`/login?redirect=${to.path}`); } diff --git a/sub-operation-service/src/views/ecommerce/agriculturalDetail.vue b/sub-operation-service/src/views/ecommerce/agriculturalDetail.vue index 3f62a63..65dde73 100644 --- a/sub-operation-service/src/views/ecommerce/agriculturalDetail.vue +++ b/sub-operation-service/src/views/ecommerce/agriculturalDetail.vue @@ -26,6 +26,34 @@ + + + 价 格: + + + + ¥ + {{ currentGood.priceRange?.[0] }} + + {{ currentGood.numberRange?.[0] }} + + + + ¥ + {{ currentGood.priceRange?.[1] }} + + {{ currentGood.numberRange?.[1] }} + + + + ¥ + {{ currentGood.priceRange?.[2] }} + + {{ currentGood.numberRange?.[2] }} + + + + 发货地址:{{ currentGood.detailAddress }} 保 障:{{ @@ -35,7 +63,7 @@ - 规格: + 规 格: - 立即购买 + 立即订购 - 加入购物车 + 加采购车 diff --git a/sub-operation-service/src/views/ecommerce/components/goodsItem.vue b/sub-operation-service/src/views/ecommerce/components/goodsItem.vue index 29f7ef6..20b9663 100644 --- a/sub-operation-service/src/views/ecommerce/components/goodsItem.vue +++ b/sub-operation-service/src/views/ecommerce/components/goodsItem.vue @@ -8,9 +8,9 @@ {{ data.goodName }} {{ data.goodPrice }} - +
+ ¥ + {{ currentGood.priceRange?.[0] }} +
{{ currentGood.numberRange?.[0] }}
+ ¥ + {{ currentGood.priceRange?.[1] }} +
{{ currentGood.numberRange?.[1] }}
+ ¥ + {{ currentGood.priceRange?.[2] }} +
{{ currentGood.numberRange?.[2] }}