Merge branch 'dev' into payment

no_ymq_dev
laurieryayoi 8 years ago
commit 5a6bcdd4d0

@ -100,6 +100,12 @@ class VueController extends BaseController {
public function getUserInfo($request, $response, $args) {
$user = $this->user;
if (!$user->isLogin) {
$res['ret'] = -1;
return $response->getBody()->write(json_encode($res));
}
$pre_user = URL::cloneUser($user);
$user->ssr_url_all = URL::getAllUrl($pre_user, 0, 0);
$user->ssr_url_all_mu = URL::getAllUrl($pre_user, 1, 0);
@ -152,16 +158,23 @@ class VueController extends BaseController {
public function getUserInviteInfo($request, $response, $args)
{
$code = InviteCode::where('user_id', $this->user->id)->first();
$user = $this->user;
if (!$user->isLogin) {
$res['ret'] = -1;
return $response->getBody()->write(json_encode($res));
}
$code = InviteCode::where('user_id', $user->id)->first();
if ($code == null) {
$this->user->addInviteCode();
$code = InviteCode::where('user_id', $this->user->id)->first();
$user->addInviteCode();
$code = InviteCode::where('user_id', $user->id)->first();
}
$pageNum = $request->getParam('current');
$paybacks = Payback::where("ref_by", $this->user->id)->orderBy("id", "desc")->paginate(15, ['*'], 'page', $pageNum);
if (!$paybacks_sum = Payback::where("ref_by", $this->user->id)->sum('ref_get')) {
$paybacks = Payback::where("ref_by", $user->id)->orderBy("id", "desc")->paginate(15, ['*'], 'page', $pageNum);
if (!$paybacks_sum = Payback::where("ref_by", $user->id)->sum('ref_get')) {
$paybacks_sum = 0;
}
$paybacks->setPath('/#/user/panel');

@ -441,17 +441,21 @@ export default {
mounted() {
let body = { current: 1 };
_post("/getuserinviteinfo", JSON.stringify(body), "include").then(r => {
this.code = this.oldCode = r.inviteInfo.code.code;
this.invitePrice = r.inviteInfo.invitePrice;
this.customPrice = r.inviteInfo.customPrice;
this.paybacks = r.inviteInfo.paybacks;
this.paybacks_sum = r.inviteInfo.paybacks_sum;
this.invite_get_money = r.inviteInfo.invite_get_money;
this.invite_gift = r.inviteInfo.invite_gift;
this.code_payback = r.inviteInfo.code_payback;
this.pagenation = {
lastPage: r.inviteInfo.paybacks.last_page
};
if (r.ret === 1) {
this.code = this.oldCode = r.inviteInfo.code.code;
this.invitePrice = r.inviteInfo.invitePrice;
this.customPrice = r.inviteInfo.customPrice;
this.paybacks = r.inviteInfo.paybacks;
this.paybacks_sum = r.inviteInfo.paybacks_sum;
this.invite_get_money = r.inviteInfo.invite_get_money;
this.invite_gift = r.inviteInfo.invite_gift;
this.code_payback = r.inviteInfo.code_payback;
this.pagenation = {
lastPage: r.inviteInfo.paybacks.last_page
};
} else if (r.ret === -1) {
console.log(r);
}
});
},
beforeDestroy() {

Loading…
Cancel
Save