Răsfoiți Sursa

Merge branch 'redesign‌-260706' of http://git.huaml.com/zhh/front-end into redesign‌-260706

shish 2 zile în urmă
părinte
comite
d08a9c9e97

+ 1 - 0
mallApp/src/assets/svg-icons/general/left.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1787276625975" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3581" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M358.997 512l311.168-311.168a42.667 42.667 0 1 0-60.33-60.33L268.5 481.834a42.667 42.667 0 0 0 0 60.33L609.835 883.5a42.667 42.667 0 0 0 60.33-60.331L358.997 512z" p-id="3582"></path></svg>

+ 1 - 0
mallApp/src/assets/svg-icons/general/right.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1787276870921" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="8480" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M665.003 512L353.835 200.832a42.667 42.667 0 0 1 60.33-60.33L755.5 481.834a42.667 42.667 0 0 1 0 60.33L414.165 883.5a42.667 42.667 0 1 1-60.33-60.331L665.003 512z" p-id="8481"></path></svg>

+ 24 - 2
mallApp/src/components/home/activitySection.vue

@@ -23,7 +23,11 @@
             <text class="countdown-unit">{{ countdown.s }}</text>
           </view>
         </view>
-        <text v-if="showMore" class="section-more" @click="goMore">更多 ></text>
+        <!-- 文字与箭头用 flex 垂直居中,避免给自定义组件写 margin-top 无效 -->
+        <view v-if="showMore" class="section-more" @click="goMore">
+          <text class="section-more-text">更多</text>
+          <zui-svg-icon icon="general-right" :width="12" :height="12" color="#999"></zui-svg-icon>
+        </view>
       </view>
       <text class="activity-subtitle">{{ data.subtitle || (isGroupBuy ? '多人拼团更实惠' : '每日精选 限时特惠') }}</text>
     </view>
@@ -40,7 +44,13 @@
               <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 }}
+              <!-- 自定义 SVG 组件 margin-top 可能无效,包一层 view 下移 4upx 与文字视觉对齐 -->
+              <view class="action-btn-icon">
+                <zui-svg-icon icon="general-right" :width="14" :height="14" color="#fff"></zui-svg-icon>
+              </view>
+            </view>
           </view>
         </view>
       </view>
@@ -302,11 +312,17 @@ export default {
   font-weight: 700;
 }
 .section-more {
+  display: flex;
+  align-items: center;
   flex-shrink: 0;
   margin-left: 16upx;
   font-size: 22upx;
   color: #999;
 }
+.section-more-text {
+  margin-right: 2upx;
+  margin-top: -4upx;
+}
 .activity-subtitle {
   display: block;
   margin-top: 8upx;
@@ -383,6 +399,8 @@ export default {
   text-decoration: line-through;
 }
 .action-btn {
+  display: flex;
+  align-items: center;
   flex-shrink: 0;
   padding: 18upx 24upx;
   font-size: 26upx;
@@ -391,6 +409,10 @@ export default {
   border-radius: 28upx;
   white-space: nowrap;
 }
+/* 箭头相对按钮文字下移 4upx */
+.action-btn-icon {
+  margin-top: 6upx;
+}
 .price {
   font-size: 30upx;
   color: #FF4D6D;

+ 1 - 1
mallApp/src/components/home/customNavBar.vue

@@ -8,7 +8,7 @@
     <view class="home-custom-nav__status" :style="{ height: metrics.statusBarHeight + 'px' }"></view>
     <view class="home-custom-nav__bar" :style="barStyle">
       <view class="home-custom-nav__back" @click="goBack">
-        <text class="home-custom-nav__back-icon">‹</text>
+        <zui-svg-icon icon="general-left" :width="24" :height="24" color="#666"></zui-svg-icon>
       </view>
       <view class="home-custom-nav__title-wrap" :style="titleWrapStyle">
         <view class="home-custom-nav__title">{{ title }}</view>

+ 11 - 1
mallApp/src/components/home/goodsSection.vue

@@ -7,7 +7,11 @@
   <view v-if="data && data.enabled == 1 && displayGoods.length" class="home-goods-section">
     <view class="section-head">
       <text class="section-title">{{ data.name }}</text>
-      <text v-if="showMore" class="section-more" @click="goMore">更多 ></text>
+      <!-- 文字与箭头用 flex 垂直居中,避免给自定义组件写 margin-top 无效 -->
+      <view v-if="showMore" class="section-more" @click="goMore">
+        <text class="section-more-text">更多</text>
+        <zui-svg-icon icon="general-right" :width="12" :height="12" color="#999"></zui-svg-icon>
+      </view>
     </view>
 
     <!-- 1排1列:横向列表 -->
@@ -196,9 +200,15 @@ export default {
   color: #FF4D6D;
 }
 .section-more {
+  display: flex;
+  align-items: center;
   font-size: 22upx;
   color: #999;
 }
+.section-more-text {
+  margin-right: 2upx;
+  margin-top: -4upx;
+}
 
 /* 1排1列 */
 .row-card {

+ 9 - 1
mallApp/src/static/svg-icons-lib.js

@@ -6,7 +6,7 @@
  *
  * !!! DO NOT MODIFY MANUALLY !!!
  *
- * @datetime 2026/8/14 10:48:17
+ * @datetime 2026/8/21 10:00:17
  *
  */
 
@@ -30,6 +30,10 @@ const collections = {
         "<svg xmlns=\"http://www.w3.org/2000/svg\" width=\"200\" height=\"200\" class=\"icon\" viewBox=\"0 0 1024 1024\"><path fill=\"#22ac38\" d=\"M984.615 196.923c0-43.323-35.446-78.77-78.769-78.77H118.154c-43.323 0-78.77 35.447-78.77 78.77v630.154c0 43.323 35.447 78.77 78.77 78.77h787.692c43.323 0 78.77-35.447 78.77-78.77zm-204.8 551.385H208.738c-23.63 0-37.415-25.6-25.6-45.293l173.293-301.292c7.877-13.785 25.6-13.785 33.477 0l104.369 179.2c7.877 11.815 25.6 13.785 33.477 1.97L612.43 460.8c7.877-11.815 25.6-11.815 33.477 0l155.569 248.123c11.815 17.723 0 39.385-21.662 39.385m-51.2-354.462c-43.323 0-78.769-35.446-78.769-78.77s35.446-78.768 78.77-78.768 78.769 35.446 78.769 78.769-35.447 78.77-78.77 78.77\"/></svg>",
         1
       ],
+      "general-left": [
+        "<svg xmlns=\"http://www.w3.org/2000/svg\" width=\"200\" height=\"200\" class=\"icon\" viewBox=\"0 0 1024 1024\"><path fill=\"#22ac38\" d=\"m358.997 512 311.168-311.168a42.667 42.667 0 1 0-60.33-60.33L268.5 481.834a42.667 42.667 0 0 0 0 60.33L609.835 883.5a42.667 42.667 0 0 0 60.33-60.331z\"/></svg>",
+        1
+      ],
       "general-message": [
         "<svg xmlns=\"http://www.w3.org/2000/svg\" width=\"210.938\" height=\"200\" class=\"icon\" viewBox=\"0 0 1080 1024\"><path fill=\"#000\" d=\"M207.303 458.638a64.284 64.284 0 1 0 128.455 0 64.284 64.284 0 0 0-128.455 0m253.895 0a64.284 64.284 0 1 0 128.455 0 64.284 64.284 0 0 0-128.455 0m253.838 0a64.284 64.284 0 1 0 128.512 0 64.284 64.284 0 0 0-128.512 0m288.655-180.053a458.5 458.5 0 0 0-111.787-145.693C794.396 47.218 665.144.342 527.929.342c-137.273 0-266.525 47.103-363.861 132.55A456.8 456.8 0 0 0 52.28 278.585a412.05 412.05 0 0 0-41.358 180.053 419.27 419.27 0 0 0 57.685 210.66c32.996 56.49 79.644 106.95 135.623 146.944v151.836a36.693 36.693 0 0 0 54.955 31.687l160.654-92.729c35.385 6.713 71.85 10.07 108.146 10.07 137.33 0 266.581-47.161 363.918-132.551a456.8 456.8 0 0 0 111.787-145.75 412.05 412.05 0 0 0 41.358-180.053 410 410 0 0 0-41.358-180.167M527.986 843.833a510 510 0 0 1-106.78-11.264 36.58 36.58 0 0 0-25.942 4.096l-117.76 68.096V797.013a36.98 36.98 0 0 0-16.498-30.663C148.536 692.68 84.025 580.551 84.025 458.581c0-212.366 199.111-385.024 443.96-385.024 244.737 0 444.019 172.658 444.019 385.081 0 212.366-199.282 385.252-444.018 385.252z\"/></svg>",
         3
@@ -46,6 +50,10 @@ const collections = {
         "<svg xmlns=\"http://www.w3.org/2000/svg\" width=\"32\" height=\"32\" class=\"icon\" viewBox=\"0 0 1024 1024\"><path fill=\"#09c567\" d=\"M819.004 1023.653H204.988c-75.353 0-136.44-61.091-136.44-136.449V205.001l409.34 136.448h68.216L955.45 205v682.204c0 75.357-61.093 136.45-136.446 136.45M547.77 680.401l99.019-.238c24.799.238 33.634-12.62 34.09-28.12.383-13.447-12.32-38.784-34.69-39.39h-98.985v-23.877s75.133-76.736 94.632-94.418c19.436-17.764 24.349-31.674 12.334-46.041-12.177-14.662-33.646-13.755-49.365-.744-15.952 13.222-92.682 84.505-92.682 84.505s-65.87-68.023-80.128-81.708c-12.805-12.327-39.986-24.272-54.613-7.714-15.262 17.307-3.397 38.926 6.16 48.382 9.53 9.366 91.959 96.518 91.959 96.518l-.15 26.224H372.06c-15.268 0-28.757 27.165-28.272 41.6.49 14.362 12.055 25.625 28.238 25.625 16.175 0 102.983-.6 102.983-.6l-.225 73.14H367.797c-15.268 0-28.08 15.376-28.696 29.811-.6 14.443 11.413 34.009 28.696 34.009H474.55s-.184 25.023.458 35.446c1.44 23.277 16.708 32.802 37.113 33.183 20.413.389 34.897-16.693 34.848-31.967-.07-12.623-.369-36.662-.369-36.662s88.847-.158 105.63 0c16.783.142 29.33-16.844 28.647-34.009-.6-17.232-11.032-30.411-36.505-30.411h-97.17zm-1.665-407.18h-68.217L68.55 136.787C68.55 61.424 129.636.347 204.99.347h614.016c75.352 0 136.447 61.077 136.447 136.44z\"/></svg>",
         5
       ],
+      "general-right": [
+        "<svg xmlns=\"http://www.w3.org/2000/svg\" width=\"200\" height=\"200\" class=\"icon\" viewBox=\"0 0 1024 1024\"><path fill=\"#22ac38\" d=\"M665.003 512 353.835 200.832a42.667 42.667 0 0 1 60.33-60.33L755.5 481.834a42.667 42.667 0 0 1 0 60.33L414.165 883.5a42.667 42.667 0 1 1-60.33-60.331z\"/></svg>",
+        1
+      ],
       "general-search": [
         "<svg xmlns=\"http://www.w3.org/2000/svg\" width=\"200\" height=\"200\" class=\"icon\" viewBox=\"0 0 1024 1024\"><path fill=\"#000\" d=\"M482.133 724.846a252.952 252.952 0 1 1 252.953-252.953 253.32 253.32 0 0 1-252.953 252.953m0-457.143a204.19 204.19 0 1 0 204.19 204.19 204.31 204.31 0 0 0-204.19-203.703z\"/><path fill=\"#000\" d=\"m615.948 660.724 34.487-34.487L787.749 763.55l-34.475 34.487z\"/></svg>",
         3