fe / yoho-limited-sell-miniapp · Commits

Go to a project

Authored by htoooth
Commit b12147810f809eda154a6eb3eb6b3a48223ab9a9 1 parent 3a6b88fb

fix

Inline Side-by-side
Showing 6 changed files with 20 additions and 19 deletions
@@ -4,8 +4,5 @@ Component({ @@ -4,8 +4,5 @@ Component({
4 data: { 4 data: {
5 }, 5 },
6 methods: { 6 methods: {
7 - cancel() {  
8 - this.triggerEvent('cancel');  
9 - }  
10 } 7 }
11 }); 8 });
1 -<view class="modal-mask" catchtap="cancel"></view> 1 +<view class="modal-mask"></view>
2 <view class="modal-dialog"> 2 <view class="modal-dialog">
3 <image class="modal-icon"src="../../../../../static/images/gou@2x.png"></image> 3 <image class="modal-icon"src="../../../../../static/images/gou@2x.png"></image>
4 <slot></slot> 4 <slot></slot>
@@ -287,8 +287,8 @@ Page(Object.assign({ @@ -287,8 +287,8 @@ Page(Object.assign({
287 287
288 let productDesc = []; 288 let productDesc = [];
289 289
290 - if (res.data.attachment) {  
291 - productDesc = res.data.attachment.map(a => { 290 + if (res.data.attachment && res.data.attachment[1]) {
  291 + productDesc = res.data.attachment.slice(1).map(a => {
292 return { 292 return {
293 imageUrl: a.attachUrl, 293 imageUrl: a.attachUrl,
294 intro: a.intro 294 intro: a.intro
@@ -210,7 +210,7 @@ @@ -210,7 +210,7 @@
210 <action-bar wx:elif="{{queueStatus === 3}}"> 210 <action-bar wx:elif="{{queueStatus === 3}}">
211 <view class="bottom1-action"> 211 <view class="bottom1-action">
212 <view class="action-list"> 212 <view class="action-list">
213 - <view class="as-bottom cancel width250" bindtap="goQueueList">排队中，查看详情</view> 213 + <view class="as-bottom confirm width250" bindtap="goQueueList">排队中，查看详情</view>
214 <view class="as-bottom ok width250" bindtap="assistShare">邀请好友助力排队</view> 214 <view class="as-bottom ok width250" bindtap="assistShare">邀请好友助力排队</view>
215 </view> 215 </view>
216 216
@@ -295,7 +295,7 @@ @@ -295,7 +295,7 @@
295 </block> 295 </block>
296 296
297 <block wx:if="{{modal}}"> 297 <block wx:if="{{modal}}">
298 -<yoho-alert wx:if="{{assistSuccess === 1}}" bindcancel="hideAlert"> 298 +<yoho-alert wx:if="{{assistSuccess === 1}}" >
299 <view class="modal-content"> 299 <view class="modal-content">
300 <view class="modal-title"> 300 <view class="modal-title">
301 <view class="sub-title">助力成功</view> 301 <view class="sub-title">助力成功</view>
@@ -308,7 +308,7 @@ @@ -308,7 +308,7 @@
308 </view> 308 </view>
309 </yoho-alert> 309 </yoho-alert>
310 310
311 -<yoho-alert wx:if="{{assistSuccess === 2}}" bindcancel="hideAlert"> 311 +<yoho-alert wx:if="{{assistSuccess === 2}}" >
312 <view class="modal-content"> 312 <view class="modal-content">
313 <view class="modal-title"> 313 <view class="modal-title">
314 <view class="sub-title">重复助力</view> 314 <view class="sub-title">重复助力</view>
@@ -320,7 +320,7 @@ @@ -320,7 +320,7 @@
320 </view> 320 </view>
321 </yoho-alert> 321 </yoho-alert>
322 322
323 -<yoho-alert wx:if="{{queueSuccess === 1}}" bindcancel="hideAlert"> 323 +<yoho-alert wx:if="{{queueSuccess === 1}}" >
324 <view class="modal-content"> 324 <view class="modal-content">
325 <view class="modal-title"> 325 <view class="modal-title">
326 <view class="sub-title">助力成功</view> 326 <view class="sub-title">助力成功</view>
@@ -342,7 +342,7 @@ @@ -342,7 +342,7 @@
342 </view> 342 </view>
343 </yoho-alert> 343 </yoho-alert>
344 344
345 -<yoho-alert wx:if="{{queueSuccess === 2}}" bindcancel="hideAlert"> 345 +<yoho-alert wx:if="{{queueSuccess === 2}}" >
346 <view class="modal-content"> 346 <view class="modal-content">
347 <view class="modal-title"> 347 <view class="modal-title">
348 <view class="sub-title">重复助力</view> 348 <view class="sub-title">重复助力</view>
@@ -364,7 +364,7 @@ @@ -364,7 +364,7 @@
364 </view> 364 </view>
365 </yoho-alert> 365 </yoho-alert>
366 366
367 -<yoho-alert wx:if="{{queueSuccess === 3}}" bindcancel="hideAlert"> 367 +<yoho-alert wx:if="{{queueSuccess === 3}}" >
368 <view class="modal-content"> 368 <view class="modal-content">
369 <view class="modal-title"> 369 <view class="modal-title">
370 <view class="sub-title">助力失败</view> 370 <view class="sub-title">助力失败</view>
@@ -386,7 +386,7 @@ @@ -386,7 +386,7 @@
386 </view> 386 </view>
387 </yoho-alert> 387 </yoho-alert>
388 388
389 -<yoho-alert wx:if="{{error}}" bindcancel="hideAlert"> 389 +<yoho-alert wx:if="{{error}}" >
390 <view class="modal-content"> 390 <view class="modal-content">
391 <view class="modal-title"> 391 <view class="modal-title">
392 <view class="sub-title">助力失败</view> 392 <view class="sub-title">助力失败</view>
@@ -103,12 +103,12 @@ @@ -103,12 +103,12 @@
103 103
104 .bottom1-action .help { 104 .bottom1-action .help {
105 position: absolute; 105 position: absolute;
106 - height: 50rpx;  
107 - width: 50rpx;  
108 - line-height: 50rpx;  
109 - border-radius: 25rpx; 106 + height: 36rpx;
  107 + width: 36rpx;
  108 + line-height: 36rpx;
  109 + border-radius: 18rpx;
110 color: #fff; 110 color: #fff;
111 - font-size: 40rpx; 111 + font-size: 28rpx;
112 background-color: #d0021b; 112 background-color: #d0021b;
113 right: 30rpx; 113 right: 30rpx;
114 top:50%; 114 top:50%;
@@ -169,6 +169,10 @@ @@ -169,6 +169,10 @@
169 background-color: #b0b0b0; 169 background-color: #b0b0b0;
170 } 170 }
171 171
  172 +.confirm {
  173 + background-color: black;
  174 +}
  175 +
172 .modal-content { 176 .modal-content {
173 text-align: center; 177 text-align: center;
174 } 178 }
@@ -33,7 +33,7 @@ @@ -33,7 +33,7 @@
33 "list": [] 33 "list": []
34 }, 34 },
35 "miniprogram": { 35 "miniprogram": {
36 - "current": 0, 36 + "current": 2,
37 "list": [ 37 "list": [
38 { 38 {
39 "id": 0, 39 "id": 0,