YUSHENG/yusheng-php
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
赵钊
2025-10-21 16:51:19 +08:00
parent 28b19e0619 5d1983fdb1
commit 1a1d192057
3 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
application/api/model/GiveGift.php
View File

@@ -72,6 +72,7 @@ class GiveGift extends Model
$FromUserInfo = db::name('user')->where('id',$uid)->field('id as user_id,nickname,avatar,sex')->find();
$FromUserInfo['icon'][0] = model('UserData')->user_wealth_icon($uid);//财富图标
$FromUserInfo['icon'][1] = model('UserData')->user_charm_icon($uid);//魅力图标
$FromUserInfo['chat_bubble'] = model('Decorate')->user_decorate_detail($uid,9);//聊天气泡
//送给一人礼物的总价格(扣除用户的数额）
$gift_price = $gift_info['gift_price'] * $num;
@@ -616,6 +617,7 @@ class GiveGift extends Model
$FromUserInfo = db::name('user')->where('id',$uid)->field('id as user_id,nickname,avatar,sex')->find();
$FromUserInfo['icon'][0] = model('UserData')->user_wealth_icon($uid);//财富图标
$FromUserInfo['icon'][1] = model('UserData')->user_charm_icon($uid);//魅力图标
$FromUserInfo['chat_bubble'] = model('Decorate')->user_decorate_detail($uid,9);//聊天气泡
//送给一人礼物的总价格(扣除用户的数额）
$gift_price = $gift_info['gift_price'] * $num;

2
application/api/model/Login.php
View File

@@ -202,6 +202,8 @@ class Login extends Model
$return_res[0]['mobile'] = $user_info['mobile'];
$return_res[0]['icon'][0] = model('UserData')->user_wealth_icon($user_info['id']);//财富图标
$return_res[0]['icon'][1] = model('UserData')->user_charm_icon($user_info['id']);//魅力图标
$return_res[0]['dress'] = model('Decorate')->user_decorate_detail($user_info['user_id'],1);
$return_res[0]['chat_bubble'] = model('Decorate')->user_decorate_detail($user_info['user_id'],9);//聊天气泡
$isAuth = 0;
if($user_info['mobile']){

2
application/api/model/User.php
View File

@@ -326,6 +326,8 @@ class User extends Model
$user_info['age'] = getAge($user_info['birthday']);
//头像装扮
$user_info['dress'] = model('Decorate')->user_decorate_detail($user_info['user_id'],1);
//聊天泡
$user_info['chat_bubble'] = model('Decorate')->user_decorate_detail($user_info['user_id'],9);//聊天气泡
//记录用户访问记录
if($from_uid != $uid){