From 2527cc500445ff1e0ffcc049c827c6ff2ead28b6 Mon Sep 17 00:00:00 2001
From: duanshuwen <duanshuwen@gogpay.cn>
Date: Thu, 6 Nov 2025 18:57:45 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=86=8D=E6=AC=A1=E9=A2=84=E5=AE=9A?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E5=95=86=E5=93=81=E8=AF=A6=E6=83=85=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/GoodDetail/index.vue           |  7 +++--
 src/components/LocationCard/styles/index.scss |  2 +-
 .../order/components/FooterSection/index.vue  |  2 +-
 .../goods/components/GoodFacility/index.vue   | 31 ++++++++++++-------
 src/pages/goods/components/GoodInfo/index.vue |  2 +-
 src/pages/goods/styles/index.scss             |  2 +-
 src/static/scss/border.scss                   |  4 +++
 7 files changed, 32 insertions(+), 18 deletions(-)

diff --git a/src/components/GoodDetail/index.vue b/src/components/GoodDetail/index.vue
index 1411505..8122060 100644
--- a/src/components/GoodDetail/index.vue
+++ b/src/components/GoodDetail/index.vue
@@ -1,6 +1,9 @@
 <template>
-  <view class="mt-16">
-    <view v-if="goodsData.commodityPurchaseInstruction">
+  <view class="border-box border-top-8">
+    <view
+      v-if="goodsData.commodityPurchaseInstruction"
+      class="border-box pl-12 pr-12"
+    >
       <ModuleTitle
         v-if="showTitle"
         :title="goodsData.commodityPurchaseInstruction.templateTitle"
diff --git a/src/components/LocationCard/styles/index.scss b/src/components/LocationCard/styles/index.scss
index d08f118..3682e55 100644
--- a/src/components/LocationCard/styles/index.scss
+++ b/src/components/LocationCard/styles/index.scss
@@ -1,7 +1,7 @@
 .store-address {
   display: flex;
   align-items: center;
-  margin: 6px 0;
+  margin: 6px 12px;
   padding: 16px 12px;
   background-image: url("./images/loc_bg_img.png"); // 预留背景图片位置，用户手动导入
   background-size: cover;
diff --git a/src/pages-order/order/components/FooterSection/index.vue b/src/pages-order/order/components/FooterSection/index.vue
index 71b6cf2..3ccf7a0 100644
--- a/src/pages-order/order/components/FooterSection/index.vue
+++ b/src/pages-order/order/components/FooterSection/index.vue
@@ -17,7 +17,7 @@
           'bg-2D91FF': ['1', '2', '3', '4', '5', '6'].includes(statusCode),
         },
       ]"
-      @click="handleButtonClick"
+      @click="handleButtonClick(orderData)"
     >
       {{ buttonText }}
     </button>
diff --git a/src/pages/goods/components/GoodFacility/index.vue b/src/pages/goods/components/GoodFacility/index.vue
index 47bd671..e92f487 100644
--- a/src/pages/goods/components/GoodFacility/index.vue
+++ b/src/pages/goods/components/GoodFacility/index.vue
@@ -1,26 +1,33 @@
 <template>
-  <view class="mt-16">
+  <view class="mt-16 border-box border-top-8">
     <view
+      class="border-box pt-12 pl-12 pr-12"
       v-for="(moduleItem, index) in goodsData.commodityEquipment"
       :key="index"
     >
       <view
-        class="flex flex-items-start flex-col pt-12 pb-12"
+        class="flex flex-items-start flex-col"
         :class="{
           'border-bottom': index < goodsData.commodityEquipment.length - 1,
         }"
       >
-        <view class="flex flex-items-center flex-row flex-shrink-0 mr-8">
-          <uni-icons fontFamily="znicons" size="20" color="#171717">{{
-            zniconsMap[moduleItem.icon]
-          }}</uni-icons>
-          <text class="font-size-12 color-171717 line-height-20">{{
-            moduleItem.title
-          }}</text>
+        <view class="flex flex-items-center flex-row flex-shrink-0">
+          <uni-icons fontFamily="znicons" size="20" color="#171717">
+            {{ zniconsMap[moduleItem.icon] }}
+          </uni-icons>
+          <text class="font-size-12 color-171717 line-height-20">
+            {{ moduleItem.title }}
+          </text>
+        </view>
+        <view class="border-box flex flex-items-center flex-row mt-4 pb-12">
+          <text
+            class="font-size-12 color-525866 line-height-20 mr-4"
+            v-for="(text, index) in moduleItem.desc"
+            :key="index"
+          >
+            {{ text }}
+          </text>
         </view>
-        <text class="flex-full font-size-12 color-525866 line-height-20 mt-4">{{
-          moduleItem.desc
-        }}</text>
       </view>
     </view>
   </view>
diff --git a/src/pages/goods/components/GoodInfo/index.vue b/src/pages/goods/components/GoodInfo/index.vue
index 3919ca0..b0a8a85 100644
--- a/src/pages/goods/components/GoodInfo/index.vue
+++ b/src/pages/goods/components/GoodInfo/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <view class="good-info">
+  <view class="good-info border-box pl-12 pr-12">
     <!-- 标题区域 -->
     <view class="title-section">
       <text class="title">
diff --git a/src/pages/goods/styles/index.scss b/src/pages/goods/styles/index.scss
index d2e3d07..4e04098 100644
--- a/src/pages/goods/styles/index.scss
+++ b/src/pages/goods/styles/index.scss
@@ -68,7 +68,7 @@ $button-color: #00a6ff;
   .goods-content {
     border-radius: 28px 28px 0 0;
     background-color: #fff;
-    padding: 20px 12px;
+    padding: 20px 0;
     position: relative;
     margin-top: -30px;
     z-index: 1;
diff --git a/src/static/scss/border.scss b/src/static/scss/border.scss
index 34d6a42..bc577d9 100644
--- a/src/static/scss/border.scss
+++ b/src/static/scss/border.scss
@@ -7,6 +7,10 @@
   border-top: 1px solid #e5e8ee;
 }
 
+.border-top-8 {
+  border-top: 8px solid #f5f5f5;
+}
+
 .border-bottom {
   border-bottom: 1px solid #e5e8ee;
 }