Showing
2 changed files
with
6 additions
and
6 deletions
@@ -284,7 +284,8 @@ Page(Object.assign({ | @@ -284,7 +284,8 @@ Page(Object.assign({ | ||
284 | productSourceType = PRODUCT_SOURCE_TYPE.ORIGIN; | 284 | productSourceType = PRODUCT_SOURCE_TYPE.ORIGIN; |
285 | } else if (!this.data.originUnionID && !this.data.originUid) { | 285 | } else if (!this.data.originUnionID && !this.data.originUid) { |
286 | productSourceType = PRODUCT_SOURCE_TYPE.ORIGIN; | 286 | productSourceType = PRODUCT_SOURCE_TYPE.ORIGIN; |
287 | - } else if (this.data.originUnionID && this.data.originUnionID !== app.getUnionID()) { | 287 | + } else if ((this.data.originUnionID && this.data.originUnionID !== app.getUnionID()) || |
288 | + (this.data.originUid && this.data.originUid !== this.data.uid)) { | ||
288 | productSourceType = PRODUCT_SOURCE_TYPE.SHARE; | 289 | productSourceType = PRODUCT_SOURCE_TYPE.SHARE; |
289 | } | 290 | } |
290 | 291 | ||
@@ -616,10 +617,9 @@ Page(Object.assign({ | @@ -616,10 +617,9 @@ Page(Object.assign({ | ||
616 | }, | 617 | }, |
617 | init() { | 618 | init() { |
618 | wx.showLoading(); | 619 | wx.showLoading(); |
619 | - return Promise.all([ | ||
620 | - this.productInfo(), | ||
621 | - this.getUid() | ||
622 | - ]).then(() => { | 620 | + this.getUid().then(() => { |
621 | + return this.productInfo(); | ||
622 | + }).then(() => { | ||
623 | return this.getAssistInfo(); | 623 | return this.getAssistInfo(); |
624 | }).then(() => { | 624 | }).then(() => { |
625 | wx.hideLoading(); | 625 | wx.hideLoading(); |
-
Please register or login to post a comment