Commit cc856530bd0a0f59441a839a01376f7eaae5ba21
1 parent
2fe4facd
商品详情修改
Showing
9 changed files
with
407 additions
and
292 deletions
app.json
| @@ -154,9 +154,11 @@ | @@ -154,9 +154,11 @@ | ||
| 154 | "pages/user/view_comment/view_comment", | 154 | "pages/user/view_comment/view_comment", |
| 155 | "pages/user/add_comment/add_comment", | 155 | "pages/user/add_comment/add_comment", |
| 156 | "pages/user/user_coupon/user_coupon", | 156 | "pages/user/user_coupon/user_coupon", |
| 157 | - "pages/user/buyDetails/buyDetails", | ||
| 158 | - "pages/evaluate/evaluate", | ||
| 159 | - "pages/evaluate_list/evaluate_list" | 157 | + "pages/user/buyDetails/buyDetails", |
| 158 | + "pages/evaluate/evaluate", | ||
| 159 | + "pages/evaluate_list/evaluate_list", | ||
| 160 | + "pages/luckactivity/luckinfo/luckinfo", | ||
| 161 | + "pages/luckactivity/index/index" | ||
| 160 | ] | 162 | ] |
| 161 | 163 | ||
| 162 | } | 164 | } |
packageA/pages/goodsInfo/goodsInfo.js
| @@ -2175,6 +2175,14 @@ Page({ | @@ -2175,6 +2175,14 @@ Page({ | ||
| 2175 | imageUrl:this.data.gallery[0].image_url, | 2175 | imageUrl:this.data.gallery[0].image_url, |
| 2176 | } | 2176 | } |
| 2177 | }, | 2177 | }, |
| 2178 | + | ||
| 2179 | + | ||
| 2180 | + | ||
| 2181 | + clickCollapse() { | ||
| 2182 | + this.setData({ | ||
| 2183 | + flag: !this.data.flag, | ||
| 2184 | + }) | ||
| 2185 | + }, | ||
| 2178 | 2186 | ||
| 2179 | 2187 | ||
| 2180 | 2188 |
packageA/pages/goodsInfo/goodsInfo.wxml
| @@ -39,7 +39,7 @@ | @@ -39,7 +39,7 @@ | ||
| 39 | <view class="goods-title"> <view class="goods-name elli">{{data.goods_name}}</view></view> | 39 | <view class="goods-title"> <view class="goods-name elli">{{data.goods_name}}</view></view> |
| 40 | </view> | 40 | </view> |
| 41 | 41 | ||
| 42 | - <view class="goods-num" style="margin-bottom: 10rpx;"> | 42 | + <view class="goods-num"> |
| 43 | <view class="sales">销量：{{data.sales_sum}}</view> | 43 | <view class="sales">销量：{{data.sales_sum}}</view> |
| 44 | <view class="sales">有效天数：{{data.validDays?data.validDays:'不限'}}</view> | 44 | <view class="sales">有效天数：{{data.validDays?data.validDays:'不限'}}</view> |
| 45 | </view> | 45 | </view> |
| @@ -55,7 +55,7 @@ | @@ -55,7 +55,7 @@ | ||
| 55 | <image class="stores-img" src="{{iurl}}/miniapp/images/stores.png"></image> | 55 | <image class="stores-img" src="{{iurl}}/miniapp/images/stores.png"></image> |
| 56 | <view class="fs30" style="color:black;">选择门店</view> | 56 | <view class="fs30" style="color:black;">选择门店</view> |
| 57 | </view> | 57 | </view> |
| 58 | - <view class="red_bb fs30"> | 58 | + <view class="red_bb fs26"> |
| 59 | 更多门店 | 59 | 更多门店 |
| 60 | <text class="bg_jj"></text> | 60 | <text class="bg_jj"></text> |
| 61 | </view> | 61 | </view> |
| @@ -86,28 +86,42 @@ | @@ -86,28 +86,42 @@ | ||
| 86 | 86 | ||
| 87 | </view> | 87 | </view> |
| 88 | 88 | ||
| 89 | - <view class="bz_view flex ai-center bdt16" wx:if="{{store_config}}" style="line-height: 36rpx"> | ||
| 90 | - <image class="bzfu_img" src="{{iurl}}/miniapp/images/bzfu_w.png"></image> | ||
| 91 | - <view class="bz-content">{{store_config.service_bz}}</view> | ||
| 92 | - </view> | 89 | + <view class="bz_view flex bdt16" wx:if="{{store_config}}"> |
| 90 | + <image class="bzfu_img" src="{{iurl}}/miniapp/images/bzfu_w.png"></image> | ||
| 91 | + <view class="flex f1 ai_c rel"> | ||
| 92 | + <view class="bz-content {{flag ? '':'ellipsis-1'}} f1">{{store_config.service_bz}}</view> | ||
| 93 | + <view bindtap="clickCollapse" class="cx-obtain-coupon wsize arrow"> | ||
| 94 | + <text class="bg_jj {{flag?'down1':''}}"></text> | ||
| 95 | + </view> | ||
| 96 | + <!-- <text class="bg_jj" bindtap="clickCollapse"></text> --> | ||
| 97 | + <!-- <text class="iconfont icon-shuangjiantouxia c-db"></text> --> | ||
| 98 | + </view> | ||
| 99 | + </view> | ||
| 100 | + | ||
| 101 | + | ||
| 102 | + | ||
| 103 | + | ||
| 104 | + | ||
| 105 | + | ||
| 106 | + | ||
| 93 | <!-- 图文详情 --> | 107 | <!-- 图文详情 --> |
| 94 | - <view> | ||
| 95 | - <view class="tuwen_title"> | 108 | + <view class="pd20"> |
| 109 | + <!-- <view class="tuwen_title"> | ||
| 96 | <view class="g_line"></view> | 110 | <view class="g_line"></view> |
| 97 | <view class="center_s"> | 111 | <view class="center_s"> |
| 98 | <image src="{{iurl}}/miniapp/images/tuwen_c.png"></image><text>详情</text> | 112 | <image src="{{iurl}}/miniapp/images/tuwen_c.png"></image><text>详情</text> |
| 99 | </view> | 113 | </view> |
| 100 | - </view> | 114 | + </view> --> |
| 101 | 115 | ||
| 102 | <view wx:if="{{service_list}}"> | 116 | <view wx:if="{{service_list}}"> |
| 103 | - <view class="goods-num" style="font-size: 26rpx; background-color: #f6f5f4;"> | 117 | + <view class="goods-num pdv20 t-c" style="font-size: 26rpx; background-color: #f6f5f4;"> |
| 104 | <view class="stock">项目名称</view> | 118 | <view class="stock">项目名称</view> |
| 105 | <view class="stock">耗时(分)</view> | 119 | <view class="stock">耗时(分)</view> |
| 106 | <view class="stock">手工费</view> | 120 | <view class="stock">手工费</view> |
| 107 | <view class="stock">次数</view> | 121 | <view class="stock">次数</view> |
| 108 | </view> | 122 | </view> |
| 109 | <block wx:for="{{service_list}}"> | 123 | <block wx:for="{{service_list}}"> |
| 110 | - <view class="goods-num" style="margin-bottom: 10rpx;font-size: 22rpx;"> | 124 | + <view class="goods-num pdv20 t-c" style="margin-bottom: 10rpx;font-size: 22rpx;"> |
| 111 | <view class="stock">{{item.projectName}}</view> | 125 | <view class="stock">{{item.projectName}}</view> |
| 112 | <view class="stock">{{item.timeConsuming}}</view> | 126 | <view class="stock">{{item.timeConsuming}}</view> |
| 113 | <view class="stock">{{item.money}}</view> | 127 | <view class="stock">{{item.money}}</view> |
| @@ -143,29 +157,33 @@ | @@ -143,29 +157,33 @@ | ||
| 143 | </view> | 157 | </view> |
| 144 | 158 | ||
| 145 | <!-- 底部按钮 --> | 159 | <!-- 底部按钮 --> |
| 146 | - <view class="join-cart"> | ||
| 147 | - <!-- bindtap="contactService" --> | ||
| 148 | - <button wx:if="{{sys_switch.weapp_customertype}}" class="custom-service cart-ico new_split" open-type="contact" session-from="wechat|{{userInfo.user_id}}|{{userInfo.nickname}}|{{userInfo.head_pic}}"> | ||
| 149 | - <image class="cs-img" src="{{iurl}}/miniapp/images/custom-service.png"></image> | ||
| 150 | - <view>客服</view> | ||
| 151 | - </button> | ||
| 152 | - <view wx:else class="custom-service cart-ico new_split" bindtap="contactService"> | ||
| 153 | - <image class="cs-img" src="{{iurl}}/miniapp/images/custom-service.png"></image> | ||
| 154 | - <view>客服</view> | ||
| 155 | - </view> | ||
| 156 | - | ||
| 157 | - <view class="shopping-cart cart-ico new_split"> | ||
| 158 | - <navigator open-type="switchTab" url="/pages/cart/cart/cart"> | ||
| 159 | - <image class="sc-img" src="{{iurl}}/miniapp/images/shopping-cart.png"></image> | ||
| 160 | - <view class="cart-num ellipsis-1"> {{cartGoodsNum}} </view> | ||
| 161 | - <view>购物车</view> | ||
| 162 | - </navigator> | ||
| 163 | - </view> | 160 | + <view class="join-cart jc_sb"> |
| 161 | + <!-- bindtap="contactService" --> | ||
| 162 | + <view class="flex"> | ||
| 163 | + <button wx:if="{{sys_switch.weapp_customertype}}" class="custom-service cart-ico new_split" open-type="contact" session-from="wechat|{{userInfo.user_id}}|{{userInfo.nickname}}|{{userInfo.head_pic}}"> | ||
| 164 | + <image class="cs-img" src="{{iurl}}/miniapp/images/custom-service.png"></image> | ||
| 165 | + <view>客服</view> | ||
| 166 | + </button> | ||
| 167 | + <view wx:else class="custom-service cart-ico new_split" bindtap="contactService"> | ||
| 168 | + <image class="cs-img" src="{{iurl}}/miniapp/images/custom-service.png"></image> | ||
| 169 | + <view>客服</view> | ||
| 170 | + </view> | ||
| 171 | + | ||
| 172 | + <view class="shopping-cart cart-ico new_split"> | ||
| 173 | + <navigator open-type="switchTab" url="/pages/cart/cart/cart"> | ||
| 174 | + <image class="sc-img" src="{{iurl}}/miniapp/images/shopping-cart.png"></image> | ||
| 175 | + <view class="cart-num ellipsis-1"> {{cartGoodsNum}} </view> | ||
| 176 | + <view>购物车</view> | ||
| 177 | + </navigator> | ||
| 178 | + </view> | ||
| 179 | + </view> | ||
| 180 | + | ||
| 164 | 181 | ||
| 165 | - <block> | ||
| 166 | - <view bindtap="openSpecModel" data-ind="1" class="join-btn cart-btn">加入购物车</view> | ||
| 167 | - <view bindtap="openSpecModel" data-ind="2" class="buy-btn cart-btn">立即购买</view> | ||
| 168 | - </block> | 182 | + <view class="flex f1 pdh20"> |
| 183 | + | ||
| 184 | + <view bindtap="openSpecModel" data-ind="1" class="join-btn cart-btn f1">加入购物车</view> | ||
| 185 | + <view bindtap="openSpecModel" data-ind="2" class="buy-btn cart-btn f1">立即购买</view> | ||
| 186 | + </view> | ||
| 169 | 187 | ||
| 170 | </view> | 188 | </view> |
| 171 | 189 |
packageA/pages/goodsInfo/goodsInfo.wxss
| @@ -9,15 +9,19 @@ image { | @@ -9,15 +9,19 @@ image { | ||
| 9 | display: flex; | 9 | display: flex; |
| 10 | justify-content: center; | 10 | justify-content: center; |
| 11 | width: 100%; | 11 | width: 100%; |
| 12 | + position: fixed; | ||
| 13 | + top: 0; | ||
| 14 | + z-index: 999; | ||
| 12 | /* height: 80rpx; */ | 15 | /* height: 80rpx; */ |
| 13 | /* margin-bottom: 20rpx; */ | 16 | /* margin-bottom: 20rpx; */ |
| 14 | background-color: #fff; | 17 | background-color: #fff; |
| 18 | + border-top: 2rpx solid #ebedf0; | ||
| 15 | /* border-bottom: 1rpx #fafafa solid; */ | 19 | /* border-bottom: 1rpx #fafafa solid; */ |
| 16 | } | 20 | } |
| 17 | .type-box { | 21 | .type-box { |
| 18 | width: 25%; | 22 | width: 25%; |
| 19 | box-sizing: border-box; | 23 | box-sizing: border-box; |
| 20 | - font-size: 28rpx; | 24 | + font-size: 32rpx; |
| 21 | line-height: 76rpx; | 25 | line-height: 76rpx; |
| 22 | padding: 0 20rpx; | 26 | padding: 0 20rpx; |
| 23 | text-align: center; | 27 | text-align: center; |
| @@ -29,12 +33,14 @@ image { | @@ -29,12 +33,14 @@ image { | ||
| 29 | display: flex; | 33 | display: flex; |
| 30 | justify-content: center; | 34 | justify-content: center; |
| 31 | width: 100%; | 35 | width: 100%; |
| 36 | + font-size: 26rpx; | ||
| 32 | } | 37 | } |
| 33 | .type-item-on { | 38 | .type-item-on { |
| 34 | color: #F95D74; | 39 | color: #F95D74; |
| 35 | font-weight: bold; | 40 | font-weight: bold; |
| 36 | /* border-bottom: 4rpx solid #F95D74; */ | 41 | /* border-bottom: 4rpx solid #F95D74; */ |
| 37 | position: relative; | 42 | position: relative; |
| 43 | + font-size: 30rpx; | ||
| 38 | } | 44 | } |
| 39 | .type-item-on:after { | 45 | .type-item-on:after { |
| 40 | content: ''; | 46 | content: ''; |
| @@ -53,19 +59,21 @@ image { | @@ -53,19 +59,21 @@ image { | ||
| 53 | } | 59 | } |
| 54 | .goods-title { | 60 | .goods-title { |
| 55 | display: flex; | 61 | display: flex; |
| 56 | - justify-content: space-between; overflow: hidden; | 62 | + justify-content: space-between; |
| 63 | + /* overflow: hidden; */ | ||
| 57 | /* height: 108rpx; */ | 64 | /* height: 108rpx; */ |
| 58 | } | 65 | } |
| 59 | .goods-name { | 66 | .goods-name { |
| 60 | - width: 560rpx; | ||
| 61 | - line-height: 46rpx; | 67 | + /* width: 560rpx; */ |
| 68 | + /* line-height: 46rpx; */ | ||
| 62 | font-size: 32rpx; | 69 | font-size: 32rpx; |
| 63 | font-weight: bold; | 70 | font-weight: bold; |
| 64 | color: #333; | 71 | color: #333; |
| 65 | - margin-top: 30rpx; | ||
| 66 | - margin-bottom:30rpx; | 72 | + /* margin-top: 30rpx; |
| 73 | + margin-bottom:30rpx; */ | ||
| 67 | flex: 1; | 74 | flex: 1; |
| 68 | text-align: justify; | 75 | text-align: justify; |
| 76 | + margin: 10rpx 0 20rpx; | ||
| 69 | } | 77 | } |
| 70 | 78 | ||
| 71 | .goods-collect { | 79 | .goods-collect { |
| @@ -89,13 +97,13 @@ image { | @@ -89,13 +97,13 @@ image { | ||
| 89 | .goods-price { | 97 | .goods-price { |
| 90 | font-size: 60rpx; | 98 | font-size: 60rpx; |
| 91 | /* padding: 20rpx 34rpx; */ | 99 | /* padding: 20rpx 34rpx; */ |
| 92 | - padding:0rpx 34rpx; | 100 | + /* padding:0rpx 34rpx; */ |
| 93 | /* line-height: 60rpx; */ | 101 | /* line-height: 60rpx; */ |
| 94 | color: #999; | 102 | color: #999; |
| 95 | - | 103 | + padding: 20rpx; |
| 96 | /* margin-top: 46rpx; */ | 104 | /* margin-top: 46rpx; */ |
| 97 | - margin-top:26rpx; | ||
| 98 | - padding-bottom:20rpx; | 105 | + /* margin-top:26rpx; |
| 106 | + padding-bottom:20rpx; */ | ||
| 99 | } | 107 | } |
| 100 | 108 | ||
| 101 | .prom-info { | 109 | .prom-info { |
| @@ -111,13 +119,13 @@ image { | @@ -111,13 +119,13 @@ image { | ||
| 111 | border-radius: 4rpx; | 119 | border-radius: 4rpx; |
| 112 | } | 120 | } |
| 113 | .market-price { | 121 | .market-price { |
| 114 | - display: flex; | ||
| 115 | - margin-left: -5rpx; | 122 | + /* display: flex; |
| 123 | + margin-left: -5rpx; */ | ||
| 116 | } | 124 | } |
| 117 | 125 | ||
| 118 | .market-price .yuan{ | 126 | .market-price .yuan{ |
| 119 | - top:24rpx; | ||
| 120 | - font-size: 36rpx | 127 | + /* top:24rpx; */ |
| 128 | + font-size: 30rpx | ||
| 121 | } | 129 | } |
| 122 | 130 | ||
| 123 | .market-price>view>text { | 131 | .market-price>view>text { |
| @@ -125,7 +133,8 @@ image { | @@ -125,7 +133,8 @@ image { | ||
| 125 | } | 133 | } |
| 126 | 134 | ||
| 127 | .market-price>.yj{ | 135 | .market-price>.yj{ |
| 128 | - color: #999999; font-size: 26rpx;margin-left: 16rpx;position: relative;top:30rpx; | 136 | + color: #999999; font-size: 24rpx;/* margin-left: 16rpx;position: relative;top:30rpx; */ |
| 137 | + display: inline-block; | ||
| 129 | } | 138 | } |
| 130 | 139 | ||
| 131 | .goods-price>.tm{ color: #999999; font-size: 26rpx;margin-top: 10rpx;} | 140 | .goods-price>.tm{ color: #999999; font-size: 26rpx;margin-top: 10rpx;} |
| @@ -134,6 +143,7 @@ image { | @@ -134,6 +143,7 @@ image { | ||
| 134 | display: flex; | 143 | display: flex; |
| 135 | font-size: 24rpx; | 144 | font-size: 24rpx; |
| 136 | justify-content: space-between; | 145 | justify-content: space-between; |
| 146 | + | ||
| 137 | } | 147 | } |
| 138 | 148 | ||
| 139 | .goods-detail .twen{ | 149 | .goods-detail .twen{ |
| @@ -348,11 +358,11 @@ image { | @@ -348,11 +358,11 @@ image { | ||
| 348 | } | 358 | } |
| 349 | 359 | ||
| 350 | .join-cart>view { | 360 | .join-cart>view { |
| 351 | - width: 32%; | 361 | + width: 29%; |
| 352 | } | 362 | } |
| 353 | 363 | ||
| 354 | .join-cart>.new_split { | 364 | .join-cart>.new_split { |
| 355 | - width: 17%; | 365 | + width: 13%; |
| 356 | text-align: center; | 366 | text-align: center; |
| 357 | padding: 0; | 367 | padding: 0; |
| 358 | margin: 0; | 368 | margin: 0; |
| @@ -551,29 +561,28 @@ border-radius: 0 56rpx 55rpx 0; | @@ -551,29 +561,28 @@ border-radius: 0 56rpx 55rpx 0; | ||
| 551 | /* padding: 0 30rpx; */ | 561 | /* padding: 0 30rpx; */ |
| 552 | font-size: 32rpx; | 562 | font-size: 32rpx; |
| 553 | box-sizing: border-box; | 563 | box-sizing: border-box; |
| 554 | - border-radius: 20rpx; | 564 | + border-radius: 20rpx 20rpx 0 0; |
| 555 | /* height: 72%; */ | 565 | /* height: 72%; */ |
| 556 | } | 566 | } |
| 557 | 567 | ||
| 558 | -.spec-model .pding{padding: 0 30rpx;} | 568 | +.spec-model .pding{padding: 0 20rpx;} |
| 559 | 569 | ||
| 560 | .spec-goods { | 570 | .spec-goods { |
| 561 | padding: 30rpx 0 20rpx; | 571 | padding: 30rpx 0 20rpx; |
| 562 | /* float: left; */ | 572 | /* float: left; */ |
| 563 | - display: flex; | ||
| 564 | width: 100%; | 573 | width: 100%; |
| 565 | border-bottom:2rpx solid #eee; | 574 | border-bottom:2rpx solid #eee; |
| 566 | } | 575 | } |
| 567 | 576 | ||
| 568 | .spec-img { | 577 | .spec-img { |
| 569 | - /* float: left; */ | 578 | + float: left; |
| 570 | height: 186rpx; | 579 | height: 186rpx; |
| 571 | width: 186rpx; | 580 | width: 186rpx; |
| 572 | border: 4rpx solid #eee | 581 | border: 4rpx solid #eee |
| 573 | } | 582 | } |
| 574 | 583 | ||
| 575 | .spec-goods-info { | 584 | .spec-goods-info { |
| 576 | - /* float: left; */ | 585 | + float: left; |
| 577 | padding: 0 25rpx; | 586 | padding: 0 25rpx; |
| 578 | width: 400rpx; | 587 | width: 400rpx; |
| 579 | } | 588 | } |
| @@ -608,14 +617,14 @@ border-radius: 0 56rpx 55rpx 0; | @@ -608,14 +617,14 @@ border-radius: 0 56rpx 55rpx 0; | ||
| 608 | 617 | ||
| 609 | .quhuo{font-size: 30rpx; color: #000} | 618 | .quhuo{font-size: 30rpx; color: #000} |
| 610 | .b_num{ | 619 | .b_num{ |
| 611 | - display: flex; | ||
| 612 | - font-size: 30rpx; | ||
| 613 | - color: #333; | ||
| 614 | - padding: 20rpx; | 620 | + display: flex;font-size: 30rpx; color: #333; |
| 621 | + justify-content: space-between; | ||
| 622 | + align-items: center; | ||
| 623 | + padding: 20rpx 0; | ||
| 615 | } | 624 | } |
| 616 | 625 | ||
| 617 | .count { | 626 | .count { |
| 618 | - position: fixed; | 627 | + /* position: fixed; */ |
| 619 | display: flex; | 628 | display: flex; |
| 620 | height: 50rpx; | 629 | height: 50rpx; |
| 621 | border: 1rpx solid #000; | 630 | border: 1rpx solid #000; |
| @@ -638,6 +647,10 @@ border-radius: 0 56rpx 55rpx 0; | @@ -638,6 +647,10 @@ border-radius: 0 56rpx 55rpx 0; | ||
| 638 | .sub { | 647 | .sub { |
| 639 | border-right: 1px solid #000; | 648 | border-right: 1px solid #000; |
| 640 | } | 649 | } |
| 650 | +.sub.active { | ||
| 651 | + /* background-color: #ddd; */ | ||
| 652 | + color: #ccc; | ||
| 653 | +} | ||
| 641 | 654 | ||
| 642 | .add { | 655 | .add { |
| 643 | border-left: 1px solid #000; | 656 | border-left: 1px solid #000; |
| @@ -662,14 +675,15 @@ border-radius: 0 56rpx 55rpx 0; | @@ -662,14 +675,15 @@ border-radius: 0 56rpx 55rpx 0; | ||
| 662 | } | 675 | } |
| 663 | 676 | ||
| 664 | .spec-cart-btns { | 677 | .spec-cart-btns { |
| 665 | - width: 92%; | 678 | + /* width: 92%; */ |
| 666 | line-height: 70rpx; | 679 | line-height: 70rpx; |
| 667 | - margin: 20rpx auto; | ||
| 668 | - /* margin-top: 160rpx; */ | ||
| 669 | - border-radius: 20rpx; | ||
| 670 | -/* position: fixed; | ||
| 671 | -bottom: 50rpx; | ||
| 672 | -left: 4%; */ | 680 | + /* margin: 0rpx auto; |
| 681 | + margin-top: 160rpx; */ | ||
| 682 | + /* border-radius: 20rpx; */ | ||
| 683 | +/* position: fixed; */ | ||
| 684 | +/* bottom: 50rpx; */ | ||
| 685 | +/* left: 4%; */ | ||
| 686 | + padding: 20rpx; | ||
| 673 | } | 687 | } |
| 674 | 688 | ||
| 675 | .spec-cart-btn { | 689 | .spec-cart-btn { |
| @@ -763,8 +777,8 @@ left:31rpx;} | @@ -763,8 +777,8 @@ left:31rpx;} | ||
| 763 | /*------拼单------*/ | 777 | /*------拼单------*/ |
| 764 | .pt_view{ text-align: center; width: 100%; height: 100rpx; line-height: 100rpx; font-size: 26rpx} | 778 | .pt_view{ text-align: center; width: 100%; height: 100rpx; line-height: 100rpx; font-size: 26rpx} |
| 765 | .pt_view .secondkill-img{width: 100%;height: 100%;} | 779 | .pt_view .secondkill-img{width: 100%;height: 100%;} |
| 766 | -.pt_fir{ background: #fff;margin-bottom: 10rpx; } | ||
| 767 | -.pt_fir .pt_fir_title{display: flex; align-items: center; margin-left: 10rpx; margin-top: 20rpx; font-size: 28rpx; position: relative;} | 780 | +.pt_fir{ background: #fff;/* margin-bottom: 10rpx; */} |
| 781 | +.pt_fir .pt_fir_title{display: flex; align-items: center; /* margin-left: 10rpx; margin-top: 20rpx; */ font-size: 28rpx; position: relative;} | ||
| 768 | .pt_fir .pt_fir_title .kt_type{ color: #fff;background:#e9030d; width: 100rpx; line-height: 40rpx; border-radius: 6rpx; margin: 0 10rpx; | 782 | .pt_fir .pt_fir_title .kt_type{ color: #fff;background:#e9030d; width: 100rpx; line-height: 40rpx; border-radius: 6rpx; margin: 0 10rpx; |
| 769 | height: 40rpx; font-size: 24rpx; text-align: center;} | 783 | height: 40rpx; font-size: 24rpx; text-align: center;} |
| 770 | .pt_fir .pt_fir_title .price{color: #e9030d;font-size: 26rpx;} | 784 | .pt_fir .pt_fir_title .price{color: #e9030d;font-size: 26rpx;} |
| @@ -786,7 +800,7 @@ left:31rpx;} | @@ -786,7 +800,7 @@ left:31rpx;} | ||
| 786 | .t_gz{padding: 10rpx 20rpx; font-size:28rpx } | 800 | .t_gz{padding: 10rpx 20rpx; font-size:28rpx } |
| 787 | 801 | ||
| 788 | .pt_fir.se1{height: auto; margin: 0} | 802 | .pt_fir.se1{height: auto; margin: 0} |
| 789 | -.pt_fir.se2{height: auto; margin: 0;border-top:6rpx solid #eeeeee;border-bottom:2rpx solid #eeeeee;} | 803 | +.pt_fir.se2{height: auto; margin: 0;/* border-top:6rpx solid #eeeeee;border-bottom:2rpx solid #eeeeee; */} |
| 790 | 804 | ||
| 791 | .pt_hb{height:78rpx; line-height: 75rpx; position: relative; font-size: 32rpx;overflow: hidden;width:695rpx;margin-left:28rpx; | 805 | .pt_hb{height:78rpx; line-height: 75rpx; position: relative; font-size: 32rpx;overflow: hidden;width:695rpx;margin-left:28rpx; |
| 792 | border-bottom: 1rpx solid #E5E5E5 } | 806 | border-bottom: 1rpx solid #E5E5E5 } |
| @@ -808,14 +822,14 @@ left:31rpx;} | @@ -808,14 +822,14 @@ left:31rpx;} | ||
| 808 | .pt_fir .pt_fir_title.no-mar-b{margin-bottom: 0;padding-bottom: 10rpx; margin-left: 20rpx} | 822 | .pt_fir .pt_fir_title.no-mar-b{margin-bottom: 0;padding-bottom: 10rpx; margin-left: 20rpx} |
| 809 | .pt_fir .pt_fir_title.boder-1{border-bottom: 1rpx #e7e7e7 solid} | 823 | .pt_fir .pt_fir_title.boder-1{border-bottom: 1rpx #e7e7e7 solid} |
| 810 | 824 | ||
| 811 | -.jie_price{padding: 10rpx 30rpx;} | 825 | +.jie_price{/* padding: 10rpx 30rpx; */} |
| 812 | .jie_price_title{font-size: 30rpx; color: #a26270; margin-bottom: 10rpx} | 826 | .jie_price_title{font-size: 30rpx; color: #a26270; margin-bottom: 10rpx} |
| 813 | .price_list{display: flex; width: 100%;} | 827 | .price_list{display: flex; width: 100%;} |
| 814 | .price_item{width: 25%;font-size: 28rpx; color: #4c336c} | 828 | .price_item{width: 25%;font-size: 28rpx; color: #4c336c} |
| 815 | 829 | ||
| 816 | -.pt_fir.se2 .zzk-1{margin-top: 23rpx; font-size: 30rpx;position: relative; margin-bottom: 30rpx; border-left:4rpx solid red;margin-left:14rpx;height:30rpx;line-height:30rpx;padding-left:5rpx;} | ||
| 817 | -.ckgd{position: absolute;top:0;right:57rpx; color:#d70025; font-size: 32rpx;} | ||
| 818 | -.ckgd .arrow-one{width:18rpx;height:18rpx;border-color:#da0b31;margin-top:5rpx;} | 830 | +.pt_fir.se2 .zzk-1{/* margin-top: 23rpx; */ font-size: 30rpx;position: relative; /* margin-bottom: 30rpx; */ border-left:4rpx solid red;/* margin-left:14rpx; */height:30rpx;line-height:30rpx;/* padding-left:5rpx; */} |
| 831 | +.ckgd{/* position: absolute;top:0;right:57rpx; */ color:#d70025; font-size: 26rpx;} | ||
| 832 | +.ckgd .arrow-one{width:14rpx;height:14rpx;border-color:#da0b31;/* margin-top:5rpx; */ margin:auto;} | ||
| 819 | .bview{ | 833 | .bview{ |
| 820 | position: fixed; top:0; left:0; width: 100%; height: 100%; | 834 | position: fixed; top:0; left:0; width: 100%; height: 100%; |
| 821 | background-color: rgba(0, 0, 0, 0.5); | 835 | background-color: rgba(0, 0, 0, 0.5); |
| @@ -842,65 +856,71 @@ left:31rpx;} | @@ -842,65 +856,71 @@ left:31rpx;} | ||
| 842 | 856 | ||
| 843 | /*---多少人参加团--*/ | 857 | /*---多少人参加团--*/ |
| 844 | .group { | 858 | .group { |
| 845 | - padding-top:25rpx; | ||
| 846 | - width: 91%; | ||
| 847 | - min-height: 92rpx; | ||
| 848 | - border-bottom:2rpx solid #eee; | ||
| 849 | - padding-bottom:25rpx; | 859 | + padding-top:20rpx; |
| 860 | + padding-bottom:20rpx; | ||
| 861 | + width: 100%; | ||
| 862 | + /* min-height: 92rpx; */ | ||
| 863 | + border-bottom: 2rpx solid #ebedf0; | ||
| 850 | 864 | ||
| 851 | } | 865 | } |
| 852 | 866 | ||
| 853 | .group .group-list { | 867 | .group .group-list { |
| 854 | - | ||
| 855 | - height: 90rpx; | ||
| 856 | - padding: 0 130rpx 0 100rpx; | ||
| 857 | - width: 470rpx; | 868 | + display: flex; |
| 869 | + align-items: center; | ||
| 870 | + justify-content: space-around; | ||
| 871 | + /* height: 90rpx; */ | ||
| 872 | + /* padding: 0 130rpx 0 100rpx; */ | ||
| 873 | + /* width: 470rpx; | ||
| 858 | 874 | ||
| 859 | - position: absolute; | 875 | + position: absolute; */ |
| 860 | } | 876 | } |
| 861 | 877 | ||
| 862 | .group .group-list .gtou { | 878 | .group .group-list .gtou { |
| 863 | - width: 80rpx; | ||
| 864 | - height: 80rpx; | ||
| 865 | - float: left; | 879 | + width: 70rpx; |
| 880 | + height: 70rpx; | ||
| 881 | + /* float: left; | ||
| 866 | position: relative; | 882 | position: relative; |
| 867 | top: 6rpx; | 883 | top: 6rpx; |
| 868 | - left: -96rpx; | 884 | + left: -96rpx; */ |
| 869 | } | 885 | } |
| 870 | 886 | ||
| 871 | .group .group-list .gtou image { | 887 | .group .group-list .gtou image { |
| 872 | - width: 80rpx; | ||
| 873 | - height: 80rpx; | ||
| 874 | - border-radius: 200rpx; | ||
| 875 | - background-color: green; | 888 | + display: block; |
| 889 | + width: 100%; | ||
| 890 | + height: 100%; | ||
| 891 | + border-radius: 50%; | ||
| 892 | + background-color: #f0f0f0; | ||
| 876 | } | 893 | } |
| 877 | 894 | ||
| 878 | .group .group-list .gdn { | 895 | .group .group-list .gdn { |
| 879 | - float: left; | 896 | + width: 140rpx; |
| 897 | + text-align: center; | ||
| 898 | + /* float: left; */ | ||
| 880 | font-size: 26rpx; | 899 | font-size: 26rpx; |
| 881 | - line-height: 48rpx; | 900 | + /* padding-left: 20rpx; */ |
| 901 | + /* line-height: 48rpx; | ||
| 882 | height: 48rpx; | 902 | height: 48rpx; |
| 883 | width: 168rpx; | 903 | width: 168rpx; |
| 884 | position: relative; | 904 | position: relative; |
| 885 | left: -80rpx; | 905 | left: -80rpx; |
| 886 | - top:20rpx; | ||
| 887 | - font-weight:600; | 906 | + top:20rpx; */ |
| 907 | + font-weight:bold; | ||
| 888 | } | 908 | } |
| 889 | 909 | ||
| 890 | .group .group-list .ghaicha { | 910 | .group .group-list .ghaicha { |
| 891 | - width:300rpx; | 911 | + /* width:300rpx; */ |
| 892 | font-size: 27rpx; | 912 | font-size: 27rpx; |
| 893 | - margin-left:180rpx; | 913 | + /* margin-left:180rpx; |
| 894 | top:13rpx; | 914 | top:13rpx; |
| 895 | - left:-3rpx; | ||
| 896 | - font-weight:600; | 915 | + left:-3rpx; */ |
| 916 | + font-weight: bold; | ||
| 897 | 917 | ||
| 898 | 918 | ||
| 899 | } | 919 | } |
| 900 | 920 | ||
| 901 | .group .group-list .ghaicha .gred { | 921 | .group .group-list .ghaicha .gred { |
| 902 | - height: 48rpx; | ||
| 903 | - width: 300rpx; | 922 | + /* height: 48rpx; |
| 923 | + width: 300rpx; */ | ||
| 904 | } | 924 | } |
| 905 | 925 | ||
| 906 | .gsj { | 926 | .gsj { |
| @@ -911,9 +931,9 @@ left:31rpx;} | @@ -911,9 +931,9 @@ left:31rpx;} | ||
| 911 | .group .group-list .cjt { | 931 | .group .group-list .cjt { |
| 912 | height:42rpx; | 932 | height:42rpx; |
| 913 | width: 137rpx; | 933 | width: 137rpx; |
| 914 | - position: absolute; | 934 | + /* position: absolute; |
| 915 | right: 4rpx; | 935 | right: 4rpx; |
| 916 | - top:25rpx; | 936 | + top:25rpx; */ |
| 917 | line-height: 42rpx; | 937 | line-height: 42rpx; |
| 918 | font-size: 24rpx; | 938 | font-size: 24rpx; |
| 919 | color: #fff; | 939 | color: #fff; |
| @@ -926,7 +946,7 @@ left:31rpx;} | @@ -926,7 +946,7 @@ left:31rpx;} | ||
| 926 | .gbody { | 946 | .gbody { |
| 927 | background-color: white; | 947 | background-color: white; |
| 928 | } | 948 | } |
| 929 | -.t_show{overflow: hidden; display: flex; width: 300rpx; color: #292929; line-height: 36rpx;font-size:26rpx; | 949 | +.t_show{/* overflow: hidden; */ display: flex; /* width: 300rpx; */ color: #292929; /* line-height: 36rpx; */font-size:26rpx; |
| 930 | } | 950 | } |
| 931 | .join-cart>view.set_width { | 951 | .join-cart>view.set_width { |
| 932 | width:58%; | 952 | width:58%; |
| @@ -955,8 +975,8 @@ left:31rpx;} | @@ -955,8 +975,8 @@ left:31rpx;} | ||
| 955 | white-space:nowrap; | 975 | white-space:nowrap; |
| 956 | } | 976 | } |
| 957 | 977 | ||
| 958 | -.tuwen_title{ height: 86rpx; background-color:#eeeeee; margin-bottom: 32rpx; position: relative; | ||
| 959 | - display: flex; justify-content: center;align-items: center; } | 978 | +.tuwen_title{ /* height: 86rpx; */ background-color:#eeeeee; /* margin-bottom: 32rpx; */ position: relative; |
| 979 | + display: flex; justify-content: center;align-items: center; padding: 20rpx;} | ||
| 960 | 980 | ||
| 961 | .tuwen_title .g_line{ | 981 | .tuwen_title .g_line{ |
| 962 | width:496rpx; | 982 | width:496rpx; |
| @@ -968,27 +988,28 @@ left:31rpx;} | @@ -968,27 +988,28 @@ left:31rpx;} | ||
| 968 | overflow: hidden; justify-content: center;align-items: center; | 988 | overflow: hidden; justify-content: center;align-items: center; |
| 969 | } | 989 | } |
| 970 | .tuwen_title .center_s image{ width: 34rpx; height: 26rpx; margin-right: 10rpx} | 990 | .tuwen_title .center_s image{ width: 34rpx; height: 26rpx; margin-right: 10rpx} |
| 971 | -.t_g_info{ margin: 0 34rpx;margin-bottom: 20rpx; display: flex; align-items: center } | 991 | +.t_g_info{ /* margin: 0 34rpx;margin-bottom: 20rpx; */ display: flex; align-items: center;padding: 20rpx; } |
| 972 | .red_shu{ width: 10rpx; height: 36rpx; background-color:#da0035; margin-right: 8rpx; } | 992 | .red_shu{ width: 10rpx; height: 36rpx; background-color:#da0035; margin-right: 8rpx; } |
| 973 | 993 | ||
| 974 | -.tb-l{ line-height: 96rpx;} | ||
| 975 | -.table_s{ border:#e4e4e4 1rpx solid; width: 682rpx; margin: 0 34rpx;font-size: 30rpx;} | ||
| 976 | -.tb_item{display: flex; height: 96rpx; border-bottom: 1rpx solid #e4e4e4 } | ||
| 977 | -.item_left{width: 214rpx; height: 100%; background: #f9f9f9 ;border-right:1rpx solid #e4e4e4} .item_left text{ margin-left: 44rpx;} | ||
| 978 | -.item_right{width: 468rpx; height: 100%; overflow : hidden;white-space:nowrap; | ||
| 979 | - text-overflow: ellipsis;} | ||
| 980 | -.item_right text{ margin-left: 66rpx;} | 994 | +.tb-l{ /* line-height: 96rpx; */} |
| 995 | +.table_s{ border:#e4e4e4 1rpx solid; box-sizing: border-box;font-size: 26rpx;} | ||
| 996 | +.tb_item{display: flex; /* height: 96rpx; */ border-bottom: 1rpx solid #e4e4e4 } | ||
| 997 | +.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; */} | ||
| 998 | +.item_right{flex:1; height: 100%; overflow : hidden;white-space:nowrap;text-overflow: ellipsis; padding: 20rpx;} | ||
| 999 | +.item_right text{ /* margin-left: 66rpx; */} | ||
| 1000 | + | ||
| 1001 | +.table_s .tb-l:last-child {border-bottom: none;} | ||
| 981 | 1002 | ||
| 982 | -.bzfu_img{ width: 164rpx; height:34rpx; margin-right: 18rpx; margin-left: 12rpx } | ||
| 983 | - .bz_view{ height:100rpx; padding: 0 34rpx 0 13rpx; color: #333; font-size: 28rpx; | 1003 | +.bzfu_img{ width: 164rpx; height:34rpx; /* margin-right: 18rpx; margin-left: 12rpx */ } |
| 1004 | + .bz_view{ /* height:100rpx; padding: 0 34rpx 0 13rpx; */ color: #333; font-size: 28rpx; padding: 20rpx 20rpx 20rpx 10rpx; | ||
| 984 | /* border-bottom: 3rpx solid #eee; */ | 1005 | /* border-bottom: 3rpx solid #eee; */ |
| 985 | /* border-top: 3rpx solid #eee; */} | 1006 | /* border-top: 3rpx solid #eee; */} |
| 986 | - .bz_view view{ width: 460rpx; max-height: 70rpx; overflow: hidden;} | 1007 | + .bz_view view{ width: 460rpx; /* max-height: 70rpx; */ /* overflow: hidden; */} |
| 987 | 1008 | ||
| 988 | -.bb_view{ display: flex;align-items: center;justify-content: space-between; padding: 0 34rpx; color: #333; | ||
| 989 | - font-size: 30rpx; height: 104rpx; line-height: 104rpx; overflow: hidden; padding-right:26rpx } | ||
| 990 | -.red_bb{ color: #d70026; min-width:158rpx;width: auto;} | ||
| 991 | -.bg_jj{ width: 18rpx; height:18rpx; | 1009 | +.bb_view{ display: flex;align-items: center;justify-content: space-between; padding: 20rpx; color: #333; |
| 1010 | + font-size: 30rpx; /* height: 104rpx; line-height: 104rpx; overflow: hidden; padding-right:26rpx */ } | ||
| 1011 | +.red_bb{ color: #d70026; /* min-width:158rpx;width: auto; */} | ||
| 1012 | +.bg_jj{ width: 14rpx; height:14rpx; | ||
| 992 | border-top: 2rpx solid #d70026; | 1013 | border-top: 2rpx solid #d70026; |
| 993 | border-right: 2rpx solid #d70026; | 1014 | border-right: 2rpx solid #d70026; |
| 994 | transform: rotate(45deg);display:inline-block; | 1015 | transform: rotate(45deg);display:inline-block; |
| @@ -999,6 +1020,7 @@ left:31rpx;} | @@ -999,6 +1020,7 @@ left:31rpx;} | ||
| 999 | .bz-content { | 1020 | .bz-content { |
| 1000 | flex-grow: 1; | 1021 | flex-grow: 1; |
| 1001 | text-align: justify; | 1022 | text-align: justify; |
| 1023 | + padding: 0 30rpx 0 20rpx; | ||
| 1002 | } | 1024 | } |
| 1003 | 1025 | ||
| 1004 | /* 顶部边框 */ | 1026 | /* 顶部边框 */ |
| @@ -1199,20 +1221,23 @@ left:31rpx;} | @@ -1199,20 +1221,23 @@ left:31rpx;} | ||
| 1199 | 1221 | ||
| 1200 | .xc_comment{ | 1222 | .xc_comment{ |
| 1201 | display: flex; | 1223 | display: flex; |
| 1224 | + justify-content: space-around; | ||
| 1202 | width: 100%; | 1225 | width: 100%; |
| 1203 | - height: 42rpx; | ||
| 1204 | - padding-left: 34rpx; | 1226 | + box-sizing: border-box; |
| 1227 | + padding: 10rpx 20rpx; | ||
| 1228 | + /* height: 42rpx; | ||
| 1229 | + padding-left: 34rpx; */ | ||
| 1205 | color: #333; | 1230 | color: #333; |
| 1206 | 1231 | ||
| 1207 | } | 1232 | } |
| 1208 | .xc_comment-have-pictures{ | 1233 | .xc_comment-have-pictures{ |
| 1209 | width: 153rpx; | 1234 | width: 153rpx; |
| 1210 | - height: 42rpx; | 1235 | + /* height: 42rpx; */ |
| 1211 | line-height: 42rpx; | 1236 | line-height: 42rpx; |
| 1212 | text-align: center; | 1237 | text-align: center; |
| 1213 | background: #ffe3e2; | 1238 | background: #ffe3e2; |
| 1214 | color: 28rpx; | 1239 | color: 28rpx; |
| 1215 | - border-radius:20rpx; | 1240 | + border-radius:21rpx; |
| 1216 | font-size: 24rpx; | 1241 | font-size: 24rpx; |
| 1217 | } | 1242 | } |
| 1218 | .xc_comment-discuss{ | 1243 | .xc_comment-discuss{ |
| @@ -1229,22 +1254,25 @@ left:31rpx;} | @@ -1229,22 +1254,25 @@ left:31rpx;} | ||
| 1229 | 1254 | ||
| 1230 | .xc_comment-detail{ | 1255 | .xc_comment-detail{ |
| 1231 | display: flex; | 1256 | display: flex; |
| 1232 | - margin-top: 40rpx; | ||
| 1233 | - width: 524rpx; | ||
| 1234 | - margin-left: 34rpx; | ||
| 1235 | - border-radius: 25rpx; | ||
| 1236 | - border: 2rpx solid #d6d4d5; | ||
| 1237 | - overflow: hidden; | 1257 | + /* margin-top: 40rpx; */ |
| 1258 | + /* width: 524rpx; */ | ||
| 1259 | + /* margin-left: 34rpx; */ | ||
| 1260 | + border-radius: 24rpx; | ||
| 1261 | + border: 2rpx solid #ebedf0; | ||
| 1262 | + margin-left: 20rpx; | ||
| 1263 | + box-sizing: border-box; | ||
| 1264 | + /* overflow: hidden; */ | ||
| 1238 | } | 1265 | } |
| 1239 | 1266 | ||
| 1240 | .xc_user-img{ | 1267 | .xc_user-img{ |
| 1241 | - border-radius:50%; | 1268 | + border-radius:50%; |
| 1269 | + margin: auto 0; | ||
| 1242 | } | 1270 | } |
| 1243 | 1271 | ||
| 1244 | .xc_comment-user{ | 1272 | .xc_comment-user{ |
| 1245 | display: flex; | 1273 | display: flex; |
| 1246 | - margin-top: 22rpx; | ||
| 1247 | - margin-left: 22rpx; | 1274 | + /* margin-top: 22rpx; |
| 1275 | + margin-left: 22rpx; */ | ||
| 1248 | } | 1276 | } |
| 1249 | .xc_user{ | 1277 | .xc_user{ |
| 1250 | width: 170rpx; | 1278 | width: 170rpx; |
| @@ -1252,34 +1280,34 @@ left:31rpx;} | @@ -1252,34 +1280,34 @@ left:31rpx;} | ||
| 1252 | margin-left: 6rpx; | 1280 | margin-left: 6rpx; |
| 1253 | overflow: hidden; | 1281 | overflow: hidden; |
| 1254 | } | 1282 | } |
| 1255 | -.xc_user-name{ height: 25rpx;} | 1283 | +.xc_user-name{ /* height: 25rpx; */} |
| 1256 | .xc_comment-img{ | 1284 | .xc_comment-img{ |
| 1257 | width: 22rpx; | 1285 | width: 22rpx; |
| 1258 | height: 22rpx; | 1286 | height: 22rpx; |
| 1259 | - margin-top: 14rpx; | 1287 | + /* margin-top: 14rpx; */ |
| 1260 | margin-right: 5rpx | 1288 | margin-right: 5rpx |
| 1261 | } | 1289 | } |
| 1262 | .xc_comment-font{ | 1290 | .xc_comment-font{ |
| 1263 | - height: 75rpx; | ||
| 1264 | - margin-left: 22rpx; | 1291 | + /* height: 75rpx; */ |
| 1292 | + /* margin-left: 22rpx; */ | ||
| 1265 | white-space:normal; | 1293 | white-space:normal; |
| 1266 | overflow: hidden; | 1294 | overflow: hidden; |
| 1267 | - margin-top: 8rpx; | ||
| 1268 | - line-height: 38rpx; | 1295 | + /* margin-top: 8rpx; |
| 1296 | + line-height: 38rpx; */ | ||
| 1269 | 1297 | ||
| 1270 | } | 1298 | } |
| 1271 | .xc_comment-val{ | 1299 | .xc_comment-val{ |
| 1272 | - width: 88%; | 1300 | + /* width: 88%; |
| 1273 | height: 30rpx; | 1301 | height: 30rpx; |
| 1274 | margin-left: 22rpx; | 1302 | margin-left: 22rpx; |
| 1275 | display: flex; | 1303 | display: flex; |
| 1276 | margin-top: 15rpx; | 1304 | margin-top: 15rpx; |
| 1277 | - margin-bottom:15rpx; | 1305 | + margin-bottom:15rpx; */ |
| 1278 | } | 1306 | } |
| 1279 | 1307 | ||
| 1280 | .xc_comment-time{ | 1308 | .xc_comment-time{ |
| 1281 | - height: 30rpx; | ||
| 1282 | - font-size: 24rpx; | 1309 | + /* height: 30rpx; */ |
| 1310 | + font-size: 22rpx; | ||
| 1283 | color: #a5a5a5; | 1311 | color: #a5a5a5; |
| 1284 | overflow: hidden; | 1312 | overflow: hidden; |
| 1285 | } | 1313 | } |
| @@ -1290,14 +1318,17 @@ left:31rpx;} | @@ -1290,14 +1318,17 @@ left:31rpx;} | ||
| 1290 | .xc_comment-left{ | 1318 | .xc_comment-left{ |
| 1291 | display:inline-block; | 1319 | display:inline-block; |
| 1292 | width: 312rpx; | 1320 | width: 312rpx; |
| 1321 | + padding: 20rpx; | ||
| 1293 | } | 1322 | } |
| 1294 | .xc_goods-img-frame{ | 1323 | .xc_goods-img-frame{ |
| 1295 | - display:inline-block; | ||
| 1296 | - width: 40%; | 1324 | + border-radius: 0 22rpx 22rpx 0; |
| 1325 | + overflow: hidden; | ||
| 1326 | + /* display:inline-block; */ | ||
| 1327 | + /* width: 40%; | ||
| 1297 | height: 90%; | 1328 | height: 90%; |
| 1298 | text-align: center; | 1329 | text-align: center; |
| 1299 | padding-top: 30rpx; | 1330 | padding-top: 30rpx; |
| 1300 | - vertical-align: top; | 1331 | + vertical-align: top; */ |
| 1301 | } | 1332 | } |
| 1302 | .xc_imgs{ | 1333 | .xc_imgs{ |
| 1303 | width: 50rpx; | 1334 | width: 50rpx; |
| @@ -1308,11 +1339,13 @@ left:31rpx;} | @@ -1308,11 +1339,13 @@ left:31rpx;} | ||
| 1308 | 1339 | ||
| 1309 | .pj_word_size{ font-size: 28rpx} | 1340 | .pj_word_size{ font-size: 28rpx} |
| 1310 | .pj_scroll{ | 1341 | .pj_scroll{ |
| 1311 | - white-space: nowrap; | 1342 | + /* white-space: nowrap; */ |
| 1312 | /* height: 324rpx; */ | 1343 | /* height: 324rpx; */ |
| 1313 | - margin-bottom: 50rpx; | 1344 | + /* margin-bottom: 50rpx; */ |
| 1314 | display: flex; | 1345 | display: flex; |
| 1315 | align-items: center; | 1346 | align-items: center; |
| 1347 | + padding: 20rpx 0; | ||
| 1348 | + /* box-sizing: border-box; */ | ||
| 1316 | /* box-shadow: 0 8px 12px #e7e9eb; */ | 1349 | /* box-shadow: 0 8px 12px #e7e9eb; */ |
| 1317 | } | 1350 | } |
| 1318 | 1351 | ||
| @@ -1326,57 +1359,61 @@ left:31rpx;} | @@ -1326,57 +1359,61 @@ left:31rpx;} | ||
| 1326 | } | 1359 | } |
| 1327 | .cx-frame{ | 1360 | .cx-frame{ |
| 1328 | /* border-top:3rpx solid #eee; */ | 1361 | /* border-top:3rpx solid #eee; */ |
| 1329 | - width:99%; | 1362 | + /* width:99%; |
| 1330 | height: 95rpx; | 1363 | height: 95rpx; |
| 1331 | line-height: 95rpx; | 1364 | line-height: 95rpx; |
| 1332 | - padding-left:24rpx; | ||
| 1333 | - | ||
| 1334 | - | 1365 | + padding-left:24rpx; */ |
| 1366 | + padding: 20rpx; | ||
| 1335 | } | 1367 | } |
| 1336 | .cx-frame .cx-sizs{ | 1368 | .cx-frame .cx-sizs{ |
| 1337 | - width: 68rpx; | ||
| 1338 | - height: 100%; | ||
| 1339 | - line-height: 100rpx; | ||
| 1340 | - overflow: hidden; | ||
| 1341 | - margin-left: 10rpx; | 1369 | + /* width: 68rpx; */ |
| 1370 | + /* height: 100%; */ | ||
| 1371 | + /* line-height: 100rpx; */ | ||
| 1372 | + /* overflow: hidden; */ | ||
| 1373 | + /* margin-left: 10rpx; */ | ||
| 1342 | } | 1374 | } |
| 1343 | .xc-coupon-fram{ | 1375 | .xc-coupon-fram{ |
| 1344 | position: relative; | 1376 | position: relative; |
| 1345 | - width:200rpx; | ||
| 1346 | - padding-top:30rpx; | 1377 | + margin-right: 16rpx; |
| 1378 | + /* width:200rpx; */ | ||
| 1379 | + /* padding-top:30rpx; */ | ||
| 1347 | 1380 | ||
| 1348 | } | 1381 | } |
| 1349 | .xc-coupon-fram .xc-coupon{ | 1382 | .xc-coupon-fram .xc-coupon{ |
| 1350 | - width:175rpx ; | 1383 | + /* width:175rpx ; |
| 1351 | height: 40rpx; | 1384 | height: 40rpx; |
| 1352 | - line-height: 40rpx; | 1385 | + line-height: 40rpx; */ |
| 1353 | background-color:#d60021 ; | 1386 | background-color:#d60021 ; |
| 1354 | - margin:0 auto; | 1387 | + /* margin:0 auto; */ |
| 1355 | color:#fff; | 1388 | color:#fff; |
| 1356 | - | 1389 | + padding: 6rpx 20rpx; |
| 1357 | 1390 | ||
| 1358 | } | 1391 | } |
| 1359 | .xc-coupon-fram .xc-circular{ | 1392 | .xc-coupon-fram .xc-circular{ |
| 1360 | - width: 22rpx; | ||
| 1361 | - height:22rpx; | ||
| 1362 | - background-color:#fff; | 1393 | + width: 16rpx; |
| 1394 | + height:16rpx; | ||
| 1395 | + background-color: white; | ||
| 1363 | position:absolute; | 1396 | position:absolute; |
| 1364 | - top: 40rpx; | 1397 | + top: 50%; |
| 1398 | + /* left: -10rpx; */ | ||
| 1399 | + transform: translateY(-50%); | ||
| 1365 | } | 1400 | } |
| 1366 | .xc-coupon-fram .xc-one{ | 1401 | .xc-coupon-fram .xc-one{ |
| 1367 | - left:3rpx; | 1402 | + left: -8rpx; |
| 1368 | } | 1403 | } |
| 1369 | .xc-coupon-fram .xc-two{ | 1404 | .xc-coupon-fram .xc-two{ |
| 1370 | - left: 178rpx; | 1405 | + right: -8rpx; |
| 1371 | } | 1406 | } |
| 1372 | 1407 | ||
| 1373 | .cx-obtain-coupon{ | 1408 | .cx-obtain-coupon{ |
| 1374 | - width: 65rpx; | 1409 | + /* width: 65rpx; |
| 1375 | height: 100%; | 1410 | height: 100%; |
| 1376 | - padding-left:15rpx; | 1411 | + padding-left:15rpx; */ |
| 1377 | color: #d70025; | 1412 | color: #d70025; |
| 1378 | - position: absolute; | ||
| 1379 | - right: 5rpx; | 1413 | + display: flex; |
| 1414 | + align-items: center; | ||
| 1415 | + /* position: absolute; | ||
| 1416 | + right: 5rpx; */ | ||
| 1380 | } | 1417 | } |
| 1381 | 1418 | ||
| 1382 | /* 自定义弹出窗口 */ | 1419 | /* 自定义弹出窗口 */ |
| @@ -1391,18 +1428,20 @@ left:31rpx;} | @@ -1391,18 +1428,20 @@ left:31rpx;} | ||
| 1391 | } | 1428 | } |
| 1392 | 1429 | ||
| 1393 | .cx-popup .top{ | 1430 | .cx-popup .top{ |
| 1394 | - width: 90%; | ||
| 1395 | - height:85rpx; | ||
| 1396 | - border-bottom: 4rpx solid #d5d5d5; | ||
| 1397 | - padding-top: 50rpx; | ||
| 1398 | - font-weight:600; | 1431 | + /* width: 90%; |
| 1432 | + height:85rpx; */ | ||
| 1433 | + font-size: 32rpx; | ||
| 1434 | + padding: 20rpx 0; | ||
| 1435 | + border-bottom: 2rpx solid #ebedf0; | ||
| 1436 | + /* padding-top: 50rpx; | ||
| 1437 | + font-weight:600; */ | ||
| 1399 | 1438 | ||
| 1400 | } | 1439 | } |
| 1401 | .cx-popup .top-frame{ | 1440 | .cx-popup .top-frame{ |
| 1402 | - width: 100%; | 1441 | + /* width: 100%; |
| 1403 | display: flex; | 1442 | display: flex; |
| 1404 | justify-content: center; | 1443 | justify-content: center; |
| 1405 | - overflow: hidden; | 1444 | + overflow: hidden; */ |
| 1406 | } | 1445 | } |
| 1407 | .xc-valid-coupon{ | 1446 | .xc-valid-coupon{ |
| 1408 | width: 90%; | 1447 | width: 90%; |
| @@ -1413,41 +1452,52 @@ left:31rpx;} | @@ -1413,41 +1452,52 @@ left:31rpx;} | ||
| 1413 | .xc-frame{ | 1452 | .xc-frame{ |
| 1414 | position: relative; | 1453 | position: relative; |
| 1415 | } | 1454 | } |
| 1416 | -.xc-coupon-frame{ | ||
| 1417 | - width: 90%; | 1455 | +.xc-coupon-frame { |
| 1456 | + width: 100%; | ||
| 1418 | max-height: 560rpx; | 1457 | max-height: 560rpx; |
| 1419 | overflow: auto; | 1458 | overflow: auto; |
| 1420 | 1459 | ||
| 1421 | } | 1460 | } |
| 1422 | -.xc-coupon-frame .coupon{ | ||
| 1423 | - width:99%; | 1461 | +.xc-coupon-frame .rel:not(:first-child) { |
| 1462 | + margin-top: 20rpx; | ||
| 1463 | +} | ||
| 1464 | +.xc-coupon-frame .coupon { | ||
| 1465 | + width:100%; | ||
| 1424 | height: 168rpx; | 1466 | height: 168rpx; |
| 1425 | border-radius: 25rpx; | 1467 | border-radius: 25rpx; |
| 1426 | - border:3rpx solid #ffdcdc; | 1468 | + border:2rpx solid #ffdcdc; |
| 1427 | overflow: hidden; | 1469 | overflow: hidden; |
| 1428 | - margin-top:16rpx; | 1470 | + /* margin-top:16rpx; */ |
| 1471 | + box-sizing: border-box; | ||
| 1429 | 1472 | ||
| 1430 | } | 1473 | } |
| 1474 | +/* .xc-coupon-frame .coupon ~ .coupon { | ||
| 1475 | + margin-top:16rpx; | ||
| 1476 | +} */ | ||
| 1431 | .xc-coupon-left{ | 1477 | .xc-coupon-left{ |
| 1432 | width: 216rpx; | 1478 | width: 216rpx; |
| 1433 | - height: 100%; | 1479 | + /* height: 100%; */ |
| 1434 | background-color: #ffeeef; | 1480 | background-color: #ffeeef; |
| 1435 | border-right: 4rpx dashed #ffdbd9; | 1481 | border-right: 4rpx dashed #ffdbd9; |
| 1436 | overflow: hidden; | 1482 | overflow: hidden; |
| 1437 | - line-height: 100%; | ||
| 1438 | - | 1483 | + /* line-height: 100%; */ |
| 1484 | + display: flex; | ||
| 1485 | + flex-direction: column; | ||
| 1486 | + justify-content: center; | ||
| 1487 | + align-items: center; | ||
| 1488 | + flex-shrink: 0; | ||
| 1439 | } | 1489 | } |
| 1440 | .xc-money{ | 1490 | .xc-money{ |
| 1441 | color: #f30026; | 1491 | color: #f30026; |
| 1442 | text-align:center; | 1492 | text-align:center; |
| 1443 | } | 1493 | } |
| 1444 | .xc-rmb{ | 1494 | .xc-rmb{ |
| 1445 | - width:44rpx; | ||
| 1446 | - padding-top:7rpx; | 1495 | + /* width:44rpx; |
| 1496 | + padding-top:7rpx; */ | ||
| 1447 | } | 1497 | } |
| 1448 | .xc-money-frame{ | 1498 | .xc-money-frame{ |
| 1449 | - margin-left:35rpx; | ||
| 1450 | - margin-top:48rpx; | 1499 | + /* margin-left:35rpx; |
| 1500 | + margin-top:48rpx; */ | ||
| 1451 | 1501 | ||
| 1452 | } | 1502 | } |
| 1453 | .xc-spacing{ | 1503 | .xc-spacing{ |
| @@ -1455,45 +1505,52 @@ left:31rpx;} | @@ -1455,45 +1505,52 @@ left:31rpx;} | ||
| 1455 | } | 1505 | } |
| 1456 | .xc-circular-one{ | 1506 | .xc-circular-one{ |
| 1457 | position: absolute; | 1507 | position: absolute; |
| 1458 | - top:-8rpx; | ||
| 1459 | - left:208rpx; | ||
| 1460 | - width: 27rpx; | 1508 | + top:-15rpx; |
| 1509 | + left:205rpx; | ||
| 1510 | + width: 30rpx; | ||
| 1461 | height: 30rpx; | 1511 | height: 30rpx; |
| 1462 | background: #fff; | 1512 | background: #fff; |
| 1463 | overflow: hidden; | 1513 | overflow: hidden; |
| 1464 | } | 1514 | } |
| 1465 | .xc-circular-two{ | 1515 | .xc-circular-two{ |
| 1466 | position: absolute; | 1516 | position: absolute; |
| 1467 | - top:150rpx; | ||
| 1468 | - left:207rpx; | ||
| 1469 | - width: 27rpx; | 1517 | + bottom: -15rpx; |
| 1518 | + /* top:150rpx; */ | ||
| 1519 | + left:205rpx; | ||
| 1520 | + width: 30rpx; | ||
| 1470 | height:30rpx; | 1521 | height:30rpx; |
| 1471 | background: #fff; | 1522 | background: #fff; |
| 1472 | } | 1523 | } |
| 1473 | .xc-detail-coupon{ | 1524 | .xc-detail-coupon{ |
| 1474 | - margin-left: 22rpx; | 1525 | + /* margin-left: 22rpx; |
| 1475 | overflow: hidden; | 1526 | overflow: hidden; |
| 1476 | - padding-top: 43rpx; | ||
| 1477 | - | 1527 | + padding-top: 43rpx; */ |
| 1528 | + /* display: flex; | ||
| 1529 | + align-items: center; */ | ||
| 1478 | } | 1530 | } |
| 1479 | .xc-coupon-right{ | 1531 | .xc-coupon-right{ |
| 1480 | - width: 455rpx; | ||
| 1481 | - height: 100%; | 1532 | + /* width: 455rpx; |
| 1533 | + height: 100%; */ | ||
| 1482 | background: #fffaf9; | 1534 | background: #fffaf9; |
| 1535 | + padding: 20rpx; | ||
| 1536 | + box-sizing: border-box; | ||
| 1537 | + width: 100%; | ||
| 1538 | + justify-content: space-between; | ||
| 1539 | + align-items: center; | ||
| 1483 | } | 1540 | } |
| 1484 | .xc-below{ | 1541 | .xc-below{ |
| 1485 | - margin-top:22rpx; | 1542 | + margin-top:20rpx; |
| 1486 | 1543 | ||
| 1487 | } | 1544 | } |
| 1488 | .xc-get{ | 1545 | .xc-get{ |
| 1489 | 1546 | ||
| 1490 | - width: 132rpx; | ||
| 1491 | - height: 48rpx; | 1547 | + width: 140rpx; |
| 1548 | + /* height: 48rpx; */ | ||
| 1492 | color: #fff; | 1549 | color: #fff; |
| 1493 | text-align: center; | 1550 | text-align: center; |
| 1494 | - border-radius:20rpx; | ||
| 1495 | - line-height:48rpx; | ||
| 1496 | - margin-left:20rpx; | 1551 | + border-radius:27rpx; |
| 1552 | + line-height:54rpx; | ||
| 1553 | + /* margin-left:20rpx; */ | ||
| 1497 | } | 1554 | } |
| 1498 | 1555 | ||
| 1499 | .background{ | 1556 | .background{ |
| @@ -1511,16 +1568,19 @@ left:31rpx;} | @@ -1511,16 +1568,19 @@ left:31rpx;} | ||
| 1511 | 1568 | ||
| 1512 | .cx-confirm{ | 1569 | .cx-confirm{ |
| 1513 | width: 100%; | 1570 | width: 100%; |
| 1514 | - height: 160rpx; | 1571 | + padding: 20rpx; |
| 1572 | + box-sizing: border-box; | ||
| 1573 | + /* height: 160rpx; */ | ||
| 1515 | 1574 | ||
| 1516 | } | 1575 | } |
| 1517 | .cx-confirm .confirm{ | 1576 | .cx-confirm .confirm{ |
| 1518 | - width: 372rpx; | ||
| 1519 | - height: 60rpx; | ||
| 1520 | - background: #f40026; | 1577 | + /* width: 372rpx; |
| 1578 | + height: 60rpx; */ | ||
| 1579 | + background-color: #f40026; | ||
| 1521 | color: #fff; | 1580 | color: #fff; |
| 1522 | - border-radius:20rpx; | ||
| 1523 | - line-height:60rpx; | 1581 | + border-radius:10rpx; |
| 1582 | + line-height: 80rpx; | ||
| 1583 | + font-size: 28rpx; | ||
| 1524 | 1584 | ||
| 1525 | } | 1585 | } |
| 1526 | 1586 | ||
| @@ -1531,17 +1591,21 @@ left:31rpx;} | @@ -1531,17 +1591,21 @@ left:31rpx;} | ||
| 1531 | 1591 | ||
| 1532 | 1592 | ||
| 1533 | /* 分享 */ | 1593 | /* 分享 */ |
| 1594 | +.icon-share { | ||
| 1595 | + font-size: 46rpx; | ||
| 1596 | + color: #d60021; | ||
| 1597 | +} | ||
| 1534 | .xc-share-frame{ | 1598 | .xc-share-frame{ |
| 1535 | - width: 129rpx; | 1599 | + /* width: 129rpx; |
| 1536 | height: 48rpx; | 1600 | height: 48rpx; |
| 1537 | border-top-left-radius: 18rpx; | 1601 | border-top-left-radius: 18rpx; |
| 1538 | - border-bottom-left-radius: 18rpx; | ||
| 1539 | - background: #d60021; | ||
| 1540 | - position:absolute; | 1602 | + border-bottom-left-radius: 18rpx; */ |
| 1603 | + /* background: #d60021; */ | ||
| 1604 | + /* position:absolute; | ||
| 1541 | left:622rpx; | 1605 | left:622rpx; |
| 1542 | top:-37rpx; | 1606 | top:-37rpx; |
| 1543 | line-height:50rpx; | 1607 | line-height:50rpx; |
| 1544 | - margin-top:52rpx; | 1608 | + margin-top:52rpx; */ |
| 1545 | } | 1609 | } |
| 1546 | .xc-share-frame-jieti{ | 1610 | .xc-share-frame-jieti{ |
| 1547 | width: 129rpx; | 1611 | width: 129rpx; |
| @@ -1559,6 +1623,7 @@ left:31rpx;} | @@ -1559,6 +1623,7 @@ left:31rpx;} | ||
| 1559 | 1623 | ||
| 1560 | } | 1624 | } |
| 1561 | 1625 | ||
| 1626 | + | ||
| 1562 | .xc-share-frame .share-frame,.xc-share-frame-jieti .share-frame{ | 1627 | .xc-share-frame .share-frame,.xc-share-frame-jieti .share-frame{ |
| 1563 | width: 30rpx; | 1628 | width: 30rpx; |
| 1564 | height: 30rpx; | 1629 | height: 30rpx; |
| @@ -1779,10 +1844,10 @@ xc-ensure-div{ | @@ -1779,10 +1844,10 @@ xc-ensure-div{ | ||
| 1779 | padding-top: 24rpx; | 1844 | padding-top: 24rpx; |
| 1780 | overflow: hidden; | 1845 | overflow: hidden; |
| 1781 | } | 1846 | } |
| 1782 | -.xc-frame{ | ||
| 1783 | - width: 100%; | ||
| 1784 | - margin-top:20rpx; | ||
| 1785 | - | 1847 | +.xc-frame { |
| 1848 | + /* width: 100%; | ||
| 1849 | + margin-top:20rpx; */ | ||
| 1850 | + padding: 20rpx; | ||
| 1786 | } | 1851 | } |
| 1787 | 1852 | ||
| 1788 | .xc-frame .list-frame{ | 1853 | .xc-frame .list-frame{ |
| @@ -1817,7 +1882,7 @@ xc-ensure-div{ | @@ -1817,7 +1882,7 @@ xc-ensure-div{ | ||
| 1817 | } | 1882 | } |
| 1818 | 1883 | ||
| 1819 | .xc-money-frame{ | 1884 | .xc-money-frame{ |
| 1820 | - margin-left:35rpx; | 1885 | + /* margin-left:35rpx; */ |
| 1821 | 1886 | ||
| 1822 | } | 1887 | } |
| 1823 | .xc-coupon-effect{ | 1888 | .xc-coupon-effect{ |
| @@ -1952,11 +2017,11 @@ xc-ensure-div{ | @@ -1952,11 +2017,11 @@ xc-ensure-div{ | ||
| 1952 | } | 2017 | } |
| 1953 | 2018 | ||
| 1954 | .xc-video{ | 2019 | .xc-video{ |
| 1955 | - width:100rpx; | ||
| 1956 | - height: 50rpx; | ||
| 1957 | - line-height: 50rpx; | 2020 | + /* width:100rpx; */ |
| 2021 | + /* height: 50rpx; | ||
| 2022 | + line-height: 50rpx; */ | ||
| 1958 | text-align: center; | 2023 | text-align: center; |
| 1959 | - margin-left:-30rpx; | 2024 | + /* margin-left:-30rpx; */ |
| 1960 | 2025 | ||
| 1961 | 2026 | ||
| 1962 | } | 2027 | } |
| @@ -2030,7 +2095,7 @@ xc-ensure-div{ | @@ -2030,7 +2095,7 @@ xc-ensure-div{ | ||
| 2030 | 2095 | ||
| 2031 | 2096 | ||
| 2032 | .wsize{font-size: 32rpx} | 2097 | .wsize{font-size: 32rpx} |
| 2033 | -.five-level-word{font-size: 28rpx;} | 2098 | +.five-level-word{font-size: 24rpx;} |
| 2034 | 2099 | ||
| 2035 | 2100 | ||
| 2036 | /*-- 推荐商品 --*/ | 2101 | /*-- 推荐商品 --*/ |
| @@ -2103,13 +2168,13 @@ padding-left:24rpx; | @@ -2103,13 +2168,13 @@ padding-left:24rpx; | ||
| 2103 | 2168 | ||
| 2104 | .xc-linellae-frame{ | 2169 | .xc-linellae-frame{ |
| 2105 | width: 100%; | 2170 | width: 100%; |
| 2106 | - height: 60rpx; | 2171 | + height: 80rpx; |
| 2107 | background: #f2f2f2; | 2172 | background: #f2f2f2; |
| 2108 | } | 2173 | } |
| 2109 | .xc-linellae-frame .xc-linellae{ | 2174 | .xc-linellae-frame .xc-linellae{ |
| 2110 | width: 386rpx; | 2175 | width: 386rpx; |
| 2111 | height: 1rpx; | 2176 | height: 1rpx; |
| 2112 | - border-bottom: 1rpx solid #a5a5a5; | 2177 | + border-bottom: 1rpx solid #ebedf0; |
| 2113 | } | 2178 | } |
| 2114 | .xc-recommend-frame{ | 2179 | .xc-recommend-frame{ |
| 2115 | background:#f2f2f2; | 2180 | background:#f2f2f2; |
| @@ -2132,7 +2197,8 @@ margin-top: 1rpx; | @@ -2132,7 +2197,8 @@ margin-top: 1rpx; | ||
| 2132 | } | 2197 | } |
| 2133 | .xc-price-frame{ | 2198 | .xc-price-frame{ |
| 2134 | color: #ec0022; | 2199 | color: #ec0022; |
| 2135 | -height:44rpx; | 2200 | + align-items: baseline; |
| 2201 | +/* height:44rpx; */ | ||
| 2136 | } | 2202 | } |
| 2137 | .xc-price-frame .sign{ | 2203 | .xc-price-frame .sign{ |
| 2138 | margin-top:19rpx; | 2204 | margin-top:19rpx; |
| @@ -2163,6 +2229,9 @@ padding-left:-4rpx; | @@ -2163,6 +2229,9 @@ padding-left:-4rpx; | ||
| 2163 | .xc-explain{ | 2229 | .xc-explain{ |
| 2164 | color:#292929; | 2230 | color:#292929; |
| 2165 | width:542rpx; | 2231 | width:542rpx; |
| 2232 | + margin: 10rpx 0 20rpx; | ||
| 2233 | + width: 100%; | ||
| 2234 | + font-weight: bold; | ||
| 2166 | } | 2235 | } |
| 2167 | .xc-item{width: 16%; font-size: 26rpx; color: #666;margin-right:5rpx;} | 2236 | .xc-item{width: 16%; font-size: 26rpx; color: #666;margin-right:5rpx;} |
| 2168 | .xc-item .yuan{ | 2237 | .xc-item .yuan{ |
| @@ -2268,15 +2337,16 @@ margin-top:5rpx; | @@ -2268,15 +2337,16 @@ margin-top:5rpx; | ||
| 2268 | } | 2337 | } |
| 2269 | .xc-goods-explain{ | 2338 | .xc-goods-explain{ |
| 2270 | width:100%; | 2339 | width:100%; |
| 2271 | - padding-left:30rpx; | 2340 | + /* padding-left:30rpx; |
| 2272 | margin-left:-9rpx; | 2341 | margin-left:-9rpx; |
| 2273 | - height: 150rpx | 2342 | + height: 150rpx */ |
| 2274 | } | 2343 | } |
| 2275 | .xc-partner-frame{ | 2344 | .xc-partner-frame{ |
| 2276 | border-bottom:2rpx solid #eee; | 2345 | border-bottom:2rpx solid #eee; |
| 2277 | width:100%; | 2346 | width:100%; |
| 2278 | -padding:0 20rpx; | ||
| 2279 | -height:56rpx; | 2347 | +padding:20rpx; |
| 2348 | +/* height:56rpx; */ | ||
| 2349 | +box-sizing: border-box; | ||
| 2280 | } | 2350 | } |
| 2281 | .xc-person-number{ | 2351 | .xc-person-number{ |
| 2282 | width:120rpx; | 2352 | width:120rpx; |
| @@ -2298,41 +2368,43 @@ right:17rpx; top:55rpx; | @@ -2298,41 +2368,43 @@ right:17rpx; top:55rpx; | ||
| 2298 | /* border-top:1rpx solid #eee; */ | 2368 | /* border-top:1rpx solid #eee; */ |
| 2299 | width: 100%; | 2369 | width: 100%; |
| 2300 | height: auto; | 2370 | height: auto; |
| 2371 | + padding: 20rpx; | ||
| 2372 | + box-sizing: border-box; | ||
| 2301 | } | 2373 | } |
| 2302 | .on_height{ | 2374 | .on_height{ |
| 2303 | height: 90rpx; | 2375 | height: 90rpx; |
| 2304 | } | 2376 | } |
| 2305 | .sn_height{ | 2377 | .sn_height{ |
| 2306 | - min-height: 170rpx; height: auto;padding: 10rpx 0; | 2378 | + /* min-height: 170rpx; height: auto;padding: 10rpx 0; */ |
| 2307 | } | 2379 | } |
| 2308 | .xc-address_frame .address_frame{ | 2380 | .xc-address_frame .address_frame{ |
| 2309 | - width: 92%; | ||
| 2310 | -padding-left: 10rpx; | ||
| 2311 | -margin: auto; | 2381 | + width: 100%; |
| 2382 | +/* padding-left: 10rpx; | ||
| 2383 | +margin: auto; */ | ||
| 2312 | 2384 | ||
| 2313 | } | 2385 | } |
| 2314 | .shop_name{ | 2386 | .shop_name{ |
| 2315 | 2387 | ||
| 2316 | } | 2388 | } |
| 2317 | .stores-img{ | 2389 | .stores-img{ |
| 2318 | -width: 40rpx; | ||
| 2319 | - height: 35rpx; | 2390 | + width: 28rpx; |
| 2391 | + height: 28rpx; | ||
| 2320 | margin-right: 10rpx; | 2392 | margin-right: 10rpx; |
| 2321 | } | 2393 | } |
| 2322 | .shop_name{ | 2394 | .shop_name{ |
| 2323 | margin-right: 10rpx; | 2395 | margin-right: 10rpx; |
| 2324 | } | 2396 | } |
| 2325 | .address{ | 2397 | .address{ |
| 2326 | - width: 87%; | 2398 | + /* width: 100%; |
| 2327 | margin-top: 5rpx; | 2399 | margin-top: 5rpx; |
| 2328 | - margin-bottom: 5rpx; | 2400 | + margin-bottom: 5rpx; */ |
| 2329 | } | 2401 | } |
| 2330 | .distance{ | 2402 | .distance{ |
| 2331 | - padding-left: 15rpx; | ||
| 2332 | - padding-right: 15rpx; | 2403 | + padding-left: 20rpx; |
| 2404 | + padding-right: 20rpx; | ||
| 2333 | background: #eee; | 2405 | background: #eee; |
| 2334 | border-radius: 20rpx; | 2406 | border-radius: 20rpx; |
| 2335 | - margin-right: 5rpx; | 2407 | + /* margin-right: 5rpx; */ |
| 2336 | color: #999; | 2408 | color: #999; |
| 2337 | height: 38rpx; | 2409 | height: 38rpx; |
| 2338 | line-height: 38rpx; | 2410 | line-height: 38rpx; |
| @@ -2518,8 +2590,8 @@ margin-top: 10rpx; | @@ -2518,8 +2590,8 @@ margin-top: 10rpx; | ||
| 2518 | } | 2590 | } |
| 2519 | .xc-goods-attribute{ | 2591 | .xc-goods-attribute{ |
| 2520 | border-bottom: 1px solid #eee; | 2592 | border-bottom: 1px solid #eee; |
| 2521 | -padding-bottom: 15px; | ||
| 2522 | -margin-bottom:40rpx; | 2593 | +padding-bottom: 20rpx; |
| 2594 | +/* margin-bottom:40rpx; */ | ||
| 2523 | } | 2595 | } |
| 2524 | .xc-val-fream{ | 2596 | .xc-val-fream{ |
| 2525 | width: 105rpx; | 2597 | width: 105rpx; |
| @@ -2546,11 +2618,11 @@ border-radius: 55rpx; | @@ -2546,11 +2618,11 @@ border-radius: 55rpx; | ||
| 2546 | .s_btn{ margin-top: 25rpx; } | 2618 | .s_btn{ margin-top: 25rpx; } |
| 2547 | /* 美妆价的样式 */ | 2619 | /* 美妆价的样式 */ |
| 2548 | .beauty-makeup-frame{ | 2620 | .beauty-makeup-frame{ |
| 2549 | - width: 101.5%; | ||
| 2550 | - margin: auto; | 2621 | + /* width: 101.5%; |
| 2622 | + margin: auto; */ | ||
| 2551 | height: 120rpx; | 2623 | height: 120rpx; |
| 2552 | border-radius: 15rpx; | 2624 | border-radius: 15rpx; |
| 2553 | - margin-top: 18px; | 2625 | + margin-top: 10px; |
| 2554 | 2626 | ||
| 2555 | } | 2627 | } |
| 2556 | .beauty-makeup-frame .left{ | 2628 | .beauty-makeup-frame .left{ |
| @@ -2558,11 +2630,12 @@ border-radius: 55rpx; | @@ -2558,11 +2630,12 @@ border-radius: 55rpx; | ||
| 2558 | height: 100%; | 2630 | height: 100%; |
| 2559 | background:#f7f7f7; | 2631 | background:#f7f7f7; |
| 2560 | border-radius: 20rpx 0rpx 0rpx 20rpx; | 2632 | border-radius: 20rpx 0rpx 0rpx 20rpx; |
| 2561 | - padding-left: 20rpx; | 2633 | + /* padding: 0 10rpx; */ |
| 2562 | } | 2634 | } |
| 2563 | .card-frame{ | 2635 | .card-frame{ |
| 2564 | - margin-top: 0rpx; padding-right: 23rpx; | ||
| 2565 | - margin-right: 15rpx; | 2636 | + margin-top: 0rpx; |
| 2637 | + /* padding-right: 23rpx; | ||
| 2638 | + margin-right: 15rpx; */ | ||
| 2566 | } | 2639 | } |
| 2567 | .advert-card{ | 2640 | .advert-card{ |
| 2568 | margin-top: 0rpx!important; | 2641 | margin-top: 0rpx!important; |
| @@ -2576,13 +2649,13 @@ border-radius: 55rpx; | @@ -2576,13 +2649,13 @@ border-radius: 55rpx; | ||
| 2576 | } | 2649 | } |
| 2577 | .grade-card-frame{ | 2650 | .grade-card-frame{ |
| 2578 | 2651 | ||
| 2579 | - height:45rpx ; | 2652 | + /* height:45rpx ; */ |
| 2580 | background: #3c300a; | 2653 | background: #3c300a; |
| 2581 | border-radius: 20rpx; | 2654 | border-radius: 20rpx; |
| 2582 | - margin-top: 10px; | ||
| 2583 | - margin-left: 7rpx; | 2655 | + /* margin-top: 10px; |
| 2656 | + margin-left: 7rpx; */ | ||
| 2584 | justify-content: center; | 2657 | justify-content: center; |
| 2585 | - padding: 0 15rpx; | 2658 | + padding: 4rpx 12rpx; |
| 2586 | } | 2659 | } |
| 2587 | .grade-card-frame .img{ | 2660 | .grade-card-frame .img{ |
| 2588 | width: 24rpx; | 2661 | width: 24rpx; |
| @@ -2596,7 +2669,7 @@ border-radius: 55rpx; | @@ -2596,7 +2669,7 @@ border-radius: 55rpx; | ||
| 2596 | max-width: 165rpx; | 2669 | max-width: 165rpx; |
| 2597 | } | 2670 | } |
| 2598 | .card-effect{ | 2671 | .card-effect{ |
| 2599 | - margin-left: 15rpx; | 2672 | + /* margin-left: 15rpx; */ |
| 2600 | } | 2673 | } |
| 2601 | .at_once_carde{ | 2674 | .at_once_carde{ |
| 2602 | width:65rpx; | 2675 | width:65rpx; |
| @@ -2620,22 +2693,23 @@ button.custom-service::after{ | @@ -2620,22 +2693,23 @@ button.custom-service::after{ | ||
| 2620 | border: 0; | 2693 | border: 0; |
| 2621 | } | 2694 | } |
| 2622 | .no_store{color:#d60021; font-size: 26rpx;} | 2695 | .no_store{color:#d60021; font-size: 26rpx;} |
| 2623 | -.cx_show_view{ width: 580rpx; line-height: 30rpx; margin-bottom: 6rpx; } | 2696 | +.cx_show_view{ width: 580rpx; /* line-height: 30rpx; margin-bottom: 6rpx; */ } |
| 2624 | .cx_show_view .word{ width: 400rpx} | 2697 | .cx_show_view .word{ width: 400rpx} |
| 2625 | .prom_condition { | 2698 | .prom_condition { |
| 2626 | color: #d60021; | 2699 | color: #d60021; |
| 2627 | - width: 180rpx; | ||
| 2628 | - height: 30rpx; | 2700 | + /* width: 180rpx; */ |
| 2701 | + /* height: 30rpx; */ | ||
| 2629 | font-size: 20rpx; | 2702 | font-size: 20rpx; |
| 2630 | - padding-top: 0.01rpx; | ||
| 2631 | - display: flex; | 2703 | + /* padding-top: 0.01rpx; */ |
| 2704 | + /* display: flex; | ||
| 2632 | justify-content: center; | 2705 | justify-content: center; |
| 2633 | - align-items: center; | ||
| 2634 | - border: #d60021 solid 1rpx; | 2706 | + align-items: center; */ |
| 2707 | + border: 2rpx solid #d60021; | ||
| 2635 | border-radius: 10rpx; | 2708 | border-radius: 10rpx; |
| 2636 | margin-right:10rpx ; | 2709 | margin-right:10rpx ; |
| 2637 | - margin-left: 10rpx; | ||
| 2638 | - | 2710 | + /* margin-left: 10rpx; */ |
| 2711 | + font-size: 24rpx; | ||
| 2712 | + padding: 0 10rpx; | ||
| 2639 | } | 2713 | } |
| 2640 | .hui_img{ width: 44rpx; height: 44rpx; margin-right: 8rpx} | 2714 | .hui_img{ width: 44rpx; height: 44rpx; margin-right: 8rpx} |
| 2641 | .order_hui{color: #444; width: 420rpx} | 2715 | .order_hui{color: #444; width: 420rpx} |
| @@ -2733,4 +2807,25 @@ button.custom-service::after{ | @@ -2733,4 +2807,25 @@ button.custom-service::after{ | ||
| 2733 | .quan_price{ | 2807 | .quan_price{ |
| 2734 | background-color: #ff4700; color: #fff; padding: 10rpx 25rpx; margin-left: 10rpx; border-radius: 30rpx; | 2808 | background-color: #ff4700; color: #fff; padding: 10rpx 25rpx; margin-left: 10rpx; border-radius: 30rpx; |
| 2735 | } | 2809 | } |
| 2736 | -.stock{ width: 25%; height: 60rpx; border: 1rpx solid #eee; text-align: center; line-height: 60rpx;} | ||
| 2737 | \ No newline at end of file | 2810 | \ No newline at end of file |
| 2811 | + | ||
| 2812 | +/*--闪白屏--*/ | ||
| 2813 | +.g_img_box{ | ||
| 2814 | + background-position: center center; | ||
| 2815 | + background-repeat: no-repeat; | ||
| 2816 | + -webkit-background-size: cover; | ||
| 2817 | + -moz-background-size: cover; | ||
| 2818 | + background-size: cover; | ||
| 2819 | +} | ||
| 2820 | + | ||
| 2821 | + | ||
| 2822 | + | ||
| 2823 | +.arrow { | ||
| 2824 | + width: auto !important; | ||
| 2825 | + position: absolute; | ||
| 2826 | + right: 0; | ||
| 2827 | + top: 10rpx; | ||
| 2828 | +} | ||
| 2829 | + | ||
| 2830 | +.stock { | ||
| 2831 | + flex: 1; | ||
| 2832 | +} | ||
| 2738 | \ No newline at end of file | 2833 | \ No newline at end of file |
pages/cart/cart2/cart2.js
| @@ -3429,14 +3429,6 @@ Page({ | @@ -3429,14 +3429,6 @@ Page({ | ||
| 3429 | }, | 3429 | }, |
| 3430 | 3430 | ||
| 3431 | 3431 | ||
| 3432 | - clickTab(e) { | ||
| 3433 | - // console.log(e); | ||
| 3434 | - let index = e.currentTarget.dataset.index; | ||
| 3435 | - this.setData({ | ||
| 3436 | - currentTabIndex: index, | ||
| 3437 | - }); | ||
| 3438 | - this.setexptype_w(e); | ||
| 3439 | - }, | ||
| 3440 | 3432 | ||
| 3441 | 3433 | ||
| 3442 | 3434 |
pages/goods/goodsInfo/buy_integral.wxml
| @@ -70,7 +70,7 @@ | @@ -70,7 +70,7 @@ | ||
| 70 | <view class="b_num"> | 70 | <view class="b_num"> |
| 71 | <view>购买数量</view> | 71 | <view>购买数量</view> |
| 72 | <view class="count"> | 72 | <view class="count"> |
| 73 | - <view bindtap="subCartNum_inte" class="sub">-</view> | 73 | + <view bindtap="{{goodsInputNum <= 1 ? '':'subCartNum_inte'}}" class="sub {{goodsInputNum <= 1 ? 'active':''}}">-</view> |
| 74 | <input bindblur="inputCartNum_inte" type="number" value="{{goodsInputNum}}"></input> | 74 | <input bindblur="inputCartNum_inte" type="number" value="{{goodsInputNum}}"></input> |
| 75 | <view bindtap="addCartNum_inte" class="add">+</view> | 75 | <view bindtap="addCartNum_inte" class="add">+</view> |
| 76 | </view> | 76 | </view> |
pages/goods/goodsInfo/buy_integral_normal.wxml
| @@ -71,7 +71,7 @@ | @@ -71,7 +71,7 @@ | ||
| 71 | <view class="b_num"> | 71 | <view class="b_num"> |
| 72 | <view>购买数量</view> | 72 | <view>购买数量</view> |
| 73 | <view class="count"> | 73 | <view class="count"> |
| 74 | - <view bindtap="subCartNum" class="sub">-</view> | 74 | + <view bindtap="{{goodsInputNum <= 1 ? '':'subCartNum'}}" class="sub {{goodsInputNum <= 1 ? 'active':''}}">-</view> |
| 75 | <input bindblur="inputCartNum" type="number" value="{{goodsInputNum}}"></input> | 75 | <input bindblur="inputCartNum" type="number" value="{{goodsInputNum}}"></input> |
| 76 | <view bindtap="addCartNum" class="add">+</view> | 76 | <view bindtap="addCartNum" class="add">+</view> |
| 77 | </view> | 77 | </view> |
pages/goods/goodsInfo/buy_pt.wxml
| @@ -107,7 +107,7 @@ | @@ -107,7 +107,7 @@ | ||
| 107 | <view class="b_num" hidden="{{ismend==1}}" style="margin-top: 20rpx"> | 107 | <view class="b_num" hidden="{{ismend==1}}" style="margin-top: 20rpx"> |
| 108 | <view>购买数量</view> | 108 | <view>购买数量</view> |
| 109 | <view class="count"> | 109 | <view class="count"> |
| 110 | - <view bindtap="subCartNum" class="sub">-</view> | 110 | + <view bindtap="{{goodsInputNum <= 1 ? '':'subCartNum_inte'}}" class="sub {{goodsInputNum <= 1 ? 'active':''}}">-</view> |
| 111 | <input bindblur="inputCartNum" class="xc-val-fream" type="number" value="{{goodsInputNum}}"></input> | 111 | <input bindblur="inputCartNum" class="xc-val-fream" type="number" value="{{goodsInputNum}}"></input> |
| 112 | <view bindtap="addCartNum" class="add">+</view> | 112 | <view bindtap="addCartNum" class="add">+</view> |
| 113 | </view> | 113 | </view> |
pages/goods/goodsInfo/goodsInfo.wxss
| @@ -568,9 +568,9 @@ border-radius: 0 56rpx 55rpx 0; | @@ -568,9 +568,9 @@ border-radius: 0 56rpx 55rpx 0; | ||
| 568 | 568 | ||
| 569 | .spec-goods { | 569 | .spec-goods { |
| 570 | padding: 30rpx 0 20rpx; | 570 | padding: 30rpx 0 20rpx; |
| 571 | - float: left; | 571 | + /* float: left; */ |
| 572 | width: 100%; | 572 | width: 100%; |
| 573 | - border-bottom:2rpx solid #eee; | 573 | + /* border-bottom:2rpx solid #eee; */ |
| 574 | } | 574 | } |
| 575 | 575 | ||
| 576 | .spec-img { | 576 | .spec-img { |
| @@ -846,7 +846,7 @@ left:31rpx;} | @@ -846,7 +846,7 @@ left:31rpx;} | ||
| 846 | .juzhong .xq .hs1{font-size: 28rpx; color: #ab8f9e} | 846 | .juzhong .xq .hs1{font-size: 28rpx; color: #ab8f9e} |
| 847 | .juzhong .xq .title .close{position: absolute;top: 0; right: 0; width: 45rpx; height: 45rpx;} | 847 | .juzhong .xq .title .close{position: absolute;top: 0; right: 0; width: 45rpx; height: 45rpx;} |
| 848 | 848 | ||
| 849 | -.pt_qd{margin-top: 40rpx; height: auto;} | 849 | +.pt_qd{/* margin-top: 40rpx; height: auto; */padding: 20rpx;} |
| 850 | .spec-cart-btn.w100{width: 95%; margin-left: 0; height: 75rpx; line-height:75rpx;margin: auto; } | 850 | .spec-cart-btn.w100{width: 95%; margin-left: 0; height: 75rpx; line-height:75rpx;margin: auto; } |
| 851 | 851 | ||
| 852 | .sto_v{color: #333;} | 852 | .sto_v{color: #333;} |
| @@ -1000,7 +1000,7 @@ left:31rpx;} | @@ -1000,7 +1000,7 @@ left:31rpx;} | ||
| 1000 | .table_s .tb-l:last-child {border-bottom: none;} | 1000 | .table_s .tb-l:last-child {border-bottom: none;} |
| 1001 | 1001 | ||
| 1002 | .bzfu_img{ width: 164rpx; height:34rpx; /* margin-right: 18rpx; margin-left: 12rpx */ } | 1002 | .bzfu_img{ width: 164rpx; height:34rpx; /* margin-right: 18rpx; margin-left: 12rpx */ } |
| 1003 | - .bz_view{ /* height:100rpx; padding: 0 34rpx 0 13rpx; */ color: #333; font-size: 28rpx; padding: 20rpx; | 1003 | + .bz_view{ /* height:100rpx; padding: 0 34rpx 0 13rpx; */ color: #333; font-size: 28rpx; padding: 20rpx 20rpx 20rpx 10rpx; |
| 1004 | /* border-bottom: 3rpx solid #eee; */ | 1004 | /* border-bottom: 3rpx solid #eee; */ |
| 1005 | /* border-top: 3rpx solid #eee; */} | 1005 | /* border-top: 3rpx solid #eee; */} |
| 1006 | .bz_view view{ width: 460rpx; /* max-height: 70rpx; */ /* overflow: hidden; */} | 1006 | .bz_view view{ width: 460rpx; /* max-height: 70rpx; */ /* overflow: hidden; */} |