From d172a1c9b80541c7f0019d5686d15ffd3058e7f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=94=B0=E9=A6=99=E7=90=AA?= <624506849@qq.com>
Date: Fri, 17 Jul 2026 17:35:42 +0800
Subject: [PATCH] =?UTF-8?q?fix(cart):=20=E8=B0=83=E6=95=B4=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=E6=8F=90=E7=A4=BA=E5=B1=95=E7=A4=BA=E5=B9=B6=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E5=B7=B2=E4=B8=8B=E6=9E=B6=E5=95=86=E5=93=81=E9=81=AE?=
 =?UTF-8?q?=E7=BD=A9=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

简化 Cart.vue 中错误文案展示，移除多余 margin
优化 error-goods 样式：使用 inset 定位，并通过 box-sizing 管理 padding，改善布局与响应表现
---
 buyer/src/pages/Cart.vue                      | 28 +++++-----
 buyer/src/pages/home/orderCenter/MyOrder.vue  |  2 +-
 .../sys/setting-manage/settingManage.vue      | 56 +++++++++++++++----
 3 files changed, 58 insertions(+), 28 deletions(-)

diff --git a/buyer/src/pages/Cart.vue b/buyer/src/pages/Cart.vue
index 54352fbd..88e98398 100644
--- a/buyer/src/pages/Cart.vue
+++ b/buyer/src/pages/Cart.vue
@@ -193,7 +193,7 @@
                 </div>
               </div>
               <div class="error-goods" v-if="goods.errorMessage">
-                <div style="margin-top: 20px">{{ goods.errorMessage }}</div>
+                <div>{{ goods.errorMessage }}</div>
                 <el-button type="primary" @click="delGoods(goods.goodsSku.id)"
                   >删除</el-button
                 >
@@ -785,20 +785,18 @@ export default {
           outline-color: $theme_color;
         }
       }
-    }
-    .error-goods {
-      position: absolute;
-      width: 100%;
-      height: 100%;
-      margin-left: -20px;
-      background-color: rgba($color: #999, $alpha: 0.5);
-      z-index: 10;
-      display: flex;
-      align-items: center;
-      justify-content: space-between;
-      padding-left: 150px;
-      color: #000;
-      padding-right: 30px;
+      .error-goods {
+        position: absolute;
+        inset: 0;
+        background-color: rgba($color: #999, $alpha: 0.5);
+        z-index: 10;
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        padding: 0 30px 0 150px;
+        box-sizing: border-box;
+        color: #000;
+      }
     }
   }
   &-footer {
diff --git a/buyer/src/pages/home/orderCenter/MyOrder.vue b/buyer/src/pages/home/orderCenter/MyOrder.vue
index 0d1ec14e..09cc3c15 100644
--- a/buyer/src/pages/home/orderCenter/MyOrder.vue
+++ b/buyer/src/pages/home/orderCenter/MyOrder.vue
@@ -55,7 +55,7 @@
                 <div>
                   <div class="hover-color" @click="goodsDetail(goods.skuId, goods.goodsId)">{{ goods.name }}</div>
                   <div class="mt_10">
-                    <span class="global_color">{{ $filters.unitPrice(goods.goodsPrice, "￥") }} </span>x {{ goods.num }}
+                    <span class="global_color">{{ $filters.unitPrice(goods.goodsPrice, "￥") }} </span> x {{ goods.num }}
                     <span style="margin-left: 10px;color: #ff9900;">{{refundPriceList(goods.isRefund)}}</span>
                   </div>
                   <el-button v-if="goods.commentStatus == 'UNFINISHED'" @click="comment(order.sn, goodsIndex)" size="small" type="success" class="fontsize_12" style="position:relative;top:-22px;left:190px;margin-right:10px">评价</el-button>
diff --git a/manager/src/views/sys/setting-manage/settingManage.vue b/manager/src/views/sys/setting-manage/settingManage.vue
index f36d8bf8..b1f3b8c4 100644
--- a/manager/src/views/sys/setting-manage/settingManage.vue
+++ b/manager/src/views/sys/setting-manage/settingManage.vue
@@ -93,6 +93,7 @@ export default {
         { type: "WECHAT_PAYMENT", name: "微信支付设置" },
       ],
       tabWay: [], // tab数据
+      settingRequestSeq: 0,
     };
   },
 
@@ -115,29 +116,60 @@ export default {
       this.selected = name;
       this.getSettingData(name);
     },
+    resolveTabWay() {
+      const tabMap = {
+        setting: this.setting,
+        authLogin: this.authLogin,
+        pay: this.pay,
+      };
+      this.tabWay = tabMap[this.$route.name] || [];
+    },
+    normalizeSettingResult(res) {
+      if (!res || res.result == null) {
+        return {};
+      }
+      const raw = res.result;
+      if (typeof raw === "string") {
+        try {
+          return JSON.parse(raw);
+        } catch (e) {
+          return {};
+        }
+      }
+      if (typeof raw === "object") {
+        return raw;
+      }
+      return {};
+    },
     /**
      * 进入页面请求第一个配置
      */
     getSettingData(name) {
       this.settingData = "";
-      Object.keys(this).forEach((item) => {
-        if (this.$route.name == item) {
-          this.tabWay = this[item];
-        }
-      });
-      // 点击页面给每项第一个数据赋值
+      this.resolveTabWay();
+
       if (!name) {
+        if (!this.tabWay.length) {
+          return;
+        }
         name = this.tabWay[0].type;
         this.selected = name;
       }
 
-      getSetting(name).then((res) => {
-        if (res.result) {
-          this.settingData = JSON.stringify(res.result);
-        } else {
+      const requestId = ++this.settingRequestSeq;
+      getSetting(name)
+        .then((res) => {
+          if (requestId !== this.settingRequestSeq) {
+            return;
+          }
+          this.settingData = JSON.stringify(this.normalizeSettingResult(res));
+        })
+        .catch(() => {
+          if (requestId !== this.settingRequestSeq) {
+            return;
+          }
           this.settingData = "{}";
-        }
-      });
+        });
     },
   },
 };