From 32556723bb2b067837f803d76a31bd88e8bdf5d2 Mon Sep 17 00:00:00 2001
From: Xulinchuan <2026734208@qq.com>
Date: Tue, 26 Aug 2025 10:20:14 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E9=A1=B9=E7=9B=AE=E7=AC=AC?=
 =?UTF-8?q?=E4=B8=80=E6=AC=A1=E8=BF=9B=E5=8E=BB=E9=BB=98=E8=AE=A4=E9=9C=80?=
 =?UTF-8?q?=E8=A6=81=E7=99=BB=E5=BD=95=E8=80=8C=E4=B8=8D=E6=98=AF=E5=8E=BB?=
 =?UTF-8?q?=E5=BE=80=E4=B8=BB=E7=A8=8B=E5=BA=8F=E9=A6=96=E9=A1=B5=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main/src/utils/permission.js                  | 13 ++++---
 .../src/utils/permission.js                   | 15 ++++----
 .../src/layouts/component/Header/index.vue    |  2 +-
 sub-operation-service/src/utils/permission.js |  3 +-
 .../views/ecommerce/agriculturalDetail.vue    | 34 +++++++++++++++++--
 .../views/ecommerce/components/goodsItem.vue  |  4 +--
 6 files changed, 53 insertions(+), 18 deletions(-)

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 @@
           <el-badge :hidden="goodNum < 1" :value="goodNum" :max="99" class="item" :offset="[-3, 10]">
             <div style="display: flex" @click="toCart">
               <div class="iconfont icon-shopcar" style="font-size: 14px; margin: 0 5px; color: #25bf82; font-weight: bold"></div>
-              <div>购物车</div>
+              <div>采购车</div>
             </div>
           </el-badge>
           <el-badge :hidden="true" :value="0" :max="99" class="item" :offset="[-3, 10]">
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 @@
                 </div>
                 <div class="tips-list">
                   <el-row :gutter="16">
+                    <el-col :span="24">
+                      <div style="display: flex; justify-content: flex-start">
+                        <div>价&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;格：</div>
+                        <div style="display: flex; justify-content: flex-start">
+                          <div style="margin-right: 16px">
+                            <p style="width: 100%; line-height: 20px">
+                              <span>￥</span>
+                              <span style="font-size: 24px; font-weight: bold">{{ currentGood.priceRange?.[0] }}</span>
+                            </p>
+                            <p style="width: 100%; line-height: 20px; font-size: 12px; color: #ccc">{{ currentGood.numberRange?.[0] }}</p>
+                          </div>
+                          <div style="margin-right: 16px">
+                            <p style="width: 100%; line-height: 20px">
+                              <span>￥</span>
+                              <span style="font-size: 24px; font-weight: bold">{{ currentGood.priceRange?.[1] }}</span>
+                            </p>
+                            <p style="width: 100%; line-height: 20px; font-size: 12px; color: #ccc">{{ currentGood.numberRange?.[1] }}</p>
+                          </div>
+                          <div style="margin-right: 16px">
+                            <p style="width: 100%; line-height: 20px">
+                              <span>￥</span>
+                              <span style="font-size: 24px; font-weight: bold">{{ currentGood.priceRange?.[2] }}</span>
+                            </p>
+                            <p style="width: 100%; line-height: 20px; font-size: 12px; color: #ccc">{{ currentGood.numberRange?.[2] }}</p>
+                          </div>
+                        </div>
+                      </div>
+                    </el-col>
                     <el-col :span="24">发货地址：{{ currentGood.detailAddress }}</el-col>
                     <el-col :span="24"
                       >保&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;障：{{
@@ -35,7 +63,7 @@
                   </el-row>
                 </div>
                 <div class="spu-sku-list">
-                  <div class="spu-title">规格：</div>
+                  <div class="spu-title">规&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;格：</div>
                   <div class="spu-sku-warp">
                     <div
                       v-for="(item, index) in currentGood.netWeight"
@@ -58,10 +86,10 @@
                 </div>
                 <div class="top-btn">
                   <div class="item-btn sign" @click="buyGood">
-                    <span>立即购买</span>
+                    <span>立即订购</span>
                   </div>
                   <div class="item-btn reservation" @click="addGoodToCart">
-                    <span>加入购物车</span>
+                    <span>加采购车</span>
                   </div>
                   <div class="contact" @click="showPhone = true">
                     <div><img :src="getAssetsFile('images/ecommerce/contact.png')" alt="" width="15" /></div>
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 @@
       <div class="goods-name txt-ellipsis clamp2">{{ data.goodName }}</div>
       <div class="goods-do">
         <div class="price txt-ellipsis clamp">{{ data.goodPrice }}</div>
-        <div class="do" @click.stop="openDialog(data)">
+        <!-- <div class="do" @click.stop="openDialog(data)">
           <div class="iconfont icon-cart"></div>
-        </div>
+        </div> -->
       </div>
     </div>
     <el-dialog v-model="centerDialogVisible" title="Warning" width="80%" align-center :show-close="false" style="border-radius: 16px">