From bf9b9373029f4ff8c0ed8f7ff50ce624d46f5416 Mon Sep 17 00:00:00 2001
From: hly <2783385703@qq.com>
Date: Thu, 28 Aug 2025 10:24:46 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E7=8E=AF=E5=A2=83=E5=92=8C=E5=95=86=E5=93=81=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

将环境配置从prod2改为local
在商品显示中添加名称和款式的组合展示
调整回收页面样式和按钮文本
---
 config.js                     |  2 +-
 pages/component/recycle.vue   | 16 ++++++++--------
 pages/subcomponent/pickup.vue |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/config.js b/config.js
index 97f54ce..553e31a 100644
--- a/config.js
+++ b/config.js
@@ -1,5 +1,5 @@
 // config.js
-const type = 'prod2'
+const type = 'local'
 
 const config = {
 	local: {
diff --git a/pages/component/recycle.vue b/pages/component/recycle.vue
index 752d350..c6d8eae 100644
--- a/pages/component/recycle.vue
+++ b/pages/component/recycle.vue
@@ -129,7 +129,7 @@
               <!-- <text class="panel-item-name">{{ item.name }}</text> -->
               <!-- <text class="panel-item-desc" v-if="item.brandName && item.styleName">品牌：{{ item.brandName }} | 款式：{{ item.styleName }}</text> -->
               <text class="panel-item-name">{{ item.brandName || item.name }}</text>
-              <text class="panel-item-desc" v-if="item.styleName">{{ item.styleName }}</text>
+              <text class="panel-item-desc" v-if="item.styleName">{{ item.name }} | {{ item.styleName }}</text>
               <text class="panel-item-desc" v-else>{{ item.service }}</text>
               <text class="panel-item-price" v-if="!item.maxPrice || item.maxPrice == item.price">¥{{ item.price }}/{{
                 item.unit || '件' }}</text>
@@ -163,7 +163,7 @@
         
         <!-- 添加衣物浮窗按钮 -->
         <view class="floating-add-btn" @click="addMoreItems">
-          <text class="floating-btn-text">添加衣物</text>
+          <text class="floating-btn-text">继续添加衣物</text>
         </view>
       </view>
     </view>
@@ -2033,7 +2033,7 @@ export default {
   display: flex;
   align-items: center;
   justify-content: flex-start;
-  padding: 24rpx 0;
+  padding: 32rpx 0;
   border-bottom: 1px solid #f0f0f0;
   cursor: pointer;
   
@@ -2044,9 +2044,9 @@ export default {
 
 .panel-img-container {
   position: relative;
-  width: 100rpx;
-  height: 100rpx;
-  margin-right: 20rpx;
+  width: 120rpx;
+  height: 120rpx;
+  margin-right: 24rpx;
   flex-shrink: 0;
 }
 
@@ -2221,8 +2221,8 @@ export default {
   position: absolute;
   left: 50%;
   transform: translateX(-50%);
-  bottom: 210rpx;
-  width: 160rpx;
+  bottom: calc(120rpx + env(safe-area-inset-bottom));
+  width: 220rpx;
   height: 80rpx;
   background: linear-gradient(to right, #ffd01e, #ff8917);
   border-radius: 40rpx;
diff --git a/pages/subcomponent/pickup.vue b/pages/subcomponent/pickup.vue
index b36a605..0da3799 100644
--- a/pages/subcomponent/pickup.vue
+++ b/pages/subcomponent/pickup.vue
@@ -61,7 +61,7 @@
                 <text class="name">{{ item.brandName || item.name }}</text>
                 <text v-if="item.brandName" class="brand-tag">品牌</text>
               </view>
-              <view class="desc" v-if="item.styleName">{{ item.styleName }}</view>
+              <view class="desc" v-if="item.styleName">{{ item.name }} | {{ item.styleName }}</view>
               <view class="desc" v-else>{{ item.desc }}</view>
               <view class="price-row">
                 <text class="price" v-if="!item.maxPrice || item.maxPrice == (item.price || item.unitPrice)">￥{{