Merge remote-tracking branch 'refs/remotes/origin/dev' into dev

dev
Esdese 3 years ago
commit 7d789b35a9

@ -39,6 +39,9 @@ Page({
}, },
onShow() { onShow() {
iPageIndex = 1; iPageIndex = 1;
this.setData({
dataList: []
})
this.getData().then(() => { this.getData().then(() => {
this.getLikeData() this.getLikeData()
}) })

@ -2,37 +2,41 @@
<wxs src="./filter.wxs" module="filter"></wxs> <wxs src="./filter.wxs" module="filter"></wxs>
<view class="box"> <view class="box">
<view class="add1"> <view class="add1">
<view style="display: inline-block;" wx:for="{{boxArr}}" wx:key="idx" wx:for-index="index"> <scroll-view scroll-x="true" style=" white-space: nowrap; display: flex">
<view class="add_box1" wx:if="{{item==undefined}}"> <view style="display: inline-block;" wx:for="{{boxArr}}" wx:key="idx" wx:for-index="index">
<view class="heng1"></view> <view class="add_box1" style="{{index === boxArr.length -1 ? 'margin-right: 32rpx' : ''}}" wx:if="{{item==undefined}}">
<view class="shu1"></view> <view class="heng1"></view>
<view class="event1">添加品牌一</view> <view class="shu1"></view>
</view> <view class="event1">添加品牌一</view>
<view class="del_box" wx:else>
<view class="del" bindtap="del" data-index="{{index}}">
<text style="font-size: 24rpx;display: inline-block;margin-left: 64rpx;">×</text>
<text style="font-size: 24rpx;font-weight: 100;" > 删除</text>
</view> </view>
<view class="brand_img_box"> <view class="del_box" wx:else>
<image src="{{item.img}}" style="width:100%;" mode="widthFix" lazy-load="{{true}}"></image> <view class="del" bindtap="del" data-index="{{index}}">
<text style="font-size: 24rpx;display: inline-block;margin-left: 64rpx;">×</text>
<text style="font-size: 24rpx;font-weight: 100;"> 删除</text>
</view>
<view class="brand_img_box">
<image src="{{item.img}}" style="width:100%;" mode="widthFix" lazy-load="{{true}}"></image>
</view>
<view class="car_barnd">{{item.brandname}}</view>
</view> </view>
<view class="car_barnd">{{item.brandname}}</view>
</view> </view>
</view> </scroll-view>
</view> </view>
<button class="btns" bindtap='startCp'>开始对比</button> <button class="btns" bindtap='startCp'>开始对比</button>
<view class="event_recom1"> <view class="event_recom1">
<!-- 占位盒子 --> <!-- 占位盒子 -->
<view style="height: 36rpx;background:white;border-top-left-radius: 24rpx;border-top-right-radius: 24rpx;"></view> <view style="height: 36rpx;background:white;border-top-left-radius: 24rpx;border-top-right-radius: 24rpx;">
</view>
<van-checkbox-group value="{{ result }}" bind:change="onChange"> <van-checkbox-group value="{{ result }}" bind:change="onChange">
<van-index-bar sticky="{{false}}"> <van-index-bar sticky="{{false}}">
<view wx:for="{{mockData}}" wx:key="idx"> <view wx:for="{{mockData}}" wx:key="idx">
<van-index-anchor index="{{item.name}}" /> <van-index-anchor index="{{item.name}}" />
<view class="my_cell" wx:for="{{item.data}}" wx:key="idx" wx:for-item="item2"> <view class="my_cell" wx:for="{{item.data}}" wx:key="idx" wx:for-item="item2">
<van-checkbox name="{{filter.stringify(item2)}}" shape="square"></van-checkbox> <van-checkbox name="{{filter.stringify(item2)}}" shape="square"></van-checkbox>
<view class="imgBox" style="display: inline-block;height: 96rpx;width: 96rpx; margin-left: 48rpx;"> <view class="imgBox"
<image src="{{item2.img}}" style="width:96rpx;" mode="widthFix" lazy-load="{{true}}"></image> style="display: inline-block;height: 96rpx;width: 96rpx; margin-left: 48rpx;">
<image src="{{item2.img}}" style="width:96rpx;" mode="widthFix" lazy-load="{{true}}">
</image>
</view> </view>
<text>{{item2.brandname}}</text> <text>{{item2.brandname}}</text>
</view> </view>

@ -10,11 +10,9 @@ page {
} }
.add1 { .add1 {
width: 750rpx; width: 100%;
overflow-x: scroll;
white-space: nowrap; white-space: nowrap;
} }
.add_box1 { .add_box1 {
display: inline-block; display: inline-block;
height: 208rpx; height: 208rpx;

Loading…
Cancel
Save