Commit cc8f21094f411c30aae8ff6ffe64dca88d0921c8
1 parent
4beda44f
分类列表、商品列表样式调整
Showing
3 changed files
with
131 additions
and
98 deletions
app.wxss
| @@ -630,7 +630,7 @@ background: #ffe3e2; | @@ -630,7 +630,7 @@ background: #ffe3e2; | ||
| 630 | font-size: 20rpx; | 630 | font-size: 20rpx; |
| 631 | } | 631 | } |
| 632 | .fs22{ | 632 | .fs22{ |
| 633 | - font-size: 22rpx; | 633 | + font-size: 22rpx !important; |
| 634 | } | 634 | } |
| 635 | .fs24{ | 635 | .fs24{ |
| 636 | font-size: 24rpx !important; | 636 | font-size: 24rpx !important; |
pages/goods/categoryList/categoryList.wxml
| @@ -406,99 +406,132 @@ | @@ -406,99 +406,132 @@ | ||
| 406 | <!-- <view class="classify_content-frame flex-wrap" style="width:100%;overflow:hidden;heigth:100%;"> --> | 406 | <!-- <view class="classify_content-frame flex-wrap" style="width:100%;overflow:hidden;heigth:100%;"> --> |
| 407 | 407 | ||
| 408 | <!-- <view class="null" style="width:100%;margin-top:70rpx;"></view> --> | 408 | <!-- <view class="null" style="width:100%;margin-top:70rpx;"></view> --> |
| 409 | - <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;"> | 409 | + <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%;"> |
| 410 | <view class="null" style="width:100%;height:1px;"></view> | 410 | <view class="null" style="width:100%;height:1px;"></view> |
| 411 | <!-- goodslist --> | 411 | <!-- goodslist --> |
| 412 | <view class="choice_list" style="height:{{msgStatus != true?'100%':''}}"> | 412 | <view class="choice_list" style="height:{{msgStatus != true?'100%':''}}"> |
| 413 | <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}}"> | 413 | <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}}"> |
| 414 | - <view class="img-wrap"> | ||
| 415 | - <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> | ||
| 416 | - </view> | ||
| 417 | - <view class="item-cont"> | ||
| 418 | - <view class="title">{{item.goods_name}}</view> | ||
| 419 | - <!-- 判断是否有活动价 --> | ||
| 420 | - <block wx:if="{{item.prom_price>0 || item.prom_integral}}"> | ||
| 421 | - <!-- 活动价 --> | ||
| 422 | - <view class="price"> | ||
| 423 | - <text wx:if="{{item.prom_integral}}">{{item.prom_integral}}积分</text> | ||
| 424 | - <text wx:if="{{item.prom_integral && item.prom_price}}">+</text> | ||
| 425 | - <text wx:if="{{item.prom_price}}">￥{{item.prom_price}}</text> | ||
| 426 | - </view> | ||
| 427 | - <view class="comment flex jc_sb"> | ||
| 428 | - <view class="word-line xc-ash">￥{{item.market_price}}</view> | ||
| 429 | - <view>评论{{item.comment_count}} 已售{{item.sales_sum}}</view> | ||
| 430 | - </view> | ||
| 431 | - </block> | ||
| 432 | - <block wx:else> | ||
| 433 | - | ||
| 434 | - <!-- 商品价格,先判断下是后又等级价--> | ||
| 435 | - <block wx:if="{{g_filter.is_has_rank(rank_switch,item)}}"> | ||
| 436 | - | ||
| 437 | - | ||
| 438 | - <!-- 当会员是等级卡的时候 --> | ||
| 439 | - <block wx:if="{{card_field}}"> | ||
| 440 | - <!-- 等级价>0 --> | ||
| 441 | - <block wx:if="{{item[card_field]>0}}"> | ||
| 442 | - <view class="flex ai_and"> | ||
| 443 | - <view class="price">￥{{item[card_field]}}</view> | ||
| 444 | - <view class="card_bg ellipsis-1"> | ||
| 445 | - <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image> | ||
| 446 | - <view class="card_name">{{card_name}}</view> | 414 | + <view class="img-wrap"> |
| 415 | + <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> | ||
| 416 | + </view> | ||
| 417 | + <view class="item-cont"> | ||
| 418 | + <view class="title">{{item.goods_name}}</view> | ||
| 419 | + <!-- 判断是否有活动价 --> | ||
| 420 | + <block wx:if="{{item.prom_price>0 || item.prom_integral}}"> | ||
| 421 | + <view class="flex ai-center"> | ||
| 422 | + <!-- 活动价 --> | ||
| 423 | + <view class="price"> | ||
| 424 | + <text wx:if="{{item.prom_integral}}">{{item.prom_integral}}积分</text> | ||
| 425 | + <text wx:if="{{item.prom_integral && item.prom_price}}">+</text> | ||
| 426 | + <text wx:if="{{item.prom_price}}" class="rmb">{{item.prom_price}}</text> | ||
| 427 | + </view> | ||
| 428 | + <view class="word-line xc-ash rmb mgl10 fs24">{{item.market_price}}</view> | ||
| 429 | + </view> | ||
| 430 | + | ||
| 431 | + <view class="comment"> | ||
| 432 | + | ||
| 433 | + <view class="fs22 pdt10 t-r"> | ||
| 434 | + <span>评论{{item.comment_count}}</span> | ||
| 435 | + <span class="pdl30">已售{{item.sales_sum}}</span> | ||
| 436 | + </view> | ||
| 447 | </view> | 437 | </view> |
| 448 | - </view> | ||
| 449 | - <view class="comment flex jc_sb"> | ||
| 450 | - <view class="word-line xc-ash">￥{{item.market_price}}</view> | ||
| 451 | - <view>评论{{item.comment_count}} 已售{{item.sales_sum}}</view> | ||
| 452 | - </view> | ||
| 453 | </block> | 438 | </block> |
| 454 | <block wx:else> | 439 | <block wx:else> |
| 455 | - <view class="price">￥{{item.shop_price}}</view> | ||
| 456 | - <view class="comment flex jc_sb"> | ||
| 457 | - <view class="word-line xc-ash">￥{{item.market_price}}</view> | ||
| 458 | - <view>评论{{item.comment_count}} 已售{{item.sales_sum}}</view> | ||
| 459 | - </view> | ||
| 460 | - </block> | ||
| 461 | - </block> | ||
| 462 | - <block wx:else> | ||
| 463 | - | ||
| 464 | - <block wx:if="{{g_filter.get_card_price(item,card_list,0)}}"> | ||
| 465 | - <view class="flex ai-center"> | ||
| 466 | - <view class="price">￥{{item.shop_price}}</view> | ||
| 467 | - <view class="word-line xc-ash mk_price">￥{{item.market_price}}</view> | ||
| 468 | - </view> | ||
| 469 | - <view class="comment flex jc_sb"> | ||
| 470 | - <view class="flex ai-center"> | ||
| 471 | - <view class="">￥{{g_filter.get_card_price(item,card_list,0)}}</view> | ||
| 472 | - <view class="card_bg ellipsis-1"> | ||
| 473 | - <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image> | ||
| 474 | - <view class="card_name">{{g_filter.get_card_price(item,card_list,1)}}</view> | ||
| 475 | - </view> | 440 | + |
| 441 | + <!-- 商品价格,先判断下是后又等级价--> | ||
| 442 | + <block wx:if="{{g_filter.is_has_rank(rank_switch,item)}}"> | ||
| 443 | + | ||
| 444 | + | ||
| 445 | + <!-- 当会员是等级卡的时候 --> | ||
| 446 | + <block wx:if="{{card_field}}"> | ||
| 447 | + <!-- 等级价>0 --> | ||
| 448 | + <block wx:if="{{item[card_field]>0}}"> | ||
| 449 | + <view class="flex ai_and"> | ||
| 450 | + <view class="price rmb">{{item[card_field]}}</view> | ||
| 451 | + <view class="card_bg ellipsis-1"> | ||
| 452 | + <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image> | ||
| 453 | + <view class="card_name">{{card_name}}</view> | ||
| 454 | + </view> | ||
| 455 | + </view> | ||
| 456 | + <view class="comment flex jc_sb"> | ||
| 457 | + <view class="word-line xc-ash rmb fs24">{{item.market_price}}</view> | ||
| 458 | + <view class="fs22 pdt10 t-r"> | ||
| 459 | + <span>评论{{item.comment_count}}</span> | ||
| 460 | + <span class="pdl30">已售{{item.sales_sum}}</span> | ||
| 461 | + </view> | ||
| 462 | + </view> | ||
| 463 | + </block> | ||
| 464 | + <block wx:else> | ||
| 465 | + <view class="flex ai-center"> | ||
| 466 | + <view class="price rmb">{{item.shop_price}}</view> | ||
| 467 | + <view class="word-line xc-ash rmb fs24 mgl10">{{item.market_price}}</view> | ||
| 468 | + </view> | ||
| 469 | + | ||
| 470 | + <view class="comment"> | ||
| 471 | + <view class="fs22 pdt10 t-r"> | ||
| 472 | + <span>评论{{item.comment_count}}</span> | ||
| 473 | + <span class="pdl30">已售{{item.sales_sum}}</span> | ||
| 474 | + </view> | ||
| 475 | + </view> | ||
| 476 | + </block> | ||
| 477 | + </block> | ||
| 478 | + <block wx:else> | ||
| 479 | + | ||
| 480 | + <block wx:if="{{g_filter.get_card_price(item,card_list,0)}}"> | ||
| 481 | + <view class="flex ai-center"> | ||
| 482 | + <view class="price rmb">{{item.shop_price}}</view> | ||
| 483 | + <view class="word-line xc-ash mk_price rmb fs24 mgl10">{{item.market_price}}</view> | ||
| 484 | + </view> | ||
| 485 | + <view class="comment"> | ||
| 486 | + <view class="flex ai-center"> | ||
| 487 | + <view class="rmb">{{g_filter.get_card_price(item,card_list,0)}}</view> | ||
| 488 | + <view class="card_bg ellipsis-1"> | ||
| 489 | + <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image> | ||
| 490 | + <view class="card_name">{{g_filter.get_card_price(item,card_list,1)}}</view> | ||
| 491 | + </view> | ||
| 492 | + </view> | ||
| 493 | + </view> | ||
| 494 | + | ||
| 495 | + <view class="fs22 t-r" style="color:#999;"> | ||
| 496 | + <span>评论{{item.comment_count}}</span> | ||
| 497 | + <span class="pdl30">已售{{item.sales_sum}}</span> | ||
| 498 | + </view> | ||
| 499 | + | ||
| 500 | + | ||
| 501 | + </block> | ||
| 502 | + <block wx:else> | ||
| 503 | + <view class="flex ai-center"> | ||
| 504 | + <view class="price rmb">{{item.shop_price}}</view> | ||
| 505 | + <view class="word-line xc-ash rmb fs24 mgl10">{{item.market_price}}</view> | ||
| 506 | + </view> | ||
| 507 | + <!-- <view class="price">￥{{item.shop_price}}</view> --> | ||
| 508 | + <view class="comment"> | ||
| 509 | + <!-- <view class="word-line xc-ash">￥{{item.market_price}}</view> --> | ||
| 510 | + <view class="fs22 pdt10 t-r"> | ||
| 511 | + <span>评论{{item.comment_count}}</span> | ||
| 512 | + <span class="pdl30">已售{{item.sales_sum}}</span> | ||
| 513 | + </view> | ||
| 514 | + </view> | ||
| 515 | + </block> | ||
| 516 | + </block> | ||
| 517 | + </block> | ||
| 518 | + <block wx:else> | ||
| 519 | + <view class="flex ai-center"> | ||
| 520 | + <view class="price rmb">{{item.shop_price}}</view> | ||
| 521 | + <view class="word-line xc-ash rmb fs24 mgl10">{{item.market_price}}</view> | ||
| 522 | + </view> | ||
| 523 | + <!-- <view class="price">￥{{item.shop_price}}</view> --> | ||
| 524 | + <view class="comment"> | ||
| 525 | + <!-- <view class="word-line xc-ash">￥{{item.market_price}}</view> --> | ||
| 526 | + <view class="fs22 pdt10 t-r"> | ||
| 527 | + <span>评论{{item.comment_count}}</span> | ||
| 528 | + <span class="pdl30">已售{{item.sales_sum}}</span> | ||
| 529 | + </view> | ||
| 476 | </view> | 530 | </view> |
| 477 | - </view> | ||
| 478 | - | ||
| 479 | - <view class="fs24" style="color:#999; margin-top: 3rpx;">评论{{item.comment_count}} 已售{{item.sales_sum}}</view> | ||
| 480 | - | ||
| 481 | - | 531 | + </block> |
| 482 | </block> | 532 | </block> |
| 483 | - <block wx:else> | ||
| 484 | - <view class="price">￥{{item.shop_price}}</view> | ||
| 485 | - <view class="comment flex jc_sb"> | ||
| 486 | - <view class="word-line xc-ash">￥{{item.market_price}}</view> | ||
| 487 | - <view>评论{{item.comment_count}} 已售{{item.sales_sum}}</view> | ||
| 488 | - </view> | ||
| 489 | - </block> | ||
| 490 | - </block> | ||
| 491 | - </block> | ||
| 492 | - <block wx:else> | ||
| 493 | - <view class="price">￥{{item.shop_price}}</view> | ||
| 494 | - <view class="comment flex jc_sb"> | ||
| 495 | - <view class="word-line xc-ash">￥{{item.market_price}}</view> | ||
| 496 | - <view>评论{{item.comment_count}} 已售{{item.sales_sum}}</view> | ||
| 497 | </view> | 533 | </view> |
| 498 | - </block> | ||
| 499 | - </block> | ||
| 500 | - </view> | ||
| 501 | - </navigator> | 534 | + </navigator> |
| 502 | <!-- 暂无更多 --> | 535 | <!-- 暂无更多 --> |
| 503 | <view style="height: 30rpx;line-height: 30rpx;margin-top: 20rpx;font-size: 25rpx; text-align: center;" | 536 | <view style="height: 30rpx;line-height: 30rpx;margin-top: 20rpx;font-size: 25rpx; text-align: center;" |
| 504 | wx:if="{{is_no_more}}">暂无更多</view> | 537 | wx:if="{{is_no_more}}">暂无更多</view> |
pages/goods/goodsList/goodsList.wxml
| @@ -68,7 +68,7 @@ | @@ -68,7 +68,7 @@ | ||
| 68 | <view class="price"> | 68 | <view class="price"> |
| 69 | <text wx:if="{{item.prom_integral}}">{{item.prom_integral}}积分</text> | 69 | <text wx:if="{{item.prom_integral}}">{{item.prom_integral}}积分</text> |
| 70 | <text wx:if="{{item.prom_integral && item.prom_price}}">+</text> | 70 | <text wx:if="{{item.prom_integral && item.prom_price}}">+</text> |
| 71 | - <text wx:if="{{item.prom_price}}">￥{{item.prom_price}}</text> | 71 | + <text wx:if="{{item.prom_price}}" class="rmb">{{item.prom_price}}</text> |
| 72 | </view> | 72 | </view> |
| 73 | <view class="word-line xc-ash mgl10 rmb fs24">{{item.market_price}}</view> | 73 | <view class="word-line xc-ash mgl10 rmb fs24">{{item.market_price}}</view> |
| 74 | </view> | 74 | </view> |
| @@ -90,14 +90,14 @@ | @@ -90,14 +90,14 @@ | ||
| 90 | <!-- 等级价>0 --> | 90 | <!-- 等级价>0 --> |
| 91 | <block wx:if="{{item[card_field]>0}}"> | 91 | <block wx:if="{{item[card_field]>0}}"> |
| 92 | <view class="flex ai-center"> | 92 | <view class="flex ai-center"> |
| 93 | - <view class="price">￥{{item[card_field]}}</view> | 93 | + <view class="price rmb">{{item[card_field]}}</view> |
| 94 | <view class="card_bg ellipsis-1"> | 94 | <view class="card_bg ellipsis-1"> |
| 95 | <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image> | 95 | <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image> |
| 96 | <text class="card_name">{{card_name}}</text> | 96 | <text class="card_name">{{card_name}}</text> |
| 97 | </view> | 97 | </view> |
| 98 | </view> | 98 | </view> |
| 99 | <view class="comment"> | 99 | <view class="comment"> |
| 100 | - <view class="word-line xc-ash">￥{{item.market_price}}</view> | 100 | + <view class="word-line xc-ash rmb">{{item.market_price}}</view> |
| 101 | <view class="fs24 t-r"> | 101 | <view class="fs24 t-r"> |
| 102 | <span>评论{{item.comment_count}}</span> | 102 | <span>评论{{item.comment_count}}</span> |
| 103 | <span class="pdl30">已售{{item.sales_sum}}</span> | 103 | <span class="pdl30">已售{{item.sales_sum}}</span> |
| @@ -105,9 +105,9 @@ | @@ -105,9 +105,9 @@ | ||
| 105 | </view> | 105 | </view> |
| 106 | </block> | 106 | </block> |
| 107 | <block wx:else> | 107 | <block wx:else> |
| 108 | - <view class="price">￥{{item.shop_price}}</view> | 108 | + <view class="price rmb">{{item.shop_price}}</view> |
| 109 | <view class="comment"> | 109 | <view class="comment"> |
| 110 | - <view class="word-line xc-ash">￥{{item.market_price}}</view> | 110 | + <view class="word-line xc-ash rmb">{{item.market_price}}</view> |
| 111 | <view class="fs24 t-r"> | 111 | <view class="fs24 t-r"> |
| 112 | <span>评论{{item.comment_count}}</span> | 112 | <span>评论{{item.comment_count}}</span> |
| 113 | <span class="pdl30">已售{{item.sales_sum}}</span> | 113 | <span class="pdl30">已售{{item.sales_sum}}</span> |
| @@ -137,8 +137,8 @@ | @@ -137,8 +137,8 @@ | ||
| 137 | </view> | 137 | </view> |
| 138 | <block wx:else> | 138 | <block wx:else> |
| 139 | <view> | 139 | <view> |
| 140 | - <view class="price">￥{{item.shop_price}}</view> | ||
| 141 | - <view class="word-line xc-ash">￥{{item.market_price}}</view> | 140 | + <view class="price rmb">{{item.shop_price}}</view> |
| 141 | + <view class="word-line xc-ash rmb">{{item.market_price}}</view> | ||
| 142 | </view> | 142 | </view> |
| 143 | <!-- <view class="price">￥{{item.shop_price}}</view> --> | 143 | <!-- <view class="price">￥{{item.shop_price}}</view> --> |
| 144 | <view class="comment pdt10"> | 144 | <view class="comment pdt10"> |
| @@ -183,7 +183,7 @@ | @@ -183,7 +183,7 @@ | ||
| 183 | <view class="price"> | 183 | <view class="price"> |
| 184 | <text wx:if="{{item.prom_integral}}">{{item.prom_integral}}积分</text> | 184 | <text wx:if="{{item.prom_integral}}">{{item.prom_integral}}积分</text> |
| 185 | <text wx:if="{{item.prom_integral && item.prom_price}}">+</text> | 185 | <text wx:if="{{item.prom_integral && item.prom_price}}">+</text> |
| 186 | - <text wx:if="{{item.prom_price}}">￥{{item.prom_price}}</text> | 186 | + <text wx:if="{{item.prom_price}}" class="rmb">{{item.prom_price}}</text> |
| 187 | </view> | 187 | </view> |
| 188 | <view class="word-line xc-ash mgl10 rmb fs24">{{item.market_price}}</view> | 188 | <view class="word-line xc-ash mgl10 rmb fs24">{{item.market_price}}</view> |
| 189 | </view> | 189 | </view> |
| @@ -205,14 +205,14 @@ | @@ -205,14 +205,14 @@ | ||
| 205 | <!-- 等级价>0 --> | 205 | <!-- 等级价>0 --> |
| 206 | <block wx:if="{{item[card_field]>0}}"> | 206 | <block wx:if="{{item[card_field]>0}}"> |
| 207 | <view class="flex ai-center"> | 207 | <view class="flex ai-center"> |
| 208 | - <view class="price">￥{{item[card_field]}}</view> | 208 | + <view class="price rmb">{{item[card_field]}}</view> |
| 209 | <view class="card_bg ellipsis-1"> | 209 | <view class="card_bg ellipsis-1"> |
| 210 | <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image> | 210 | <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image> |
| 211 | <text class="card_name">{{card_name}}</text> | 211 | <text class="card_name">{{card_name}}</text> |
| 212 | </view> | 212 | </view> |
| 213 | </view> | 213 | </view> |
| 214 | <view class="comment"> | 214 | <view class="comment"> |
| 215 | - <view class="word-line xc-ash">￥{{item.market_price}}</view> | 215 | + <view class="word-line xc-ash rmb">{{item.market_price}}</view> |
| 216 | <view class="fs24 t-r"> | 216 | <view class="fs24 t-r"> |
| 217 | <span>评论{{item.comment_count}}</span> | 217 | <span>评论{{item.comment_count}}</span> |
| 218 | <span class="pdl30">已售{{item.sales_sum}}</span> | 218 | <span class="pdl30">已售{{item.sales_sum}}</span> |
| @@ -220,9 +220,9 @@ | @@ -220,9 +220,9 @@ | ||
| 220 | </view> | 220 | </view> |
| 221 | </block> | 221 | </block> |
| 222 | <block wx:else> | 222 | <block wx:else> |
| 223 | - <view class="price">￥{{item.shop_price}}</view> | 223 | + <view class="price rmb">{{item.shop_price}}</view> |
| 224 | <view class="comment"> | 224 | <view class="comment"> |
| 225 | - <view class="word-line xc-ash">￥{{item.market_price}}</view> | 225 | + <view class="word-line xc-ash rmb">{{item.market_price}}</view> |
| 226 | <view class="fs24 t-r"> | 226 | <view class="fs24 t-r"> |
| 227 | <span>评论{{item.comment_count}}</span> | 227 | <span>评论{{item.comment_count}}</span> |
| 228 | <span class="pdl30">已售{{item.sales_sum}}</span> | 228 | <span class="pdl30">已售{{item.sales_sum}}</span> |
| @@ -252,8 +252,8 @@ | @@ -252,8 +252,8 @@ | ||
| 252 | </view> | 252 | </view> |
| 253 | <block wx:else> | 253 | <block wx:else> |
| 254 | <view> | 254 | <view> |
| 255 | - <view class="price">￥{{item.shop_price}}</view> | ||
| 256 | - <view class="word-line xc-ash">￥{{item.market_price}}</view> | 255 | + <view class="price rmb">{{item.shop_price}}</view> |
| 256 | + <view class="word-line xc-ash rmb">{{item.market_price}}</view> | ||
| 257 | </view> | 257 | </view> |
| 258 | <!-- <view class="price">￥{{item.shop_price}}</view> --> | 258 | <!-- <view class="price">￥{{item.shop_price}}</view> --> |
| 259 | <view class="comment pdt10"> | 259 | <view class="comment pdt10"> |