测试问题修改

@@ -213,7 +213,7 @@ page {
 }
 
 .rule-text {
-  width: 52rpx;
+  width: 60rpx;
   font-family: PingFang-SC-Regular;
   font-size: 13px;
   color: #FFFFFF;

@@ -609,9 +609,19 @@ Page(Object.assign({
       helpUserName: userInfo.wechat.nickName ? userInfo.wechat.nickName : '',
       helpUserImgUrl: userInfo.wechat.avatarUrl ? userInfo.wechat.avatarUrl : '',
       limitProductCode: this.data.limitProductCode
-    }).then(() => {
-      return detailModel.addQueue(this.data.originUid, this.data.activityId, this.getUserWechatId());
     }).then(result => {
+      if (result.code === 520) {//此限定商品分享助力只限新客！
+        wx.hideLoading();
+        wx.showModal({
+          title: '提示',
+          content: result.message,
+          showCancel: false,
+        });
+      } else {
+        return detailModel.addQueue(this.data.originUid, this.data.activityId, this.getUserWechatId());
+      }
+    }).then(result => {
+      // debugger;
       if (result.code === 200) {
 
         yas.report(YB_ASSIST_SUCCESS_L, {
@@ -632,13 +642,6 @@ Page(Object.assign({
         this.setData({
           queueSuccess: QUEUE_SUCCESS.FULL
         });
-      } else if (result.code === 520) {//此限定商品分享助力只限新客！
-        wx.hideLoading();
-        wx.showModal({
-          title: '提示',
-          content: result.message,
-          showCancel: false,
-        });
       } else {
         yas.report(YB_ASSIST_SUCCESS_L, {
           ASSIST_RESULT: ASSIST_FAIL,
@@ -721,6 +724,7 @@ Page(Object.assign({
   goQueueList() {
     router.go('queueIndex', Object.assign({
       actId: this.data.activityId,
+      isNew: this.data.isNew,
     }, this.data.snapData));
   },
   showError() {

@@ -281,7 +281,7 @@
             <view class="bottom1-action">
                 <view class="action-list" style="width: 570rpx;">
                     <view class="as-bottom confirm width250" style="width: 230rpx;" bindtap="goQueueList">排队中，查看详情</view>
-                    <view class="as-bottom ok width250" style="width: 230rpx;" bindtap="assistShare">{{isNew=='Y' ? '邀请新用户助力排队' : '邀请好友助力排队'}}</view>
+                    <view class="as-bottom ok" bindtap="assistShare">{{isNew=='Y' ? '邀请新用户助力排队' : '邀请好友助力排队'}}</view>
                 </view>
 
                 <view class="help-wrapper" bindtap="goHelp">
@@ -334,7 +334,7 @@
                 <view class="top-title" >你的好友邀请你为ta助力排队</view>
                 <view class="top-action">
                     <view class="as-bottom ok width130" bindtap="queueAction">帮ta助力</view>
-                    <view class="as-bottom cancel width130" bindtap="queueCancel">取消</view>
+                    <view class="as-bottom cancel width130" bindtap="queueCancel">直接参加</view>
                 </view>
             </view>
         </action-bar>

@@ -162,7 +162,7 @@
 }
 
 .width250 {
-    width: 250rpx;
+    width: 252rpx;
 }
 
 .width130 {

@@ -147,6 +147,7 @@ Page(Object.assign({
   onLoad: function(options) {
     console.log(options);
     let actId = options.actId;
+    let isNew = options.isNew || false;
     let uid = app.getUid();
 
     if (actId) {
@@ -165,7 +166,8 @@ Page(Object.assign({
       }
 
       this.setData({
-        shareInfo: Object.assign(this.data.shareInfo, options)
+        shareInfo: Object.assign(this.data.shareInfo, options),
+        isNew
       });
     }
 
@@ -392,7 +394,8 @@ Page(Object.assign({
   navigateToMyList: function(e) {
     router.go('myList', Object.assign({
       actId: this.data.activityInfo.activityId,
-      isEnd: this.data.activityInfo.isEnd
+      isEnd: this.data.activityInfo.isEnd,
+      isNew: this.data.isNew
     }, this.data.shareInfo));
   },
 

@@ -158,7 +158,7 @@
     </view>
     <form bindsubmit='submitFormId' report-submit='true'>
         <button wx:if="{{activityInfo.isBegin === 1 && userInfo.isDrawline && !activityInfo.isEnd}}" class='invite-button' hidden='{{hideInviteButton}}' form-type='submit'  bindtap='inviteFriends'>
-            邀请好友助力排队
+            {{isNew=='Y' ? '邀请新用户助力排队' : '邀请好友助力排队'}}
         </button>
     </form>
 </view>

@@ -509,7 +509,7 @@ image {
 
 .invite-button {
     position: fixed;
-    width: 280rpx;
+    width: 290rpx;
     height: 50rpx;
     line-height: 50rpx;
     color: white;

@@ -90,13 +90,15 @@ Page(Object.assign({
     console.log(options);
     let actId = options.actId;
     let isEnd = options.isEnd || 0;
+    let isNew = options.isNew || false;
     let uid = app.getUid() || options.uid;
 
 
     if (actId) {
       this.setData({
         actId: actId,
-        isEnd: parseInt(isEnd)
+        isEnd: parseInt(isEnd),
+        isNew
       });
       this.getQueueList(actId);
       for (let i in options) {

@@ -50,7 +50,7 @@
     </block>
     <form bindsubmit='submitFormId' report-submit='true'>
         <button wx:if='{{!isEnd}}' class='invite-button' hidden='{{hideInviteButton}}' form-type='submit' bindtap='inviteFriends'>
-            邀请好友助力排队
+          {{isNew=='Y' ? '邀请新用户助力排队' : '邀请好友助力排队'}}
         </button>
     </form>
 </view>

@@ -386,7 +386,7 @@ image {
 
 .invite-button {
     position: fixed;
-    width: 280rpx;
+    width: 290rpx;
     height: 50rpx;
     line-height: 50rpx;
     color: white;