Authored by 郭成尧

Merge branch 'feature/userqrcode' into release/5.0.0

... ... @@ -46,7 +46,7 @@ class UserModel
/* tar add 160914 qrcode*/
$result['qrcodeLink'] = Helpers::url('/home/user/qrcode',array(
'token' => isset($userData['data']['uid']) ? Encryption::encrypt($userData['data']['uid']) : '',
'token' => isset($userData['data']['uid']) ? Encryption::encrypt($userData['data']['uid'], 'yoho9646yoho9646') : '',
'icon' => isset($userData['data']['head_ico']) ? $userData['data']['head_ico'] : '',
'uname' => isset($userData['data']['nickname']) ? $userData['data']['nickname'] : '',
'vip' => isset($userData['data']['vip_info']['cur_level']) ? $userData['data']['vip_info']['cur_level'] : '',
... ...