...
|
...
|
@@ -284,7 +284,8 @@ Page(Object.assign({ |
|
|
productSourceType = PRODUCT_SOURCE_TYPE.ORIGIN;
|
|
|
} else if (!this.data.originUnionID && !this.data.originUid) {
|
|
|
productSourceType = PRODUCT_SOURCE_TYPE.ORIGIN;
|
|
|
} else if (this.data.originUnionID && this.data.originUnionID !== app.getUnionID()) {
|
|
|
} else if ((this.data.originUnionID && this.data.originUnionID !== app.getUnionID()) ||
|
|
|
(this.data.originUid && this.data.originUid !== this.data.uid)) {
|
|
|
productSourceType = PRODUCT_SOURCE_TYPE.SHARE;
|
|
|
}
|
|
|
|
...
|
...
|
@@ -616,10 +617,9 @@ Page(Object.assign({ |
|
|
},
|
|
|
init() {
|
|
|
wx.showLoading();
|
|
|
return Promise.all([
|
|
|
this.productInfo(),
|
|
|
this.getUid()
|
|
|
]).then(() => {
|
|
|
this.getUid().then(() => {
|
|
|
return this.productInfo();
|
|
|
}).then(() => {
|
|
|
return this.getAssistInfo();
|
|
|
}).then(() => {
|
|
|
wx.hideLoading();
|
...
|
...
|
|