Commit 24a0c3194d6885e27e7b74490645ec2d7fd58ed8
1 parent
a0195900
手店界面优化
Showing
6 changed files
with
412 additions
and
316 deletions
app.wxss
| @@ -25,6 +25,9 @@ | @@ -25,6 +25,9 @@ | ||
| 25 | .pdt10 { | 25 | .pdt10 { |
| 26 | padding-top: 10rpx; | 26 | padding-top: 10rpx; |
| 27 | } | 27 | } |
| 28 | +.pdt12 { | ||
| 29 | + padding-top: 12rpx; | ||
| 30 | +} | ||
| 28 | .pdb10 { | 31 | .pdb10 { |
| 29 | padding-bottom: 10rpx; | 32 | padding-bottom: 10rpx; |
| 30 | } | 33 | } |
| @@ -676,9 +679,9 @@ background: #ffe3e2; | @@ -676,9 +679,9 @@ background: #ffe3e2; | ||
| 676 | /* 图标字体(ty) */ | 679 | /* 图标字体(ty) */ |
| 677 | @font-face { | 680 | @font-face { |
| 678 | font-family: 'iconfont'; /* Project id 2054717 */ | 681 | font-family: 'iconfont'; /* Project id 2054717 */ |
| 679 | - src: url('//at.alicdn.com/t/font_2054717_vx6pr6zmhth.woff2?t=1623117016358') format('woff2'), | ||
| 680 | - url('//at.alicdn.com/t/font_2054717_vx6pr6zmhth.woff?t=1623117016358') format('woff'), | ||
| 681 | - url('//at.alicdn.com/t/font_2054717_vx6pr6zmhth.ttf?t=1623117016358') format('truetype'); | 682 | + src: url('//at.alicdn.com/t/font_2054717_vmvsus9wgw.woff2?t=1625560227550') format('woff2'), |
| 683 | + url('//at.alicdn.com/t/font_2054717_vmvsus9wgw.woff?t=1625560227550') format('woff'), | ||
| 684 | + url('//at.alicdn.com/t/font_2054717_vmvsus9wgw.ttf?t=1625560227550') format('truetype'); | ||
| 682 | } | 685 | } |
| 683 | 686 | ||
| 684 | .iconfont { | 687 | .iconfont { |
| @@ -689,6 +692,14 @@ background: #ffe3e2; | @@ -689,6 +692,14 @@ background: #ffe3e2; | ||
| 689 | -moz-osx-font-smoothing: grayscale; | 692 | -moz-osx-font-smoothing: grayscale; |
| 690 | } | 693 | } |
| 691 | 694 | ||
| 695 | +.icon-share:before { | ||
| 696 | + content: "\e785"; | ||
| 697 | +} | ||
| 698 | + | ||
| 699 | +.icon-shuangjiantouxia:before { | ||
| 700 | + content: "\e660"; | ||
| 701 | +} | ||
| 702 | + | ||
| 692 | .icon-plyy:before { | 703 | .icon-plyy:before { |
| 693 | content: "\e729"; | 704 | content: "\e729"; |
| 694 | } | 705 | } |
components/goods_list/goods_list.wxml
| @@ -7,28 +7,31 @@ | @@ -7,28 +7,31 @@ | ||
| 7 | <view class="collect ib" wx:for="{{recommend}}" bindtap="go_url" data-url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}"> | 7 | <view class="collect ib" wx:for="{{recommend}}" bindtap="go_url" data-url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}"> |
| 8 | <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" hover-class="none"> | 8 | <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" hover-class="none"> |
| 9 | <!-- 商品图⽚ --> | 9 | <!-- 商品图⽚ --> |
| 10 | - <image class="sp" src="{{url+item.original_img}}" mode="widthFix" binderror="bind_bnerr_xc" data-url="{{url+item.original_img}}" data-errorimg="recommend[{{index}}].original_img"></image> | 10 | + <image class="sp" src="{{url+item.original_img}}" mode="aspectFill" binderror="bind_bnerr_xc" data-url="{{url+item.original_img}}" data-errorimg="recommend[{{index}}].original_img"></image> |
| 11 | <view class="bottom"> | 11 | <view class="bottom"> |
| 12 | <!-- 商品名称 --> | 12 | <!-- 商品名称 --> |
| 13 | <view class="goods_name ellipsis-2 fs28">{{item.goods_name}}</view> | 13 | <view class="goods_name ellipsis-2 fs28">{{item.goods_name}}</view> |
| 14 | <!-- 判断是否有活动价 --> | 14 | <!-- 判断是否有活动价 --> |
| 15 | <block wx:if="{{item.prom_price>0 || item.prom_integral>0}}"> | 15 | <block wx:if="{{item.prom_price>0 || item.prom_integral>0}}"> |
| 16 | - <view class="money flex xc-wc" > | ||
| 17 | - <text wx:if="{{item.prom_integral}}"><text class="fs35" style="font-weight: bold;">{{item.prom_integral}}</text>积分</text> | ||
| 18 | - <text wx:if="{{item.prom_integral && item.prom_price}}">+</text> | ||
| 19 | - <!-- 活动价 --> | ||
| 20 | - <view class="flex xc-wc" wx:if="{{item.prom_price}}"> | ||
| 21 | - <view class="fs24">￥</view> | ||
| 22 | - <view class="fs35">{{item.prom_price}}</view> | ||
| 23 | - </view> | ||
| 24 | - </view> | ||
| 25 | - <view class="flex" style="line-height: 28rpx;"> | ||
| 26 | - <!-- 原价 --> | ||
| 27 | - <view class="price flex xc-ash line_th"> | ||
| 28 | - <view class="fs22">￥</view> | ||
| 29 | - <view class="fs22">{{item.market_price}}</view> | ||
| 30 | - </view> | ||
| 31 | - </view> | 16 | + <view class="flex ai_c pdt10"> |
| 17 | + <view class="money flex xc-wc" > | ||
| 18 | + <text wx:if="{{item.prom_integral}}"><text class="fs35" style="font-weight: bold;">{{item.prom_integral}}</text>积分</text> | ||
| 19 | + <text wx:if="{{item.prom_integral && item.prom_price}}">+</text> | ||
| 20 | + <!-- 活动价 --> | ||
| 21 | + <view class="flex xc-wc" wx:if="{{item.prom_price}}"> | ||
| 22 | + <view class="fs24">￥</view> | ||
| 23 | + <view class="fs35">{{item.prom_price}}</view> | ||
| 24 | + </view> | ||
| 25 | + </view> | ||
| 26 | + <view class="flex" style="line-height: 28rpx;"> | ||
| 27 | + <!-- 原价 --> | ||
| 28 | + <view class="price flex xc-ash line_th"> | ||
| 29 | + <view class="fs22">￥</view> | ||
| 30 | + <view class="fs22">{{item.market_price}}</view> | ||
| 31 | + </view> | ||
| 32 | + </view> | ||
| 33 | + </view> | ||
| 34 | + | ||
| 32 | </block> | 35 | </block> |
| 33 | <block wx:else> | 36 | <block wx:else> |
| 34 | <!-- 商品价格,先判断下是后⼜等级价--> | 37 | <!-- 商品价格,先判断下是后⼜等级价--> |
| @@ -119,7 +122,7 @@ | @@ -119,7 +122,7 @@ | ||
| 119 | </block> | 122 | </block> |
| 120 | </block> | 123 | </block> |
| 121 | <!-- 商品压根就没有等级价 --> | 124 | <!-- 商品压根就没有等级价 --> |
| 122 | - <view class="flex ai_c" wx:else> | 125 | + <view class="flex ai_c pdt10" wx:else> |
| 123 | <view class="money flex"> | 126 | <view class="money flex"> |
| 124 | <!-- 办卡价 --> | 127 | <!-- 办卡价 --> |
| 125 | <view class="flex xc-wc"> | 128 | <view class="flex xc-wc"> |
components/goods_list/goods_list.wxss
| @@ -3,6 +3,10 @@ | @@ -3,6 +3,10 @@ | ||
| 3 | /* margin-bottom: 40rpx; */ | 3 | /* margin-bottom: 40rpx; */ |
| 4 | } | 4 | } |
| 5 | 5 | ||
| 6 | +.pdt10 { | ||
| 7 | + padding-top: 10rpx; | ||
| 8 | +} | ||
| 9 | + | ||
| 6 | .ai-center{ | 10 | .ai-center{ |
| 7 | align-items: center; | 11 | align-items: center; |
| 8 | } | 12 | } |
| @@ -177,7 +181,7 @@ | @@ -177,7 +181,7 @@ | ||
| 177 | .nothing .Foil { | 181 | .nothing .Foil { |
| 178 | width: 80rpx; | 182 | width: 80rpx; |
| 179 | height: 2rpx; | 183 | height: 2rpx; |
| 180 | - background-color: rgb(138, 138, 138); | 184 | + background-color: #ebedf0; |
| 181 | } | 185 | } |
| 182 | 186 | ||
| 183 | .line_th { | 187 | .line_th { |
pages/goods/goodsInfo/goodsInfo.wxml
| @@ -194,7 +194,7 @@ | @@ -194,7 +194,7 @@ | ||
| 194 | </view> | 194 | </view> |
| 195 | </view> | 195 | </view> |
| 196 | 196 | ||
| 197 | - <view class="pt_fir se1"> | 197 | + <!-- <view class="pt_fir se1"> |
| 198 | <view class="pt_hb"> | 198 | <view class="pt_hb"> |
| 199 | 拼团玩法 | 199 | 拼团玩法 |
| 200 | <view class="ptgz_an xq flex" bindtap="show_pt_xx">查看详细 | 200 | <view class="ptgz_an xq flex" bindtap="show_pt_xx">查看详细 |
| @@ -203,7 +203,7 @@ | @@ -203,7 +203,7 @@ | ||
| 203 | </view> | 203 | </view> |
| 204 | <view class="flex-level" style='height:198rpx; width:100%;'> | 204 | <view class="flex-level" style='height:198rpx; width:100%;'> |
| 205 | <view class="flex-vertical-between rel" style='width:94%;margin-left:10rpx;'> | 205 | <view class="flex-vertical-between rel" style='width:94%;margin-left:10rpx;'> |
| 206 | - <!-- 许程 7： 24 --> | 206 | + |
| 207 | <view class="xc-item t-c"> | 207 | <view class="xc-item t-c"> |
| 208 | <view class="circle yuan t-c circle-color">1</view> | 208 | <view class="circle yuan t-c circle-color">1</view> |
| 209 | <view class="word">选择商品完成下单</view> | 209 | <view class="word">选择商品完成下单</view> |
| @@ -229,14 +229,14 @@ | @@ -229,14 +229,14 @@ | ||
| 229 | </view> | 229 | </view> |
| 230 | </view> | 230 | </view> |
| 231 | </view> | 231 | </view> |
| 232 | - </view> | 232 | + </view> --> |
| 233 | </view> | 233 | </view> |
| 234 | 234 | ||
| 235 | <!-- 积分购 --> | 235 | <!-- 积分购 --> |
| 236 | <view wx:if="{{prom_type==4}}"> | 236 | <view wx:if="{{prom_type==4}}"> |
| 237 | - <view class="goods-price rel"> | 237 | + <view class="goods-price"> |
| 238 | <!-- 价格显示 --> | 238 | <!-- 价格显示 --> |
| 239 | - <view class="co-red" style="overflow: hidden" > | 239 | + <view class="co-red" style="" > |
| 240 | <view class="market-price" style="overflow: hidden; height: 66rpx;"> | 240 | <view class="market-price" style="overflow: hidden; height: 66rpx;"> |
| 241 | <image class="rel_img" src="{{iurl}}/miniapp/images/integral/integral_red.png"></image> | 241 | <image class="rel_img" src="{{iurl}}/miniapp/images/integral/integral_red.png"></image> |
| 242 | <block wx:if="{{prom_integral}}">{{prom_integral}} | 242 | <block wx:if="{{prom_integral}}">{{prom_integral}} |
| @@ -249,6 +249,7 @@ | @@ -249,6 +249,7 @@ | ||
| 249 | </view> | 249 | </view> |
| 250 | 250 | ||
| 251 | <!-- 这个是分享按钮 --> | 251 | <!-- 这个是分享按钮 --> |
| 252 | + <!-- <view class="xc-share-frame flex {{prom_type==1?'s_ms_bth':''}} " bindtap="saveImageToPhotosAlbum"> --> | ||
| 252 | <view class="xc-share-frame flex {{prom_type==1?'s_ms_bth':''}} " bindtap="saveImageToPhotosAlbum"> | 253 | <view class="xc-share-frame flex {{prom_type==1?'s_ms_bth':''}} " bindtap="saveImageToPhotosAlbum"> |
| 253 | <image class="share-frame" src="{{iurl}}/miniapp/images/share.png"></image> | 254 | <image class="share-frame" src="{{iurl}}/miniapp/images/share.png"></image> |
| 254 | <view class="share-font">分享</view> | 255 | <view class="share-font">分享</view> |
| @@ -269,32 +270,40 @@ | @@ -269,32 +270,40 @@ | ||
| 269 | 270 | ||
| 270 | <!-- 不是拼团，不是积分购 --> | 271 | <!-- 不是拼团，不是积分购 --> |
| 271 | <block wx:if="{{prom_type!=6 && prom_type!=4}}"> | 272 | <block wx:if="{{prom_type!=6 && prom_type!=4}}"> |
| 272 | - <view class="goods-price rel"> | ||
| 273 | - <view class="co-red" style="overflow: hidden" wx:if="{{prom_type==0 || prom_type==3}}"> | ||
| 274 | - <view class="market-price" style="overflow: hidden"> | ||
| 275 | - <block wx:if="{{card_field && data[card_field]>0}}"> | ||
| 276 | - <view class="flex ai-center grade-card-frame" style="margin-left:12rpx;"> | ||
| 277 | - <image class="img" src="{{iurl}}/miniapp/images/userinfo/userinfo/privilege_t.png"></image> | ||
| 278 | - <view class="fs24 white view card-name ellipsis-1">{{card_name}}</view> | ||
| 279 | - </view> | ||
| 280 | - <text class="rel yuan">￥</text>{{filters.toFix(data[card_field],2)}} | ||
| 281 | - <view class='yj' style="top:35rpx"> | ||
| 282 | - <text>零售价:￥{{data.market_price}}</text> | ||
| 283 | - </view> | ||
| 284 | - </block> | ||
| 285 | - <block wx:else> | ||
| 286 | - <text class="rel yuan">￥</text>{{filters.toFix(data.shop_price,2)}} | ||
| 287 | - <view class='yj'><text>零售价:￥{{data.market_price}}</text></view> | ||
| 288 | - </block> | ||
| 289 | - </view> | ||
| 290 | - | ||
| 291 | - </view> | ||
| 292 | - | ||
| 293 | - <!-- 这个是分享按钮 --> | ||
| 294 | - <view class="xc-share-frame flex {{prom_type==1?'s_ms_bth':''}} " bindtap="saveImageToPhotosAlbum"> | ||
| 295 | - <image class="share-frame" src="{{iurl}}/miniapp/images/share.png"></image> | ||
| 296 | - <view class="share-font">分享</view> | ||
| 297 | - </view> | 273 | + <view class="goods-price"> |
| 274 | + | ||
| 275 | + <view class="flex jc_sb"> | ||
| 276 | + <view class="co-red" style="" wx:if="{{prom_type==0 || prom_type==3}}"> | ||
| 277 | + <view class="market-price" style=""> | ||
| 278 | + <block wx:if="{{card_field && data[card_field]>0}}"> | ||
| 279 | + <view class="flex ai-center grade-card-frame" style="margin-left:12rpx;"> | ||
| 280 | + <image class="img" src="{{iurl}}/miniapp/images/userinfo/userinfo/privilege_t.png"></image> | ||
| 281 | + <view class="fs24 white view card-name ellipsis-1">{{card_name}}</view> | ||
| 282 | + </view> | ||
| 283 | + <text class="rel yuan">￥</text>{{filters.toFix(data[card_field],2)}} | ||
| 284 | + <view class='yj' style="top:35rpx"> | ||
| 285 | + <text>零售价:￥{{data.market_price}}</text> | ||
| 286 | + </view> | ||
| 287 | + </block> | ||
| 288 | + <block wx:else> | ||
| 289 | + <text class="yuan">￥</text>{{filters.toFix(data.shop_price,2)}} | ||
| 290 | + <view class='yj'><text>零售价:￥{{data.market_price}}</text></view> | ||
| 291 | + </block> | ||
| 292 | + </view> | ||
| 293 | + | ||
| 294 | + </view> | ||
| 295 | + | ||
| 296 | + <!-- 这个是分享按钮 --> | ||
| 297 | + <!-- <view class="xc-share-frame {{prom_type==1?'s_ms_bth':''}} t-c" bindtap="saveImageToPhotosAlbum"> --> | ||
| 298 | + <view class="xc-share-frame t-c" bindtap="saveImageToPhotosAlbum" wx:if="{{prom_type != 1}}"> | ||
| 299 | + <!-- <image class="share-frame" src="{{iurl}}/miniapp/images/share.png"></image> --> | ||
| 300 | + <view class="iconfont icon-share fs60"></view> | ||
| 301 | + <!-- <view class="share-font">1分享</view> --> | ||
| 302 | + <view class="fs22 c-7b">分享</view> | ||
| 303 | + </view> | ||
| 304 | + </view> | ||
| 305 | + | ||
| 306 | + | ||
| 298 | 307 | ||
| 299 | <!-- 不是秒杀 --> | 308 | <!-- 不是秒杀 --> |
| 300 | <!-- 等级卡的价格,不是等级卡会员，且商品又有设置等级级价，商家后台有开通升级卡同能 --> | 309 | <!-- 等级卡的价格,不是等级卡会员，且商品又有设置等级级价，商家后台有开通升级卡同能 --> |
| @@ -372,19 +381,25 @@ | @@ -372,19 +381,25 @@ | ||
| 372 | <view class="stock">{{categories3[0].num}}人评价</view> | 381 | <view class="stock">{{categories3[0].num}}人评价</view> |
| 373 | </view> | 382 | </view> |
| 374 | <view wx:if="{{prom_type==1}}"> | 383 | <view wx:if="{{prom_type==1}}"> |
| 375 | - <view class="flex"> | ||
| 376 | - <view> | ||
| 377 | - <view class="flex xc-price-frame"> | ||
| 378 | - <view class="flex fs45 sign">￥</view> | ||
| 379 | - <view class="fs60 val">{{prom_price}}</view> | ||
| 380 | - </view> | ||
| 381 | - <view class="word-line fs24 xc-unit-price">零售价￥{{data.market_price}}</view> | 384 | + <view class="flex jc_sb"> |
| 385 | + <view class="flex" style="align-items: baseline;"> | ||
| 386 | + <view class="flex xc-price-frame"><text class="fs30">￥</text>{{prom_price}}</view> | ||
| 387 | + <view class="word-line fs24">零售价￥{{data.market_price}}</view> | ||
| 382 | </view> | 388 | </view> |
| 383 | - <view class="xc-val-price"> | 389 | + |
| 390 | + <!-- 这个是分享按钮 --> | ||
| 391 | + <!-- <view class="xc-share-frame {{prom_type==1?'s_ms_bth':''}} t-c" bindtap="saveImageToPhotosAlbum"> --> | ||
| 392 | + <view class="xc-share-frame t-c" bindtap="saveImageToPhotosAlbum"> | ||
| 393 | + <!-- <image class="share-frame" src="{{iurl}}/miniapp/images/share.png"></image> --> | ||
| 394 | + <view class="iconfont icon-share fs60"></view> | ||
| 395 | + <!-- <view class="share-font">1分享</view> --> | ||
| 396 | + <view class="fs22 c-7b">分享</view> | ||
| 397 | + </view> | ||
| 398 | + <!-- <view class="xc-val-price"> | ||
| 384 | <view class="fs30" style='padding-left:13rpx;' wx:if="{{prom_st==1}}" >已抢:{{prom_act.buy_num+prom_act.virtual}}件</view> | 399 | <view class="fs30" style='padding-left:13rpx;' wx:if="{{prom_st==1}}" >已抢:{{prom_act.buy_num+prom_act.virtual}}件</view> |
| 385 | <view class="fs30" style='padding-left:13rpx;' wx:else >已抢:0件</view> | 400 | <view class="fs30" style='padding-left:13rpx;' wx:else >已抢:0件</view> |
| 386 | <view class="fs30 save t-c">秒杀立省￥{{filters.toFix(data.market_price-prom_price,2)}}</view> | 401 | <view class="fs30 save t-c">秒杀立省￥{{filters.toFix(data.market_price-prom_price,2)}}</view> |
| 387 | - </view> | 402 | + </view> --> |
| 388 | </view> | 403 | </view> |
| 389 | </view> | 404 | </view> |
| 390 | 405 | ||
| @@ -392,7 +407,7 @@ | @@ -392,7 +407,7 @@ | ||
| 392 | {{data.goods_name}} | 407 | {{data.goods_name}} |
| 393 | </view> | 408 | </view> |
| 394 | 409 | ||
| 395 | - <view wx:if="{{prom_type==1}}" style='height:58rpx'></view> | 410 | + <!-- <view wx:if="{{prom_type==1}}" style='height:58rpx'></view> --> |
| 396 | <!-- 许程 7.24 暂时注释 --> | 411 | <!-- 许程 7.24 暂时注释 --> |
| 397 | <view wx:if="{{prom_type==1}}"> | 412 | <view wx:if="{{prom_type==1}}"> |
| 398 | <view class="goods-num" wx:if="{{prom_type==1}}"> | 413 | <view class="goods-num" wx:if="{{prom_type==1}}"> |
| @@ -428,16 +443,16 @@ | @@ -428,16 +443,16 @@ | ||
| 428 | <image class="stores-img" src="{{iurl}}/miniapp/images/stores.png"></image> | 443 | <image class="stores-img" src="{{iurl}}/miniapp/images/stores.png"></image> |
| 429 | <view class="fs30" style="color:black;">选择门店</view> | 444 | <view class="fs30" style="color:black;">选择门店</view> |
| 430 | </view> | 445 | </view> |
| 431 | - <view class="red_bb fs30"> | 446 | + <view class="red_bb fs26"> |
| 432 | 更多门店 | 447 | 更多门店 |
| 433 | <text class="bg_jj"></text> | 448 | <text class="bg_jj"></text> |
| 434 | </view> | 449 | </view> |
| 435 | </view> | 450 | </view> |
| 436 | 451 | ||
| 437 | <view wx:if="{{def_pick_store && def_pick_store.pickup_name}}"> | 452 | <view wx:if="{{def_pick_store && def_pick_store.pickup_name}}"> |
| 438 | - <view class="flex-space-between address ai_end "> | 453 | + <view class="flex-space-between address ai_end pdv10"> |
| 439 | <view> | 454 | <view> |
| 440 | - <text class="fs30 xc-black3 shop_name">{{def_pick_store.pickup_name}}</text> | 455 | + <text class="fs30 xc-black3 shop_name bold">{{def_pick_store.pickup_name}}</text> |
| 441 | </view> | 456 | </view> |
| 442 | <view class="distance fs24"wx:if="{{def_pick_store.distance!=null}}"> | 457 | <view class="distance fs24"wx:if="{{def_pick_store.distance!=null}}"> |
| 443 | 距离：{{def_pick_store.distance>1000?filters.toFix(def_pick_store.distance/1000,2)+"km":filters.toFix(def_pick_store.distance,0)+"m"}} | 458 | 距离：{{def_pick_store.distance>1000?filters.toFix(def_pick_store.distance/1000,2)+"km":filters.toFix(def_pick_store.distance,0)+"m"}} |
| @@ -465,12 +480,14 @@ | @@ -465,12 +480,14 @@ | ||
| 465 | <view class="bdt16" wx:if="{{prom_type!=1&&prom_act.kttype!=3&&prom_act.kttype!=2&&prom_act.kttype!=1 && is_closecoupon!=1}}"> | 480 | <view class="bdt16" wx:if="{{prom_type!=1&&prom_act.kttype!=3&&prom_act.kttype!=2&&prom_act.kttype!=1 && is_closecoupon!=1}}"> |
| 466 | <view class="cx-frame flex" style="position: relative" wx:if="{{fir_quan.length>0}}"> | 481 | <view class="cx-frame flex" style="position: relative" wx:if="{{fir_quan.length>0}}"> |
| 467 | <view class="cx-sizs fs30">领券</view> | 482 | <view class="cx-sizs fs30">领券</view> |
| 468 | - <view class="xc-coupon-fram" wx:for="{{fir_quan}}" wx:key="{{index}}"> | ||
| 469 | - <view class="circle xc-circular xc-one"></view> | ||
| 470 | - <view class="xc-coupon t-c four-level-word">满{{item.condition}}减{{item.money}}</view> | ||
| 471 | - <view class="circle xc-circular xc-two"></view> | ||
| 472 | - </view> | ||
| 473 | - | 483 | + <view class="flex ai_c f1 pdh20"> |
| 484 | + <view class="xc-coupon-fram" wx:for="{{fir_quan}}" wx:key="{{index}}"> | ||
| 485 | + <view class="circle xc-circular xc-one"></view> | ||
| 486 | + <view class="xc-coupon t-c four-level-word">满{{item.condition}}减{{item.money}}</view> | ||
| 487 | + <view class="circle xc-circular xc-two"></view> | ||
| 488 | + </view> | ||
| 489 | + </view> | ||
| 490 | + | ||
| 474 | <view data-coupon="1" bindtap="switchCoupon" class="cx-obtain-coupon wsize"> | 491 | <view data-coupon="1" bindtap="switchCoupon" class="cx-obtain-coupon wsize"> |
| 475 | <text class="bg_jj"></text> | 492 | <text class="bg_jj"></text> |
| 476 | </view> | 493 | </view> |
| @@ -480,9 +497,9 @@ | @@ -480,9 +497,9 @@ | ||
| 480 | <!-- 要判断是不是有促销活动 --> | 497 | <!-- 要判断是不是有促销活动 --> |
| 481 | <block wx:if="{{prom_goods}}"> | 498 | <block wx:if="{{prom_goods}}"> |
| 482 | <view class="cx-frame flex" style="position: relative; height: auto" > | 499 | <view class="cx-frame flex" style="position: relative; height: auto" > |
| 483 | - <view class="cx-sizs wsize">促销</view> | 500 | + <view class="cx-sizs fs30">促销</view> |
| 484 | <!-- 中间显示层 --> | 501 | <!-- 中间显示层 --> |
| 485 | - <view style="margin-top: 36rpx"> | 502 | + <view class="f1 pdh20"> |
| 486 | <view class="cx_show_view flex fs28" wx:for="{{prom_goods}}"> | 503 | <view class="cx_show_view flex fs28" wx:for="{{prom_goods}}"> |
| 487 | <view class="prom_condition">消费满{{item.condition}}<text wx:if="{{item.prom_type==1}}">件</text><text wx:else>元</text></view> | 504 | <view class="prom_condition">消费满{{item.condition}}<text wx:if="{{item.prom_type==1}}">件</text><text wx:else>元</text></view> |
| 488 | <view class="word {{is_more_cx?'':'ellipsis-1'}}"> | 505 | <view class="word {{is_more_cx?'':'ellipsis-1'}}"> |
| @@ -519,9 +536,13 @@ | @@ -519,9 +536,13 @@ | ||
| 519 | </block> | 536 | </block> |
| 520 | 537 | ||
| 521 | 538 | ||
| 522 | - <view class="bz_view flex ai-center bdt16" wx:if="{{bconfig}}" style="line-height: 36rpx"> | 539 | + <view class="bz_view flex bdt16" wx:if="{{bconfig}}" style=""> |
| 523 | <image class="bzfu_img" src="{{iurl}}/miniapp/images/bzfu_w.png"></image> | 540 | <image class="bzfu_img" src="{{iurl}}/miniapp/images/bzfu_w.png"></image> |
| 524 | - <view class="bz-content">{{bconfig.service_bz}}</view> | 541 | + <view class="flex f1 ai_c"> |
| 542 | + <view class="bz-content ellipsis-1 f1">{{bconfig.service_bz}}</view> | ||
| 543 | + <text class="iconfont icon-shuangjiantouxia c-db"></text> | ||
| 544 | + </view> | ||
| 545 | + | ||
| 525 | </view> | 546 | </view> |
| 526 | 547 | ||
| 527 | 548 | ||
| @@ -548,10 +569,10 @@ | @@ -548,10 +569,10 @@ | ||
| 548 | 569 | ||
| 549 | 570 | ||
| 550 | <!--- 宝贝评价 ----> | 571 | <!--- 宝贝评价 ----> |
| 551 | - <view class="bdt16" style="overflow: hidden"> | 572 | + <view class="bdt16"> |
| 552 | <view class="bb_view"> | 573 | <view class="bb_view"> |
| 553 | - <view>宝贝评价（{{categories3[0].num}}）</view> | ||
| 554 | - <view class="red_bb" bindtap="look_pj">查看全部 | 574 | + <view class="bold">宝贝评价({{categories3[0].num}})</view> |
| 575 | + <view class="red_bb fs26" bindtap="look_pj">查看全部 | ||
| 555 | <text class="bg_jj"></text> | 576 | <text class="bg_jj"></text> |
| 556 | </view> | 577 | </view> |
| 557 | </view> | 578 | </view> |
| @@ -564,8 +585,8 @@ | @@ -564,8 +585,8 @@ | ||
| 564 | </view> | 585 | </view> |
| 565 | 586 | ||
| 566 | <scroll-view scroll-x="true" class="pj_scroll"> | 587 | <scroll-view scroll-x="true" class="pj_scroll"> |
| 567 | - | ||
| 568 | - <view class="xc_comment-detail" style="display: inline-block" wx:for="{{fir_comments}}" wx:key="fir_comments"> | 588 | + <view class="flex"> |
| 589 | + <view class="xc_comment-detail" style="" wx:for="{{fir_comments}}" wx:key="fir_comments"> | ||
| 569 | <view class="xc_comment-left"> | 590 | <view class="xc_comment-left"> |
| 570 | <view class="xc_comment-user"> | 591 | <view class="xc_comment-user"> |
| 571 | <view class="xc_user-img"> | 592 | <view class="xc_user-img"> |
| @@ -577,8 +598,8 @@ | @@ -577,8 +598,8 @@ | ||
| 577 | <image class="xc_comment-img" src="{{iurl}}/miniapp/images/star-red.png" wx:for="{{item.sum_rank}}" wx:key="{{index}}"></image> | 598 | <image class="xc_comment-img" src="{{iurl}}/miniapp/images/star-red.png" wx:for="{{item.sum_rank}}" wx:key="{{index}}"></image> |
| 578 | </view> | 599 | </view> |
| 579 | </view> | 600 | </view> |
| 580 | - <view class="xc_comment-font pj_word_size ellipsis-2"> | ||
| 581 | - {{item.content?item.content:'此用户没有填写评价。'}} | 601 | + <view class="xc_comment-font pj_word_size ellipsis-1 pdt12"> |
| 602 | + <text class="ellipsis-1">{{item.content?item.content:'此用户没有填写评价。'}} </text> | ||
| 582 | </view> | 603 | </view> |
| 583 | <view class="xc_comment-val"> | 604 | <view class="xc_comment-val"> |
| 584 | <view class="xc_comment-time">{{item.add_time}}</view> | 605 | <view class="xc_comment-time">{{item.add_time}}</view> |
| @@ -591,89 +612,92 @@ | @@ -591,89 +612,92 @@ | ||
| 591 | <image wx:else class="xc_goods-img" src='{{gallery[0].image_url}}'></image> | 612 | <image wx:else class="xc_goods-img" src='{{gallery[0].image_url}}'></image> |
| 592 | </view> | 613 | </view> |
| 593 | </view> | 614 | </view> |
| 594 | - | 615 | + </view> |
| 595 | </scroll-view> | 616 | </scroll-view> |
| 596 | </view> | 617 | </view> |
| 597 | 618 | ||
| 598 | <!-- 图文详情 --> | 619 | <!-- 图文详情 --> |
| 599 | - <view> | ||
| 600 | - <view class="tuwen_title"> | 620 | + <view class="bdt16"> |
| 621 | + <!-- <view class="tuwen_title"> | ||
| 601 | <view class="g_line"></view> | 622 | <view class="g_line"></view> |
| 602 | <view class="center_s"> | 623 | <view class="center_s"> |
| 603 | <image src="{{iurl}}/miniapp/images/tuwen_c.png"></image> | 624 | <image src="{{iurl}}/miniapp/images/tuwen_c.png"></image> |
| 604 | <text>详情</text> | 625 | <text>详情</text> |
| 605 | </view> | 626 | </view> |
| 606 | - </view> | 627 | + </view> --> |
| 607 | <view class="t_g_info"> | 628 | <view class="t_g_info"> |
| 608 | <view class="red_shu"></view> | 629 | <view class="red_shu"></view> |
| 609 | - <view class="fs30">商品信息</view> | ||
| 610 | - </view> | ||
| 611 | - <view class="table_s"> | ||
| 612 | - <view class="tb_item tb-l"> | ||
| 613 | - <view class="item_left"> | ||
| 614 | - <text>商品名称</text> | ||
| 615 | - </view> | ||
| 616 | - <view class="item_right"> | ||
| 617 | - <text>{{data.goods_name}}</text> | ||
| 618 | - </view> | ||
| 619 | - </view> | ||
| 620 | - <view class="tb_item tb-l"> | ||
| 621 | - <view class="item_left"> | ||
| 622 | - <text>商品编号</text> | ||
| 623 | - </view> | ||
| 624 | - <view class="item_right"> | ||
| 625 | - <text>{{data.goods_sn}}</text> | ||
| 626 | - </view> | ||
| 627 | - </view> | ||
| 628 | - <view class="tb_item tb-l"> | ||
| 629 | - <view class="item_left"> | ||
| 630 | - <text>商品条码</text> | ||
| 631 | - </view> | ||
| 632 | - <view class="item_right"> | ||
| 633 | - <text>{{data.sku}}</text> | ||
| 634 | - </view> | ||
| 635 | - </view> | ||
| 636 | - <view class="tb_item tb-l" wx:if="{{cat_name && is_show_pl}}"> | ||
| 637 | - <view class="item_left"> | ||
| 638 | - <text>品类</text> | ||
| 639 | - </view> | ||
| 640 | - <view class="item_right"> | ||
| 641 | - <text>{{cat_name}}</text> | ||
| 642 | - </view> | ||
| 643 | - </view> | ||
| 644 | - <view class="tb_item tb-l" wx:if="{{brand_name && is_show_pp}}"> | ||
| 645 | - <view class="item_left"> | ||
| 646 | - <text>品牌</text> | ||
| 647 | - </view> | ||
| 648 | - <view class="item_right"> | ||
| 649 | - <text>{{brand_name}}</text> | ||
| 650 | - </view> | ||
| 651 | - </view> | ||
| 652 | - <view class="tb_item tb-l" wx:if="{{nation_name && is_show_gb}}"> | ||
| 653 | - <view class="item_left"> | ||
| 654 | - <text>国别</text> | ||
| 655 | - </view> | ||
| 656 | - <view class="item_right"> | ||
| 657 | - <text>{{nation_name}}</text> | ||
| 658 | - </view> | ||
| 659 | - </view> | ||
| 660 | - <view class="tb_item tb-l"> | ||
| 661 | - <view class="item_left"> | ||
| 662 | - <text>规格</text> | ||
| 663 | - </view> | ||
| 664 | - <view class="item_right"> | ||
| 665 | - <text>{{filters.show_gui_ge(data.goods_spec,data.goods_color)}}</text> | ||
| 666 | - </view> | ||
| 667 | - </view> | ||
| 668 | - <view class="tb_item tb-l"> | ||
| 669 | - <view class="item_left"> | ||
| 670 | - <text>上架时间</text> | ||
| 671 | - </view> | ||
| 672 | - <view class="item_right"> | ||
| 673 | - <text>{{data.on_time}}</text> | ||
| 674 | - </view> | ||
| 675 | - </view> | 630 | + <view class="fs30 bold">商品详情</view> |
| 676 | </view> | 631 | </view> |
| 632 | + <view class="pd20"> | ||
| 633 | + <view class="table_s"> | ||
| 634 | + <view class="tb_item tb-l"> | ||
| 635 | + <view class="item_left"> | ||
| 636 | + <text>商品名称</text> | ||
| 637 | + </view> | ||
| 638 | + <view class="item_right"> | ||
| 639 | + <text>{{data.goods_name}}</text> | ||
| 640 | + </view> | ||
| 641 | + </view> | ||
| 642 | + <view class="tb_item tb-l"> | ||
| 643 | + <view class="item_left"> | ||
| 644 | + <text>商品编号</text> | ||
| 645 | + </view> | ||
| 646 | + <view class="item_right"> | ||
| 647 | + <text>{{data.goods_sn}}</text> | ||
| 648 | + </view> | ||
| 649 | + </view> | ||
| 650 | + <view class="tb_item tb-l"> | ||
| 651 | + <view class="item_left"> | ||
| 652 | + <text>商品条码</text> | ||
| 653 | + </view> | ||
| 654 | + <view class="item_right"> | ||
| 655 | + <text>{{data.sku}}</text> | ||
| 656 | + </view> | ||
| 657 | + </view> | ||
| 658 | + <view class="tb_item tb-l" wx:if="{{cat_name && is_show_pl}}"> | ||
| 659 | + <view class="item_left"> | ||
| 660 | + <text>品类</text> | ||
| 661 | + </view> | ||
| 662 | + <view class="item_right"> | ||
| 663 | + <text>{{cat_name}}</text> | ||
| 664 | + </view> | ||
| 665 | + </view> | ||
| 666 | + <view class="tb_item tb-l" wx:if="{{brand_name && is_show_pp}}"> | ||
| 667 | + <view class="item_left"> | ||
| 668 | + <text>品牌</text> | ||
| 669 | + </view> | ||
| 670 | + <view class="item_right"> | ||
| 671 | + <text>{{brand_name}}</text> | ||
| 672 | + </view> | ||
| 673 | + </view> | ||
| 674 | + <view class="tb_item tb-l" wx:if="{{nation_name && is_show_gb}}"> | ||
| 675 | + <view class="item_left"> | ||
| 676 | + <text>国别</text> | ||
| 677 | + </view> | ||
| 678 | + <view class="item_right"> | ||
| 679 | + <text>{{nation_name}}</text> | ||
| 680 | + </view> | ||
| 681 | + </view> | ||
| 682 | + <view class="tb_item tb-l"> | ||
| 683 | + <view class="item_left"> | ||
| 684 | + <text>规格</text> | ||
| 685 | + </view> | ||
| 686 | + <view class="item_right"> | ||
| 687 | + <text>{{filters.show_gui_ge(data.goods_spec,data.goods_color)}}</text> | ||
| 688 | + </view> | ||
| 689 | + </view> | ||
| 690 | + <view class="tb_item tb-l"> | ||
| 691 | + <view class="item_left"> | ||
| 692 | + <text>上架时间</text> | ||
| 693 | + </view> | ||
| 694 | + <view class="item_right"> | ||
| 695 | + <text>{{data.on_time}}</text> | ||
| 696 | + </view> | ||
| 697 | + </view> | ||
| 698 | + </view> | ||
| 699 | + </view> | ||
| 700 | + | ||
| 677 | <!--详情图片--> | 701 | <!--详情图片--> |
| 678 | <view class="wxParse"> | 702 | <view class="wxParse"> |
| 679 | <template is="wxParse" data="{{wxParseData:content.nodes}}"></template> | 703 | <template is="wxParse" data="{{wxParseData:content.nodes}}"></template> |
| @@ -1040,7 +1064,7 @@ | @@ -1040,7 +1064,7 @@ | ||
| 1040 | <view class="flex-space-between address ai_end xc-width "> | 1064 | <view class="flex-space-between address ai_end xc-width "> |
| 1041 | 1065 | ||
| 1042 | <view class="flex ai_end" wx:if="{{def_pick_store && def_pick_store.pickup_name}}"> | 1066 | <view class="flex ai_end" wx:if="{{def_pick_store && def_pick_store.pickup_name}}"> |
| 1043 | - <text class="fs30 xc-black3 shop_name">{{def_pick_store.pickup_name}}</text> | 1067 | + <text class="fs30 xc-black3 shop_name bold">{{def_pick_store.pickup_name}}</text> |
| 1044 | <view class="distance fs24 xc-ash"wx:if="{{def_pick_store.distance!=null}}"> | 1068 | <view class="distance fs24 xc-ash"wx:if="{{def_pick_store.distance!=null}}"> |
| 1045 | 距离:{{def_pick_store.distance>1000?filters.toFix(def_pick_store.distance/1000,2)+"km":filters.toFix(def_pick_store.distance,0)+"m"}} | 1069 | 距离:{{def_pick_store.distance>1000?filters.toFix(def_pick_store.distance/1000,2)+"km":filters.toFix(def_pick_store.distance,0)+"m"}} |
| 1046 | 1070 | ||
| @@ -1264,9 +1288,9 @@ | @@ -1264,9 +1288,9 @@ | ||
| 1264 | <view class="coupon flex"> | 1288 | <view class="coupon flex"> |
| 1265 | <view class="circle xc-circular-one"></view> | 1289 | <view class="circle xc-circular-one"></view> |
| 1266 | <view class="xc-coupon-left "> | 1290 | <view class="xc-coupon-left "> |
| 1267 | - <view class="flex xc-money-frame"> | ||
| 1268 | - <view class=" xc-money two-level-word xc-rmb">￥</view> | ||
| 1269 | - <view class="one-level-word xc-money">{{item.money}}</view> | 1291 | + <view class="flex ai_c xc-money-frame"> |
| 1292 | + <text class="xc-money two-level-word xc-rmb">￥</text> | ||
| 1293 | + <text class="one-level-word xc-money">{{item.money}}</text> | ||
| 1270 | </view> | 1294 | </view> |
| 1271 | <view class="xc-money four-level-word xc-spacing"> | 1295 | <view class="xc-money four-level-word xc-spacing"> |
| 1272 | 满{{item.condition}}元可用 | 1296 | 满{{item.condition}}元可用 |
| @@ -1275,7 +1299,7 @@ | @@ -1275,7 +1299,7 @@ | ||
| 1275 | <view class="xc-coupon-right flex"> | 1299 | <view class="xc-coupon-right flex"> |
| 1276 | <view class="xc-detail-coupon"> | 1300 | <view class="xc-detail-coupon"> |
| 1277 | <view class="four-level-word">订单金额满{{item.condition}}元可用</view> | 1301 | <view class="four-level-word">订单金额满{{item.condition}}元可用</view> |
| 1278 | - <view class="four-level-word xc-below">{{item.start}}-{{item.end}}</view> | 1302 | + <view class="four-level-word xc-below">{{filters.replace_time2(item.start)}} 至 {{filters.replace_time2(item.end)}}</view> |
| 1279 | </view> | 1303 | </view> |
| 1280 | <view class="flex-vertical"> | 1304 | <view class="flex-vertical"> |
| 1281 | <view class="three-level-word xc-get background {{item.everyone_num>0 && item.lqnum>=item.everyone_num?'nouse':''}}" | 1305 | <view class="three-level-word xc-get background {{item.everyone_num>0 && item.lqnum>=item.everyone_num?'nouse':''}}" |
| @@ -1288,8 +1312,8 @@ | @@ -1288,8 +1312,8 @@ | ||
| 1288 | </view> | 1312 | </view> |
| 1289 | </view> | 1313 | </view> |
| 1290 | </view> | 1314 | </view> |
| 1291 | - <view class="cx-confirm flex-center" data-coupon='0' bindtap="switchCoupon"> | ||
| 1292 | - <view class="confirm t-c">确定</view> | 1315 | + <view class="cx-confirm pd20" data-coupon='0' bindtap="switchCoupon"> |
| 1316 | + <view class="confirm t-c">关闭</view> | ||
| 1293 | </view> | 1317 | </view> |
| 1294 | </view> | 1318 | </view> |
| 1295 | </view> | 1319 | </view> |
pages/goods/goodsInfo/goodsInfo.wxss
| @@ -12,12 +12,13 @@ image { | @@ -12,12 +12,13 @@ image { | ||
| 12 | /* height: 80rpx; */ | 12 | /* height: 80rpx; */ |
| 13 | /* margin-bottom: 20rpx; */ | 13 | /* margin-bottom: 20rpx; */ |
| 14 | background-color: #fff; | 14 | background-color: #fff; |
| 15 | + border-top: 2rpx solid #ebedf0; | ||
| 15 | /* border-bottom: 1rpx #fafafa solid; */ | 16 | /* border-bottom: 1rpx #fafafa solid; */ |
| 16 | } | 17 | } |
| 17 | .type-box { | 18 | .type-box { |
| 18 | width: 25%; | 19 | width: 25%; |
| 19 | box-sizing: border-box; | 20 | box-sizing: border-box; |
| 20 | - font-size: 28rpx; | 21 | + font-size: 32rpx; |
| 21 | line-height: 76rpx; | 22 | line-height: 76rpx; |
| 22 | padding: 0 20rpx; | 23 | padding: 0 20rpx; |
| 23 | text-align: center; | 24 | text-align: center; |
| @@ -53,19 +54,21 @@ image { | @@ -53,19 +54,21 @@ image { | ||
| 53 | } | 54 | } |
| 54 | .goods-title { | 55 | .goods-title { |
| 55 | display: flex; | 56 | display: flex; |
| 56 | - justify-content: space-between; overflow: hidden; | 57 | + justify-content: space-between; |
| 58 | + /* overflow: hidden; */ | ||
| 57 | /* height: 108rpx; */ | 59 | /* height: 108rpx; */ |
| 58 | } | 60 | } |
| 59 | .goods-name { | 61 | .goods-name { |
| 60 | - width: 560rpx; | ||
| 61 | - line-height: 46rpx; | 62 | + /* width: 560rpx; */ |
| 63 | + /* line-height: 46rpx; */ | ||
| 62 | font-size: 32rpx; | 64 | font-size: 32rpx; |
| 63 | font-weight: bold; | 65 | font-weight: bold; |
| 64 | color: #333; | 66 | color: #333; |
| 65 | - margin-top: 30rpx; | ||
| 66 | - margin-bottom:30rpx; | 67 | + /* margin-top: 30rpx; |
| 68 | + margin-bottom:30rpx; */ | ||
| 67 | flex: 1; | 69 | flex: 1; |
| 68 | text-align: justify; | 70 | text-align: justify; |
| 71 | + margin: 10rpx 0 20rpx; | ||
| 69 | } | 72 | } |
| 70 | 73 | ||
| 71 | .goods-collect { | 74 | .goods-collect { |
| @@ -89,13 +92,13 @@ image { | @@ -89,13 +92,13 @@ image { | ||
| 89 | .goods-price { | 92 | .goods-price { |
| 90 | font-size: 60rpx; | 93 | font-size: 60rpx; |
| 91 | /* padding: 20rpx 34rpx; */ | 94 | /* padding: 20rpx 34rpx; */ |
| 92 | - padding:0rpx 34rpx; | 95 | + /* padding:0rpx 34rpx; */ |
| 93 | /* line-height: 60rpx; */ | 96 | /* line-height: 60rpx; */ |
| 94 | color: #999; | 97 | color: #999; |
| 95 | - | 98 | + padding: 20rpx; |
| 96 | /* margin-top: 46rpx; */ | 99 | /* margin-top: 46rpx; */ |
| 97 | - margin-top:26rpx; | ||
| 98 | - padding-bottom:20rpx; | 100 | + /* margin-top:26rpx; |
| 101 | + padding-bottom:20rpx; */ | ||
| 99 | } | 102 | } |
| 100 | 103 | ||
| 101 | .prom-info { | 104 | .prom-info { |
| @@ -111,13 +114,13 @@ image { | @@ -111,13 +114,13 @@ image { | ||
| 111 | border-radius: 4rpx; | 114 | border-radius: 4rpx; |
| 112 | } | 115 | } |
| 113 | .market-price { | 116 | .market-price { |
| 114 | - display: flex; | ||
| 115 | - margin-left: -5rpx; | 117 | + /* display: flex; |
| 118 | + margin-left: -5rpx; */ | ||
| 116 | } | 119 | } |
| 117 | 120 | ||
| 118 | .market-price .yuan{ | 121 | .market-price .yuan{ |
| 119 | - top:24rpx; | ||
| 120 | - font-size: 36rpx | 122 | + /* top:24rpx; */ |
| 123 | + font-size: 30rpx | ||
| 121 | } | 124 | } |
| 122 | 125 | ||
| 123 | .market-price>view>text { | 126 | .market-price>view>text { |
| @@ -125,7 +128,8 @@ image { | @@ -125,7 +128,8 @@ image { | ||
| 125 | } | 128 | } |
| 126 | 129 | ||
| 127 | .market-price>.yj{ | 130 | .market-price>.yj{ |
| 128 | - color: #999999; font-size: 26rpx;margin-left: 16rpx;position: relative;top:30rpx; | 131 | + color: #999999; font-size: 24rpx;/* margin-left: 16rpx;position: relative;top:30rpx; */ |
| 132 | + display: inline-block; | ||
| 129 | } | 133 | } |
| 130 | 134 | ||
| 131 | .goods-price>.tm{ color: #999999; font-size: 26rpx;margin-top: 10rpx;} | 135 | .goods-price>.tm{ color: #999999; font-size: 26rpx;margin-top: 10rpx;} |
| @@ -951,8 +955,8 @@ left:31rpx;} | @@ -951,8 +955,8 @@ left:31rpx;} | ||
| 951 | white-space:nowrap; | 955 | white-space:nowrap; |
| 952 | } | 956 | } |
| 953 | 957 | ||
| 954 | -.tuwen_title{ height: 86rpx; background-color:#eeeeee; margin-bottom: 32rpx; position: relative; | ||
| 955 | - display: flex; justify-content: center;align-items: center; } | 958 | +.tuwen_title{ /* height: 86rpx; */ background-color:#eeeeee; /* margin-bottom: 32rpx; */ position: relative; |
| 959 | + display: flex; justify-content: center;align-items: center; padding: 20rpx;} | ||
| 956 | 960 | ||
| 957 | .tuwen_title .g_line{ | 961 | .tuwen_title .g_line{ |
| 958 | width:496rpx; | 962 | width:496rpx; |
| @@ -964,27 +968,28 @@ left:31rpx;} | @@ -964,27 +968,28 @@ left:31rpx;} | ||
| 964 | overflow: hidden; justify-content: center;align-items: center; | 968 | overflow: hidden; justify-content: center;align-items: center; |
| 965 | } | 969 | } |
| 966 | .tuwen_title .center_s image{ width: 34rpx; height: 26rpx; margin-right: 10rpx} | 970 | .tuwen_title .center_s image{ width: 34rpx; height: 26rpx; margin-right: 10rpx} |
| 967 | -.t_g_info{ margin: 0 34rpx;margin-bottom: 20rpx; display: flex; align-items: center } | 971 | +.t_g_info{ /* margin: 0 34rpx;margin-bottom: 20rpx; */ display: flex; align-items: center;padding: 20rpx; } |
| 968 | .red_shu{ width: 10rpx; height: 36rpx; background-color:#da0035; margin-right: 8rpx; } | 972 | .red_shu{ width: 10rpx; height: 36rpx; background-color:#da0035; margin-right: 8rpx; } |
| 969 | 973 | ||
| 970 | -.tb-l{ line-height: 96rpx;} | ||
| 971 | -.table_s{ border:#e4e4e4 1rpx solid; width: 682rpx; margin: 0 34rpx;font-size: 30rpx;} | ||
| 972 | -.tb_item{display: flex; height: 96rpx; border-bottom: 1rpx solid #e4e4e4 } | ||
| 973 | -.item_left{width: 214rpx; height: 100%; background: #f9f9f9 ;border-right:1rpx solid #e4e4e4} .item_left text{ margin-left: 44rpx;} | ||
| 974 | -.item_right{width: 468rpx; height: 100%; overflow : hidden;white-space:nowrap; | ||
| 975 | - text-overflow: ellipsis;} | ||
| 976 | -.item_right text{ margin-left: 66rpx;} | 974 | +.tb-l{ /* line-height: 96rpx; */} |
| 975 | +.table_s{ border:#e4e4e4 1rpx solid; box-sizing: border-box;font-size: 26rpx;} | ||
| 976 | +.tb_item{display: flex; /* height: 96rpx; */ border-bottom: 1rpx solid #e4e4e4 } | ||
| 977 | +.item_left{width: 210rpx; height: 100%; box-sizing:border-box; text-align: center;padding: 20rpx; background: #f9f9f9 ;border-right:2rpx solid #e4e4e4} .item_left text{ /* margin-left: 44rpx; */} | ||
| 978 | +.item_right{flex:1; height: 100%; overflow : hidden;white-space:nowrap;text-overflow: ellipsis; padding: 20rpx;} | ||
| 979 | +.item_right text{ /* margin-left: 66rpx; */} | ||
| 980 | + | ||
| 981 | +.table_s .tb-l:last-child {border-bottom: none;} | ||
| 977 | 982 | ||
| 978 | -.bzfu_img{ width: 164rpx; height:34rpx; margin-right: 18rpx; margin-left: 12rpx } | ||
| 979 | - .bz_view{ height:100rpx; padding: 0 34rpx 0 13rpx; color: #333; font-size: 28rpx; | 983 | +.bzfu_img{ width: 164rpx; height:34rpx; /* margin-right: 18rpx; margin-left: 12rpx */ } |
| 984 | + .bz_view{ /* height:100rpx; padding: 0 34rpx 0 13rpx; */ color: #333; font-size: 28rpx; padding: 20rpx; | ||
| 980 | /* border-bottom: 3rpx solid #eee; */ | 985 | /* border-bottom: 3rpx solid #eee; */ |
| 981 | /* border-top: 3rpx solid #eee; */} | 986 | /* border-top: 3rpx solid #eee; */} |
| 982 | .bz_view view{ width: 460rpx; max-height: 70rpx; overflow: hidden;} | 987 | .bz_view view{ width: 460rpx; max-height: 70rpx; overflow: hidden;} |
| 983 | 988 | ||
| 984 | -.bb_view{ display: flex;align-items: center;justify-content: space-between; padding: 0 34rpx; color: #333; | ||
| 985 | - font-size: 30rpx; height: 104rpx; line-height: 104rpx; overflow: hidden; padding-right:26rpx } | ||
| 986 | -.red_bb{ color: #d70026; min-width:158rpx;width: auto;} | ||
| 987 | -.bg_jj{ width: 18rpx; height:18rpx; | 989 | +.bb_view{ display: flex;align-items: center;justify-content: space-between; padding: 20rpx; color: #333; |
| 990 | + font-size: 30rpx; /* height: 104rpx; line-height: 104rpx; overflow: hidden; padding-right:26rpx */ } | ||
| 991 | +.red_bb{ color: #d70026; /* min-width:158rpx;width: auto; */} | ||
| 992 | +.bg_jj{ width: 14rpx; height:14rpx; | ||
| 988 | border-top: 2rpx solid #d70026; | 993 | border-top: 2rpx solid #d70026; |
| 989 | border-right: 2rpx solid #d70026; | 994 | border-right: 2rpx solid #d70026; |
| 990 | transform: rotate(45deg);display:inline-block; | 995 | transform: rotate(45deg);display:inline-block; |
| @@ -995,6 +1000,7 @@ left:31rpx;} | @@ -995,6 +1000,7 @@ left:31rpx;} | ||
| 995 | .bz-content { | 1000 | .bz-content { |
| 996 | flex-grow: 1; | 1001 | flex-grow: 1; |
| 997 | text-align: justify; | 1002 | text-align: justify; |
| 1003 | + padding: 0 20rpx; | ||
| 998 | } | 1004 | } |
| 999 | 1005 | ||
| 1000 | /* 顶部边框 */ | 1006 | /* 顶部边框 */ |
| @@ -1195,20 +1201,23 @@ left:31rpx;} | @@ -1195,20 +1201,23 @@ left:31rpx;} | ||
| 1195 | 1201 | ||
| 1196 | .xc_comment{ | 1202 | .xc_comment{ |
| 1197 | display: flex; | 1203 | display: flex; |
| 1204 | + justify-content: space-around; | ||
| 1198 | width: 100%; | 1205 | width: 100%; |
| 1199 | - height: 42rpx; | ||
| 1200 | - padding-left: 34rpx; | 1206 | + box-sizing: border-box; |
| 1207 | + padding: 10rpx 20rpx; | ||
| 1208 | + /* height: 42rpx; | ||
| 1209 | + padding-left: 34rpx; */ | ||
| 1201 | color: #333; | 1210 | color: #333; |
| 1202 | 1211 | ||
| 1203 | } | 1212 | } |
| 1204 | .xc_comment-have-pictures{ | 1213 | .xc_comment-have-pictures{ |
| 1205 | width: 153rpx; | 1214 | width: 153rpx; |
| 1206 | - height: 42rpx; | 1215 | + /* height: 42rpx; */ |
| 1207 | line-height: 42rpx; | 1216 | line-height: 42rpx; |
| 1208 | text-align: center; | 1217 | text-align: center; |
| 1209 | background: #ffe3e2; | 1218 | background: #ffe3e2; |
| 1210 | color: 28rpx; | 1219 | color: 28rpx; |
| 1211 | - border-radius:20rpx; | 1220 | + border-radius:21rpx; |
| 1212 | font-size: 24rpx; | 1221 | font-size: 24rpx; |
| 1213 | } | 1222 | } |
| 1214 | .xc_comment-discuss{ | 1223 | .xc_comment-discuss{ |
| @@ -1225,22 +1234,25 @@ left:31rpx;} | @@ -1225,22 +1234,25 @@ left:31rpx;} | ||
| 1225 | 1234 | ||
| 1226 | .xc_comment-detail{ | 1235 | .xc_comment-detail{ |
| 1227 | display: flex; | 1236 | display: flex; |
| 1228 | - margin-top: 40rpx; | ||
| 1229 | - width: 524rpx; | ||
| 1230 | - margin-left: 34rpx; | ||
| 1231 | - border-radius: 25rpx; | ||
| 1232 | - border: 2rpx solid #d6d4d5; | ||
| 1233 | - overflow: hidden; | 1237 | + /* margin-top: 40rpx; */ |
| 1238 | + /* width: 524rpx; */ | ||
| 1239 | + /* margin-left: 34rpx; */ | ||
| 1240 | + border-radius: 24rpx; | ||
| 1241 | + border: 2rpx solid #ebedf0; | ||
| 1242 | + margin-left: 20rpx; | ||
| 1243 | + box-sizing: border-box; | ||
| 1244 | + /* overflow: hidden; */ | ||
| 1234 | } | 1245 | } |
| 1235 | 1246 | ||
| 1236 | .xc_user-img{ | 1247 | .xc_user-img{ |
| 1237 | - border-radius:50%; | 1248 | + border-radius:50%; |
| 1249 | + margin: auto 0; | ||
| 1238 | } | 1250 | } |
| 1239 | 1251 | ||
| 1240 | .xc_comment-user{ | 1252 | .xc_comment-user{ |
| 1241 | display: flex; | 1253 | display: flex; |
| 1242 | - margin-top: 22rpx; | ||
| 1243 | - margin-left: 22rpx; | 1254 | + /* margin-top: 22rpx; |
| 1255 | + margin-left: 22rpx; */ | ||
| 1244 | } | 1256 | } |
| 1245 | .xc_user{ | 1257 | .xc_user{ |
| 1246 | width: 170rpx; | 1258 | width: 170rpx; |
| @@ -1248,34 +1260,34 @@ left:31rpx;} | @@ -1248,34 +1260,34 @@ left:31rpx;} | ||
| 1248 | margin-left: 6rpx; | 1260 | margin-left: 6rpx; |
| 1249 | overflow: hidden; | 1261 | overflow: hidden; |
| 1250 | } | 1262 | } |
| 1251 | -.xc_user-name{ height: 25rpx;} | 1263 | +.xc_user-name{ /* height: 25rpx; */} |
| 1252 | .xc_comment-img{ | 1264 | .xc_comment-img{ |
| 1253 | width: 22rpx; | 1265 | width: 22rpx; |
| 1254 | height: 22rpx; | 1266 | height: 22rpx; |
| 1255 | - margin-top: 14rpx; | 1267 | + /* margin-top: 14rpx; */ |
| 1256 | margin-right: 5rpx | 1268 | margin-right: 5rpx |
| 1257 | } | 1269 | } |
| 1258 | .xc_comment-font{ | 1270 | .xc_comment-font{ |
| 1259 | - height: 75rpx; | ||
| 1260 | - margin-left: 22rpx; | 1271 | + /* height: 75rpx; */ |
| 1272 | + /* margin-left: 22rpx; */ | ||
| 1261 | white-space:normal; | 1273 | white-space:normal; |
| 1262 | overflow: hidden; | 1274 | overflow: hidden; |
| 1263 | - margin-top: 8rpx; | ||
| 1264 | - line-height: 38rpx; | 1275 | + /* margin-top: 8rpx; |
| 1276 | + line-height: 38rpx; */ | ||
| 1265 | 1277 | ||
| 1266 | } | 1278 | } |
| 1267 | .xc_comment-val{ | 1279 | .xc_comment-val{ |
| 1268 | - width: 88%; | 1280 | + /* width: 88%; |
| 1269 | height: 30rpx; | 1281 | height: 30rpx; |
| 1270 | margin-left: 22rpx; | 1282 | margin-left: 22rpx; |
| 1271 | display: flex; | 1283 | display: flex; |
| 1272 | margin-top: 15rpx; | 1284 | margin-top: 15rpx; |
| 1273 | - margin-bottom:15rpx; | 1285 | + margin-bottom:15rpx; */ |
| 1274 | } | 1286 | } |
| 1275 | 1287 | ||
| 1276 | .xc_comment-time{ | 1288 | .xc_comment-time{ |
| 1277 | - height: 30rpx; | ||
| 1278 | - font-size: 24rpx; | 1289 | + /* height: 30rpx; */ |
| 1290 | + font-size: 22rpx; | ||
| 1279 | color: #a5a5a5; | 1291 | color: #a5a5a5; |
| 1280 | overflow: hidden; | 1292 | overflow: hidden; |
| 1281 | } | 1293 | } |
| @@ -1286,14 +1298,17 @@ left:31rpx;} | @@ -1286,14 +1298,17 @@ left:31rpx;} | ||
| 1286 | .xc_comment-left{ | 1298 | .xc_comment-left{ |
| 1287 | display:inline-block; | 1299 | display:inline-block; |
| 1288 | width: 312rpx; | 1300 | width: 312rpx; |
| 1301 | + padding: 20rpx; | ||
| 1289 | } | 1302 | } |
| 1290 | .xc_goods-img-frame{ | 1303 | .xc_goods-img-frame{ |
| 1291 | - display:inline-block; | ||
| 1292 | - width: 40%; | 1304 | + border-radius: 0 22rpx 22rpx 0; |
| 1305 | + overflow: hidden; | ||
| 1306 | + /* display:inline-block; */ | ||
| 1307 | + /* width: 40%; | ||
| 1293 | height: 90%; | 1308 | height: 90%; |
| 1294 | text-align: center; | 1309 | text-align: center; |
| 1295 | padding-top: 30rpx; | 1310 | padding-top: 30rpx; |
| 1296 | - vertical-align: top; | 1311 | + vertical-align: top; */ |
| 1297 | } | 1312 | } |
| 1298 | .xc_imgs{ | 1313 | .xc_imgs{ |
| 1299 | width: 50rpx; | 1314 | width: 50rpx; |
| @@ -1304,11 +1319,13 @@ left:31rpx;} | @@ -1304,11 +1319,13 @@ left:31rpx;} | ||
| 1304 | 1319 | ||
| 1305 | .pj_word_size{ font-size: 28rpx} | 1320 | .pj_word_size{ font-size: 28rpx} |
| 1306 | .pj_scroll{ | 1321 | .pj_scroll{ |
| 1307 | - white-space: nowrap; | 1322 | + /* white-space: nowrap; */ |
| 1308 | /* height: 324rpx; */ | 1323 | /* height: 324rpx; */ |
| 1309 | - margin-bottom: 50rpx; | 1324 | + /* margin-bottom: 50rpx; */ |
| 1310 | display: flex; | 1325 | display: flex; |
| 1311 | align-items: center; | 1326 | align-items: center; |
| 1327 | + padding: 20rpx 0; | ||
| 1328 | + /* box-sizing: border-box; */ | ||
| 1312 | /* box-shadow: 0 8px 12px #e7e9eb; */ | 1329 | /* box-shadow: 0 8px 12px #e7e9eb; */ |
| 1313 | } | 1330 | } |
| 1314 | 1331 | ||
| @@ -1322,57 +1339,61 @@ left:31rpx;} | @@ -1322,57 +1339,61 @@ left:31rpx;} | ||
| 1322 | } | 1339 | } |
| 1323 | .cx-frame{ | 1340 | .cx-frame{ |
| 1324 | /* border-top:3rpx solid #eee; */ | 1341 | /* border-top:3rpx solid #eee; */ |
| 1325 | - width:99%; | 1342 | + /* width:99%; |
| 1326 | height: 95rpx; | 1343 | height: 95rpx; |
| 1327 | line-height: 95rpx; | 1344 | line-height: 95rpx; |
| 1328 | - padding-left:24rpx; | ||
| 1329 | - | ||
| 1330 | - | 1345 | + padding-left:24rpx; */ |
| 1346 | + padding: 20rpx; | ||
| 1331 | } | 1347 | } |
| 1332 | .cx-frame .cx-sizs{ | 1348 | .cx-frame .cx-sizs{ |
| 1333 | - width: 68rpx; | ||
| 1334 | - height: 100%; | ||
| 1335 | - line-height: 100rpx; | ||
| 1336 | - overflow: hidden; | ||
| 1337 | - margin-left: 10rpx; | 1349 | + /* width: 68rpx; */ |
| 1350 | + /* height: 100%; */ | ||
| 1351 | + /* line-height: 100rpx; */ | ||
| 1352 | + /* overflow: hidden; */ | ||
| 1353 | + /* margin-left: 10rpx; */ | ||
| 1338 | } | 1354 | } |
| 1339 | .xc-coupon-fram{ | 1355 | .xc-coupon-fram{ |
| 1340 | position: relative; | 1356 | position: relative; |
| 1341 | - width:200rpx; | ||
| 1342 | - padding-top:30rpx; | 1357 | + margin-right: 16rpx; |
| 1358 | + /* width:200rpx; */ | ||
| 1359 | + /* padding-top:30rpx; */ | ||
| 1343 | 1360 | ||
| 1344 | } | 1361 | } |
| 1345 | .xc-coupon-fram .xc-coupon{ | 1362 | .xc-coupon-fram .xc-coupon{ |
| 1346 | - width:175rpx ; | 1363 | + /* width:175rpx ; |
| 1347 | height: 40rpx; | 1364 | height: 40rpx; |
| 1348 | - line-height: 40rpx; | 1365 | + line-height: 40rpx; */ |
| 1349 | background-color:#d60021 ; | 1366 | background-color:#d60021 ; |
| 1350 | - margin:0 auto; | 1367 | + /* margin:0 auto; */ |
| 1351 | color:#fff; | 1368 | color:#fff; |
| 1352 | - | 1369 | + padding: 6rpx 20rpx; |
| 1353 | 1370 | ||
| 1354 | } | 1371 | } |
| 1355 | .xc-coupon-fram .xc-circular{ | 1372 | .xc-coupon-fram .xc-circular{ |
| 1356 | - width: 22rpx; | ||
| 1357 | - height:22rpx; | ||
| 1358 | - background-color:#fff; | 1373 | + width: 16rpx; |
| 1374 | + height:16rpx; | ||
| 1375 | + background-color: white; | ||
| 1359 | position:absolute; | 1376 | position:absolute; |
| 1360 | - top: 40rpx; | 1377 | + top: 50%; |
| 1378 | + /* left: -10rpx; */ | ||
| 1379 | + transform: translateY(-50%); | ||
| 1361 | } | 1380 | } |
| 1362 | .xc-coupon-fram .xc-one{ | 1381 | .xc-coupon-fram .xc-one{ |
| 1363 | - left:3rpx; | 1382 | + left: -8rpx; |
| 1364 | } | 1383 | } |
| 1365 | .xc-coupon-fram .xc-two{ | 1384 | .xc-coupon-fram .xc-two{ |
| 1366 | - left: 178rpx; | 1385 | + right: -8rpx; |
| 1367 | } | 1386 | } |
| 1368 | 1387 | ||
| 1369 | .cx-obtain-coupon{ | 1388 | .cx-obtain-coupon{ |
| 1370 | - width: 65rpx; | 1389 | + /* width: 65rpx; |
| 1371 | height: 100%; | 1390 | height: 100%; |
| 1372 | - padding-left:15rpx; | 1391 | + padding-left:15rpx; */ |
| 1373 | color: #d70025; | 1392 | color: #d70025; |
| 1374 | - position: absolute; | ||
| 1375 | - right: 5rpx; | 1393 | + display: flex; |
| 1394 | + align-items: center; | ||
| 1395 | + /* position: absolute; | ||
| 1396 | + right: 5rpx; */ | ||
| 1376 | } | 1397 | } |
| 1377 | 1398 | ||
| 1378 | /* 自定义弹出窗口 */ | 1399 | /* 自定义弹出窗口 */ |
| @@ -1389,7 +1410,7 @@ left:31rpx;} | @@ -1389,7 +1410,7 @@ left:31rpx;} | ||
| 1389 | .cx-popup .top{ | 1410 | .cx-popup .top{ |
| 1390 | /* width: 90%; | 1411 | /* width: 90%; |
| 1391 | height:85rpx; */ | 1412 | height:85rpx; */ |
| 1392 | - font-size: 28rpx; | 1413 | + font-size: 32rpx; |
| 1393 | padding: 20rpx 0; | 1414 | padding: 20rpx 0; |
| 1394 | border-bottom: 2rpx solid #ebedf0; | 1415 | border-bottom: 2rpx solid #ebedf0; |
| 1395 | /* padding-top: 50rpx; | 1416 | /* padding-top: 50rpx; |
| @@ -1411,41 +1432,52 @@ left:31rpx;} | @@ -1411,41 +1432,52 @@ left:31rpx;} | ||
| 1411 | .xc-frame{ | 1432 | .xc-frame{ |
| 1412 | position: relative; | 1433 | position: relative; |
| 1413 | } | 1434 | } |
| 1414 | -.xc-coupon-frame{ | ||
| 1415 | - width: 90%; | 1435 | +.xc-coupon-frame { |
| 1436 | + width: 100%; | ||
| 1416 | max-height: 560rpx; | 1437 | max-height: 560rpx; |
| 1417 | overflow: auto; | 1438 | overflow: auto; |
| 1418 | 1439 | ||
| 1419 | } | 1440 | } |
| 1420 | -.xc-coupon-frame .coupon{ | ||
| 1421 | - width:99%; | 1441 | +.xc-coupon-frame .rel:not(:first-child) { |
| 1442 | + margin-top: 20rpx; | ||
| 1443 | +} | ||
| 1444 | +.xc-coupon-frame .coupon { | ||
| 1445 | + width:100%; | ||
| 1422 | height: 168rpx; | 1446 | height: 168rpx; |
| 1423 | border-radius: 25rpx; | 1447 | border-radius: 25rpx; |
| 1424 | - border:3rpx solid #ffdcdc; | 1448 | + border:2rpx solid #ffdcdc; |
| 1425 | overflow: hidden; | 1449 | overflow: hidden; |
| 1426 | - margin-top:16rpx; | 1450 | + /* margin-top:16rpx; */ |
| 1451 | + box-sizing: border-box; | ||
| 1427 | 1452 | ||
| 1428 | } | 1453 | } |
| 1454 | +/* .xc-coupon-frame .coupon ~ .coupon { | ||
| 1455 | + margin-top:16rpx; | ||
| 1456 | +} */ | ||
| 1429 | .xc-coupon-left{ | 1457 | .xc-coupon-left{ |
| 1430 | width: 216rpx; | 1458 | width: 216rpx; |
| 1431 | - height: 100%; | 1459 | + /* height: 100%; */ |
| 1432 | background-color: #ffeeef; | 1460 | background-color: #ffeeef; |
| 1433 | border-right: 4rpx dashed #ffdbd9; | 1461 | border-right: 4rpx dashed #ffdbd9; |
| 1434 | overflow: hidden; | 1462 | overflow: hidden; |
| 1435 | - line-height: 100%; | ||
| 1436 | - | 1463 | + /* line-height: 100%; */ |
| 1464 | + display: flex; | ||
| 1465 | + flex-direction: column; | ||
| 1466 | + justify-content: center; | ||
| 1467 | + align-items: center; | ||
| 1468 | + flex-shrink: 0; | ||
| 1437 | } | 1469 | } |
| 1438 | .xc-money{ | 1470 | .xc-money{ |
| 1439 | color: #f30026; | 1471 | color: #f30026; |
| 1440 | text-align:center; | 1472 | text-align:center; |
| 1441 | } | 1473 | } |
| 1442 | .xc-rmb{ | 1474 | .xc-rmb{ |
| 1443 | - width:44rpx; | ||
| 1444 | - padding-top:7rpx; | 1475 | + /* width:44rpx; |
| 1476 | + padding-top:7rpx; */ | ||
| 1445 | } | 1477 | } |
| 1446 | .xc-money-frame{ | 1478 | .xc-money-frame{ |
| 1447 | - margin-left:35rpx; | ||
| 1448 | - margin-top:48rpx; | 1479 | + /* margin-left:35rpx; |
| 1480 | + margin-top:48rpx; */ | ||
| 1449 | 1481 | ||
| 1450 | } | 1482 | } |
| 1451 | .xc-spacing{ | 1483 | .xc-spacing{ |
| @@ -1453,45 +1485,52 @@ left:31rpx;} | @@ -1453,45 +1485,52 @@ left:31rpx;} | ||
| 1453 | } | 1485 | } |
| 1454 | .xc-circular-one{ | 1486 | .xc-circular-one{ |
| 1455 | position: absolute; | 1487 | position: absolute; |
| 1456 | - top:-8rpx; | ||
| 1457 | - left:208rpx; | ||
| 1458 | - width: 27rpx; | 1488 | + top:-15rpx; |
| 1489 | + left:205rpx; | ||
| 1490 | + width: 30rpx; | ||
| 1459 | height: 30rpx; | 1491 | height: 30rpx; |
| 1460 | background: #fff; | 1492 | background: #fff; |
| 1461 | overflow: hidden; | 1493 | overflow: hidden; |
| 1462 | } | 1494 | } |
| 1463 | .xc-circular-two{ | 1495 | .xc-circular-two{ |
| 1464 | position: absolute; | 1496 | position: absolute; |
| 1465 | - top:150rpx; | ||
| 1466 | - left:207rpx; | ||
| 1467 | - width: 27rpx; | 1497 | + bottom: -15rpx; |
| 1498 | + /* top:150rpx; */ | ||
| 1499 | + left:205rpx; | ||
| 1500 | + width: 30rpx; | ||
| 1468 | height:30rpx; | 1501 | height:30rpx; |
| 1469 | background: #fff; | 1502 | background: #fff; |
| 1470 | } | 1503 | } |
| 1471 | .xc-detail-coupon{ | 1504 | .xc-detail-coupon{ |
| 1472 | - margin-left: 22rpx; | 1505 | + /* margin-left: 22rpx; |
| 1473 | overflow: hidden; | 1506 | overflow: hidden; |
| 1474 | - padding-top: 43rpx; | ||
| 1475 | - | 1507 | + padding-top: 43rpx; */ |
| 1508 | + /* display: flex; | ||
| 1509 | + align-items: center; */ | ||
| 1476 | } | 1510 | } |
| 1477 | .xc-coupon-right{ | 1511 | .xc-coupon-right{ |
| 1478 | - width: 455rpx; | ||
| 1479 | - height: 100%; | 1512 | + /* width: 455rpx; |
| 1513 | + height: 100%; */ | ||
| 1480 | background: #fffaf9; | 1514 | background: #fffaf9; |
| 1515 | + padding: 20rpx; | ||
| 1516 | + box-sizing: border-box; | ||
| 1517 | + width: 100%; | ||
| 1518 | + justify-content: space-between; | ||
| 1519 | + align-items: center; | ||
| 1481 | } | 1520 | } |
| 1482 | .xc-below{ | 1521 | .xc-below{ |
| 1483 | - margin-top:22rpx; | 1522 | + margin-top:20rpx; |
| 1484 | 1523 | ||
| 1485 | } | 1524 | } |
| 1486 | .xc-get{ | 1525 | .xc-get{ |
| 1487 | 1526 | ||
| 1488 | - width: 132rpx; | ||
| 1489 | - height: 48rpx; | 1527 | + width: 140rpx; |
| 1528 | + /* height: 48rpx; */ | ||
| 1490 | color: #fff; | 1529 | color: #fff; |
| 1491 | text-align: center; | 1530 | text-align: center; |
| 1492 | - border-radius:20rpx; | ||
| 1493 | - line-height:48rpx; | ||
| 1494 | - margin-left:20rpx; | 1531 | + border-radius:27rpx; |
| 1532 | + line-height:54rpx; | ||
| 1533 | + /* margin-left:20rpx; */ | ||
| 1495 | } | 1534 | } |
| 1496 | 1535 | ||
| 1497 | .background{ | 1536 | .background{ |
| @@ -1509,16 +1548,19 @@ left:31rpx;} | @@ -1509,16 +1548,19 @@ left:31rpx;} | ||
| 1509 | 1548 | ||
| 1510 | .cx-confirm{ | 1549 | .cx-confirm{ |
| 1511 | width: 100%; | 1550 | width: 100%; |
| 1512 | - height: 160rpx; | 1551 | + padding: 20rpx; |
| 1552 | + box-sizing: border-box; | ||
| 1553 | + /* height: 160rpx; */ | ||
| 1513 | 1554 | ||
| 1514 | } | 1555 | } |
| 1515 | .cx-confirm .confirm{ | 1556 | .cx-confirm .confirm{ |
| 1516 | - width: 372rpx; | ||
| 1517 | - height: 60rpx; | ||
| 1518 | - background: #f40026; | 1557 | + /* width: 372rpx; |
| 1558 | + height: 60rpx; */ | ||
| 1559 | + background-color: #f40026; | ||
| 1519 | color: #fff; | 1560 | color: #fff; |
| 1520 | - border-radius:20rpx; | ||
| 1521 | - line-height:60rpx; | 1561 | + border-radius:10rpx; |
| 1562 | + line-height: 80rpx; | ||
| 1563 | + font-size: 28rpx; | ||
| 1522 | 1564 | ||
| 1523 | } | 1565 | } |
| 1524 | 1566 | ||
| @@ -1529,17 +1571,21 @@ left:31rpx;} | @@ -1529,17 +1571,21 @@ left:31rpx;} | ||
| 1529 | 1571 | ||
| 1530 | 1572 | ||
| 1531 | /* 分享 */ | 1573 | /* 分享 */ |
| 1574 | +.icon-share { | ||
| 1575 | + font-size: 46rpx; | ||
| 1576 | + color: #d60021; | ||
| 1577 | +} | ||
| 1532 | .xc-share-frame{ | 1578 | .xc-share-frame{ |
| 1533 | - width: 129rpx; | 1579 | + /* width: 129rpx; |
| 1534 | height: 48rpx; | 1580 | height: 48rpx; |
| 1535 | border-top-left-radius: 18rpx; | 1581 | border-top-left-radius: 18rpx; |
| 1536 | - border-bottom-left-radius: 18rpx; | ||
| 1537 | - background: #d60021; | ||
| 1538 | - position:absolute; | 1582 | + border-bottom-left-radius: 18rpx; */ |
| 1583 | + /* background: #d60021; */ | ||
| 1584 | + /* position:absolute; | ||
| 1539 | left:622rpx; | 1585 | left:622rpx; |
| 1540 | top:-37rpx; | 1586 | top:-37rpx; |
| 1541 | line-height:50rpx; | 1587 | line-height:50rpx; |
| 1542 | - margin-top:52rpx; | 1588 | + margin-top:52rpx; */ |
| 1543 | } | 1589 | } |
| 1544 | .xc-share-frame-jieti{ | 1590 | .xc-share-frame-jieti{ |
| 1545 | width: 129rpx; | 1591 | width: 129rpx; |
| @@ -1557,6 +1603,7 @@ left:31rpx;} | @@ -1557,6 +1603,7 @@ left:31rpx;} | ||
| 1557 | 1603 | ||
| 1558 | } | 1604 | } |
| 1559 | 1605 | ||
| 1606 | + | ||
| 1560 | .xc-share-frame .share-frame,.xc-share-frame-jieti .share-frame{ | 1607 | .xc-share-frame .share-frame,.xc-share-frame-jieti .share-frame{ |
| 1561 | width: 30rpx; | 1608 | width: 30rpx; |
| 1562 | height: 30rpx; | 1609 | height: 30rpx; |
| @@ -1777,7 +1824,7 @@ xc-ensure-div{ | @@ -1777,7 +1824,7 @@ xc-ensure-div{ | ||
| 1777 | padding-top: 24rpx; | 1824 | padding-top: 24rpx; |
| 1778 | overflow: hidden; | 1825 | overflow: hidden; |
| 1779 | } | 1826 | } |
| 1780 | -.xc-frame{ | 1827 | +.xc-frame { |
| 1781 | /* width: 100%; | 1828 | /* width: 100%; |
| 1782 | margin-top:20rpx; */ | 1829 | margin-top:20rpx; */ |
| 1783 | padding: 20rpx; | 1830 | padding: 20rpx; |
| @@ -1815,7 +1862,7 @@ xc-ensure-div{ | @@ -1815,7 +1862,7 @@ xc-ensure-div{ | ||
| 1815 | } | 1862 | } |
| 1816 | 1863 | ||
| 1817 | .xc-money-frame{ | 1864 | .xc-money-frame{ |
| 1818 | - margin-left:35rpx; | 1865 | + /* margin-left:35rpx; */ |
| 1819 | 1866 | ||
| 1820 | } | 1867 | } |
| 1821 | .xc-coupon-effect{ | 1868 | .xc-coupon-effect{ |
| @@ -2028,7 +2075,7 @@ xc-ensure-div{ | @@ -2028,7 +2075,7 @@ xc-ensure-div{ | ||
| 2028 | 2075 | ||
| 2029 | 2076 | ||
| 2030 | .wsize{font-size: 32rpx} | 2077 | .wsize{font-size: 32rpx} |
| 2031 | -.five-level-word{font-size: 28rpx;} | 2078 | +.five-level-word{font-size: 24rpx;} |
| 2032 | 2079 | ||
| 2033 | 2080 | ||
| 2034 | /*-- 推荐商品 --*/ | 2081 | /*-- 推荐商品 --*/ |
| @@ -2101,13 +2148,13 @@ padding-left:24rpx; | @@ -2101,13 +2148,13 @@ padding-left:24rpx; | ||
| 2101 | 2148 | ||
| 2102 | .xc-linellae-frame{ | 2149 | .xc-linellae-frame{ |
| 2103 | width: 100%; | 2150 | width: 100%; |
| 2104 | - height: 60rpx; | 2151 | + height: 80rpx; |
| 2105 | background: #f2f2f2; | 2152 | background: #f2f2f2; |
| 2106 | } | 2153 | } |
| 2107 | .xc-linellae-frame .xc-linellae{ | 2154 | .xc-linellae-frame .xc-linellae{ |
| 2108 | width: 386rpx; | 2155 | width: 386rpx; |
| 2109 | height: 1rpx; | 2156 | height: 1rpx; |
| 2110 | - border-bottom: 1rpx solid #a5a5a5; | 2157 | + border-bottom: 1rpx solid #ebedf0; |
| 2111 | } | 2158 | } |
| 2112 | .xc-recommend-frame{ | 2159 | .xc-recommend-frame{ |
| 2113 | background:#f2f2f2; | 2160 | background:#f2f2f2; |
| @@ -2130,7 +2177,8 @@ margin-top: 1rpx; | @@ -2130,7 +2177,8 @@ margin-top: 1rpx; | ||
| 2130 | } | 2177 | } |
| 2131 | .xc-price-frame{ | 2178 | .xc-price-frame{ |
| 2132 | color: #ec0022; | 2179 | color: #ec0022; |
| 2133 | -height:44rpx; | 2180 | + align-items: baseline; |
| 2181 | +/* height:44rpx; */ | ||
| 2134 | } | 2182 | } |
| 2135 | .xc-price-frame .sign{ | 2183 | .xc-price-frame .sign{ |
| 2136 | margin-top:19rpx; | 2184 | margin-top:19rpx; |
| @@ -2161,6 +2209,9 @@ padding-left:-4rpx; | @@ -2161,6 +2209,9 @@ padding-left:-4rpx; | ||
| 2161 | .xc-explain{ | 2209 | .xc-explain{ |
| 2162 | color:#292929; | 2210 | color:#292929; |
| 2163 | width:542rpx; | 2211 | width:542rpx; |
| 2212 | + margin: 10rpx 0 20rpx; | ||
| 2213 | + width: 100%; | ||
| 2214 | + font-weight: bold; | ||
| 2164 | } | 2215 | } |
| 2165 | .xc-item{width: 16%; font-size: 26rpx; color: #666;margin-right:5rpx;} | 2216 | .xc-item{width: 16%; font-size: 26rpx; color: #666;margin-right:5rpx;} |
| 2166 | .xc-item .yuan{ | 2217 | .xc-item .yuan{ |
| @@ -2266,9 +2317,9 @@ margin-top:5rpx; | @@ -2266,9 +2317,9 @@ margin-top:5rpx; | ||
| 2266 | } | 2317 | } |
| 2267 | .xc-goods-explain{ | 2318 | .xc-goods-explain{ |
| 2268 | width:100%; | 2319 | width:100%; |
| 2269 | - padding-left:30rpx; | 2320 | + /* padding-left:30rpx; |
| 2270 | margin-left:-9rpx; | 2321 | margin-left:-9rpx; |
| 2271 | - height: 150rpx | 2322 | + height: 150rpx */ |
| 2272 | } | 2323 | } |
| 2273 | .xc-partner-frame{ | 2324 | .xc-partner-frame{ |
| 2274 | border-bottom:2rpx solid #eee; | 2325 | border-bottom:2rpx solid #eee; |
| @@ -2296,41 +2347,43 @@ right:17rpx; top:55rpx; | @@ -2296,41 +2347,43 @@ right:17rpx; top:55rpx; | ||
| 2296 | /* border-top:1rpx solid #eee; */ | 2347 | /* border-top:1rpx solid #eee; */ |
| 2297 | width: 100%; | 2348 | width: 100%; |
| 2298 | height: auto; | 2349 | height: auto; |
| 2350 | + padding: 20rpx; | ||
| 2351 | + box-sizing: border-box; | ||
| 2299 | } | 2352 | } |
| 2300 | .on_height{ | 2353 | .on_height{ |
| 2301 | height: 90rpx; | 2354 | height: 90rpx; |
| 2302 | } | 2355 | } |
| 2303 | .sn_height{ | 2356 | .sn_height{ |
| 2304 | - min-height: 170rpx; height: auto;padding: 10rpx 0; | 2357 | + /* min-height: 170rpx; height: auto;padding: 10rpx 0; */ |
| 2305 | } | 2358 | } |
| 2306 | .xc-address_frame .address_frame{ | 2359 | .xc-address_frame .address_frame{ |
| 2307 | - width: 92%; | ||
| 2308 | -padding-left: 10rpx; | ||
| 2309 | -margin: auto; | 2360 | + width: 100%; |
| 2361 | +/* padding-left: 10rpx; | ||
| 2362 | +margin: auto; */ | ||
| 2310 | 2363 | ||
| 2311 | } | 2364 | } |
| 2312 | .shop_name{ | 2365 | .shop_name{ |
| 2313 | 2366 | ||
| 2314 | } | 2367 | } |
| 2315 | .stores-img{ | 2368 | .stores-img{ |
| 2316 | -width: 40rpx; | ||
| 2317 | - height: 35rpx; | 2369 | + width: 28rpx; |
| 2370 | + height: 28rpx; | ||
| 2318 | margin-right: 10rpx; | 2371 | margin-right: 10rpx; |
| 2319 | } | 2372 | } |
| 2320 | .shop_name{ | 2373 | .shop_name{ |
| 2321 | margin-right: 10rpx; | 2374 | margin-right: 10rpx; |
| 2322 | } | 2375 | } |
| 2323 | .address{ | 2376 | .address{ |
| 2324 | - width: 87%; | 2377 | + /* width: 100%; |
| 2325 | margin-top: 5rpx; | 2378 | margin-top: 5rpx; |
| 2326 | - margin-bottom: 5rpx; | 2379 | + margin-bottom: 5rpx; */ |
| 2327 | } | 2380 | } |
| 2328 | .distance{ | 2381 | .distance{ |
| 2329 | - padding-left: 15rpx; | ||
| 2330 | - padding-right: 15rpx; | 2382 | + padding-left: 20rpx; |
| 2383 | + padding-right: 20rpx; | ||
| 2331 | background: #eee; | 2384 | background: #eee; |
| 2332 | border-radius: 20rpx; | 2385 | border-radius: 20rpx; |
| 2333 | - margin-right: 5rpx; | 2386 | + /* margin-right: 5rpx; */ |
| 2334 | color: #999; | 2387 | color: #999; |
| 2335 | height: 38rpx; | 2388 | height: 38rpx; |
| 2336 | line-height: 38rpx; | 2389 | line-height: 38rpx; |
| @@ -2618,22 +2671,23 @@ button.custom-service::after{ | @@ -2618,22 +2671,23 @@ button.custom-service::after{ | ||
| 2618 | border: 0; | 2671 | border: 0; |
| 2619 | } | 2672 | } |
| 2620 | .no_store{color:#d60021; font-size: 26rpx;} | 2673 | .no_store{color:#d60021; font-size: 26rpx;} |
| 2621 | -.cx_show_view{ width: 580rpx; line-height: 30rpx; margin-bottom: 6rpx; } | 2674 | +.cx_show_view{ width: 580rpx; /* line-height: 30rpx; margin-bottom: 6rpx; */ } |
| 2622 | .cx_show_view .word{ width: 400rpx} | 2675 | .cx_show_view .word{ width: 400rpx} |
| 2623 | .prom_condition { | 2676 | .prom_condition { |
| 2624 | color: #d60021; | 2677 | color: #d60021; |
| 2625 | - width: 180rpx; | ||
| 2626 | - height: 30rpx; | 2678 | + /* width: 180rpx; */ |
| 2679 | + /* height: 30rpx; */ | ||
| 2627 | font-size: 20rpx; | 2680 | font-size: 20rpx; |
| 2628 | - padding-top: 0.01rpx; | ||
| 2629 | - display: flex; | 2681 | + /* padding-top: 0.01rpx; */ |
| 2682 | + /* display: flex; | ||
| 2630 | justify-content: center; | 2683 | justify-content: center; |
| 2631 | - align-items: center; | ||
| 2632 | - border: #d60021 solid 1rpx; | 2684 | + align-items: center; */ |
| 2685 | + border: 2rpx solid #d60021; | ||
| 2633 | border-radius: 10rpx; | 2686 | border-radius: 10rpx; |
| 2634 | margin-right:10rpx ; | 2687 | margin-right:10rpx ; |
| 2635 | - margin-left: 10rpx; | ||
| 2636 | - | 2688 | + /* margin-left: 10rpx; */ |
| 2689 | + font-size: 24rpx; | ||
| 2690 | + padding: 0 10rpx; | ||
| 2637 | } | 2691 | } |
| 2638 | .hui_img{ width: 44rpx; height: 44rpx; margin-right: 8rpx} | 2692 | .hui_img{ width: 44rpx; height: 44rpx; margin-right: 8rpx} |
| 2639 | .order_hui{color: #444; width: 420rpx} | 2693 | .order_hui{color: #444; width: 420rpx} |
pages/index/index/index.wxml
| @@ -163,7 +163,7 @@ | @@ -163,7 +163,7 @@ | ||
| 163 | <swiper-item wx:for="{{saleGoods}}" wx:key="{{index}}" class="p_swiper " wx:key="saleGoods"> | 163 | <swiper-item wx:for="{{saleGoods}}" wx:key="{{index}}" class="p_swiper " wx:key="saleGoods"> |
| 164 | <navigator class="mgl20" hover-class="none" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{aitem.goods_id}}" wx:for="{{item}}" wx:key="item" wx:for-item="aitem" wx:for-index="aind"> | 164 | <navigator class="mgl20" hover-class="none" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{aitem.goods_id}}" wx:for="{{item}}" wx:key="item" wx:for-item="aitem" wx:for-index="aind"> |
| 165 | <view class="imgview "> | 165 | <view class="imgview "> |
| 166 | - <image src="{{url+aitem.original_img}}" lazy-load="true" data-errorimg="saleGoods[{{index}}][{{aind}}].original_img" binderror="bind_bnerr3" data-img="{{aitem.original_img}}"></image> | 166 | + <image src="{{url+aitem.original_img}}" mode="aspectFill" lazy-load="true" data-errorimg="saleGoods[{{index}}][{{aind}}].original_img" binderror="bind_bnerr3" data-img="{{aitem.original_img}}"></image> |
| 167 | 167 | ||
| 168 | <image wx:if="{{aitem.status==0}}" class="status_img" src="{{url}}/miniapp/images/miao/yure.png"></image> | 168 | <image wx:if="{{aitem.status==0}}" class="status_img" src="{{url}}/miniapp/images/miao/yure.png"></image> |
| 169 | <image wx:if="{{aitem.status==1}}" class="status_img" src="{{url}}/miniapp/images/miao/going.png"></image> | 169 | <image wx:if="{{aitem.status==1}}" class="status_img" src="{{url}}/miniapp/images/miao/going.png"></image> |