Commit d68fc47aa841cb0c48d78021d524d0a08379447e
1 parent
91fe5eba
列表样式
Showing
3 changed files
with
132 additions
and
45 deletions
components/diy_seckill/diy_seckill.js
| @@ -37,7 +37,8 @@ Component({ | @@ -37,7 +37,8 @@ Component({ | ||
| 37 | timer: null, | 37 | timer: null, |
| 38 | user_id:0, | 38 | user_id:0, |
| 39 | img_width:100, | 39 | img_width:100, |
| 40 | - img_height:100 | 40 | + img_height:100, |
| 41 | + swiperHeight:0 | ||
| 41 | }, | 42 | }, |
| 42 | 43 | ||
| 43 | pageLifetimes: { | 44 | pageLifetimes: { |
| @@ -69,7 +70,6 @@ Component({ | @@ -69,7 +70,6 @@ Component({ | ||
| 69 | 70 | ||
| 70 | ready: function () { | 71 | ready: function () { |
| 71 | var g_id = this.data.object; | 72 | var g_id = this.data.object; |
| 72 | - | ||
| 73 | this.init(g_id); | 73 | this.init(g_id); |
| 74 | this.data.user_id=getApp().globalData.user_id; | 74 | this.data.user_id=getApp().globalData.user_id; |
| 75 | }, | 75 | }, |
| @@ -125,17 +125,7 @@ Component({ | @@ -125,17 +125,7 @@ Component({ | ||
| 125 | th.no_gid_set(); | 125 | th.no_gid_set(); |
| 126 | } | 126 | } |
| 127 | }, | 127 | }, |
| 128 | - imageLoad(e){ | ||
| 129 | - var width=e.detail.width, //获取图片真实宽度 | ||
| 130 | - height=e.detail.height, | ||
| 131 | - ratio=width/height; //图片的真实宽高比例 | ||
| 132 | - let object=this.data.object | ||
| 133 | - let picture_scale=object.picture_scale | ||
| 134 | - if (condition) { | ||
| 135 | - | ||
| 136 | - } | ||
| 137 | 128 | ||
| 138 | - }, | ||
| 139 | //当是默认的情况 | 129 | //当是默认的情况 |
| 140 | no_gid_set() { | 130 | no_gid_set() { |
| 141 | var user_id=getApp().globalData.user_id; | 131 | var user_id=getApp().globalData.user_id; |
| @@ -207,26 +197,37 @@ Component({ | @@ -207,26 +197,37 @@ Component({ | ||
| 207 | 197 | ||
| 208 | 198 | ||
| 209 | Promise.all(promisies).then(() => { | 199 | Promise.all(promisies).then(() => { |
| 210 | - | ||
| 211 | // 判断活动是否结束 | 200 | // 判断活动是否结束 |
| 212 | for(let i in all_array){ | 201 | for(let i in all_array){ |
| 213 | let item=all_array[i]; | 202 | let item=all_array[i]; |
| 214 | if(newTime > item.end_time) { | 203 | if(newTime > item.end_time) { |
| 215 | all_array[i].status = 3; | 204 | all_array[i].status = 3; |
| 216 | - }; | ||
| 217 | - | 205 | + }; |
| 218 | } | 206 | } |
| 219 | 207 | ||
| 220 | - var arr = new Array(); | ||
| 221 | - //--三个三个一组--- | ||
| 222 | - for (var i = 0; i < all_array.length; i += 3) { | ||
| 223 | - arr.push(all_array.slice(i, i + 3)); | ||
| 224 | - } | 208 | + var arr = new Array(); |
| 209 | + if (th.data.object.style==6) { | ||
| 210 | + //--三个三个一组--- | ||
| 211 | + for (var i = 0; i < all_array.length; i += 2) { | ||
| 212 | + arr.push(all_array.slice(i, i + 2)); | ||
| 213 | + } | ||
| 214 | + | ||
| 215 | + }else{ | ||
| 216 | + //--三个三个一组--- | ||
| 217 | + for (var i = 0; i < all_array.length; i += 3) { | ||
| 218 | + arr.push(all_array.slice(i, i + 3)); | ||
| 219 | + } | ||
| 220 | + } | ||
| 221 | + | ||
| 225 | /*--熏染到前台--*/ | 222 | /*--熏染到前台--*/ |
| 226 | console.log('秒杀数据：'); | 223 | console.log('秒杀数据：'); |
| 227 | console.log(arr); | 224 | console.log(arr); |
| 228 | console.error('....................'); | 225 | console.error('....................'); |
| 229 | - th.setData({ goods_array: arr }); | 226 | + th.setData({ goods_array: arr }); |
| 227 | + if (th.data.object.style==6) { | ||
| 228 | + th.setSwiper_h() | ||
| 229 | + } | ||
| 230 | + | ||
| 230 | }); | 231 | }); |
| 231 | 232 | ||
| 232 | 233 | ||
| @@ -234,7 +235,32 @@ Component({ | @@ -234,7 +235,32 @@ Component({ | ||
| 234 | th.countDown2(th); | 235 | th.countDown2(th); |
| 235 | }, 1000); | 236 | }, 1000); |
| 236 | }, | 237 | }, |
| 237 | - | 238 | + setSwiper_h(){ |
| 239 | + var th=this | ||
| 240 | + wx.createSelectorQuery().in(this).select('.swiper_h').boundingClientRect(rect => { | ||
| 241 | + console.error('组件高度'); | ||
| 242 | + console.log(rect) | ||
| 243 | + if (rect && rect.height) { | ||
| 244 | + var sumHeigth=(rect.height+13)+'px' | ||
| 245 | + th.setData({ | ||
| 246 | + swiperHeight: sumHeigth | ||
| 247 | + }) | ||
| 248 | + } | ||
| 249 | + }).exec(); | ||
| 250 | + // const query = this.createSelectorQuery() | ||
| 251 | + // query.select('.swiper_h').boundingClientRect() | ||
| 252 | + // query.exec( (res)=> { | ||
| 253 | + // console.log(res) | ||
| 254 | + // console.log(res[0].height) | ||
| 255 | + // console.log(res[0].height * data.t.length) | ||
| 256 | + // let sumHeigth = res[0].height * data.t.length; | ||
| 257 | + // console.error('组件高度'); | ||
| 258 | + // console.log(sumHeigth); | ||
| 259 | + // th.setData({ | ||
| 260 | + // swiperHeight: sumHeigth | ||
| 261 | + // }) | ||
| 262 | + // }) | ||
| 263 | + }, | ||
| 238 | 264 | ||
| 239 | 265 | ||
| 240 | //---小于10的格式化函数---- | 266 | //---小于10的格式化函数---- |
components/diy_seckill/diy_seckill.wxml
| @@ -26,15 +26,15 @@ | @@ -26,15 +26,15 @@ | ||
| 26 | <image class="imgBox_img" wx:if="{{object.subscript_style==5}}" src="{{object.subscript_diy_style}}"></image> | 26 | <image class="imgBox_img" wx:if="{{object.subscript_style==5}}" src="{{object.subscript_diy_style}}"></image> |
| 27 | <image class="imgBox_img" wx:if="{{object.subscript_style<=4}}" src="{{imghost+'/miniapp/images/component/j0'+object.subscript_style +'.png'}}"></image> | 27 | <image class="imgBox_img" wx:if="{{object.subscript_style<=4}}" src="{{imghost+'/miniapp/images/component/j0'+object.subscript_style +'.png'}}"></image> |
| 28 | </view> | 28 | </view> |
| 29 | - <view class="new_item1_time" wx:if="{{object.count_down}}"> | 29 | + <view style="height: 70rpx;" class="new_item1_time" wx:if="{{object.count_down}}"> |
| 30 | <image src="{{imghost+'/miniapp/images/component/seckill.png'}}"></image> | 30 | <image src="{{imghost+'/miniapp/images/component/seckill.png'}}"></image> |
| 31 | <view style="text-align: center;"> | 31 | <view style="text-align: center;"> |
| 32 | <view>距结束时间</view> | 32 | <view>距结束时间</view> |
| 33 | <view>{{aitem.djs.day}}天{{aitem.djs.hou}}:{{aitem.djs.min}}:{{aitem.djs.sec}}</view> | 33 | <view>{{aitem.djs.day}}天{{aitem.djs.hou}}:{{aitem.djs.min}}:{{aitem.djs.sec}}</view> |
| 34 | </view> | 34 | </view> |
| 35 | </view> | 35 | </view> |
| 36 | - <view class="ellipsis-2 new_item1_goods_name" style="{{(object.text_style==2 ? 'font-weight: bold;':'') + (object.text_align==2 ? 'text-align:center;' :'' )}}" wx:if="{{object.trade_name}}">{{aitem.goods_name}}</view> | ||
| 37 | - <view class="new_item1_price" style="{{(object.text_align==2 ? 'justify-content:center;flex-direction:column;' :'' )}}"> | 36 | + <view class="ellipsis-2 new_item1_goods_name" style="{{'padding:10rpx;'+(object.text_style==2 ? 'font-weight: bold;':'') + (object.text_align==2 ? 'text-align:center;' :'' )}}" wx:if="{{object.trade_name}}">{{aitem.goods_name}}</view> |
| 37 | + <view class="new_item1_price" style="{{'padding:0 10rpx;'+(object.text_align==2 ? 'justify-content:center;flex-direction:column;' :'' )}}"> | ||
| 38 | <view style="{{(object.text_style==2 ? 'font-weight: bold;':'')}}"> | 38 | <view style="{{(object.text_style==2 ? 'font-weight: bold;':'')}}"> |
| 39 | <view class="flex" style="{{'font-size: 28rpx; ' +(object.text_align==2 ? 'justify-content:center;' :'' ) }}"> | 39 | <view class="flex" style="{{'font-size: 28rpx; ' +(object.text_align==2 ? 'justify-content:center;' :'' ) }}"> |
| 40 | <view class="clor" style="margin-right: 5rpx;" wx:if="{{object.commodity_price}}">￥<text style="font-size:42rpx;">{{aitem.price}}</text></view> | 40 | <view class="clor" style="margin-right: 5rpx;" wx:if="{{object.commodity_price}}">￥<text style="font-size:42rpx;">{{aitem.price}}</text></view> |
| @@ -59,13 +59,13 @@ | @@ -59,13 +59,13 @@ | ||
| 59 | <block wx:if="{{object.style==2}}"> | 59 | <block wx:if="{{object.style==2}}"> |
| 60 | <view style="{{'padding-left:'+object.page_margins+'px;padding-right:'+object.page_margins+'px;'}}" class="{{'flex2 new_item1_box '+ ((object.product_style==1 || object.product_style==3 )? ' bgf ':'')}}"> | 60 | <view style="{{'padding-left:'+object.page_margins+'px;padding-right:'+object.page_margins+'px;'}}" class="{{'flex2 new_item1_box '+ ((object.product_style==1 || object.product_style==3 )? ' bgf ':'')}}"> |
| 61 | <block wx:for="{{goods_array}}"> | 61 | <block wx:for="{{goods_array}}"> |
| 62 | - <view wx:for="{{item}}" wx:for-item="aitem" wx:for-index="aind" class="{{'new_item1 ' + (object.product_style==2 ? ' boxsha ':'') + (object.product_style==3 ? ' aborder ':'') + (object.chamfer_of_main_drawing==2 ? ' but_radius5 ':'') + ((object.product_style==1 || object.product_style==3 )? ' bgf ':'')}}" style="{{'margin-bottom:'+object.product_spacing+'px; '+('width:calc(100%/2 - ' + object.product_spacing/2+'px)')}}"> | 62 | + <view wx:for="{{item}}" wx:for-item="aitem" wx:for-index="aind" class="{{'boxpad new_item1 ' + (object.product_style==2 ? ' boxsha ':'') + (object.product_style==3 ? ' aborder ':'') + ((object.product_style==1 || object.product_style==3 )? ' bgf ':'')}}" style="{{'margin-bottom:'+object.product_spacing+'px; '+('width:calc(100%/2 - ' + object.product_spacing/2+'px)')}}"> |
| 63 | <navigator url="{{aitem.goods_type == 1 ? ('/packageA/pages/goodsInfo/goodsInfo?goods_id=' + aitem.goods_id + '&title=' + aitem.goods_name + '&prom_type=1&prom_id=' + aitem.id ) : ('/pages/goods/goodsInfo/goodsInfo?goods_id=' + aitem.goods_id + '&title=' + aitem.goods_name + '&prom_type=1&prom_id=' + aitem.id)}}" class="s1_gk_a1"> | 63 | <navigator url="{{aitem.goods_type == 1 ? ('/packageA/pages/goodsInfo/goodsInfo?goods_id=' + aitem.goods_id + '&title=' + aitem.goods_name + '&prom_type=1&prom_id=' + aitem.id ) : ('/pages/goods/goodsInfo/goodsInfo?goods_id=' + aitem.goods_id + '&title=' + aitem.goods_name + '&prom_type=1&prom_id=' + aitem.id)}}" class="s1_gk_a1"> |
| 64 | <view class="imgBox"> | 64 | <view class="imgBox"> |
| 65 | <!-- <image mode="{{object.picture_fill==1 ? 'aspectFill' : 'scaleToFill'}}" class="{{'new_item1_image '+ 'aspect_ratio'+object.picture_scale}}" style="{{'width:'+img_width+';height:'+img_height}}" src="{{imghost+aitem.original_img}}" data-errorimg="goods_array[{{index}}][{{aind}}].original_img" binderror="bind_bnerr3"></image> --> | 65 | <!-- <image mode="{{object.picture_fill==1 ? 'aspectFill' : 'scaleToFill'}}" class="{{'new_item1_image '+ 'aspect_ratio'+object.picture_scale}}" style="{{'width:'+img_width+';height:'+img_height}}" src="{{imghost+aitem.original_img}}" data-errorimg="goods_array[{{index}}][{{aind}}].original_img" binderror="bind_bnerr3"></image> --> |
| 66 | <view class="{{'container'+object.picture_scale}}" style="{{object.picture_fill==1 ? 'background-color: #fff;' : ''}}"> | 66 | <view class="{{'container'+object.picture_scale}}" style="{{object.picture_fill==1 ? 'background-color: #fff;' : ''}}"> |
| 67 | <!-- <image mode="{{object.picture_fill==1 ? 'aspectFit' : 'aspectFill'}}" class="{{'new_item1_image images1'}}" src="{{imghost+aitem.original_img}}" data-errorimg="goods_array[{{index}}][{{aind}}].original_img" binderror="bind_bnerr3"></image> --> | 67 | <!-- <image mode="{{object.picture_fill==1 ? 'aspectFit' : 'aspectFill'}}" class="{{'new_item1_image images1'}}" src="{{imghost+aitem.original_img}}" data-errorimg="goods_array[{{index}}][{{aind}}].original_img" binderror="bind_bnerr3"></image> --> |
| 68 | - <image mode="{{object.picture_fill==1 ? 'aspectFit' : 'aspectFill'}}" class="{{'new_item1_image images1'}}" src="./t1.png" data-errorimg="goods_array[{{index}}][{{aind}}].original_img" binderror="bind_bnerr3"></image> | 68 | + <image mode="{{object.picture_fill==1 ? 'aspectFit' : 'aspectFill'}}" class="{{'new_item1_image images1 '+ (object.chamfer_of_main_drawing==2 ? ' but_radius5 ':'') }}" src="./t1.png" data-errorimg="goods_array[{{index}}][{{aind}}].original_img" binderror="bind_bnerr3"></image> |
| 69 | </view> | 69 | </view> |
| 70 | 70 | ||
| 71 | <image class="imgBox_img" wx:if="{{object.subscript_style==5}}" src="{{object.subscript_diy_style}}"></image> | 71 | <image class="imgBox_img" wx:if="{{object.subscript_style==5}}" src="{{object.subscript_diy_style}}"></image> |
| @@ -104,13 +104,13 @@ | @@ -104,13 +104,13 @@ | ||
| 104 | <block wx:if="{{object.style==3}}"> | 104 | <block wx:if="{{object.style==3}}"> |
| 105 | <view style="{{'padding-left:'+object.page_margins+'px;padding-right:'+object.page_margins+'px;'}}" class="{{'flex2 new_item1_box '+ ((object.product_style==1 || object.product_style==3 )? ' bgf ':'')}}"> | 105 | <view style="{{'padding-left:'+object.page_margins+'px;padding-right:'+object.page_margins+'px;'}}" class="{{'flex2 new_item1_box '+ ((object.product_style==1 || object.product_style==3 )? ' bgf ':'')}}"> |
| 106 | <block wx:for="{{goods_array}}"> | 106 | <block wx:for="{{goods_array}}"> |
| 107 | - <view wx:for="{{item}}" wx:for-item="aitem" wx:for-index="aind" class="{{'new_item1 ' + (object.product_style==2 ? ' boxsha ':'') + (object.product_style==3 ? ' aborder ':'') + (object.chamfer_of_main_drawing==2 ? ' but_radius5 ':'') + ((object.product_style==1 || object.product_style==3 )? ' bgf ':'')}}" style="{{'margin-bottom:'+object.product_spacing+'px; '+('width:calc(100%/3 - ' + (object.product_spacing*2)/3+'px)')}}"> | 107 | + <view wx:for="{{item}}" wx:for-item="aitem" wx:for-index="aind" class="{{'boxpad new_item1 ' + (object.product_style==2 ? ' boxsha ':'') + (object.product_style==3 ? ' aborder ':'') + ((object.product_style==1 || object.product_style==3 )? ' bgf ':'')}}" style="{{'margin-bottom:'+object.product_spacing+'px; '+('width:calc(100%/3 - ' + (object.product_spacing*2)/3+'px)')}}"> |
| 108 | <navigator url="{{aitem.goods_type == 1 ? ('/packageA/pages/goodsInfo/goodsInfo?goods_id=' + aitem.goods_id + '&title=' + aitem.goods_name + '&prom_type=1&prom_id=' + aitem.id ) : ('/pages/goods/goodsInfo/goodsInfo?goods_id=' + aitem.goods_id + '&title=' + aitem.goods_name + '&prom_type=1&prom_id=' + aitem.id)}}" class="s1_gk_a1"> | 108 | <navigator url="{{aitem.goods_type == 1 ? ('/packageA/pages/goodsInfo/goodsInfo?goods_id=' + aitem.goods_id + '&title=' + aitem.goods_name + '&prom_type=1&prom_id=' + aitem.id ) : ('/pages/goods/goodsInfo/goodsInfo?goods_id=' + aitem.goods_id + '&title=' + aitem.goods_name + '&prom_type=1&prom_id=' + aitem.id)}}" class="s1_gk_a1"> |
| 109 | <view class="imgBox"> | 109 | <view class="imgBox"> |
| 110 | <!-- <image mode="{{object.picture_fill==1 ? 'aspectFill' : 'scaleToFill'}}" class="{{'new_item1_image '+ 'aspect_ratio'+object.picture_scale}}" style="{{'width:'+img_width+';height:'+img_height}}" src="{{imghost+aitem.original_img}}" data-errorimg="goods_array[{{index}}][{{aind}}].original_img" binderror="bind_bnerr3"></image> --> | 110 | <!-- <image mode="{{object.picture_fill==1 ? 'aspectFill' : 'scaleToFill'}}" class="{{'new_item1_image '+ 'aspect_ratio'+object.picture_scale}}" style="{{'width:'+img_width+';height:'+img_height}}" src="{{imghost+aitem.original_img}}" data-errorimg="goods_array[{{index}}][{{aind}}].original_img" binderror="bind_bnerr3"></image> --> |
| 111 | <view class="{{'container'+object.picture_scale}}" style="{{object.picture_fill==1 ? 'background-color: #fff;' : ''}}"> | 111 | <view class="{{'container'+object.picture_scale}}" style="{{object.picture_fill==1 ? 'background-color: #fff;' : ''}}"> |
| 112 | <!-- <image mode="{{object.picture_fill==1 ? 'aspectFit' : 'aspectFill'}}" class="{{'new_item1_image images1'}}" src="{{imghost+aitem.original_img}}" data-errorimg="goods_array[{{index}}][{{aind}}].original_img" binderror="bind_bnerr3"></image> --> | 112 | <!-- <image mode="{{object.picture_fill==1 ? 'aspectFit' : 'aspectFill'}}" class="{{'new_item1_image images1'}}" src="{{imghost+aitem.original_img}}" data-errorimg="goods_array[{{index}}][{{aind}}].original_img" binderror="bind_bnerr3"></image> --> |
| 113 | - <image mode="{{object.picture_fill==1 ? 'aspectFit' : 'aspectFill'}}" class="{{'new_item1_image images1'}}" src="./t1.png" data-errorimg="goods_array[{{index}}][{{aind}}].original_img" binderror="bind_bnerr3"></image> | 113 | + <image mode="{{object.picture_fill==1 ? 'aspectFit' : 'aspectFill'}}" class="{{'new_item1_image images1 '+ (object.chamfer_of_main_drawing==2 ? ' but_radius5 ':'') }}" src="./t1.png" data-errorimg="goods_array[{{index}}][{{aind}}].original_img" binderror="bind_bnerr3"></image> |
| 114 | </view> | 114 | </view> |
| 115 | 115 | ||
| 116 | <image class="imgBox_img" wx:if="{{object.subscript_style==5}}" src="{{object.subscript_diy_style}}"></image> | 116 | <image class="imgBox_img" wx:if="{{object.subscript_style==5}}" src="{{object.subscript_diy_style}}"></image> |
| @@ -149,14 +149,14 @@ | @@ -149,14 +149,14 @@ | ||
| 149 | <block wx:if="{{object.style==4}}"> | 149 | <block wx:if="{{object.style==4}}"> |
| 150 | <view style="{{'padding-left:'+object.page_margins+'px;padding-right:'+object.page_margins+'px;'}}" class="{{'flex2 new_item1_box '+ ((object.product_style==1 || object.product_style==3 )? ' bgf ':'')}}"> | 150 | <view style="{{'padding-left:'+object.page_margins+'px;padding-right:'+object.page_margins+'px;'}}" class="{{'flex2 new_item1_box '+ ((object.product_style==1 || object.product_style==3 )? ' bgf ':'')}}"> |
| 151 | <block wx:for="{{goods_array}}"> | 151 | <block wx:for="{{goods_array}}"> |
| 152 | - <view wx:for="{{item}}" wx:for-item="aitem" wx:for-index="aind" class="{{'new_item1 ' + (object.product_style==2 ? ' boxsha ':'') + (object.product_style==3 ? ' aborder ':'') + (object.chamfer_of_main_drawing==2 ? ' but_radius5 ':'') + ((object.product_style==1 || object.product_style==3 )? ' bgf ':'')}}" style="{{'margin-bottom:'+object.product_spacing+'px;'}}"> | 152 | + <view wx:for="{{item}}" wx:for-item="aitem" wx:for-index="aind" class="{{'boxpad new_item1 ' + (object.product_style==2 ? ' boxsha ':'') + (object.product_style==3 ? ' aborder ':'') + ((object.product_style==1 || object.product_style==3 )? ' bgf ':'')}}" style="{{'border-top-right-radius:0;margin-bottom:'+object.product_spacing+'px;'}}"> |
| 153 | <navigator style="display: flex;" url="{{aitem.goods_type == 1 ? ('/packageA/pages/goodsInfo/goodsInfo?goods_id=' + aitem.goods_id + '&title=' + aitem.goods_name + '&prom_type=1&prom_id=' + aitem.id ) : ('/pages/goods/goodsInfo/goodsInfo?goods_id=' + aitem.goods_id + '&title=' + aitem.goods_name + '&prom_type=1&prom_id=' + aitem.id)}}" class="s1_gk_a1"> | 153 | <navigator style="display: flex;" url="{{aitem.goods_type == 1 ? ('/packageA/pages/goodsInfo/goodsInfo?goods_id=' + aitem.goods_id + '&title=' + aitem.goods_name + '&prom_type=1&prom_id=' + aitem.id ) : ('/pages/goods/goodsInfo/goodsInfo?goods_id=' + aitem.goods_id + '&title=' + aitem.goods_name + '&prom_type=1&prom_id=' + aitem.id)}}" class="s1_gk_a1"> |
| 154 | <view style="width: 50%;"> | 154 | <view style="width: 50%;"> |
| 155 | <view class="imgBox"> | 155 | <view class="imgBox"> |
| 156 | <!-- <image mode="{{object.picture_fill==1 ? 'aspectFill' : 'scaleToFill'}}" class="{{'new_item1_image '+ 'aspect_ratio'+object.picture_scale}}" style="{{'width:'+img_width+';height:'+img_height}}" src="{{imghost+aitem.original_img}}" data-errorimg="goods_array[{{index}}][{{aind}}].original_img" binderror="bind_bnerr3"></image> --> | 156 | <!-- <image mode="{{object.picture_fill==1 ? 'aspectFill' : 'scaleToFill'}}" class="{{'new_item1_image '+ 'aspect_ratio'+object.picture_scale}}" style="{{'width:'+img_width+';height:'+img_height}}" src="{{imghost+aitem.original_img}}" data-errorimg="goods_array[{{index}}][{{aind}}].original_img" binderror="bind_bnerr3"></image> --> |
| 157 | <view class="{{'container'+object.picture_scale}}" style="{{object.picture_fill==1 ? 'background-color: #fff;' : ''}}"> | 157 | <view class="{{'container'+object.picture_scale}}" style="{{object.picture_fill==1 ? 'background-color: #fff;' : ''}}"> |
| 158 | <!-- <image mode="{{object.picture_fill==1 ? 'aspectFit' : 'aspectFill'}}" class="{{'new_item1_image images1'}}" src="{{imghost+aitem.original_img}}" data-errorimg="goods_array[{{index}}][{{aind}}].original_img" binderror="bind_bnerr3"></image> --> | 158 | <!-- <image mode="{{object.picture_fill==1 ? 'aspectFit' : 'aspectFill'}}" class="{{'new_item1_image images1'}}" src="{{imghost+aitem.original_img}}" data-errorimg="goods_array[{{index}}][{{aind}}].original_img" binderror="bind_bnerr3"></image> --> |
| 159 | - <image mode="{{object.picture_fill==1 ? 'aspectFit' : 'aspectFill'}}" class="{{'new_item1_image images1'}}" src="./t1.png" data-errorimg="goods_array[{{index}}][{{aind}}].original_img" binderror="bind_bnerr3"></image> | 159 | + <image mode="{{object.picture_fill==1 ? 'aspectFit' : 'aspectFill'}}" class="{{'new_item1_image images1'+ (object.chamfer_of_main_drawing==2 ? ' but_radius5 ':'') }}" src="./t1.png" data-errorimg="goods_array[{{index}}][{{aind}}].original_img" binderror="bind_bnerr3"></image> |
| 160 | </view> | 160 | </view> |
| 161 | 161 | ||
| 162 | <image class="imgBox_img" wx:if="{{object.subscript_style==5}}" src="{{object.subscript_diy_style}}"></image> | 162 | <image class="imgBox_img" wx:if="{{object.subscript_style==5}}" src="{{object.subscript_diy_style}}"></image> |
| @@ -211,15 +211,15 @@ | @@ -211,15 +211,15 @@ | ||
| 211 | <image class="imgBox_img" wx:if="{{object.subscript_style==5}}" src="{{object.subscript_diy_style}}"></image> | 211 | <image class="imgBox_img" wx:if="{{object.subscript_style==5}}" src="{{object.subscript_diy_style}}"></image> |
| 212 | <image class="imgBox_img" wx:if="{{object.subscript_style<=4}}" src="{{imghost+'/miniapp/images/component/j0'+object.subscript_style +'.png'}}"></image> | 212 | <image class="imgBox_img" wx:if="{{object.subscript_style<=4}}" src="{{imghost+'/miniapp/images/component/j0'+object.subscript_style +'.png'}}"></image> |
| 213 | </view> | 213 | </view> |
| 214 | - <view class="new_item1_time" wx:if="{{object.count_down}}"> | 214 | + <view style="height: 70rpx;" class="new_item1_time" wx:if="{{object.count_down}}"> |
| 215 | <image src="{{imghost+'/miniapp/images/component/seckill.png'}}"></image> | 215 | <image src="{{imghost+'/miniapp/images/component/seckill.png'}}"></image> |
| 216 | <view style="text-align: center;"> | 216 | <view style="text-align: center;"> |
| 217 | <view>距结束时间</view> | 217 | <view>距结束时间</view> |
| 218 | <view>{{aitem.djs.day}}天{{aitem.djs.hou}}:{{aitem.djs.min}}:{{aitem.djs.sec}}</view> | 218 | <view>{{aitem.djs.day}}天{{aitem.djs.hou}}:{{aitem.djs.min}}:{{aitem.djs.sec}}</view> |
| 219 | </view> | 219 | </view> |
| 220 | </view> | 220 | </view> |
| 221 | - <view class="ellipsis-2 new_item1_goods_name" style="{{(object.text_style==2 ? 'font-weight: bold;':'') + (object.text_align==2 ? 'text-align:center;' :'' )}}" wx:if="{{object.trade_name}}">{{aitem.goods_name}}</view> | ||
| 222 | - <view class="new_item1_price" style="{{(object.text_align==2 ? 'justify-content:center;flex-direction:column;' :'' )}}"> | 221 | + <view class="ellipsis-2 new_item1_goods_name" style="{{'padding:10rpx;'+(object.text_style==2 ? 'font-weight: bold;':'') + (object.text_align==2 ? 'text-align:center;' :'' )}}" wx:if="{{object.trade_name}}">{{aitem.goods_name}}</view> |
| 222 | + <view class="new_item1_price" style="{{'padding:0 10rpx;'+(object.text_align==2 ? 'justify-content:center;flex-direction:column;' :'' )}}"> | ||
| 223 | <view style="{{(object.text_style==2 ? 'font-weight: bold;':'')}}"> | 223 | <view style="{{(object.text_style==2 ? 'font-weight: bold;':'')}}"> |
| 224 | <view class="flex" style="{{'font-size: 28rpx; ' +(object.text_align==2 ? 'justify-content:center;' :'' ) }}"> | 224 | <view class="flex" style="{{'font-size: 28rpx; ' +(object.text_align==2 ? 'justify-content:center;' :'' ) }}"> |
| 225 | <view class="clor" style="margin-right: 5rpx;" wx:if="{{object.commodity_price}}">￥<text style="font-size:42rpx;">{{aitem.price}}</text></view> | 225 | <view class="clor" style="margin-right: 5rpx;" wx:if="{{object.commodity_price}}">￥<text style="font-size:42rpx;">{{aitem.price}}</text></view> |
| @@ -237,13 +237,13 @@ | @@ -237,13 +237,13 @@ | ||
| 237 | </view> | 237 | </view> |
| 238 | </navigator> | 238 | </navigator> |
| 239 | </view> | 239 | </view> |
| 240 | - <view wx:if="{{aind==1}}" class="{{'new_item1 ' + (object.product_style==2 ? ' boxsha ':'') + (object.product_style==3 ? ' aborder ':'') + (object.chamfer_of_main_drawing==2 ? ' but_radius5 ':'') + ((object.product_style==1 || object.product_style==3 )? ' bgf ':'')}}" style="{{'margin-bottom:'+object.product_spacing+'px; '+('width:calc(100%/2 - ' + object.product_spacing/2+'px)')}}"> | 240 | + <view wx:if="{{aind==1}}" class="{{'boxpad new_item1 ' + (object.product_style==2 ? ' boxsha ':'') + (object.product_style==3 ? ' aborder ':'') + ((object.product_style==1 || object.product_style==3 )? ' bgf ':'')}}" style="{{'margin-bottom:'+object.product_spacing+'px; '+('width:calc(100%/2 - ' + object.product_spacing/2+'px)')}}"> |
| 241 | <navigator url="{{aitem.goods_type == 1 ? ('/packageA/pages/goodsInfo/goodsInfo?goods_id=' + aitem.goods_id + '&title=' + aitem.goods_name + '&prom_type=1&prom_id=' + aitem.id ) : ('/pages/goods/goodsInfo/goodsInfo?goods_id=' + aitem.goods_id + '&title=' + aitem.goods_name + '&prom_type=1&prom_id=' + aitem.id)}}" class="s1_gk_a1"> | 241 | <navigator url="{{aitem.goods_type == 1 ? ('/packageA/pages/goodsInfo/goodsInfo?goods_id=' + aitem.goods_id + '&title=' + aitem.goods_name + '&prom_type=1&prom_id=' + aitem.id ) : ('/pages/goods/goodsInfo/goodsInfo?goods_id=' + aitem.goods_id + '&title=' + aitem.goods_name + '&prom_type=1&prom_id=' + aitem.id)}}" class="s1_gk_a1"> |
| 242 | <view class="imgBox"> | 242 | <view class="imgBox"> |
| 243 | <!-- <image mode="{{object.picture_fill==1 ? 'aspectFill' : 'scaleToFill'}}" class="{{'new_item1_image '+ 'aspect_ratio'+object.picture_scale}}" style="{{'width:'+img_width+';height:'+img_height}}" src="{{imghost+aitem.original_img}}" data-errorimg="goods_array[{{index}}][{{aind}}].original_img" binderror="bind_bnerr3"></image> --> | 243 | <!-- <image mode="{{object.picture_fill==1 ? 'aspectFill' : 'scaleToFill'}}" class="{{'new_item1_image '+ 'aspect_ratio'+object.picture_scale}}" style="{{'width:'+img_width+';height:'+img_height}}" src="{{imghost+aitem.original_img}}" data-errorimg="goods_array[{{index}}][{{aind}}].original_img" binderror="bind_bnerr3"></image> --> |
| 244 | <view class="{{'container'+object.picture_scale}}" style="{{object.picture_fill==1 ? 'background-color: #fff;' : ''}}"> | 244 | <view class="{{'container'+object.picture_scale}}" style="{{object.picture_fill==1 ? 'background-color: #fff;' : ''}}"> |
| 245 | <!-- <image mode="{{object.picture_fill==1 ? 'aspectFit' : 'aspectFill'}}" class="{{'new_item1_image images1'}}" src="{{imghost+aitem.original_img}}" data-errorimg="goods_array[{{index}}][{{aind}}].original_img" binderror="bind_bnerr3"></image> --> | 245 | <!-- <image mode="{{object.picture_fill==1 ? 'aspectFit' : 'aspectFill'}}" class="{{'new_item1_image images1'}}" src="{{imghost+aitem.original_img}}" data-errorimg="goods_array[{{index}}][{{aind}}].original_img" binderror="bind_bnerr3"></image> --> |
| 246 | - <image mode="{{object.picture_fill==1 ? 'aspectFit' : 'aspectFill'}}" class="{{'new_item1_image images1'}}" src="./t1.png" data-errorimg="goods_array[{{index}}][{{aind}}].original_img" binderror="bind_bnerr3"></image> | 246 | + <image mode="{{object.picture_fill==1 ? 'aspectFit' : 'aspectFill'}}" class="{{'new_item1_image images1 ' + (object.chamfer_of_main_drawing==2 ? ' but_radius5 ':'') }}" src="./t1.png" data-errorimg="goods_array[{{index}}][{{aind}}].original_img" binderror="bind_bnerr3"></image> |
| 247 | </view> | 247 | </view> |
| 248 | 248 | ||
| 249 | <image class="imgBox_img" wx:if="{{object.subscript_style==5}}" src="{{object.subscript_diy_style}}"></image> | 249 | <image class="imgBox_img" wx:if="{{object.subscript_style==5}}" src="{{object.subscript_diy_style}}"></image> |
| @@ -275,13 +275,13 @@ | @@ -275,13 +275,13 @@ | ||
| 275 | </view> | 275 | </view> |
| 276 | </navigator> | 276 | </navigator> |
| 277 | </view> | 277 | </view> |
| 278 | - <view wx:if="{{aind==2}}" class="{{'new_item1 ' + (object.product_style==2 ? ' boxsha ':'') + (object.product_style==3 ? ' aborder ':'') + (object.chamfer_of_main_drawing==2 ? ' but_radius5 ':'') + ((object.product_style==1 || object.product_style==3 )? ' bgf ':'')}}" style="{{'margin-bottom:'+object.product_spacing+'px; '+('width:calc(100%/2 - ' + object.product_spacing/2+'px)')}}"> | 278 | + <view wx:if="{{aind==2}}" class="{{'boxpad new_item1 ' + (object.product_style==2 ? ' boxsha ':'') + (object.product_style==3 ? ' aborder ':'') + ((object.product_style==1 || object.product_style==3 )? ' bgf ':'')}}" style="{{'margin-bottom:'+object.product_spacing+'px; '+('width:calc(100%/2 - ' + object.product_spacing/2+'px)')}}"> |
| 279 | <navigator url="{{aitem.goods_type == 1 ? ('/packageA/pages/goodsInfo/goodsInfo?goods_id=' + aitem.goods_id + '&title=' + aitem.goods_name + '&prom_type=1&prom_id=' + aitem.id ) : ('/pages/goods/goodsInfo/goodsInfo?goods_id=' + aitem.goods_id + '&title=' + aitem.goods_name + '&prom_type=1&prom_id=' + aitem.id)}}" class="s1_gk_a1"> | 279 | <navigator url="{{aitem.goods_type == 1 ? ('/packageA/pages/goodsInfo/goodsInfo?goods_id=' + aitem.goods_id + '&title=' + aitem.goods_name + '&prom_type=1&prom_id=' + aitem.id ) : ('/pages/goods/goodsInfo/goodsInfo?goods_id=' + aitem.goods_id + '&title=' + aitem.goods_name + '&prom_type=1&prom_id=' + aitem.id)}}" class="s1_gk_a1"> |
| 280 | <view class="imgBox"> | 280 | <view class="imgBox"> |
| 281 | <!-- <image mode="{{object.picture_fill==1 ? 'aspectFill' : 'scaleToFill'}}" class="{{'new_item1_image '+ 'aspect_ratio'+object.picture_scale}}" style="{{'width:'+img_width+';height:'+img_height}}" src="{{imghost+aitem.original_img}}" data-errorimg="goods_array[{{index}}][{{aind}}].original_img" binderror="bind_bnerr3"></image> --> | 281 | <!-- <image mode="{{object.picture_fill==1 ? 'aspectFill' : 'scaleToFill'}}" class="{{'new_item1_image '+ 'aspect_ratio'+object.picture_scale}}" style="{{'width:'+img_width+';height:'+img_height}}" src="{{imghost+aitem.original_img}}" data-errorimg="goods_array[{{index}}][{{aind}}].original_img" binderror="bind_bnerr3"></image> --> |
| 282 | <view class="{{'container'+object.picture_scale}}" style="{{object.picture_fill==1 ? 'background-color: #fff;' : ''}}"> | 282 | <view class="{{'container'+object.picture_scale}}" style="{{object.picture_fill==1 ? 'background-color: #fff;' : ''}}"> |
| 283 | <!-- <image mode="{{object.picture_fill==1 ? 'aspectFit' : 'aspectFill'}}" class="{{'new_item1_image images1'}}" src="{{imghost+aitem.original_img}}" data-errorimg="goods_array[{{index}}][{{aind}}].original_img" binderror="bind_bnerr3"></image> --> | 283 | <!-- <image mode="{{object.picture_fill==1 ? 'aspectFit' : 'aspectFill'}}" class="{{'new_item1_image images1'}}" src="{{imghost+aitem.original_img}}" data-errorimg="goods_array[{{index}}][{{aind}}].original_img" binderror="bind_bnerr3"></image> --> |
| 284 | - <image mode="{{object.picture_fill==1 ? 'aspectFit' : 'aspectFill'}}" class="{{'new_item1_image images1'}}" src="./t1.png" data-errorimg="goods_array[{{index}}][{{aind}}].original_img" binderror="bind_bnerr3"></image> | 284 | + <image mode="{{object.picture_fill==1 ? 'aspectFit' : 'aspectFill'}}" class="{{'new_item1_image images1 ' + (object.chamfer_of_main_drawing==2 ? ' but_radius5 ':'') }}" src="./t1.png" data-errorimg="goods_array[{{index}}][{{aind}}].original_img" binderror="bind_bnerr3"></image> |
| 285 | </view> | 285 | </view> |
| 286 | 286 | ||
| 287 | <image class="imgBox_img" wx:if="{{object.subscript_style==5}}" src="{{object.subscript_diy_style}}"></image> | 287 | <image class="imgBox_img" wx:if="{{object.subscript_style==5}}" src="{{object.subscript_diy_style}}"></image> |
| @@ -317,7 +317,54 @@ | @@ -317,7 +317,54 @@ | ||
| 317 | </block> | 317 | </block> |
| 318 | </view> | 318 | </view> |
| 319 | </block> | 319 | </block> |
| 320 | + <!-- 横向滑动 --> | ||
| 321 | + <block wx:if="{{object.style==6}}"> | ||
| 322 | + <!-- <swiper indicator-dots circular> --> | ||
| 323 | + <swiper indicator-dots style="{{'padding-left:'+object.page_margins+'px;padding-right:'+object.page_margins+'px;'+(swiperHeight ? ('height:'+swiperHeight+';'):'' )}}" class="{{' new_item1_box '+ ((object.product_style==1 || object.product_style==3 )? ' bgf ':'')}}"> | ||
| 324 | + <swiper-item wx:for="{{goods_array}}" class="flex2" style="padding: 5rpx;"> | ||
| 325 | + <view wx:for="{{item}}" wx:for-item="aitem" wx:for-index="aind" class="{{'boxpad swiper_h new_item1 ' + (object.product_style==2 ? ' boxsha ':'') + (object.product_style==3 ? ' aborder ':'') + ((object.product_style==1 || object.product_style==3 )? ' bgf ':'')}}" style="{{'margin-bottom:'+object.product_spacing+'px; '+('width:calc(100%/2 - ' + object.product_spacing/2+'px)')}}"> | ||
| 326 | + <navigator url="{{aitem.goods_type == 1 ? ('/packageA/pages/goodsInfo/goodsInfo?goods_id=' + aitem.goods_id + '&title=' + aitem.goods_name + '&prom_type=1&prom_id=' + aitem.id ) : ('/pages/goods/goodsInfo/goodsInfo?goods_id=' + aitem.goods_id + '&title=' + aitem.goods_name + '&prom_type=1&prom_id=' + aitem.id)}}" class="s1_gk_a1"> | ||
| 327 | + <view class="imgBox"> | ||
| 328 | + <!-- <image mode="{{object.picture_fill==1 ? 'aspectFill' : 'scaleToFill'}}" class="{{'new_item1_image '+ 'aspect_ratio'+object.picture_scale}}" style="{{'width:'+img_width+';height:'+img_height}}" src="{{imghost+aitem.original_img}}" data-errorimg="goods_array[{{index}}][{{aind}}].original_img" binderror="bind_bnerr3"></image> --> | ||
| 329 | + <view class="{{'container'+object.picture_scale}}" style="{{object.picture_fill==1 ? 'background-color: #fff;' : ''}}"> | ||
| 330 | + <!-- <image mode="{{object.picture_fill==1 ? 'aspectFit' : 'aspectFill'}}" class="{{'new_item1_image images1'}}" src="{{imghost+aitem.original_img}}" data-errorimg="goods_array[{{index}}][{{aind}}].original_img" binderror="bind_bnerr3"></image> --> | ||
| 331 | + <image mode="{{object.picture_fill==1 ? 'aspectFit' : 'aspectFill'}}" class="{{'new_item1_image images1 ' + (object.chamfer_of_main_drawing==2 ? ' but_radius5 ':'') }}" src="./t1.png" data-errorimg="goods_array[{{index}}][{{aind}}].original_img" binderror="bind_bnerr3"></image> | ||
| 332 | + </view> | ||
| 333 | + | ||
| 334 | + <image class="imgBox_img" wx:if="{{object.subscript_style==5}}" src="{{object.subscript_diy_style}}"></image> | ||
| 335 | + <image class="imgBox_img" wx:if="{{object.subscript_style<=4}}" src="{{imghost+'/miniapp/images/component/j0'+object.subscript_style +'.png'}}"></image> | ||
| 336 | + </view> | ||
| 337 | + <view class="new_item1_time" wx:if="{{object.count_down}}" style="justify-content: center;"> | ||
| 338 | + <!-- <image src="{{imghost+'/miniapp/images/component/seckill.png'}}"></image> --> | ||
| 339 | + <!-- <view style="text-align: center;"> | ||
| 340 | + <view>距结束时间</view> --> | ||
| 341 | + <view>{{aitem.djs.day}}天{{aitem.djs.hou}}:{{aitem.djs.min}}:{{aitem.djs.sec}}</view> | ||
| 342 | + <!-- </view> --> | ||
| 343 | + </view> | ||
| 344 | + <view class="ellipsis-2 new_item1_goods_name" style="{{(object.text_style==2 ? 'font-weight: bold;':'') + (object.text_align==2 ? 'text-align:center;' :'' )}}" wx:if="{{object.trade_name}}">{{aitem.goods_name}}</view> | ||
| 345 | + <view wx:if="{{object.seconds_num || object.remaining_inventory}}" class="new_item1_price" style="{{'display:block;color: rgb(56, 56, 56); '+(object.text_align==2 ?'text-align:center;':'')+(object.text_style==2 ? 'font-weight: bold;':'')}}"> | ||
| 346 | + <text wx:if="{{object.seconds_num}}">已秒 <text class="clor">10</text>件</text> | ||
| 347 | + <text wx:if="{{object.remaining_inventory}}">还剩余<text class="clor">20</text>件</text> | ||
| 348 | + </view> | ||
| 349 | + <view class="new_item1_price" style="{{(object.text_align==2 ? 'justify-content:center;flex-direction:column;' :'' )}}"> | ||
| 350 | + <view style="{{(object.text_style==2 ? 'font-weight: bold;':'')}}"> | ||
| 351 | + <view style="{{'font-size: 28rpx; ' +(object.text_align==2 ? 'justify-content:center;' :'' ) }}"> | ||
| 352 | + <view class="clor" style="margin-right: 5rpx;" wx:if="{{object.commodity_price}}">￥<text style="font-size:42rpx;">{{aitem.price}}</text></view> | ||
| 353 | + <view wx:if="{{object.wholesale_price}}">￥{{aitem.market_price}}</view> | ||
| 354 | + </view> | ||
| 355 | + </view> | ||
| 356 | + <view> | ||
| 357 | + <image wx:if="{{object.purchase_button<=4}}" src="{{imghost+'/miniapp/images/component/0'+object.purchase_button+'.png'}}" style="width: 122rpx;height: 122rpx;"></image> | ||
| 358 | + <view wx:if="{{ 5<=object.purchase_button && object.purchase_button<=8 }}" class="{{'new_item1_but ' + (object.purchase_button==5 ? 'new_item1_but1':'' )+ (object.purchase_button==7 ? 'new_item1_but2':'' )+ (object.purchase_button==8 ? 'new_item1_but3':'' ) }}">{{object.button_content}}</view> | ||
| 359 | + </view> | ||
| 360 | + </view> | ||
| 361 | + </navigator> | ||
| 362 | + </view> | ||
| 363 | + </swiper-item> | ||
| 364 | + </swiper> | ||
| 365 | + <!-- </swiper> --> | ||
| 320 | 366 | ||
| 367 | + </block> | ||
| 321 | 368 | ||
| 322 | </block> | 369 | </block> |
| 323 | <block wx:else> | 370 | <block wx:else> |
| @@ -451,4 +498,5 @@ | @@ -451,4 +498,5 @@ | ||
| 451 | </view> | 498 | </view> |
| 452 | <view class='clear'></view> | 499 | <view class='clear'></view> |
| 453 | </block> | 500 | </block> |
| 454 | -</block> | ||
| 455 | \ No newline at end of file | 501 | \ No newline at end of file |
| 502 | +</block> | ||
| 503 | + |
components/diy_seckill/diy_seckill.wxss
| @@ -292,7 +292,7 @@ swiper { | @@ -292,7 +292,7 @@ swiper { | ||
| 292 | 292 | ||
| 293 | 293 | ||
| 294 | .ellipsis-2 { | 294 | .ellipsis-2 { |
| 295 | - height: 75rpx; | 295 | + height: 97rpx; |
| 296 | overflow: hidden; | 296 | overflow: hidden; |
| 297 | text-overflow: ellipsis; | 297 | text-overflow: ellipsis; |
| 298 | display: -webkit-box; | 298 | display: -webkit-box; |
| @@ -312,7 +312,7 @@ swiper { | @@ -312,7 +312,7 @@ swiper { | ||
| 312 | max-height: 100%; */ | 312 | max-height: 100%; */ |
| 313 | } | 313 | } |
| 314 | .new_item1_time{ | 314 | .new_item1_time{ |
| 315 | - height: 70rpx; | 315 | + height: 60rpx; |
| 316 | background: rgba(196, 24, 45, 1); | 316 | background: rgba(196, 24, 45, 1); |
| 317 | color: #fff; | 317 | color: #fff; |
| 318 | font-size: 25rpx; | 318 | font-size: 25rpx; |
| @@ -327,13 +327,14 @@ swiper { | @@ -327,13 +327,14 @@ swiper { | ||
| 327 | height: 52rpx; | 327 | height: 52rpx; |
| 328 | } | 328 | } |
| 329 | .new_item1_goods_name{ | 329 | .new_item1_goods_name{ |
| 330 | - padding: 10rpx; | 330 | + padding: 10rpx 0rpx; |
| 331 | font-size: 26rpx; | 331 | font-size: 26rpx; |
| 332 | width: 100%; | 332 | width: 100%; |
| 333 | + box-sizing: border-box; | ||
| 333 | } | 334 | } |
| 334 | .new_item1_price{ | 335 | .new_item1_price{ |
| 335 | display: flex; | 336 | display: flex; |
| 336 | - padding: 0 10rpx; | 337 | + /* padding: 0 10rpx; */ |
| 337 | align-items: center; | 338 | align-items: center; |
| 338 | justify-content: space-between; | 339 | justify-content: space-between; |
| 339 | font-size: 26rpx; | 340 | font-size: 26rpx; |
| @@ -389,7 +390,7 @@ swiper { | @@ -389,7 +390,7 @@ swiper { | ||
| 389 | border-radius:289rpx; | 390 | border-radius:289rpx; |
| 390 | } | 391 | } |
| 391 | .but_radius5{ | 392 | .but_radius5{ |
| 392 | - border-radius:17px; | 393 | + border-radius:17px 17px 0 0; |
| 393 | } | 394 | } |
| 394 | .imgBox{ | 395 | .imgBox{ |
| 395 | position: relative; | 396 | position: relative; |
| @@ -400,6 +401,7 @@ swiper { | @@ -400,6 +401,7 @@ swiper { | ||
| 400 | top: 22rpx; | 401 | top: 22rpx; |
| 401 | width: 74rpx; | 402 | width: 74rpx; |
| 402 | height: 70rpx; | 403 | height: 70rpx; |
| 404 | + | ||
| 403 | } | 405 | } |
| 404 | 406 | ||
| 405 | .aspect_ratio1{ | 407 | .aspect_ratio1{ |
| @@ -459,4 +461,15 @@ swiper { | @@ -459,4 +461,15 @@ swiper { | ||
| 459 | justify-content: space-between; | 461 | justify-content: space-between; |
| 460 | flex-wrap: wrap; | 462 | flex-wrap: wrap; |
| 461 | box-sizing: border-box; | 463 | box-sizing: border-box; |
| 462 | -} | ||
| 463 | \ No newline at end of file | 464 | \ No newline at end of file |
| 465 | +} | ||
| 466 | +.flex2:after { | ||
| 467 | + content: ""; | ||
| 468 | + width: 30%; | ||
| 469 | + height: 0px; | ||
| 470 | + visibility: hidden; | ||
| 471 | + } | ||
| 472 | + | ||
| 473 | + .boxpad{ | ||
| 474 | + padding:11rpx 9rpx; | ||
| 475 | + box-sizing: border-box; | ||
| 476 | + } | ||
| 464 | \ No newline at end of file | 477 | \ No newline at end of file |