|
|
@@ -654,7 +654,7 @@ echo '导入成功';
|
|
654
|
654
|
public function userInfo()
|
|
655
|
655
|
{
|
|
656
|
656
|
$user = $this->request->userInfo()
|
|
657
|
|
- ->hidden(['account','label_id', 'group_id', 'pwd', 'card_id', 'last_time', 'last_ip', 'status', 'spread_time', 'real_name', 'brokerage_price']);
|
|
|
657
|
+ ->hidden(['account','label_id', 'group_id', 'pwd', 'card_id', 'last_time', 'last_ip', 'status', 'spread_time', 'real_name']);
|
|
658
|
658
|
$user->append(['service', 'total_consume', 'total_collect_product', 'total_collect_store', 'total_coupon', 'total_visit_product', 'total_unread']);
|
|
659
|
659
|
$data=$user->toArray();
|
|
660
|
660
|
|
|
|
@@ -718,8 +718,17 @@ $data=$user->toArray();
|
|
718
|
718
|
// $area_manage_type=Db::name('area_manage')->where('uid', $user["uid"])->value('type');
|
|
719
|
719
|
//类型 district-区/县代 city-市代',
|
|
720
|
720
|
// $data['area_manage_type']=$area_manage_type??'';
|
|
721
|
|
- $data['member_brokerage_price']=set_price_rtrim($data['member_brokerage_price']);
|
|
|
721
|
+// $data['member_brokerage_price']=set_price_rtrim($data['member_brokerage_price']);
|
|
|
722
|
+ //积分
|
|
722
|
723
|
$data['score']=set_price_rtrim($data['score']);
|
|
|
724
|
+ //2025新增 贡献值,红包,京东,vr,复购金
|
|
|
725
|
+ $date['contribute']=set_price_rtrim($data['contribute']);//贡献值
|
|
|
726
|
+ $data['repurchase_price']=set_price_rtrim($data['repurchase_price']);//复购余额
|
|
|
727
|
+ $data['jingdou']=set_price_rtrim($data['jingdou']);//京豆
|
|
|
728
|
+ $data['vr']=set_price_rtrim($data['vr']);//购物金
|
|
|
729
|
+ $data['hongbao']=set_price_rtrim($data['hongbao']);//红包
|
|
|
730
|
+ $data['brokerage_price']=set_price_rtrim($data['brokerage_price']);
|
|
|
731
|
+ $data['isOld']=($data['is_old']);//
|
|
723
|
732
|
$data['exchange']=0;
|
|
724
|
733
|
$data['withdraw']=0;
|
|
725
|
734
|
if($this->source=='yhc'){
|