|
|
@@ -361,11 +361,13 @@ class User extends BaseController
|
|
361
|
361
|
public function vr_info(){
|
|
362
|
362
|
log::info("============vr");
|
|
363
|
363
|
$user = $this->request->userInfo();
|
|
|
364
|
+
|
|
364
|
365
|
if($user->uid>0){
|
|
365
|
366
|
//已经入账京豆
|
|
366
|
|
- $data['total_source']=$user->vr;
|
|
|
367
|
+ $data['total_source'] = $user->vr;
|
|
367
|
368
|
//为生效京豆
|
|
368
|
|
- $data['no_total_source']=Db::name('user_sign_vr')->where('status', -1)->where('uid', $user->uid)->sum('number');;
|
|
|
369
|
+ $data['no_total_source']=0;
|
|
|
370
|
+ //$data['no_total_source']=Db::name('user_sign_vr')->where('status', -1)->where('uid', $user->uid)->sum('number');;
|
|
369
|
371
|
log::info("====spread_info_yhc=={$data['total_source']}======={$data['no_total_source']}");
|
|
370
|
372
|
return app('json')->success($data);
|
|
371
|
373
|
|
|
|
@@ -380,13 +382,13 @@ class User extends BaseController
|
|
380
|
382
|
$uid = $this->request->uid();
|
|
381
|
383
|
log::info("vr_list==={$uid}");
|
|
382
|
384
|
$where['uid'] = $uid;
|
|
383
|
|
-
|
|
|
385
|
+ $data = DB::name('user_sign_vr')->page($page, $limit)->order("id desc")->select();
|
|
384
|
386
|
if ($pm==0){
|
|
385
|
387
|
|
|
386
|
|
- $data = DB::name('user_sign_vr')->where($where)->where('type', 1)->field('id,mark,number,type,addtime,order_id')->page($page, $limit)->order("id desc")->select();
|
|
|
388
|
+ $data = DB::name('user_sign_vr')->where($where)->where('type', 1)->page($page, $limit)->order("id desc")->select();
|
|
387
|
389
|
}
|
|
388
|
|
- if($pm==1){
|
|
389
|
|
- $data = DB::name('user_sign_vr')->where($where)->where('type', 2)->field('id,mark,number,type,addtime,order_id')->page($page, $limit)->order("id desc")->select();
|
|
|
390
|
+ if($pm==2){
|
|
|
391
|
+ $data = DB::name('user_sign_vr')->where($where)->where('type', 2)->page($page, $limit)->order("id desc")->select();
|
|
390
|
392
|
|
|
391
|
393
|
}
|
|
392
|
394
|
// if($pm==2){
|