From fefad188074652302a8f891ab5eb88bda836d4be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=A7=E7=81=B0=E7=81=B0?= <jianweie@163.com>
Date: Sun, 27 Nov 2022 01:34:41 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E6=A0=8F=E7=9B=AE=E9=A1=B5=E9=9D=A2=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E7=80=91=E5=B8=83=E6=B5=81=E5=8A=A0=E8=BD=BD?=
 =?UTF-8?q?=E7=BC=93=E6=85=A2=E5=8D=A1=E9=A1=BF=E7=9A=84=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CoreShop/pages/category/list/list.vue     | 83 ++++++-------------
 1 file changed, 27 insertions(+), 56 deletions(-)

diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/category/list/list.vue b/CoreCms.Net.Uni-App/CoreShop/pages/category/list/list.vue
index 02561f78..9ff4969b 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/category/list/list.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/category/list/list.vue
@@ -1,5 +1,5 @@
 <template>
-    <view class="">
+    <view class="coreshop-bg-white">
         <u-toast ref="uToast" /><u-no-network></u-no-network>
         <u-navbar :title="title" safeAreaInsetTop fixed placeholder @leftClick="goNavigateBack"></u-navbar>
 
@@ -85,19 +85,15 @@
             </view>
         </u-sticky>
 
-        
-        <view class="coreshop-margin-left-16 coreshop-margin-right-16 index-goods coreshop-margin-top-10" v-if="goodsList.length > 0">
-            <custom-waterfalls-flow ref="waterfallsFlowRef" :value="goodsList" @wapperClick="wapperClick" @imageClick="imageClick">
-                <!-- #ifdef MP-WEIXIN -->
-                <view class="goods" v-for="(item,index) in goodsList" :key="index" slot="slot{{index}}">
-                    <view class="coreshop-padding-top-6 coreshop-padding-bottom-3 coreshop-padding-left-8 coreshop-padding-right-8 coreshop-bg-white coreshop-border-radius-bl-18">
-
-                        <view class="coreshop-title-294 coreshop-multiple-line-clamp">
-                            <image class="coreshop-image-recommend-tags" src="/static/images/common/recommend.png" v-if="item.isRecommend"></image>
-                            <image class="coreshop-image-hot-tags" src="/static/images/common/hot.png" v-if="item.isHot"></image>
+        <view class="coreshop-margin-left-10 coreshop-margin-right-10 index-goods coreshop-margin-top-10" v-if="goodsList.length > 0">
+            <view class="flex-box clear-fix">
+                <view class="coreshop-padding-bottom-10 coreshop-bg-main column-value2" v-for="(item,index) in goodsList" :key="index">
+                    <view class="coreshop-padding-top-6 coreshop-padding-bottom-3 coreshop-padding-left-8 coreshop-padding-right-8 coreshop-bg-main coreshop-border-radius-bl-18" @click="goGoodsDetail(item.id)">
+                        <image :lazy-load="true" :src="item.image" class="img" mode="widthFix"></image>
+                        <view class="coreshop-multiple-line-clamp">
                             <text class="coreshop-font-14">{{item.name}}</text>
                         </view>
-                        <view class="coreshop-margin-top-8 coreshop-flex coreshop-justify-between coreshop-align-center">
+                        <view class="coreshop-margin-top-8 coreshop-flex coreshop-justify-between coreshop-align-center coreshop-margin-bottom-5">
                             <view class="coreshop-text-red coreshop-font-weight-bold">
                                 <text class="coreshop-font-12">¥</text>
                                 <text class="coreshop-font-16">{{item.price}}</text>
@@ -107,15 +103,18 @@
                                 <text class="coreshop-font-10 coreshop-text-gray">已售{{item.buyCount+item.initialSales}}{{item.unit}}</text>
                             </view>
                         </view>
-                        <view class="coreshop-flex coreshop-flex-direction-row coreshop-font-11 coreshop-margin-top-10 coreshop-padding-top-10 coreshop-solid-top" v-if="pointSwitch==1 && pointExchangeModel==2 && pointShowExchangePrice==1 && item.pointsDeduction > 0">
+                        <view class="coreshop-divider" v-if="pointSwitch==1 && pointExchangeModel==2 && pointShowExchangePrice==1 && item.pointsDeduction > 0">
+                            <view class="complete"></view>
+                        </view>
+                        <view class="coreshop-flex coreshop-font-11 coreshop-margin-top-5 coreshop-margin-bottom-5" :class="newData.column>2?'coreshop-flex-direction-column':'coreshop-flex-direction-row'" v-if="pointSwitch==1 && pointExchangeModel==2 && pointShowExchangePrice==1 && item.pointsDeduction > 0">
                             <view>
                                 {{ pointShowName}}兑换价:
                             </view>
                             <view class="coreshop-text-red">
-                                {{pointDiscountedProportion * item.pointsDeduction }}{{ pointShowName}}+{{ parseFloat(item.price-item.pointsDeduction).toFixed(2)}}元
+                                {{pointDiscountedProportion * item.pointsDeduction }}{{ pointShowName}}+{{ parseFloat(item.price-item.pointsDeduction).toFixed(2)}} 元
                             </view>
                         </view>
-                        <view class="coreshop-flex coreshop-flex-direction-row coreshop-font-11 coreshop-margin-top-5" v-if="pointSwitch==1 && pointGetModel==2 && pointShowPoint==1 && item.points > 0">
+                        <view class="coreshop-flex coreshop-flex-direction-row coreshop-font-11 coreshop-margin-top-5 coreshop-margin-bottom-5" v-if="pointSwitch==1 && pointGetModel==2 && pointShowPoint==1 && item.points > 0">
                             <view>
                                 购买赠送:
                             </view>
@@ -125,47 +124,8 @@
                         </view>
                     </view>
                 </view>
-                <!-- #endif -->
-                <!-- #ifndef MP-WEIXIN -->
-                <template v-slot:default="item">
-                    <view class="goods">
-                        <view class="coreshop-padding-top-6 coreshop-padding-bottom-3 coreshop-padding-left-8 coreshop-padding-right-8 coreshop-bg-white coreshop-border-radius-bl-18">
-                            <view class="coreshop-title-294 coreshop-multiple-line-clamp">
-                                <image class="coreshop-image-recommend-tags" src="/static/images/common/recommend.png" v-if="item.isRecommend"></image>
-                                <image class="coreshop-image-hot-tags" src="/static/images/common/hot.png" v-if="item.isHot"></image>
-                                <text class="coreshop-font-14">{{item.name}}</text>
-                            </view>
-                            <view class="coreshop-margin-top-8 coreshop-flex coreshop-justify-between coreshop-align-center">
-                                <view class="coreshop-text-red coreshop-font-weight-bold">
-                                    <text class="coreshop-font-12">¥</text>
-                                    <text class="coreshop-font-16">{{item.price}}</text>
-                                    <span class="coreshop-font-xs  coreshop-text-through coreshop-margin-left-6 coreshop-text-gray">{{item.mktprice}}元</span>
-                                </view>
-                                <view>
-                                    <text class="coreshop-font-10 coreshop-text-gray">已售{{item.buyCount+item.initialSales}}{{item.unit}}</text>
-                                </view>
-                            </view>
-                            <view class="coreshop-flex coreshop-flex-direction-row coreshop-font-11 coreshop-margin-top-10 coreshop-padding-top-10 coreshop-solid-top" v-if="pointSwitch==1 && pointExchangeModel==2 && pointShowExchangePrice==1 && item.pointsDeduction > 0">
-                                <view>
-                                    {{ pointShowName}}兑换价:
-                                </view>
-                                <view class="coreshop-text-red">
-                                    {{pointDiscountedProportion * item.pointsDeduction }}{{ pointShowName}}+{{ parseFloat(item.price-item.pointsDeduction).toFixed(2)}} 元
-                                </view>
-                            </view>
-                            <view class="coreshop-flex coreshop-flex-direction-row coreshop-font-11 coreshop-margin-top-5" v-if="pointSwitch==1 && pointGetModel==2 && pointShowPoint==1 && item.points > 0">
-                                <view>
-                                    购买赠送:
-                                </view>
-                                <view class="coreshop-text-red">
-                                    {{item.points}}{{ pointShowName}}
-                                </view>
-                            </view>
-                        </view>
-                    </view>
-                </template>
-                <!-- #endif -->
-            </custom-waterfalls-flow>
+            </view>
+
             <u-loadmore :status="loadStatus" :icon-type="loadIconType" :load-text="loadText" margin-top="20" margin-bottom="20" />
         </view>
         <!-- 无数据时默认显示 -->
@@ -702,5 +662,16 @@
 </script>
 
 <style scoped lang="scss">
+
+    .flex-box { column-count: 2; column-gap: 8px;
+        .column-value2 { width: 100%; break-inside: avoid; color: #333333 !important; margin-bottom: 8px; }
+    }
+    .flex-box3 { column-count: 3; column-gap: 8px;
+        .column-value3 { width: 100%; break-inside: avoid; color: #333333 !important; margin-bottom: 5px; }
+    }
+    .img { width: 100%; }
+    .clear-fix::after { content: ''; display: block; height: 0; clear: both; }
+    .clear-fix { zoom: 1; }
+
     @import "list.scss";
 </style>