From 16fc923e4b8255766861642c56521c8140a181ce Mon Sep 17 00:00:00 2001
From: linxi <957440651@qq.com>
Date: Mon, 1 Jun 2026 11:27:26 +0800
Subject: [PATCH 1/4] =?UTF-8?q?Feat=EF=BC=9A=E6=A0=B7=E5=BC=8F=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg_product/views/giftList.vue | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkg_product/views/giftList.vue b/pkg_product/views/giftList.vue
index 2915887..ab100b8 100644
--- a/pkg_product/views/giftList.vue
+++ b/pkg_product/views/giftList.vue
@@ -66,10 +66,11 @@
         class="item"
       >
         <view class="bg" @click="provinceItemClick(item)">
+              <!-- <rich-text :nodes="item.bgHtml" /> -->
           <image
             :src="item.backgroundImage"
             class="bg-img"
-            mode="aspectFill"
+            mode="widthFix|aspectFill"
             lazy-load
           />
         </view>
@@ -270,16 +271,12 @@ export default {
       position: relative;
       z-index: 2;
       width: 100%;
-      padding-top: 62%;
       overflow: hidden;
       border-radius: 20rpx;
       background-color: #f6f6f6;
       .bg-img {
-        position: absolute;
         top: 0;
-        left: 0;
         width: 100%;
-        height: 100%;
         display: block;
       }
     }

From 4c008f2b55bf262454ebdf2f594d12982d09932e Mon Sep 17 00:00:00 2001
From: LinCyJang <linxi957440651@163.com>
Date: Tue, 2 Jun 2026 22:01:34 +0800
Subject: [PATCH 2/4] =?UTF-8?q?Style=EF=BC=9A=E6=A0=B7=E5=BC=8F=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 assets/css/style.less                    | 1 +
 pkg-video/views/county-claim-address.vue | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/assets/css/style.less b/assets/css/style.less
index a8fc99a..9c4c3f3 100644
--- a/assets/css/style.less
+++ b/assets/css/style.less
@@ -8267,6 +8267,7 @@ rich-text {
     display: flex;
     align-items: center;
     justify-content: center;
+    line-height: 40rpx;
   }
 
   .draw-ticket-icon {
diff --git a/pkg-video/views/county-claim-address.vue b/pkg-video/views/county-claim-address.vue
index 6d3ace6..fb7925e 100644
--- a/pkg-video/views/county-claim-address.vue
+++ b/pkg-video/views/county-claim-address.vue
@@ -750,7 +750,7 @@ export default {
   border: 4rpx solid #333;
   border-radius: 50%;
   font-size: 32rpx;
-  line-height: 38rpx;
+  line-height: 44rpx;
   text-align: center;
   color: #333;
   font-weight: 700;

From 11e69ea9c70106162efabcca5f1a772f1e1148f5 Mon Sep 17 00:00:00 2001
From: linxi <957440651@qq.com>
Date: Fri, 5 Jun 2026 09:46:45 +0800
Subject: [PATCH 3/4] =?UTF-8?q?Fix:=EF=BC=9A5313=20=E3=80=90=E5=95=86?=
 =?UTF-8?q?=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=90=8E=E5=8F=B0=E5=90=8E=E5=8F=B0=E7=A6=81=E7=94=A8=E8=B4=A6?=
 =?UTF-8?q?=E5=8F=B7=E5=90=8E=EF=BC=8C=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=AB=AF?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=8F=90=E7=A4=BA=E2=80=9C=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=97=A0=E6=B3=95=E8=B0=83=E7=94=A8=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 utils/index.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/utils/index.js b/utils/index.js
index ccf2fdb..ad33cea 100644
--- a/utils/index.js
+++ b/utils/index.js
@@ -379,7 +379,7 @@ export const login = loginInfo => {
                                             })
                                     })
                                     .catch(error => {
-                                        reject('登录接口调用失败')
+                                        reject('请联系管理员')
                                     })
                             } else {
                                 reject('用户未授权')
@@ -413,7 +413,7 @@ export const login = loginInfo => {
                                                 })
                                         })
                                         .catch(error => {
-                                            reject('登录接口调用失败')
+                                            reject('请联系管理员')
                                         })
                                 },
                                 fail() {
@@ -423,7 +423,7 @@ export const login = loginInfo => {
                         }
                     },
                     fail() {
-                        reject('调用登录接口失败')
+                        reject('请联系管理员')
                     },
                 })
             })

From 26c5c4d1154622a827bd852ce07e901a7124de65 Mon Sep 17 00:00:00 2001
From: linxi <957440651@qq.com>
Date: Fri, 5 Jun 2026 10:39:14 +0800
Subject: [PATCH 4/4] =?UTF-8?q?Fix=EF=BC=9A5306=20=E3=80=90=E5=95=86?=
 =?UTF-8?q?=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E5=BD=93=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E5=BA=93=E5=AD=98=E4=B8=BA0=E7=9A=84=E6=83=85?=
 =?UTF-8?q?=E5=86=B5=E4=B8=8B=EF=BC=8C=E5=8A=A0=E5=85=A5=E8=B4=AD=E7=89=A9?=
 =?UTF-8?q?=E8=BD=A6=E6=8C=89=E9=92=AE=E7=9B=92=E7=AB=8B=E5=8D=B3=E8=B4=AD?=
 =?UTF-8?q?=E4=B9=B0=E6=8C=89=E9=92=AE=E9=83=BD=E7=BD=AE=E7=81=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/ProductWindow.vue  | 13 +++++++++++--
 pages/shop/GoodsCon/index.vue |  7 ++++---
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/components/ProductWindow.vue b/components/ProductWindow.vue
index 004747d..1e6ea87 100644
--- a/components/ProductWindow.vue
+++ b/components/ProductWindow.vue
@@ -75,7 +75,7 @@
       <view class="v12-px-2 v12-mt-3" v-if="showOk">
         <u-button 
           shape="circle" 
-          color="#C52733" 
+          :color="(attr.productSelect.stock === 0 && attr.cartAttr) ? '#9D9D9D' : '#C52733'" 
           @click="$emit('ok')"
           :disabled="(attr.productSelect.stock === 0 && attr.cartAttr)"
         >{{ okText }}</u-button>
@@ -83,7 +83,7 @@
       <view class="v12-px-2 v12-mt-3" v-if="isGift">
         <u-button 
           shape="circle" 
-          color="#C52733" 
+          :color="(attr.productSelect.stock === 0 && attr.cartAttr) ? '#9D9D9D' : '#C52733'" 
           @click="$emit('gift')"
           :disabled="(attr.productSelect.stock === 0 && attr.cartAttr)"
         >送给朋友</u-button>
@@ -255,6 +255,15 @@ export default {
 }
 </script>
 <style scope>
+  .btn-car-disabled {
+    border: 2rpx solid #9D9D9D !important;
+    color: #9D9D9D !important;
+  }
+
+  .btn-buy-disabled {
+    background: #9D9D9D !important;
+    color: #FFFFFF !important;
+  }
   .itemn{
     margin: 28rpx 0 0 34rpx !important;
     width: auto;
diff --git a/pages/shop/GoodsCon/index.vue b/pages/shop/GoodsCon/index.vue
index 4511564..0cca15a 100644
--- a/pages/shop/GoodsCon/index.vue
+++ b/pages/shop/GoodsCon/index.vue
@@ -1872,8 +1872,8 @@ export default {
   }
 
   .btn-car-disabled {
-    border: 2rpx solid #707070;
-    color: #707070;
+    border: 2rpx solid #9D9D9D !important;
+    color: #9D9D9D !important;
   }
 
   .btn-buy {
@@ -1886,7 +1886,8 @@ export default {
   }
 
   .btn-buy-disabled {
-    background: #9D9D9D;
+    background: #9D9D9D !important;
+    color: #FFFFFF !important;
   }
 }