Authored by htoooth

fix

... ... @@ -104,5 +104,17 @@ export default {
limitProductCode
}
});
},
getUserInfoByUnionId(name, unionId) {
return api.get({
url: '',
data: {
nickname: name,
openId: unionId,
source_type: 'wechat',
method: 'app.passport.signinByOpenID'
}
});
}
};
... ...
... ... @@ -48,8 +48,8 @@ const PRODUCT_SOURCE_TYPE = {
const ASSIST_STATUS = {
UNKNOWN: 0,
UN_ASSIST: 1,
ASSIST_FULL: 2,
UN_ASSIST: 1, // 本人不用助力
ASSIST_FULL: 2, // 人数已满
ASSIST_ACTION: 3,
ASSIST_ALREADY_ACTION: 4, // 已助力
};
... ... @@ -154,11 +154,6 @@ Page(Object.assign({
this.init();
}, app ? 0 : 1000);
},
init() {
this.productInfo().then(() => {
this.getAssistInfo();
});
},
onShareAppMessage: function(res) {
let params = {
FROM: res.from,
... ... @@ -326,7 +321,9 @@ Page(Object.assign({
assistStatus = ASSIST_STATUS.ASSIST_FULL;
} else {
// 不是发起者
if (this.data.originUid && this.data.originUnionID && this.data.originUnionID !== app.getUnionID()) {
if ((this.data.originUid && this.data.originUid !== this.data.uid) ||
(this.data.originUnionID && this.data.originUnionID !== app.getUnionID())
) {
assistStatus = ASSIST_STATUS.ASSIST_ACTION;
} else {
assistStatus = ASSIST_STATUS.UN_ASSIST;
... ... @@ -542,15 +539,18 @@ Page(Object.assign({
router.go('home');
},
reload() {
this.onLoad({
limitProductCode: this.data.limitProductCode
});
this.setData({
queueSuccess: QUEUE_SUCCESS.UNKNOWN,
assistSuccess: ASSIST_SUCCESS.UNKNOWN,
error: false
});
this.hideAlert();
this.onLoad({
limitProductCode: this.data.limitProductCode
});
this.init();
},
goQueueList() {
router.go('queueIndex', Object.assign({
... ... @@ -592,8 +592,7 @@ Page(Object.assign({
refreshText: '加载中...'
});
this.productInfo().then(() => {
this.getAssistInfo();
this.init().then(() => {
wx.stopPullDownRefresh();
this.setData({
refreshText: '下拉刷新'
... ... @@ -609,5 +608,46 @@ Page(Object.assign({
this.setData({
modal: true
});
},
init() {
return Promise.all([
this.productInfo(),
this.getUid()
]).then(() => {
return this.getAssistInfo();
});
},
_getUid() {
let userInfo = app.getUserInfo();
if (!userInfo.wechat) {
return Promise.resolve();
}
if (this.data.uid) {
return Promise.resolve();
}
let nickName = userInfo.wechat.nickName;
let unionID = app.getUnionID();
if (!nickName || !unionID) {
return Promise.resolve();
}
return detailModel.getUserInfoByUnionId(nickName, unionID).then(result => {
if (result.code === 200 && result.data.is_bind === 'Y' && result.data.uid) {
return result.data.uid;
}
});
},
getUid() {
return this._getUid().then(uid => {
if (uid) {
this.setData({
uid
});
}
});
}
}, Actionsheet));
}, Actionsheet));
\ No newline at end of file
... ...
... ... @@ -45,10 +45,10 @@
<action-bar wx:if="{{assistStatus === 1}}">
<form bindsubmit="assistShare" report-submit='true'>
<view class="bottom1-action">
<button class="action-btn" formType="submit">邀请好友助力获取限购码</button>
<view class="help" bindtap="goHelp">?</view>
</view>
<view class="bottom1-action">
<button class="action-btn" formType="submit">邀请好友助力获取限购码</button>
<view class="help" bindtap="goHelp">?</view>
</view>
</form>
</action-bar>
... ...