fe / yoho-limited-sell-miniapp · Commits

Go to a project

Authored by 邱骏
Commit 51b1a55cfb7180b28c892b1a6b93bdc2f139a8f9 2 parents 4f2958da 5a1c3871

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

Inline Side-by-side
Showing 2 changed files with 8 additions and 8 deletions
@@ -165,8 +165,6 @@ Page(Object.assign({ @@ -165,8 +165,6 @@ Page(Object.assign({
165 } else if (res.from === 'button') { 165 } else if (res.from === 'button') {
166 // 用户点击分享按钮 166 // 用户点击分享按钮
167 167
168 - console.log(`/pages/product/detail/detail?limitProductCode=${this.data.limitProductCode}&originUid=${app.getUid()}&originUnionID=${app.getUnionID()}`);  
169 -  
170 return { 168 return {
171 title: params.TITLE, // 分享标题 169 title: params.TITLE, // 分享标题
172 desc: params.DESC, // 分享描述 170 desc: params.DESC, // 分享描述
@@ -398,8 +396,8 @@ Page(Object.assign({ @@ -398,8 +396,8 @@ Page(Object.assign({
398 detailModel.addAssist({ 396 detailModel.addAssist({
399 userId: this.data.originUid, 397 userId: this.data.originUid,
400 helpUserId: app.getUnionID(), 398 helpUserId: app.getUnionID(),
401 - helpUserName: userInfo.nickName ? userInfo.nickName : '',  
402 - helpUserImgUrl: userInfo.avatarUrl ? userInfo.avatarUrl : '', 399 + helpUserName: userInfo.wechat.nickName ? userInfo.wechat.nickName : '',
  400 + helpUserImgUrl: userInfo.wechat.avatarUrl ? userInfo.wechat.avatarUrl : '',
403 limitProductCode: this.data.limitProductCode 401 limitProductCode: this.data.limitProductCode
404 }).then(result => { 402 }).then(result => {
405 if (result.code === 200) { 403 if (result.code === 200) {
@@ -408,7 +406,9 @@ Page(Object.assign({ @@ -408,7 +406,9 @@ Page(Object.assign({
408 }); 406 });
409 407
410 if ((this.data.avatarList.length + 1) === this.data.assisLimit) { 408 if ((this.data.avatarList.length + 1) === this.data.assisLimit) {
411 - detailModel.getLimitCode(this.data.uid, this.data.limitProductCode); 409 + detailModel.getLimitCode(this.data.originUid, this.data.limitProductCode);
  410 + } else if (this.data.avatarList.length === this.data.assisLimit) {
  411 + detailModel.getLimitCode(this.data.originUid, this.data.limitProductCode);
412 } 412 }
413 } else if (result.code === 401) { 413 } else if (result.code === 401) {
414 this.setData({ 414 this.setData({
@@ -432,8 +432,8 @@ Page(Object.assign({ @@ -432,8 +432,8 @@ Page(Object.assign({
432 detailModel.addAssist({ 432 detailModel.addAssist({
433 userId: this.data.originUid, 433 userId: this.data.originUid,
434 helpUserId: app.getUnionID(), 434 helpUserId: app.getUnionID(),
435 - helpUserName: userInfo.nickName,  
436 - helpUserImgUrl: userInfo.avatarUrl, 435 + helpUserName: userInfo.wechat.nickName ? userInfo.wechat.nickName : '',
  436 + helpUserImgUrl: userInfo.wechat.avatarUrl ? userInfo.wechat.avatarUrl : '',
437 limitProductCode: this.data.limitProductCode, 437 limitProductCode: this.data.limitProductCode,
438 activityId: this.data.activityId 438 activityId: this.data.activityId
439 }).then(() => { 439 }).then(() => {
@@ -254,7 +254,7 @@ @@ -254,7 +254,7 @@
254 254
255 <action-bar wx:elif="{{queueStatus === 3}}"> 255 <action-bar wx:elif="{{queueStatus === 3}}">
256 <view class="top-assis-action"> 256 <view class="top-assis-action">
257 - <view class="top-title" >你的好友邀请你为ta助力参加排队</view> 257 + <view class="top-title" >你的好友邀请你为ta助力排队</view>
258 <view class="top-action"> 258 <view class="top-action">
259 <view class="top-ok" bindtap="queueAction">帮ta助力</view> 259 <view class="top-ok" bindtap="queueAction">帮ta助力</view>
260 <view class="top-cancel" bindtap="queueCancel">取消</view> 260 <view class="top-cancel" bindtap="queueCancel">取消</view>