解决冲突

mallApp/src/components/home/activitySection.vue

@@ -40,7 +40,7 @@
               <text class="price">￥{{ formatPrice(g.price) }}</text>
               <text class="origin-price">￥{{ formatPrice(g.originPrice) }}</text>
             </view>
-            <view class="action-btn">{{ actionText }} ></view>
+            <view class="action-btn">{{ actionText }}</view>
           </view>
         </view>
       </view>
@@ -378,14 +378,14 @@ export default {
   margin-right: 8upx;
 }
 .row-price-wrap .origin-price {
-  font-size: 22upx;
+  font-size: 28upx;
   color: #bbb;
   text-decoration: line-through;
 }
 .action-btn {
   flex-shrink: 0;
-  padding: 13upx 24upx;
-  font-size: 24upx;
+  padding: 18upx 24upx;
+  font-size: 26upx;
   color: #fff;
   background: linear-gradient(135deg, #FF8FA3, #FF4D6D);
   border-radius: 28upx;
@@ -397,7 +397,7 @@ export default {
   font-weight: 700;
 }
 .origin-price {
-  font-size: 22upx;
+  font-size: 28upx;
   color: #bbb;
   text-decoration: line-through;
 }

mallApp/src/components/home/goodsSection.vue

@@ -115,7 +115,7 @@ export default {
      * @returns {string}
      */
     displayPrice(g) {
-      if (this.isNoPrice(g)) return '--'
+      if (this.isNoPrice(g)) return '?'
       return this.formatPrice(g && g.price)
     },
     formatSold(val) {
@@ -134,7 +134,7 @@ export default {
         return
       }
       if (this.isNoPrice(g)) {
-        this.$msg('暂无价格，请向商家询价')
+        this.$msg('请向商家咨询价格')
         return
       }
       if (!(Number(g.price) > 0)) {

mallApp/src/mixins/cgProduct.js

@@ -494,7 +494,7 @@ export default {
 			const price = Number(saleGoods.price != null ? saleGoods.price : goods.price);
 			// 无价格类型（priceType=0）：不能加购，引导向商家询价
 			if (Number(goods.priceType) === 0) {
-				this.$msg('暂无价格，请向商家询价');
+				this.$msg('请向商家咨询价格');
 				return null;
 			}
 			// 有价格类型且价格为0时，提示商品还没有价格

mallApp/src/pages/goods/components/sel-popup.vue

@@ -187,7 +187,7 @@ export default {
       const sale = spec || this.info;
       // 无价格商品不能加购/购买，引导询价
       if (Number(sale.priceType) === 0) {
-        this.$msg('暂无价格，请向商家询价');
+        this.$msg('请向商家咨询价格');
         return null;
       }
       if (Number(sale.price) <= 0) {

mallApp/src/pages/goods/detail.vue

@@ -22,7 +22,7 @@
           <text v-if="isSeckillActive && data.originPrice > 0" class="app-price-origin">￥{{ parseFloat(data.originPrice).toFixed(2) }}</text>
         </view>
         <!-- 无价格商品：不展示数字价，引导底部询价 -->
-        <view class="app-price app-bold" v-else>￥--</view>
+        <view class="app-price app-bold" v-else>￥?</view>
         <view class="tui-pro-titbox">
           <view class="tui-pro-title-wrap">
             <view class="tui-pro-title app-size-32">{{ data.name }}</view>

mallApp/src/pages/goods/list.vue

@@ -579,7 +579,7 @@ export default {
         return
       }
       if (this.isNoPrice(item)) {
-        this.$msg('暂无价格，请向商家询价')
+        this.$msg('请向商家咨询价格')
         return
       }
       if (!(Number(item.price) > 0)) {

mallApp/src/pages/goods/section-list.vue

@@ -235,7 +235,7 @@ export default {
         return
       }
       if (this.isNoPrice(item)) {
-        this.$msg('暂无价格，请向商家询价')
+        this.$msg('请向商家咨询价格')
         return
       }
       if (!(Number(item.price) > 0)) {
@@ -413,7 +413,7 @@ export default {
 
 .origin-price {
   margin-left: 12upx;
-  font-size: 22upx;
+  font-size: 28upx;
   color: #bbb;
   text-decoration: line-through;
 }

mallApp/src/pages/home/category.vue

@@ -47,7 +47,7 @@
               <view class="goods-sales">已售 {{ itemData.totalSold }}</view>
             </view>
             <view class="goods-price" v-if="Number(itemData.priceType) == 1">￥{{ itemData.price?parseFloat(itemData.price):0 }}</view>
-            <view class="goods-price" v-else>￥--</view>
+            <view class="goods-price" v-else>￥?</view>
             <view class="buy-btn">购买</view>
           </view>
         </view>
@@ -74,7 +74,7 @@
                 <view class="goods-sales">已售 {{ itemData.totalSold }}</view>
               </view>
               <view class="goods-price" v-if="Number(itemData.priceType) == 1">￥{{ itemData.price?parseFloat(itemData.price):0 }}</view>
-              <view class="goods-price" v-else>￥--</view>
+              <view class="goods-price" v-else>￥?</view>
               <view class="buy-btn">购买</view>
             </view>
           </view>

mallApp/src/pages/home/recent.vue

@@ -9,7 +9,7 @@
     <block v-if="loginStyle == 0">
       <no-network-bar></no-network-bar>
       <view class="main-content guest-guide">
-        <view class="guest-section-title">花店提供的商品和服务</view>
+        <view class="guest-section-title">我们提供以下商品和服务</view>
         <view class="guest-service-list">
           <view
             class="guest-service-card"
@@ -117,7 +117,11 @@
             <view class="shop-main-actions">
               <view
                 class="balance-btn"
-                :class="Number(item.balance) < 0 ? 'is-debt' : 'is-balance'"
+                :class="{
+                  'is-debt': Number(item.balance) < 0,
+                  'is-positive': Number(item.balance) > 0,
+                  'is-zero': Number(item.balance) === 0 || !item.balance
+                }"
                 @click.stop="recharge(item)"
               >
                 <view class="balance-btn-content">
@@ -216,11 +220,11 @@ export default {
       guestServiceList: [
         {
           title: '绿植花材',
-          desc: '进入店铺后按分类挑选花材、查看库存与报价'
+          desc: '进入店铺后按分类挑选绿植花材'
         },
         {
           title: '花束选购',
-          desc: '浏览花束商品，按需加购并提交采购'
+          desc: '浏览花束花礼商品，按需加购'
         },
         {
           title: '商品相册',
@@ -802,23 +806,36 @@ page {
     margin-right: 16upx;
     background: #eef9f0;
 
-    /* 余额：标签+数值均为绿色 */
-    &.is-balance {
+    /* 余额为 0：标签+数值均为绿色，不加粗 */
+    &.is-zero {
       background: #eef9f0;
 
       .balance-btn-label,
       .balance-btn-value {
         color: #1f7a3d;
+        font-weight: 400;
       }
     }
 
-    /* 待结：标签+数值均为红色 */
+    /* 余额 > 0：文字蓝色加粗，背景保持原绿色底 */
+    &.is-positive {
+      background: #eef9f0;
+
+      .balance-btn-label,
+      .balance-btn-value {
+        color: #4c8ff3;
+        font-weight: 700;
+      }
+    }
+
+    /* 待结（余额 < 0）：标签+数值均为红色加粗 */
     &.is-debt {
       background: #fef2f2;
 
       .balance-btn-label,
       .balance-btn-value {
         color: #ef4444;
+        font-weight: 700;
       }
     }
   }
@@ -843,7 +860,7 @@ page {
   }
 
   .balance-btn-label {
-    font-size: 28upx;
+    font-size: 30upx;
     font-weight: 600;
     margin-right: 8upx;
   }

mallApp/src/pages/home/shop-category.vue

@@ -211,7 +211,7 @@
                 <!-- 价格左、加购右同一行，名称独立在上方 -->
                 <view class="goods-bottom">
                   <text class="goods-price" v-if="Number(item.priceType) == 1">¥{{ formatPrice(item.price) }} 起</text>
-                  <text class="goods-price" v-else>￥--</text>
+                  <text class="goods-price" v-else>￥?</text>
                   <view class="goods-cart-btn" @tap.stop="handleBouquetAddToCart(item)">
                     <sprite-icon name="icon-cart" :size="36" />
                   </view>
@@ -880,7 +880,7 @@ export default {
         return
       }
       if (Number(item.priceType) === 0) {
-        this.$msg('暂无价格，请向商家询价')
+        this.$msg('请向商家咨询价格')
         return
       }
       if (Number(item.priceType) !== 1 || !(Number(item.price) > 0)) {