fe / yoho-limited-sell-miniapp · Commits

Go to a project

Authored by 肖亚东
Commit dd1f599e8d1caf8b92aa00fb10d5549be8213678 1 parent 4b670ffe

测试问题修改

Inline Side-by-side
Showing 10 changed files with 28 additions and 19 deletions
@@ -213,7 +213,7 @@ page { @@ -213,7 +213,7 @@ page {
213 } 213 }
214 214
215 .rule-text { 215 .rule-text {
216 - width: 52rpx; 216 + width: 60rpx;
217 font-family: PingFang-SC-Regular; 217 font-family: PingFang-SC-Regular;
218 font-size: 13px; 218 font-size: 13px;
219 color: #FFFFFF; 219 color: #FFFFFF;
@@ -609,9 +609,19 @@ Page(Object.assign({ @@ -609,9 +609,19 @@ Page(Object.assign({
609 helpUserName: userInfo.wechat.nickName ? userInfo.wechat.nickName : '', 609 helpUserName: userInfo.wechat.nickName ? userInfo.wechat.nickName : '',
610 helpUserImgUrl: userInfo.wechat.avatarUrl ? userInfo.wechat.avatarUrl : '', 610 helpUserImgUrl: userInfo.wechat.avatarUrl ? userInfo.wechat.avatarUrl : '',
611 limitProductCode: this.data.limitProductCode 611 limitProductCode: this.data.limitProductCode
612 - }).then(() => { 612 + }).then(result => {
  613 + if (result.code === 520) {//此限定商品分享助力只限新客！
  614 + wx.hideLoading();
  615 + wx.showModal({
  616 + title: '提示',
  617 + content: result.message,
  618 + showCancel: false,
  619 + });
  620 + } else {
613 return detailModel.addQueue(this.data.originUid, this.data.activityId, this.getUserWechatId()); 621 return detailModel.addQueue(this.data.originUid, this.data.activityId, this.getUserWechatId());
  622 + }
614 }).then(result => { 623 }).then(result => {
  624 + // debugger;
615 if (result.code === 200) { 625 if (result.code === 200) {
616 626
617 yas.report(YB_ASSIST_SUCCESS_L, { 627 yas.report(YB_ASSIST_SUCCESS_L, {
@@ -632,13 +642,6 @@ Page(Object.assign({ @@ -632,13 +642,6 @@ Page(Object.assign({
632 this.setData({ 642 this.setData({
633 queueSuccess: QUEUE_SUCCESS.FULL 643 queueSuccess: QUEUE_SUCCESS.FULL
634 }); 644 });
635 - } else if (result.code === 520) {//此限定商品分享助力只限新客！  
636 - wx.hideLoading();  
637 - wx.showModal({  
638 - title: '提示',  
639 - content: result.message,  
640 - showCancel: false,  
641 - });  
642 } else { 645 } else {
643 yas.report(YB_ASSIST_SUCCESS_L, { 646 yas.report(YB_ASSIST_SUCCESS_L, {
644 ASSIST_RESULT: ASSIST_FAIL, 647 ASSIST_RESULT: ASSIST_FAIL,
@@ -721,6 +724,7 @@ Page(Object.assign({ @@ -721,6 +724,7 @@ Page(Object.assign({
721 goQueueList() { 724 goQueueList() {
722 router.go('queueIndex', Object.assign({ 725 router.go('queueIndex', Object.assign({
723 actId: this.data.activityId, 726 actId: this.data.activityId,
  727 + isNew: this.data.isNew,
724 }, this.data.snapData)); 728 }, this.data.snapData));
725 }, 729 },
726 showError() { 730 showError() {
@@ -281,7 +281,7 @@ @@ -281,7 +281,7 @@
281 <view class="bottom1-action"> 281 <view class="bottom1-action">
282 <view class="action-list" style="width: 570rpx;"> 282 <view class="action-list" style="width: 570rpx;">
283 <view class="as-bottom confirm width250" style="width: 230rpx;" bindtap="goQueueList">排队中，查看详情</view> 283 <view class="as-bottom confirm width250" style="width: 230rpx;" bindtap="goQueueList">排队中，查看详情</view>
284 - <view class="as-bottom ok width250" style="width: 230rpx;" bindtap="assistShare">{{isNew=='Y' ? '邀请新用户助力排队' : '邀请好友助力排队'}}</view> 284 + <view class="as-bottom ok" bindtap="assistShare">{{isNew=='Y' ? '邀请新用户助力排队' : '邀请好友助力排队'}}</view>
285 </view> 285 </view>
286 286
287 <view class="help-wrapper" bindtap="goHelp"> 287 <view class="help-wrapper" bindtap="goHelp">
@@ -334,7 +334,7 @@ @@ -334,7 +334,7 @@
334 <view class="top-title" >你的好友邀请你为ta助力排队</view> 334 <view class="top-title" >你的好友邀请你为ta助力排队</view>
335 <view class="top-action"> 335 <view class="top-action">
336 <view class="as-bottom ok width130" bindtap="queueAction">帮ta助力</view> 336 <view class="as-bottom ok width130" bindtap="queueAction">帮ta助力</view>
337 - <view class="as-bottom cancel width130" bindtap="queueCancel">取消</view> 337 + <view class="as-bottom cancel width130" bindtap="queueCancel">直接参加</view>
338 </view> 338 </view>
339 </view> 339 </view>
340 </action-bar> 340 </action-bar>
@@ -162,7 +162,7 @@ @@ -162,7 +162,7 @@
162 } 162 }
163 163
164 .width250 { 164 .width250 {
165 - width: 250rpx; 165 + width: 252rpx;
166 } 166 }
167 167
168 .width130 { 168 .width130 {
@@ -147,6 +147,7 @@ Page(Object.assign({ @@ -147,6 +147,7 @@ Page(Object.assign({
147 onLoad: function(options) { 147 onLoad: function(options) {
148 console.log(options); 148 console.log(options);
149 let actId = options.actId; 149 let actId = options.actId;
  150 + let isNew = options.isNew || false;
150 let uid = app.getUid(); 151 let uid = app.getUid();
151 152
152 if (actId) { 153 if (actId) {
@@ -165,7 +166,8 @@ Page(Object.assign({ @@ -165,7 +166,8 @@ Page(Object.assign({
165 } 166 }
166 167
167 this.setData({ 168 this.setData({
168 - shareInfo: Object.assign(this.data.shareInfo, options) 169 + shareInfo: Object.assign(this.data.shareInfo, options),
  170 + isNew
169 }); 171 });
170 } 172 }
171 173
@@ -392,7 +394,8 @@ Page(Object.assign({ @@ -392,7 +394,8 @@ Page(Object.assign({
392 navigateToMyList: function(e) { 394 navigateToMyList: function(e) {
393 router.go('myList', Object.assign({ 395 router.go('myList', Object.assign({
394 actId: this.data.activityInfo.activityId, 396 actId: this.data.activityInfo.activityId,
395 - isEnd: this.data.activityInfo.isEnd 397 + isEnd: this.data.activityInfo.isEnd,
  398 + isNew: this.data.isNew
396 }, this.data.shareInfo)); 399 }, this.data.shareInfo));
397 }, 400 },
398 401
@@ -158,7 +158,7 @@ @@ -158,7 +158,7 @@
158 </view> 158 </view>
159 <form bindsubmit='submitFormId' report-submit='true'> 159 <form bindsubmit='submitFormId' report-submit='true'>
160 <button wx:if="{{activityInfo.isBegin === 1 && userInfo.isDrawline && !activityInfo.isEnd}}" class='invite-button' hidden='{{hideInviteButton}}' form-type='submit' bindtap='inviteFriends'> 160 <button wx:if="{{activityInfo.isBegin === 1 && userInfo.isDrawline && !activityInfo.isEnd}}" class='invite-button' hidden='{{hideInviteButton}}' form-type='submit' bindtap='inviteFriends'>
161 - 邀请好友助力排队 161 + {{isNew=='Y' ? '邀请新用户助力排队' : '邀请好友助力排队'}}
162 </button> 162 </button>
163 </form> 163 </form>
164 </view> 164 </view>
@@ -509,7 +509,7 @@ image { @@ -509,7 +509,7 @@ image {
509 509
510 .invite-button { 510 .invite-button {
511 position: fixed; 511 position: fixed;
512 - width: 280rpx; 512 + width: 290rpx;
513 height: 50rpx; 513 height: 50rpx;
514 line-height: 50rpx; 514 line-height: 50rpx;
515 color: white; 515 color: white;
@@ -90,13 +90,15 @@ Page(Object.assign({ @@ -90,13 +90,15 @@ Page(Object.assign({
90 console.log(options); 90 console.log(options);
91 let actId = options.actId; 91 let actId = options.actId;
92 let isEnd = options.isEnd || 0; 92 let isEnd = options.isEnd || 0;
  93 + let isNew = options.isNew || false;
93 let uid = app.getUid() || options.uid; 94 let uid = app.getUid() || options.uid;
94 95
95 96
96 if (actId) { 97 if (actId) {
97 this.setData({ 98 this.setData({
98 actId: actId, 99 actId: actId,
99 - isEnd: parseInt(isEnd) 100 + isEnd: parseInt(isEnd),
  101 + isNew
100 }); 102 });
101 this.getQueueList(actId); 103 this.getQueueList(actId);
102 for (let i in options) { 104 for (let i in options) {
@@ -50,7 +50,7 @@ @@ -50,7 +50,7 @@
50 </block> 50 </block>
51 <form bindsubmit='submitFormId' report-submit='true'> 51 <form bindsubmit='submitFormId' report-submit='true'>
52 <button wx:if='{{!isEnd}}' class='invite-button' hidden='{{hideInviteButton}}' form-type='submit' bindtap='inviteFriends'> 52 <button wx:if='{{!isEnd}}' class='invite-button' hidden='{{hideInviteButton}}' form-type='submit' bindtap='inviteFriends'>
53 - 邀请好友助力排队 53 + {{isNew=='Y' ? '邀请新用户助力排队' : '邀请好友助力排队'}}
54 </button> 54 </button>
55 </form> 55 </form>
56 </view> 56 </view>
@@ -386,7 +386,7 @@ image { @@ -386,7 +386,7 @@ image {
386 386
387 .invite-button { 387 .invite-button {
388 position: fixed; 388 position: fixed;
389 - width: 280rpx; 389 + width: 290rpx;
390 height: 50rpx; 390 height: 50rpx;
391 line-height: 50rpx; 391 line-height: 50rpx;
392 color: white; 392 color: white;