xt / xcx-book · Commits

Go to a project

Commit 221378114f587e07a7fa0038a3cccd784c968e0a

Authored by vking
1 parent 7fc95509
build: skipped

online

Inline Side-by-side
Showing 5 changed files with 11 additions and 9 deletions
@@ -6,7 +6,10 @@ @@ -6,7 +6,10 @@
6 <view class="close"></view> 6 <view class="close"></view>
7 </view> 7 </view>
8 <view class="slogan">致电商家时，请说明是一键订平台的客户</view> 8 <view class="slogan">致电商家时，请说明是一键订平台的客户</view>
9 - <view class="list"> 9 + <scroll-view
  10 + scroll-y
  11 + class="list"
  12 + >
10 <view class="item flex-ll" wx:for="{{seller.activity}}" wx:key="seller.activity.key"> 13 <view class="item flex-ll" wx:for="{{seller.activity}}" wx:key="seller.activity.key">
11 <view class="left flex-vc"> 14 <view class="left flex-vc">
12 <block wx:if="{{item.type==1}}"><!--//满减--> 15 <block wx:if="{{item.type==1}}"><!--//满减-->
@@ -44,6 +47,6 @@ @@ -44,6 +47,6 @@
44 {{item.desc}} 47 {{item.desc}}
45 </view> 48 </view>
46 </view> 49 </view>
47 - </view> 50 + </scroll-view>
48 </view> 51 </view>
49 </view> 52 </view>
@@ -44,7 +44,6 @@ @@ -44,7 +44,6 @@
44 } 44 }
45 .list{ 45 .list{
46 max-height: 730rpx; 46 max-height: 730rpx;
47 - overflow-y: auto;  
48 } 47 }
49 .item{ 48 .item{
50 width: 100%; 49 width: 100%;
@@ -106,7 +106,7 @@ Page({ @@ -106,7 +106,7 @@ Page({
106 formdata.x=1; 106 formdata.x=1;
107 formdata.y=200; 107 formdata.y=200;
108 formdata.rdate=this.options.rdate; 108 formdata.rdate=this.options.rdate;
109 - formdata.status='1,2'; 109 + formdata.status='1,2,5';
110 let tids={}; 110 let tids={};
111 let reserves=await App.Reserve.GetReserveList(formdata); 111 let reserves=await App.Reserve.GetReserveList(formdata);
112 if(reserves.data.length>0){ 112 if(reserves.data.length>0){
@@ -63,9 +63,7 @@ @@ -63,9 +63,7 @@
63 </view> 63 </view>
64 <view class="addr-long">{{seller.distanceStr?'距您'+seller.distanceStr:''}}</view> 64 <view class="addr-long">{{seller.distanceStr?'距您'+seller.distanceStr:''}}</view>
65 </view> 65 </view>
66 - <formids class="flex-vc" bindclick="reserveEvent" data-act="phone">  
67 - <view class="more more-phone"></view>  
68 - </formids> 66 + <view class="more more-phone" bindtap="reserveEvent" data-act="phone"></view>
69 </view> 67 </view>
70 <view class="addr flex-lr" bindtap="lookLocation" wx:else="" > 68 <view class="addr flex-lr" bindtap="lookLocation" wx:else="" >
71 <view class="addr-view"> 69 <view class="addr-view">
@@ -96,11 +96,13 @@ @@ -96,11 +96,13 @@
96 96
97 .seller .addr{ 97 .seller .addr{
98 border-top: 2rpx solid #f5f5f5; 98 border-top: 2rpx solid #f5f5f5;
  99 + height: 160rpx;
  100 + line-height: 160rpx;
99 } 101 }
100 102
101 .addr-text{ 103 .addr-text{
102 line-height: 42rpx; 104 line-height: 42rpx;
103 - margin-top: 34rpx; 105 + /*margin-top: 34rpx;*/
104 } 106 }
105 .addr-text .text{ 107 .addr-text .text{
106 white-space: nowrap; 108 white-space: nowrap;
@@ -120,7 +122,7 @@ @@ -120,7 +122,7 @@
120 height: 34rpx; 122 height: 34rpx;
121 line-height: 34rpx; 123 line-height: 34rpx;
122 margin-top: 2rpx; 124 margin-top: 2rpx;
123 - margin-bottom: 40rpx; 125 + /*margin-bottom: 40rpx;*/
124 } 126 }
125 127
126 .block{ 128 .block{