Merge branch 'develop' of http://git.yoho.cn/fe/yoho-limited-sell-miniapp into develop

@@ -165,8 +165,6 @@ Page(Object.assign({
     } else if (res.from === 'button') {
       // 用户点击分享按钮
 
-      console.log(`/pages/product/detail/detail?limitProductCode=${this.data.limitProductCode}&originUid=${app.getUid()}&originUnionID=${app.getUnionID()}`);
-
       return {
         title: params.TITLE, // 分享标题
         desc: params.DESC, // 分享描述
@@ -398,8 +396,8 @@ Page(Object.assign({
     detailModel.addAssist({
       userId: this.data.originUid,
       helpUserId: app.getUnionID(),
-      helpUserName: userInfo.nickName ? userInfo.nickName : '',
-      helpUserImgUrl: userInfo.avatarUrl ? userInfo.avatarUrl : '',
+      helpUserName: userInfo.wechat.nickName ? userInfo.wechat.nickName : '',
+      helpUserImgUrl: userInfo.wechat.avatarUrl ? userInfo.wechat.avatarUrl : '',
       limitProductCode: this.data.limitProductCode
     }).then(result => {
       if (result.code === 200) {
@@ -408,7 +406,9 @@ Page(Object.assign({
         });
 
         if ((this.data.avatarList.length + 1) === this.data.assisLimit) {
-          detailModel.getLimitCode(this.data.uid, this.data.limitProductCode);
+          detailModel.getLimitCode(this.data.originUid, this.data.limitProductCode);
+        } else if (this.data.avatarList.length === this.data.assisLimit) {
+          detailModel.getLimitCode(this.data.originUid, this.data.limitProductCode);
         }
       } else if (result.code === 401) {
         this.setData({
@@ -432,8 +432,8 @@ Page(Object.assign({
     detailModel.addAssist({
       userId: this.data.originUid,
       helpUserId: app.getUnionID(),
-      helpUserName: userInfo.nickName,
-      helpUserImgUrl: userInfo.avatarUrl,
+      helpUserName: userInfo.wechat.nickName ? userInfo.wechat.nickName : '',
+      helpUserImgUrl: userInfo.wechat.avatarUrl ? userInfo.wechat.avatarUrl : '',
       limitProductCode: this.data.limitProductCode,
       activityId: this.data.activityId
     }).then(() => {

@@ -254,7 +254,7 @@
 
         <action-bar wx:elif="{{queueStatus === 3}}">
             <view class="top-assis-action">
-                <view class="top-title" >你的好友邀请你为ta助力参加排队</view>
+                <view class="top-title" >你的好友邀请你为ta助力排队</view>
                 <view class="top-action">
                     <view class="top-ok" bindtap="queueAction">帮ta助力</view>
                     <view class="top-cancel" bindtap="queueCancel">取消</view>