fe / yoho-limited-sell-miniapp · Commits

Go to a project

Authored by htoooth
Commit 81ce2d85b81b35ce8206bb632e4fd42377fbda7c 1 parent e2571f7a

fix

Inline Side-by-side
Showing 8 changed files with 34 additions and 34 deletions
1 -<view class="bottom-assis-list">  
2 - <view class="assis-title">当前已成功助力好友数：{{count}}/{{num}}</view> 1 +<view class="bottom-assist-list">
  2 + <view class="assist-title">当前已成功助力好友数：{{count}}/{{num}}</view>
3 <view class="avatar-list"> 3 <view class="avatar-list">
4 <view class="avatar-item" wx:for="{{list}}"> 4 <view class="avatar-item" wx:for="{{list}}">
5 <block wx:if="{{item.helpUserImgUrl}}"> 5 <block wx:if="{{item.helpUserImgUrl}}">
1 -.bottom-assis-list { 1 +.bottom-assist-list {
2 display: flex; 2 display: flex;
3 align-items: center; 3 align-items: center;
4 justify-content: space-between; 4 justify-content: space-between;
@@ -14,11 +14,11 @@ @@ -14,11 +14,11 @@
14 text-align: center; 14 text-align: center;
15 } 15 }
16 16
17 -.bottom-assis-list .assis-title { 17 +.bottom-assist-list .assist-title {
18 color: #fff; 18 color: #fff;
19 } 19 }
20 20
21 -.bottom-assis-list .avatar-list { 21 +.bottom-assist-list .avatar-list {
22 display: flex; 22 display: flex;
23 width: 240rpx; 23 width: 240rpx;
24 align-items: center; 24 align-items: center;
@@ -26,7 +26,7 @@ @@ -26,7 +26,7 @@
26 flex-wrap: wrap; 26 flex-wrap: wrap;
27 } 27 }
28 28
29 -.bottom-assis-list .avatar-item { 29 +.bottom-assist-list .avatar-item {
30 margin-left: 10rpx; 30 margin-left: 10rpx;
31 margin-top: 10rpx; 31 margin-top: 10rpx;
32 display: inline-block; 32 display: inline-block;
@@ -225,12 +225,12 @@ Page(Object.assign({ @@ -225,12 +225,12 @@ Page(Object.assign({
225 let uid = this.data.originUid || this.data.uid; 225 let uid = this.data.originUid || this.data.uid;
226 226
227 if (index === 0) { 227 if (index === 0) {
228 - if (this.data.showAssisList) { 228 + if (this.data.showAssistList) {
229 return; 229 return;
230 } 230 }
231 detailModel.addShareAction(uid, this.data.limitProductCode); 231 detailModel.addShareAction(uid, this.data.limitProductCode);
232 } else if (index === 1) { 232 } else if (index === 1) {
233 - if (this.data.showAssisListk) { 233 + if (this.data.showAssistList) {
234 router.go('snapShare', this.data.snapData); 234 router.go('snapShare', this.data.snapData);
235 return; 235 return;
236 } 236 }
@@ -340,16 +340,16 @@ Page(Object.assign({ @@ -340,16 +340,16 @@ Page(Object.assign({
340 assistStatus = ASSIST_STATUS.ASSIST_ALREADY_ACTION; 340 assistStatus = ASSIST_STATUS.ASSIST_ALREADY_ACTION;
341 } 341 }
342 342
343 - let showAssisList = false; 343 + let showAssistList = false;
344 344
345 if (result.data.isShare === 'Y') { 345 if (result.data.isShare === 'Y') {
346 - showAssisList = true; 346 + showAssistList = true;
347 } 347 }
348 348
349 this.setData({ 349 this.setData({
350 avatarList: result.data.list || [], 350 avatarList: result.data.list || [],
351 assistStatus, 351 assistStatus,
352 - showAssisList 352 + showAssistList
353 }); 353 });
354 354
355 }); 355 });
@@ -523,7 +523,7 @@ Page(Object.assign({ @@ -523,7 +523,7 @@ Page(Object.assign({
523 queueCancel() { 523 queueCancel() {
524 this.reload(); 524 this.reload();
525 }, 525 },
526 - assisCancel() { 526 + assistCancel() {
527 this.reload(); 527 this.reload();
528 }, 528 },
529 buyNow() { 529 buyNow() {
@@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
8 "copyright": "/components/layout/copyright/copyright", 8 "copyright": "/components/layout/copyright/copyright",
9 "quick-navigation": "/components/layout/quick-navigation/quick-navigation", 9 "quick-navigation": "/components/layout/quick-navigation/quick-navigation",
10 "yoho-alert": "./components/alert/alert", 10 "yoho-alert": "./components/alert/alert",
11 - "assis-list": "./components/assis-list/assis-list", 11 + "assist-list": "./components/assist-list/assist-list",
12 "action-bar": "./components/action-bar/action-bar" 12 "action-bar": "./components/action-bar/action-bar"
13 } 13 }
14 } 14 }
@@ -37,7 +37,7 @@ @@ -37,7 +37,7 @@
37 <view wx:if="{{showAssistList}}" style="height:70rpx;"></view> 37 <view wx:if="{{showAssistList}}" style="height:70rpx;"></view>
38 <view style="height:100rpx;"></view> 38 <view style="height:100rpx;"></view>
39 39
40 -<assis-list wx:if="{{showAssistList}}" list="{{avatarList}}" num="{{assistLimit}}"></assis-list> 40 +<assist-list wx:if="{{showAssistList}}" list="{{avatarList}}" num="{{assistLimit}}"></assist-list>
41 41
42 <block wx:if="{{limitProductType === 4}}"> 42 <block wx:if="{{limitProductType === 4}}">
43 <block wx:if="{{showStatus === 1}}"> 43 <block wx:if="{{showStatus === 1}}">
@@ -59,7 +59,7 @@ @@ -59,7 +59,7 @@
59 </action-bar> 59 </action-bar>
60 60
61 <action-bar wx:else> 61 <action-bar wx:else>
62 - <view class="top-assis-action"> 62 + <view class="top-assist-action">
63 <view class="top-title" >当前活动已结束</view> 63 <view class="top-title" >当前活动已结束</view>
64 <view class="top-action1"> 64 <view class="top-action1">
65 <view class="top-ok" bindtap="goList">查看其他活动</view> 65 <view class="top-ok" bindtap="goList">查看其他活动</view>
@@ -70,17 +70,17 @@ @@ -70,17 +70,17 @@
70 70
71 <block wx:if="{{productSourceType === 2}}"> 71 <block wx:if="{{productSourceType === 2}}">
72 <action-bar wx:if="{{assistStatus === 3}}"> 72 <action-bar wx:if="{{assistStatus === 3}}">
73 - <view class="top-assis-action"> 73 + <view class="top-assist-action">
74 <view class="top-title" >你的好友邀请你为ta助力</view> 74 <view class="top-title" >你的好友邀请你为ta助力</view>
75 <view class="top-action"> 75 <view class="top-action">
76 <view class="top-ok" bindtap="assistAction">帮ta助力</view> 76 <view class="top-ok" bindtap="assistAction">帮ta助力</view>
77 - <view class="top-cancel" bindtap="assisCancel">取消</view> 77 + <view class="top-cancel" bindtap="assistCancel">取消</view>
78 </view> 78 </view>
79 </view> 79 </view>
80 </action-bar> 80 </action-bar>
81 81
82 <action-bar wx:elif="{{assistStatus === 2}}"> 82 <action-bar wx:elif="{{assistStatus === 2}}">
83 - <view class="top-assis-action"> 83 + <view class="top-assist-action">
84 <view class="top-title">你的好友已助力成功</view> 84 <view class="top-title">你的好友已助力成功</view>
85 <view class="top-ok" bindtap="restartSelfShare">我也要参加</view> 85 <view class="top-ok" bindtap="restartSelfShare">我也要参加</view>
86 </view> 86 </view>
@@ -94,7 +94,7 @@ @@ -94,7 +94,7 @@
94 </action-bar> 94 </action-bar>
95 95
96 <action-bar wx:else> 96 <action-bar wx:else>
97 - <view class="top-assis-action"> 97 + <view class="top-assist-action">
98 <view class="top-title" >当前活动已结束</view> 98 <view class="top-title" >当前活动已结束</view>
99 <view class="top-action1"> 99 <view class="top-action1">
100 <view class="top-ok" bindtap="goList">查看其他活动</view> 100 <view class="top-ok" bindtap="goList">查看其他活动</view>
@@ -114,7 +114,7 @@ @@ -114,7 +114,7 @@
114 114
115 <block wx:elif="{{showStatus === 3}}"> 115 <block wx:elif="{{showStatus === 3}}">
116 <action-bar> 116 <action-bar>
117 - <view class="top-assis-action"> 117 + <view class="top-assist-action">
118 <view class="top-title" >当前活动已结束</view> 118 <view class="top-title" >当前活动已结束</view>
119 <view class="top-action1"> 119 <view class="top-action1">
120 <view class="top-ok" bindtap="goList">查看其他活动</view> 120 <view class="top-ok" bindtap="goList">查看其他活动</view>
@@ -149,7 +149,7 @@ @@ -149,7 +149,7 @@
149 149
150 <block wx:else> 150 <block wx:else>
151 <action-bar> 151 <action-bar>
152 - <view class="top-assis-action"> 152 + <view class="top-assist-action">
153 <view class="top-title" >当前活动已结束</view> 153 <view class="top-title" >当前活动已结束</view>
154 <view class="top-action1"> 154 <view class="top-action1">
155 <view class="top-ok" bindtap="goList">查看其他活动</view> 155 <view class="top-ok" bindtap="goList">查看其他活动</view>
@@ -190,7 +190,7 @@ @@ -190,7 +190,7 @@
190 <block wx:elif="{{queueStatus === 4}}"> 190 <block wx:elif="{{queueStatus === 4}}">
191 <block wx:if="{{showStatus === 3}}"> 191 <block wx:if="{{showStatus === 3}}">
192 <action-bar> 192 <action-bar>
193 - <view class="top-assis-action"> 193 + <view class="top-assist-action">
194 <view class="top-title" >当前活动已结束</view> 194 <view class="top-title" >当前活动已结束</view>
195 <view class="top-action3"> 195 <view class="top-action3">
196 <view class="top-ok" bindtap="goQueueList">查看中奖信息</view> 196 <view class="top-ok" bindtap="goQueueList">查看中奖信息</view>
@@ -225,7 +225,7 @@ @@ -225,7 +225,7 @@
225 </block> 225 </block>
226 226
227 <action-bar wx:else> 227 <action-bar wx:else>
228 - <view class="top-assis-action"> 228 + <view class="top-assist-action">
229 <view class="top-title" >当前活动已结束</view> 229 <view class="top-title" >当前活动已结束</view>
230 <view class="top-action3"> 230 <view class="top-action3">
231 <view class="top-ok" bindtap="goQueueList">查看中奖信息</view> 231 <view class="top-ok" bindtap="goQueueList">查看中奖信息</view>
@@ -249,7 +249,7 @@ @@ -249,7 +249,7 @@
249 </block> 249 </block>
250 250
251 <action-bar wx:else> 251 <action-bar wx:else>
252 - <view class="top-assis-action"> 252 + <view class="top-assist-action">
253 <view class="top-title" >当前活动已结束</view> 253 <view class="top-title" >当前活动已结束</view>
254 <view class="top-action3"> 254 <view class="top-action3">
255 <view class="top-ok" bindtap="goQueueList">查看中奖信息</view> 255 <view class="top-ok" bindtap="goQueueList">查看中奖信息</view>
@@ -269,7 +269,7 @@ @@ -269,7 +269,7 @@
269 </action-bar> 269 </action-bar>
270 270
271 <action-bar wx:elif="{{queueStatus === 3}}"> 271 <action-bar wx:elif="{{queueStatus === 3}}">
272 - <view class="top-assis-action"> 272 + <view class="top-assist-action">
273 <view class="top-title" >你的好友邀请你为ta助力排队</view> 273 <view class="top-title" >你的好友邀请你为ta助力排队</view>
274 <view class="top-action"> 274 <view class="top-action">
275 <view class="top-ok" bindtap="queueAction">帮ta助力</view> 275 <view class="top-ok" bindtap="queueAction">帮ta助力</view>
@@ -294,7 +294,7 @@ @@ -294,7 +294,7 @@
294 </action-bar> 294 </action-bar>
295 </block> 295 </block>
296 <action-bar wx:else> 296 <action-bar wx:else>
297 - <view class="top-assis-action"> 297 + <view class="top-assist-action">
298 <view class="top-title" >当前活动已结束</view> 298 <view class="top-title" >当前活动已结束</view>
299 <view class="top-action3"> 299 <view class="top-action3">
300 <view class="top-ok" bindtap="goQueueList">查看中奖信息</view> 300 <view class="top-ok" bindtap="goQueueList">查看中奖信息</view>
@@ -316,7 +316,7 @@ @@ -316,7 +316,7 @@
316 316
317 <block wx:elif="{{queueStatus === 6}}"> 317 <block wx:elif="{{queueStatus === 6}}">
318 <action-bar > 318 <action-bar >
319 - <view class="top-assis-action"> 319 + <view class="top-assist-action">
320 <view class="top-title" >你的好友已助力成功</view> 320 <view class="top-title" >你的好友已助力成功</view>
321 <view class="top-action3"> 321 <view class="top-action3">
322 <view class="top-ok" bindtap="goQueueList">查看排队详情</view> 322 <view class="top-ok" bindtap="goQueueList">查看排队详情</view>
@@ -327,7 +327,7 @@ @@ -327,7 +327,7 @@
327 </block> 327 </block>
328 328
329 <action-bar wx:else> 329 <action-bar wx:else>
330 - <view class="top-assis-action"> 330 + <view class="top-assist-action">
331 <view class="top-title" >当前活动已结束</view> 331 <view class="top-title" >当前活动已结束</view>
332 <view class="top-action3"> 332 <view class="top-action3">
333 <view class="top-ok" bindtap="goQueueList">查看中奖信息</view> 333 <view class="top-ok" bindtap="goQueueList">查看中奖信息</view>
@@ -157,7 +157,7 @@ @@ -157,7 +157,7 @@
157 157
158 } 158 }
159 159
160 -.top-assis-action { 160 +.top-assist-action {
161 height: 100%; 161 height: 100%;
162 width: 100%; 162 width: 100%;
163 display: flex; 163 display: flex;
@@ -165,18 +165,18 @@ @@ -165,18 +165,18 @@
165 justify-content: space-between; 165 justify-content: space-between;
166 } 166 }
167 167
168 -.top-assis-action .top-title { 168 +.top-assist-action .top-title {
169 font-size: 28rpx; 169 font-size: 28rpx;
170 } 170 }
171 171
172 -.top-assis-action .top-action { 172 +.top-assist-action .top-action {
173 display: flex; 173 display: flex;
174 align-items: center; 174 align-items: center;
175 justify-content: space-between; 175 justify-content: space-between;
176 width: 280rpx; 176 width: 280rpx;
177 } 177 }
178 178
179 -.top-assis-action .top-action1 { 179 +.top-assist-action .top-action1 {
180 display: flex; 180 display: flex;
181 align-items: center; 181 align-items: center;
182 justify-content: flex-end; 182 justify-content: flex-end;
@@ -190,7 +190,7 @@ @@ -190,7 +190,7 @@
190 width: 400rpx; 190 width: 400rpx;
191 } 191 }
192 192
193 -.top-assis-action .top-ok { 193 +.top-assist-action .top-ok {
194 font-size: 20rpx; 194 font-size: 20rpx;
195 color: #fff; 195 color: #fff;
196 background-color: #d0021b; 196 background-color: #d0021b;
@@ -202,7 +202,7 @@ @@ -202,7 +202,7 @@
202 text-align: center; 202 text-align: center;
203 } 203 }
204 204
205 -.top-assis-action .top-cancel { 205 +.top-assist-action .top-cancel {
206 font-size: 20rpx; 206 font-size: 20rpx;
207 height: 50rpx; 207 height: 50rpx;
208 padding-left: 40rpx; 208 padding-left: 40rpx;