From f043d7aa0dcde60084eab802dea3235d7bc6531d Mon Sep 17 00:00:00 2001
From: JianWeie <jianweie@163.com>
Date: Tue, 1 Mar 2022 23:27:00 +0800
Subject: [PATCH] =?UTF-8?q?#=202022-03-01=20###=200.2.7=20=E4=B8=93?=
 =?UTF-8?q?=E4=B8=9A=E7=89=88=EF=BC=9A=20=E3=80=90=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E3=80=91=E8=B0=83=E6=95=B4=E5=89=8D=E7=AB=AF=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=B1=95=E7=A4=BA=E5=9B=BE=E7=89=87=E5=A4=A7?=
 =?UTF-8?q?=E5=B0=8F=E4=B8=8D=E8=A7=84=E5=88=99=E7=9A=84=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E3=80=82=E9=87=8D=E5=86=99=E5=89=8D=E7=AB=AFcoreshop-goods?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../coreshop-page/coreshop-goods.vue          | 151 +++++++++---------
 1 file changed, 72 insertions(+), 79 deletions(-)

diff --git a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-goods.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-goods.vue
index 699a9706..7996e53c 100644
--- a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-goods.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-goods.vue
@@ -6,47 +6,46 @@
             <view class="coreshop-margin-left-5 coreshop-margin-right-5 coreshop-margin-top-10 coreshop-margin-bottom-10 ">
                 <coreshop-section font-size="15" :title="coreshopdata.parameters.title" v-if="coreshopdata.parameters.title != ''" @click="coreshopdata.parameters.lookMore == 'true' ? goGoodsList({catId: coreshopdata.parameters.classifyId,brandId:coreshopdata.parameters.brandId}) :''" :arrow="coreshopdata.parameters.lookMore == 'true'" :sub-title="coreshopdata.parameters.lookMore == 'true'?'更多':''"></coreshop-section>
             </view>
-            <view class="" v-if="count">
-                <u-grid :col="coreshopdata.parameters.column" :border="false" align="left">
-                    <u-grid-item :custom-style="{padding: '0px'}" v-for="(item, index) in coreshopdata.parameters.list" :key="index">
-                        <view class="good_box" @tap="goGoodsDetail(item.id)">
-                            <u--image :src="item.image" mode="widthFix" width="100%" :height="coreshopdata.parameters.column==2?'164px':'104px'" radius="10"></u--image>
-                            <view class="good_title u-line-2">
-                                {{item.name}}
+            <view class="coreshop-flex coreshop-align-start" style="flex-flow: row wrap;">
+                <view :class="['good_box',coreshopdata.parameters.column==2?'cla2':'cla3']" @tap="goGoodsDetail(item.id)" v-for="(item, index) in coreshopdata.parameters.list" :key="index" v-if="count">
+                    <u--image :src="item.image" mode="widthFix" width="100%" :height="coreshopdata.parameters.column==2?'164px':'104px'" radius="10"></u--image>
+                    <view class="good_title u-line-2 coreshop-min-height-34">
+                        {{item.name}}
+                    </view>
+                    <view class="good-price coreshop-display-block">
+                        {{item.price}}元 <span class="coreshop-font-xs  coreshop-text-through coreshop-margin-left-5 coreshop-text-gray">{{item.mktprice}}元</span>
+                    </view>
+                    <view class="good-tag-recommend" v-if="item.isRecommend">
+                        推荐
+                    </view>
+                    <view class="good-tag-hot" v-if="item.isHot">
+                        热门
+                    </view>
+                </view>
+                <view v-else-if="!count && !coreshopdata.parameters.listAjax">
+                    <u-grid col="3" border="false" align="left">
+                        <u-grid-item :custom-style="{padding: '0px'}" v-for="item in 3" :key="item">
+                            <view class="good_box">
+                                <view class="good_title u-line-2">
+                                    无
+                                </view>
+                                <view class="good-price">
+                                    0元
+                                </view>
+                                <view class="good-tag-recommend">
+                                    推荐
+                                </view>
+                                <view class="good-tag-hot">
+                                    热门
+                                </view>
                             </view>
-                            <view class="good-price coreshop-display-block">
-                                {{item.price}}元 <span class="coreshop-font-xs  coreshop-text-through coreshop-margin-left-5 coreshop-text-gray">{{item.mktprice}}元</span>
-                            </view>
-                            <view class="good-tag-recommend" v-if="item.isRecommend">
-                                推荐
-                            </view>
-                            <view class="good-tag-hot" v-if="item.isHot">
-                                热门
-                            </view>
-                        </view>
-                    </u-grid-item>
-                </u-grid>
-            </view>
-            <view v-else-if="!count && !coreshopdata.parameters.listAjax">
-                <u-grid col="3" border="false" align="left">
-                    <u-grid-item :custom-style="{padding: '0px'}" v-for="item in 3" :key="item">
-                        <view class="good_box">
-                            <view class="good_title u-line-2">
-                                无
-                            </view>
-                            <view class="good-price">
-                                0元
-                            </view>
-                            <view class="good-tag-recommend">
-                                推荐
-                            </view>
-                            <view class="good-tag-hot">
-                                热门
-                            </view>
-                        </view>
-                    </u-grid-item>
-                </u-grid>
+                        </u-grid-item>
+                    </u-grid>
+                </view>
             </view>
+
+
+           
         </view>
 
         <!-- 列表平铺单列 -->
@@ -54,26 +53,20 @@
             <view class="coreshop-margin-left-5 coreshop-margin-right-5 coreshop-margin-top-10 coreshop-margin-bottom-10 ">
                 <coreshop-section font-size="15" :title="coreshopdata.parameters.title" v-if="coreshopdata.parameters.title != ''" @click="coreshopdata.parameters.lookMore == 'true' ? goGoodsList({catId: coreshopdata.parameters.classifyId,brandId:coreshopdata.parameters.brandId}) :''" :arrow="coreshopdata.parameters.lookMore == 'true'" :sub-title="coreshopdata.parameters.lookMore == 'true'?'更多':''"></coreshop-section>
             </view>
-            <view v-if="count">
-                <u-grid :col="1" :border="false" align="left">
-                    <u-grid-item :custom-style="{padding: '0px'}" v-for="item in coreshopdata.parameters.list" :key="item.id">
-                        <view class="good_box" @click="goGoodsDetail(item.id)">
-                            <u--image :src="item.image" mode="widthFix" width="100%" radius="10"></u--image>
-                            <view class="good_title u-line-2">
-                                {{item.name}}
-                            </view>
-                            <view class="good-price coreshop-display-block">
-                                {{item.price}}元 <span class="coreshop-font-xs  coreshop-text-through coreshop-margin-left-5 coreshop-text-gray">{{item.mktprice}}元</span>
-                            </view>
-                            <view class="good-tag-recommend" v-if="item.isRecommend">
-                                推荐
-                            </view>
-                            <view class="good-tag-hot" v-if="item.isHot">
-                                热门
-                            </view>
-                        </view>
-                    </u-grid-item>
-                </u-grid>
+            <view class="good_box" @click="goGoodsDetail(item.id)" v-for="item in coreshopdata.parameters.list" :key="item.id" v-if="count">
+                <u--image :src="item.image" mode="widthFix" width="100%" radius="10"></u--image>
+                <view class="good_title u-line-2">
+                    {{item.name}}
+                </view>
+                <view class="good-price coreshop-display-block">
+                    {{item.price}}元 <span class="coreshop-font-xs  coreshop-text-through coreshop-margin-left-5 coreshop-text-gray">{{item.mktprice}}元</span>
+                </view>
+                <view class="good-tag-recommend" v-if="item.isRecommend">
+                    推荐
+                </view>
+                <view class="good-tag-hot" v-if="item.isHot">
+                    热门
+                </view>
             </view>
             <view class="order-none" v-else>
                 <u-empty :icon="$globalConstVars.apiFilesUrl+'/static/images/empty/order.png'" icon-size="150" text="暂无" mode="list"></u-empty>
@@ -89,26 +82,24 @@
             <block v-if="count">
                 <swiper :class="coreshopdata.parameters.column==3?'swiper3':coreshopdata.parameters.column==2?'swiper2':''" @change="change">
                     <swiper-item v-for="no of pageCount" :key="no">
-                        <u-grid :col="coreshopdata.parameters.column" :border="false" align="left">
-                            <u-grid-item v-for="(item, index)  in coreshopdata.parameters.list" v-if="index >=coreshopdata.parameters.column*no && index <coreshopdata.parameters.column*(no+1)" :key="index" @click="goGoodsDetail(item.id)">
-                                <view class="good_box">
-                                    <u-image :src="item.image" :index="item.id" mode="widthFit" width="100%" :height="coreshopdata.parameters.column==3?'104px':coreshopdata.parameters.column==2?'164px':''" radius="10">
-                                    </u-image>
-                                    <view class="good_title u-line-2">
-                                        {{item.name}}
-                                    </view>
-                                    <view class="good-price coreshop-display-block">
-                                        {{item.price}}元 <span class="coreshop-font-xs  coreshop-text-through coreshop-margin-left-5 coreshop-text-gray">{{item.mktprice}}元</span>
-                                    </view>
-                                    <view class="good-tag-recommend" v-if="item.isRecommend">
-                                        推荐
-                                    </view>
-                                    <view class="good-tag-hot" v-if="item.isHot">
-                                        热门
-                                    </view>
+                        <view  class="coreshop-flex coreshop-align-start" style="flex-flow: row wrap;">
+                            <view :class="['good_box',coreshopdata.parameters.column==2?'cla2':'cla3']" v-for="(item, index)  in coreshopdata.parameters.list" v-if="index >=coreshopdata.parameters.column*no && index <coreshopdata.parameters.column*(no+1)" :key="index" @click="goGoodsDetail(item.id)">
+                                <u-image :src="item.image" :index="item.id" mode="widthFit" width="100%" :height="coreshopdata.parameters.column==3?'104px':coreshopdata.parameters.column==2?'164px':''" radius="10">
+                                </u-image>
+                                <view class="good_title u-line-2">
+                                    {{item.name}}
                                 </view>
-                            </u-grid-item>
-                        </u-grid>
+                                <view class="good-price coreshop-display-block">
+                                    {{item.price}}元 <span class="coreshop-font-xs  coreshop-text-through coreshop-margin-left-5 coreshop-text-gray">{{item.mktprice}}元</span>
+                                </view>
+                                <view class="good-tag-recommend" v-if="item.isRecommend">
+                                    推荐
+                                </view>
+                                <view class="good-tag-hot" v-if="item.isHot">
+                                    热门
+                                </view>
+                            </view>
+                        </view>
                     </swiper-item>
                 </swiper>
                 <view class="indicator-dots">
@@ -172,7 +163,7 @@
 
 <style scoped lang="scss">
     .goodsBox { border-radius: 8px; color: #333333 !important; padding: 0 5px; overflow: hidden;
-        .good_box { border-radius: 8px; margin: 3px; background-color: #ffffff; padding: 5px; position: relative;
+        .good_box { border-radius: 8px; margin: 5px; background-color: #ffffff; position: relative;
             .good_title { font-size: 13px; margin-top: 5px; color: $u-main-color; }
             .good_title-xl { font-size: 14px; margin-top: 5px; color: $u-main-color; }
             .good-tag-hot { display: flex; margin-top: 5px; position: absolute; top: 7.5px; left: 7.5px; background-color: $u-type-error; color: #FFFFFF; display: flex; align-items: center; padding: 2px 7px; border-radius: 25px; font-size: 10px; line-height: 1; }
@@ -180,6 +171,8 @@
             .good-tag-recommend2 { display: flex; margin-top: 5px; position: absolute; bottom: 7.5px; left: 7.5px; background-color: $u-type-primary; color: #FFFFFF; border-radius: 25px; line-height: 1; padding: 2px 7px; display: flex; align-items: center; border-radius: 25px; font-size: 10px; }
             .good-price { font-size: 15px; color: $u-type-error; margin-top: 5px; }
         }
+        .cla2 { width: calc(50% - 10px); }
+        .cla3 { width: calc(33% - 10px); }
 
         .indicator-dots { margin-top: 10px; margin-bottom: 10px; display: flex; justify-content: center; align-items: center; flex-direction: row;
             .indicator-dots-item { background-color: $u-tips-color; height: 6px; width: 6px; border-radius: 10px; margin: 0 3px; }