From cc8f21094f411c30aae8ff6ffe64dca88d0921c8 Mon Sep 17 00:00:00 2001
From: taiyuan <taiyuan@yolipai.com>
Date: Wed, 15 Sep 2021 16:58:14 +0800
Subject: [PATCH] 分类列表、商品列表样式调整

---
 app.wxss                                   |   2 +-
 pages/goods/categoryList/categoryList.wxml | 199 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------------------------------------------------------------
 pages/goods/goodsList/goodsList.wxml       |  28 ++++++++++++++--------------
 3 files changed, 131 insertions(+), 98 deletions(-)

diff --git a/app.wxss b/app.wxss
index 683d317..60f5c3e 100644
--- a/app.wxss
+++ b/app.wxss
@@ -630,7 +630,7 @@ background: #ffe3e2;
     font-size: 20rpx;
 }
 .fs22{
-    font-size: 22rpx;
+    font-size: 22rpx !important;
 }
 .fs24{
     font-size: 24rpx !important;
diff --git a/pages/goods/categoryList/categoryList.wxml b/pages/goods/categoryList/categoryList.wxml
index 0bdf776..cae4c14 100644
--- a/pages/goods/categoryList/categoryList.wxml
+++ b/pages/goods/categoryList/categoryList.wxml
@@ -406,99 +406,132 @@
                 <!-- <view class="classify_content-frame flex-wrap" style="width:100%;overflow:hidden;heigth:100%;"> -->
               
                <!-- <view class="null" style="width:100%;margin-top:70rpx;"></view> -->
-                <scroll-view scroll-y scroll-top="{{scrollTop}}" bindscrolltolower='scrollLower' style="height:{{windowHeight}};position:absolute;margin-top:70rpx;top:140rpx;bottom:0;rigth:0;left:26%;width:73%;margin-bottom:100rpx;">
+                <scroll-view scroll-y scroll-top="{{scrollTop}}" bindscrolltolower='scrollLower' style="height:{{windowHeight}};position:absolute;margin-top:70rpx;top:140rpx;bottom:0;rigth:0;left:26%;width:73%;">
                 <view class="null" style="width:100%;height:1px;"></view>
                 <!-- goodslist -->
                     <view class="choice_list" style="height:{{msgStatus != true?'100%':''}}">
                       <navigator class="choice_item" style="margin-bottom:{{dataLength -1 == index?'100px':'0'}}" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" wx:for="{{requestData}}" data-id="{{index}}" wx:key="{{index}}">
-                        <view class="img-wrap">
-                          <image src="{{url+item.original_img}}" binderror="bind_bnerr_t3" data-url="{{url+item.original_img}}" lazy-load="true" data-errorimg="requestData[{{index}}].original_img"></image>
-                        </view>
-                        <view class="item-cont">
-                          <view class="title">{{item.goods_name}}</view>
-                            <!-- 判断是否有活动价 -->
-                            <block wx:if="{{item.prom_price>0 || item.prom_integral}}">
-                                <!-- 活动价 -->
-                                <view class="price">
-									<text wx:if="{{item.prom_integral}}">{{item.prom_integral}}积分</text>
-									<text wx:if="{{item.prom_integral && item.prom_price}}">+</text> 
-									<text wx:if="{{item.prom_price}}">￥{{item.prom_price}}</text> 							
-								</view>
-                                <view class="comment flex jc_sb">
-                                  <view class="word-line xc-ash">￥{{item.market_price}}</view>
-                                  <view>评论{{item.comment_count}} 已售{{item.sales_sum}}</view>
-                                </view>
-                            </block>
-                            <block wx:else>
-								
-                              <!-- 商品价格,先判断下是后又等级价-->
-                              <block wx:if="{{g_filter.is_has_rank(rank_switch,item)}}">
-                                
-								
-								<!-- 当会员是等级卡的时候 -->
-                                <block wx:if="{{card_field}}">
-                                  <!-- 等级价>0 -->
-                                  <block wx:if="{{item[card_field]>0}}">
-                                    <view class="flex ai_and">
-                                      <view class="price">￥{{item[card_field]}}</view>
-                                      <view class="card_bg ellipsis-1">
-                                        <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>
-                                        <view class="card_name">{{card_name}}</view>
+                              <view class="img-wrap">
+                                <image src="{{url+item.original_img}}" binderror="bind_bnerr_t3" data-url="{{url+item.original_img}}" lazy-load="true" data-errorimg="requestData[{{index}}].original_img"></image>
+                              </view>
+                              <view class="item-cont">
+                                <view class="title">{{item.goods_name}}</view>
+                                  <!-- 判断是否有活动价 -->
+                                  <block wx:if="{{item.prom_price>0 || item.prom_integral}}">
+                      						<view class="flex ai-center">
+                      							<!-- 活动价 -->
+                      							<view class="price">
+                      								<text wx:if="{{item.prom_integral}}">{{item.prom_integral}}积分</text>
+                      								<text wx:if="{{item.prom_integral && item.prom_price}}">+</text> 
+                      								<text wx:if="{{item.prom_price}}" class="rmb">{{item.prom_price}}</text> 							
+                      							</view>
+                      							<view class="word-line xc-ash rmb mgl10 fs24">{{item.market_price}}</view>
+                      						</view>
+                                     
+                                      <view class="comment">
+                                        
+                                        <view class="fs22 pdt10 t-r">
+                      										<span>评论{{item.comment_count}}</span>
+                      										<span class="pdl30">已售{{item.sales_sum}}</span>
+                      									</view>
                                       </view>
-                                    </view>
-                                    <view class="comment flex jc_sb">
-                                      <view class="word-line xc-ash">￥{{item.market_price}}</view>
-                                      <view>评论{{item.comment_count}} 已售{{item.sales_sum}}</view>
-                                    </view>
                                   </block>
                                   <block wx:else>
-                                    <view class="price">￥{{item.shop_price}}</view>
-                                    <view class="comment flex jc_sb">
-                                      <view class="word-line xc-ash">￥{{item.market_price}}</view>
-                                      <view>评论{{item.comment_count}} 已售{{item.sales_sum}}</view>
-                                    </view>
-                                  </block>
-                                </block>
-                                <block wx:else>
-									
-                                  <block wx:if="{{g_filter.get_card_price(item,card_list,0)}}"> 
-                                    <view class="flex ai-center">
-                                      <view class="price">￥{{item.shop_price}}</view>
-                                      <view class="word-line xc-ash mk_price">￥{{item.market_price}}</view>
-                                    </view>
-                                    <view class="comment flex jc_sb">
-                                      <view class="flex ai-center">
-                                        <view class="">￥{{g_filter.get_card_price(item,card_list,0)}}</view>
-                                        <view class="card_bg ellipsis-1">
-                                          <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>
-                                          <view class="card_name">{{g_filter.get_card_price(item,card_list,1)}}</view>
-                                        </view>
+                      
+                                    <!-- 商品价格,先判断下是后又等级价-->
+                                    <block wx:if="{{g_filter.is_has_rank(rank_switch,item)}}">
+                                      
+                      
+                      <!-- 当会员是等级卡的时候 -->
+                                      <block wx:if="{{card_field}}">
+                                        <!-- 等级价>0 -->
+                                        <block wx:if="{{item[card_field]>0}}">
+                                          <view class="flex ai_and">
+                                            <view class="price rmb">{{item[card_field]}}</view>
+                                            <view class="card_bg ellipsis-1">
+                                              <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>
+                                              <view class="card_name">{{card_name}}</view>
+                                            </view>
+                                          </view>
+                                          <view class="comment flex jc_sb">
+                                            <view class="word-line xc-ash rmb fs24">{{item.market_price}}</view>
+                                            <view class="fs22 pdt10 t-r">
+                      												<span>评论{{item.comment_count}}</span>
+                      												<span class="pdl30">已售{{item.sales_sum}}</span>
+                      											</view>
+                                          </view>
+                                        </block>
+                                        <block wx:else>
+                      										<view class="flex ai-center">
+                      											<view class="price rmb">{{item.shop_price}}</view>
+                      											<view class="word-line xc-ash rmb fs24 mgl10">{{item.market_price}}</view>
+                      										</view>
+                                          
+                                          <view class="comment">
+                                            <view class="fs22 pdt10 t-r">
+                      												<span>评论{{item.comment_count}}</span>
+                      												<span class="pdl30">已售{{item.sales_sum}}</span>
+                      											</view>
+                                          </view>
+                                        </block>
+                                      </block>
+                                      <block wx:else>
+                      	
+                                        <block wx:if="{{g_filter.get_card_price(item,card_list,0)}}"> 
+                                          <view class="flex ai-center">
+                                            <view class="price rmb">{{item.shop_price}}</view>
+                                            <view class="word-line xc-ash mk_price rmb fs24 mgl10">{{item.market_price}}</view>
+                                          </view>
+                                          <view class="comment">
+                                            <view class="flex ai-center">
+                                              <view class="rmb">{{g_filter.get_card_price(item,card_list,0)}}</view>
+                                              <view class="card_bg ellipsis-1">
+                                                <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>
+                                                <view class="card_name">{{g_filter.get_card_price(item,card_list,1)}}</view>
+                                              </view>
+                                            </view>
+                                          </view>
+                      	
+                      	<view class="fs22 t-r" style="color:#999;">
+                      		<span>评论{{item.comment_count}}</span>
+                      		<span class="pdl30">已售{{item.sales_sum}}</span>
+                      	</view>
+                      	
+                      	
+                                        </block>
+                                        <block wx:else>
+                      										<view class="flex ai-center">
+                      											<view class="price rmb">{{item.shop_price}}</view>
+                      											<view class="word-line xc-ash rmb fs24 mgl10">{{item.market_price}}</view>
+                      										</view>
+                                          <!-- <view class="price">￥{{item.shop_price}}</view> -->
+                                          <view class="comment">
+                                            <!-- <view class="word-line xc-ash">￥{{item.market_price}}</view> -->
+                                            <view class="fs22 pdt10 t-r">
+                      												<span>评论{{item.comment_count}}</span>
+                      												<span class="pdl30">已售{{item.sales_sum}}</span>
+                      											</view>
+                                          </view>
+                                        </block>
+                                      </block>
+                                    </block>
+                                    <block wx:else>
+                      								<view class="flex ai-center">
+                      									<view class="price rmb">{{item.shop_price}}</view>
+                      									<view class="word-line xc-ash rmb fs24 mgl10">{{item.market_price}}</view>
+                      								</view>
+                                      <!-- <view class="price">￥{{item.shop_price}}</view> -->
+                                      <view class="comment">
+                                        <!-- <view class="word-line xc-ash">￥{{item.market_price}}</view> -->
+                                        <view class="fs22 pdt10 t-r">
+                      										<span>评论{{item.comment_count}}</span>
+                      										<span class="pdl30">已售{{item.sales_sum}}</span>
+                      									</view>
                                       </view>
-                                    </view>
-									
-									<view class="fs24" style="color:#999; margin-top: 3rpx;">评论{{item.comment_count}} 已售{{item.sales_sum}}</view>
-									
-									
+                                    </block>
                                   </block>
-                                  <block wx:else>
-                                    <view class="price">￥{{item.shop_price}}</view>
-                                    <view class="comment flex jc_sb">
-                                      <view class="word-line xc-ash">￥{{item.market_price}}</view>
-                                      <view>评论{{item.comment_count}} 已售{{item.sales_sum}}</view>
-                                    </view>
-                                  </block>
-                                </block>
-                              </block>
-                              <block wx:else>
-                                <view class="price">￥{{item.shop_price}}</view>
-                                <view class="comment flex jc_sb">
-                                  <view class="word-line xc-ash">￥{{item.market_price}}</view>
-                                  <view>评论{{item.comment_count}} 已售{{item.sales_sum}}</view>
                                 </view>
-                              </block>
-                            </block>
-                          </view>
-                      </navigator>
+                            </navigator>
 					  <!-- 暂无更多 -->
 					  <view style="height: 30rpx;line-height: 30rpx;margin-top: 20rpx;font-size: 25rpx; text-align: center;" 
 					        wx:if="{{is_no_more}}">暂无更多</view>					  
diff --git a/pages/goods/goodsList/goodsList.wxml b/pages/goods/goodsList/goodsList.wxml
index 9a35814..1c5eac3 100644
--- a/pages/goods/goodsList/goodsList.wxml
+++ b/pages/goods/goodsList/goodsList.wxml
@@ -68,7 +68,7 @@
 					<view class="price">
 						<text wx:if="{{item.prom_integral}}">{{item.prom_integral}}积分</text>
 						<text wx:if="{{item.prom_integral && item.prom_price}}">+</text>
-						<text wx:if="{{item.prom_price}}">￥{{item.prom_price}}</text>			
+						<text wx:if="{{item.prom_price}}" class="rmb">{{item.prom_price}}</text>			
 					</view>
 					<view class="word-line xc-ash mgl10 rmb fs24">{{item.market_price}}</view>
 				</view>
@@ -90,14 +90,14 @@
               <!-- 等级价>0 -->
               <block wx:if="{{item[card_field]>0}}">
                 <view class="flex ai-center">
-                  <view class="price">￥{{item[card_field]}}</view>
+                  <view class="price rmb">{{item[card_field]}}</view>
                   <view class="card_bg ellipsis-1">
                     <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>
                     <text class="card_name">{{card_name}}</text>
                   </view>
                 </view>
                 <view class="comment">
-                  <view class="word-line xc-ash">￥{{item.market_price}}</view>
+                  <view class="word-line xc-ash rmb">{{item.market_price}}</view>
                   <view class="fs24 t-r">
 										<span>评论{{item.comment_count}}</span>
 										<span class="pdl30">已售{{item.sales_sum}}</span>
@@ -105,9 +105,9 @@
                 </view>
               </block>
               <block wx:else>
-                <view class="price">￥{{item.shop_price}}</view>
+                <view class="price rmb">{{item.shop_price}}</view>
                 <view class="comment">
-                  <view class="word-line xc-ash">￥{{item.market_price}}</view>
+                  <view class="word-line xc-ash rmb">{{item.market_price}}</view>
                   <view class="fs24 t-r">
 										<span>评论{{item.comment_count}}</span>
 										<span class="pdl30">已售{{item.sales_sum}}</span>
@@ -137,8 +137,8 @@
               </view>
               <block wx:else>
 								<view>
-									<view class="price">￥{{item.shop_price}}</view>
-									<view class="word-line xc-ash">￥{{item.market_price}}</view>
+									<view class="price rmb">{{item.shop_price}}</view>
+									<view class="word-line xc-ash rmb">{{item.market_price}}</view>
 								</view>
                 <!-- <view class="price">￥{{item.shop_price}}</view> -->
                 <view class="comment pdt10">
@@ -183,7 +183,7 @@
 						<view class="price">
 							<text wx:if="{{item.prom_integral}}">{{item.prom_integral}}积分</text>
 							<text wx:if="{{item.prom_integral && item.prom_price}}">+</text>
-							<text wx:if="{{item.prom_price}}">￥{{item.prom_price}}</text>			
+							<text wx:if="{{item.prom_price}}" class="rmb">{{item.prom_price}}</text>			
 						</view>
 						<view class="word-line xc-ash mgl10 rmb fs24">{{item.market_price}}</view>
 					</view>
@@ -205,14 +205,14 @@
 		            <!-- 等级价>0 -->
 		            <block wx:if="{{item[card_field]>0}}">
 		              <view class="flex ai-center">
-		                <view class="price">￥{{item[card_field]}}</view>
+		                <view class="price rmb">{{item[card_field]}}</view>
 		                <view class="card_bg ellipsis-1">
 		                  <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>
 		                  <text class="card_name">{{card_name}}</text>
 		                </view>
 		              </view>
 		              <view class="comment">
-		                <view class="word-line xc-ash">￥{{item.market_price}}</view>
+		                <view class="word-line xc-ash rmb">{{item.market_price}}</view>
 		                <view class="fs24 t-r">
 											<span>评论{{item.comment_count}}</span>
 											<span class="pdl30">已售{{item.sales_sum}}</span>
@@ -220,9 +220,9 @@
 		              </view>
 		            </block>
 		            <block wx:else>
-		              <view class="price">￥{{item.shop_price}}</view>
+		              <view class="price rmb">{{item.shop_price}}</view>
 		              <view class="comment">
-		                <view class="word-line xc-ash">￥{{item.market_price}}</view>
+		                <view class="word-line xc-ash rmb">{{item.market_price}}</view>
 		                <view class="fs24 t-r">
 											<span>评论{{item.comment_count}}</span>
 											<span class="pdl30">已售{{item.sales_sum}}</span>
@@ -252,8 +252,8 @@
 		            </view>
 		            <block wx:else>
 									<view>
-										<view class="price">￥{{item.shop_price}}</view>
-										<view class="word-line xc-ash">￥{{item.market_price}}</view>
+										<view class="price rmb">{{item.shop_price}}</view>
+										<view class="word-line xc-ash rmb">{{item.market_price}}</view>
 									</view>
 		              <!-- <view class="price">￥{{item.shop_price}}</view> -->
 		              <view class="comment pdt10">
--
libgit2 0.21.4