From bfc67b5fa0fb822e5ffa2a467a223574d5c32242 Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Sat, 11 May 2024 16:33:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=B9=E9=87=8F=E4=B8=8B=E5=8D=95=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E8=A7=84=E6=A0=BC=E5=9B=BE=E7=89=87=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E6=94=BE=E5=A4=A7=E6=9F=A5=E7=9C=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../goods-batch-buy/goods-batch-buy.vue       | 172 ++++++++++--------
 static/icon/iconfont.css                      |  12 ++
 static/icon/iconfont.ttf                      | Bin 22588 -> 23384 bytes
 3 files changed, 113 insertions(+), 71 deletions(-)

diff --git a/components/goods-batch-buy/goods-batch-buy.vue b/components/goods-batch-buy/goods-batch-buy.vue
index 90c5a06d..52f83cc0 100644
--- a/components/goods-batch-buy/goods-batch-buy.vue
+++ b/components/goods-batch-buy/goods-batch-buy.vue
@@ -19,7 +19,12 @@
                                 <scroll-view :scroll-y="true" class="ht-auto">
                                     <block v-for="(item, index) in batchbuy_data.goods_spec_data" :key="index">
                                         <view :class="'padding-vertical-main tc cp oh pr ' + (nav_active_index == index ? 'bg-white cr-main' : '')" :data-index="index" @tap="nav_event">
-                                            <image v-if="(item.images || null) != null" class="dis-inline-block br-f5 radius dis-block spec-images" :src="item.images" mode="widthFix"></image>
+                                            <block v-if="(item.images || null) != null">
+                                                <image class="dis-inline-block br-f5 radius dis-block spec-images" :src="item.images" mode="widthFix"></image>
+                                                <view class="icon-enlarge-submit pa padding-xs lh-sm radius" :data-value="item.images" @tap="spec_images_view_event">
+                                                    <iconfont name="icon-enlarge" size="26rpx" color="#fff" propClass="lh-sm"></iconfont>
+                                                </view>
+                                            </block>
                                             <view class="cr-base">{{ item.name }}</view>
                                             <view v-if="(item.badge_total || 0) > 0" class="badge-icon pa">
                                                 <component-badge :propNumber="item.badge_total"></component-badge>
@@ -53,8 +58,13 @@
                                     <block v-for="(item, index) in batchbuy_data.goods_spec_data" :key="index">
                                         <view class="oh padding-vertical-main">
                                             <view class="fl item-left">
-                                                <view>
-                                                    <image v-if="(item.images || null) != null" class="dis-inline-block va-m br-f5 radius margin-right-sm spec-images" :src="item.images" mode="widthFix"></image>
+                                                <view class="pr">
+                                                    <block v-if="(item.images || null) != null">
+                                                        <image class="dis-inline-block va-m br-f5 radius margin-right-sm spec-images" :src="item.images" mode="widthFix"></image>
+                                                        <view class="icon-enlarge-submit pa padding-xs lh-sm radius" :data-value="item.images" @tap="spec_images_view_event">
+                                                            <iconfont name="icon-enlarge" size="26rpx" color="#fff" propClass="lh-sm"></iconfont>
+                                                        </view>
+                                                    </block>
                                                     <text class="text-size-xs va-m">{{ item.name }}</text>
                                                 </view>
                                                 <view class="sales-price text-size-xs margin-top-xs">{{ propCurrencySymbol }}{{ item.base.price }}</view>
@@ -471,76 +481,96 @@ export default {
                 },
             });
         },
+
+        // 规格图片预览事件
+        spec_images_view_event(e) {
+            var value = e.currentTarget.dataset.value || null;
+            if (value != null) {
+                uni.previewImage({
+                    current: value,
+                    urls: [value],
+                });
+            }
+        }
     },
 };
 </script>
 <style>
-.plugins-batchbuy-container {
-    height: 70vh;
-    padding-bottom: 160rpx;
-}
-.plugins-batchbuy-container .spec-data-content {
-    height: calc(100% - 15rpx);
-}
-.plugins-batchbuy-container .spec-data-content.wholesale {
-    height: calc(100% - 160rpx);
-}
-.plugins-batchbuy-container .left-nav {
-    width: 200rpx;
-}
-.plugins-batchbuy-container .left-nav .badge-icon {
-    top: 8rpx;
-    right: 36rpx;
-}
-.plugins-batchbuy-container .left-nav .spec-images {
-    width: 100rpx;
-    height: 100rpx !important;
-}
-.plugins-batchbuy-container .right-conent {
-    width: calc(100% - 210rpx);
-}
-.plugins-batchbuy-container .right-conent .item-left {
-    width: calc(100% - 290rpx);
-}
-.plugins-batchbuy-container .item-right {
-    background: #fbfbfb;
-    border: 1px solid #f0f0f0;
-}
-.plugins-batchbuy-container .item-right .number-submit {
-    width: 80rpx;
-    font-weight: bold;
-}
-.plugins-batchbuy-container .item-right input {
-    width: 50px;
-}
-.plugins-batchbuy-container .item-right .number-submit,
-.plugins-batchbuy-container .item-right input {
-    padding: 0;
-    height: 60rpx;
-    line-height: 60rpx;
-}
-.plugins-batchbuy-container .right-conent-only-level-one {
-    width: 100%;
-}
-.plugins-batchbuy-container .right-conent-only-level-one .spec-images {
-    width: 100rpx;
-    height: 100rpx !important;
-}
-.plugins-batchbuy-container .confirm-submit {
-    left: 0;
-    bottom: 0;
-}
-.plugins-batchbuy-container .buy-nav-btn-number-0 .item,
-.plugins-batchbuy-container .buy-nav-btn-number-1 .item {
-    width: 100% !important;
-}
-.plugins-batchbuy-container .buy-nav-btn-number-2 .item {
-    width: 50% !important;
-}
-.plugins-batchbuy-container .buy-nav-btn-number-3 .item {
-    width: 33.33% !important;
-}
-.plugins-batchbuy-container .buy-nav-btn-number-4 .item {
-    width: 25% !important;
-}
+    .plugins-batchbuy-container {
+        height: 70vh;
+        padding-bottom: 160rpx;
+    }
+    .plugins-batchbuy-container .spec-data-content {
+        height: calc(100% - 15rpx);
+    }
+    .plugins-batchbuy-container .spec-data-content.wholesale {
+        height: calc(100% - 160rpx);
+    }
+    .plugins-batchbuy-container .left-nav {
+        width: 200rpx;
+    }
+    .plugins-batchbuy-container .left-nav .badge-icon {
+        top: 8rpx;
+        right: 36rpx;
+    }
+    .plugins-batchbuy-container .left-nav .spec-images {
+        width: 100rpx;
+        height: 100rpx !important;
+    }
+    .plugins-batchbuy-container .icon-enlarge-submit {
+        left: 55rpx;
+        top: 30rpx;
+        background: rgb(0, 0, 0, 30%);
+    }
+    .plugins-batchbuy-container .right-conent {
+        width: calc(100% - 210rpx);
+    }
+    .plugins-batchbuy-container .right-conent .item-left {
+        width: calc(100% - 290rpx);
+    }
+    .plugins-batchbuy-container .item-right {
+        background: #fbfbfb;
+        border: 1px solid #f0f0f0;
+    }
+    .plugins-batchbuy-container .item-right .number-submit {
+        width: 80rpx;
+        font-weight: bold;
+    }
+    .plugins-batchbuy-container .item-right input {
+        width: 50px;
+    }
+    .plugins-batchbuy-container .item-right .number-submit,
+    .plugins-batchbuy-container .item-right input {
+        padding: 0;
+        height: 60rpx;
+        line-height: 60rpx;
+    }
+    .plugins-batchbuy-container .right-conent-only-level-one {
+        width: 100%;
+    }
+    .plugins-batchbuy-container .right-conent-only-level-one .spec-images {
+        width: 100rpx;
+        height: 100rpx !important;
+    }
+    .plugins-batchbuy-container .right-conent-only-level-one .icon-enlarge-submit {
+        left: 5rpx;
+        top: 5rpx;
+    }
+    .plugins-batchbuy-container .confirm-submit {
+        left: 0;
+        bottom: 0;
+    }
+    .plugins-batchbuy-container .buy-nav-btn-number-0 .item,
+    .plugins-batchbuy-container .buy-nav-btn-number-1 .item {
+        width: 100% !important;
+    }
+    .plugins-batchbuy-container .buy-nav-btn-number-2 .item {
+        width: 50% !important;
+    }
+    .plugins-batchbuy-container .buy-nav-btn-number-3 .item {
+        width: 33.33% !important;
+    }
+    .plugins-batchbuy-container .buy-nav-btn-number-4 .item {
+        width: 25% !important;
+    }
 </style>
diff --git a/static/icon/iconfont.css b/static/icon/iconfont.css
index 6b2bb44d..2654c7f6 100644
--- a/static/icon/iconfont.css
+++ b/static/icon/iconfont.css
@@ -14,6 +14,18 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-enlarge-four:before {
+  content: "\e602";
+}
+
+.icon-enlarge:before {
+  content: "\e64e";
+}
+
+.icon-enlarge-border:before {
+  content: "\e6f2";
+}
+
 .icon-map-navigator:before {
   content: "\10183";
 }
diff --git a/static/icon/iconfont.ttf b/static/icon/iconfont.ttf
index 1a42135260f291000a022089d33ad18ce59360a8..acbd8495bce2f8c59d9669dc404e2b4da3b8f484 100644
GIT binary patch
delta 2823
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
Yi0kUWw<O%Pe`NQ-$kgjS89T%BKMfv^2><{9

delta 2027
zcmYk6X>62L6o%hB8`Dm=>9o`7Hr=2j6}Qq(D^#fh1uJ4%r9Vh5OW{WgP2@)*hN&^p
zm=G682)_Xp2wI?6K`ZVRD<a|oDk>H{gIW;;6GJHDd*?vnOrH7f^4)K~bI$vo(*tI3
zpLww?c4*ltz-$8W`0}py?uH5LcL2^7z|*m+bA3mO!;=c6b^=W~t5>$Km{^;!pZA_6
z(bZf?nc}YHc#w==-L<Z#V<d5v&l@ExI@d05Pdt}>2}n7_{exZYJ>6yv-sN71^U^i#
zT`P;Sb~Nk*T6zJ;s_wN<th+ROXeKcK0^nZo(qP53Rv6w(&Y5M;wq-W_1D}fvz{t{-
z3vOK#Hxe=TQs)btd*QIF{Md7?Tf(N#Y~OO+Z0uj+$TP93<TA{7IFqAEyfQ#X6<qk2
z2Qrcm@W^iIlgn}?UJ{>}NC2{3_R4<F^K@>XfAeE_rU>QO&hG)PEy5B!hQ(Nbg_wu=
zcm#9tC|d9^=3rI~v+)p`(S(_pf$4Y<4Y&{YV;UMcdH_>#FQ#B3>QRR%CZh(ms73|u
z#yz+TlW+&_L=|qwZHS-}<1vAMT!s>qq8MSmMj;B2j}UT@iy-n4KsK`AM>=0J6KM!|
zk-~U=aKnRfjM)iC|MRYN6Kl8`POA-8VJHx)!NQ;*I~9fpd0AngkXICj40%;y@Q_^!
z(*W76Fd>k=3R44lO^Go}kk=LF3(}`Ba}Y|-!W=@FV+*qh=~pm|*MkZZ40%Igsv!dk
zlMZ=PVfrDIq=kim97fFkfHi@<rLa1Xw-we2LXBHkC&)VrYX>=^u!<0B+roN6-cwjv
z$ooq2><1hZRvYr6f~heMK2j(F$j1uB02xv!3&<x51p+y$P%4m56^aHjtWZ9X&lCy?
za!jG5AfGD~7vwmJ@rOEte4$WrkP`~E2l-N=3Lz&I>JjplLS;g}R;W?PHwx7X`BtHB
zA?!95Dj0HFp_UPo?>HfpHROAR0*CydQ0kB~3Plh3QK9@HKPfZ<<Y$GJfSgrm4#+PG
zZ2}olXc)-3B+P#y2j>;K2=c2!KS4yHvmkMW9)ny^=r+i23VjFpU7-UZe<<`KWK^Lm
zA%80LC*-27|3yac=k+gzriENmXkW->g+_*4QD|wz`6m{3F2wnQ7P=g9zPQEqw>Sf`
z(D{fnPz!qi;>>^rF%Jh!lZA}|ai+<_7J)d^YGJcLoFcTa%Np}^6795HqPmx1$W)mg
z^S7hXan-raRqlGyb=}?Tfv0<1&$w;gZ0{8BQSbGX&Xhf=ov9~%Exw&;X=xkMMq}xr
z^cm@!(ywK7W}L}v&K%8}>ks?4`Oo`rWOrmA34{W(1G@rObLQl1%{iOv&27%z6O0CX
zf&+Qgc`NdULJLDD@<aKJ`J4047laF%3N{ps6!sRLE~+ouTr^NzUc97uU$`oKtR!3-
zD&1Imq3n41oQhN%P~xz2(AkLoRq4-|ST7smQ_OFP?Fy!>I+*Lv@l=$RSJwI~qj}{X
zPJ@%ns-w03n#u}O6Ri#wn_D;3M5mf)*yLoGNX7r|G@XuUq^>S9HXNxl^%0NP>v2Tg
zUavcWP-#fl>mqHwKw4U0y06XdIHDe}vp2a_Umvl@=Xu>@!?%u(Wn=||S#9>AcF*_%
f!GO<rJ!8Z6aDQKBbCYS^a&6H8gZ@*CW3K-I8|3^q