diff --git a/application/admin/view/default/user/index.html b/application/admin/view/default/user/index.html index 6259c5427..5c129dff6 100755 --- a/application/admin/view/default/user/index.html +++ b/application/admin/view/default/user/index.html @@ -143,11 +143,17 @@
支付宝openid
{{if empty($v['alipay_openid'])}}未知{{else /}}{{$v.alipay_openid}}{{/if}}
+
百度openid
+
{{if empty($v['baidu_openid'])}}未知{{else /}}{{$v.baidu_openid}}{{/if}}
+
微信openid
{{if empty($v['weixin_openid'])}}未知{{else /}}{{$v.weixin_openid}}{{/if}}
-
百度openid
-
{{if empty($v['baidu_openid'])}}未知{{else /}}{{$v.baidu_openid}}{{/if}}
+
微信unionid
+
{{if empty($v['weixin_unionid'])}}未知{{else /}}{{$v.weixin_unionid}}{{/if}}
+ +
微信webopenid
+
{{if empty($v['weixin_web_openid'])}}未知{{else /}}{{$v.weixin_web_openid}}{{/if}}
性别
{{if empty($v['gender_text'])}}未设置{{else /}}{{$v.gender_text}}{{/if}}
diff --git a/application/admin/view/default/user/save_info.html b/application/admin/view/default/user/save_info.html index 62204b33f..7642333df 100755 --- a/application/admin/view/default/user/save_info.html +++ b/application/admin/view/default/user/save_info.html @@ -37,13 +37,21 @@ +
+ + +
- - + + +
+
+ +
diff --git a/application/api/controller/User.php b/application/api/controller/User.php index 495f12de5..b38eece6c 100755 --- a/application/api/controller/User.php +++ b/application/api/controller/User.php @@ -207,6 +207,7 @@ class User extends Common $result['nick_name'] = isset($result['nickName']) ? $result['nickName'] : ''; $result['avatar'] = isset($result['avatarUrl']) ? $result['avatarUrl'] : ''; $result['gender'] = empty($result['gender']) ? 0 : ($result['gender'] == 2) ? 1 : 2; + $result['weixin_unionid'] = isset($result['unionId']) ? $result['unionId'] : ''; $result['openid'] = $result['openId']; $result['referrer']= isset($this->data_post['referrer']) ? $this->data_post['referrer'] : 0; return UserService::AuthUserProgram($result, 'weixin_openid'); diff --git a/application/service/UserService.php b/application/service/UserService.php index 437c2e4e2..a043e0a15 100755 --- a/application/service/UserService.php +++ b/application/service/UserService.php @@ -314,8 +314,10 @@ class UserService 'integral' => intval($params['integral']), 'status' => intval($params['status']), 'alipay_openid' => isset($params['alipay_openid']) ? $params['alipay_openid'] : '', - 'weixin_openid' => isset($params['weixin_openid']) ? $params['weixin_openid'] : '', 'baidu_openid' => isset($params['baidu_openid']) ? $params['baidu_openid'] : '', + 'weixin_openid' => isset($params['weixin_openid']) ? $params['weixin_openid'] : '', + 'weixin_unionid' => isset($params['weixin_unionid']) ? $params['weixin_unionid'] : '', + 'weixin_web_openid' => isset($params['weixin_web_openid']) ? $params['weixin_web_openid'] : '', 'birthday' => empty($params['birthday']) ? 0 : strtotime($params['birthday']), 'upd_time' => time(), ]; @@ -1653,6 +1655,12 @@ class UserService 'city' => empty($params['city']) ? '' : $params['city'], 'referrer' => isset($params['referrer']) ? $params['referrer'] : 0, ]; + + // 微信用户unionid + if(!empty($params['weixin_unionid'])) + { + $data['weixin_unionid'] = $params['weixin_unionid']; + } $user = self::AppUserInfoHandle(null, $field, $params['openid']); if(!empty($user)) { @@ -1688,7 +1696,7 @@ class UserService public static function AppUserInfoHandle($user_id = null, $where_field = null, $where_value = null, $user = []) { // 获取用户信息 - $field = 'id,username,nickname,mobile,email,avatar,alipay_openid,weixin_openid,baidu_openid,integral,locking_integral'; + $field = 'id,username,nickname,mobile,email,avatar,alipay_openid,weixin_openid,weixin_unionid,weixin_web_openid,baidu_openid,integral,locking_integral'; if(!empty($user_id)) { $user = self::UserInfo('id', $user_id, $field); diff --git a/public/appmini/old/weixin/app.js b/public/appmini/old/weixin/app.js index 8f5f92189..c38b4e506 100755 --- a/public/appmini/old/weixin/app.js +++ b/public/appmini/old/weixin/app.js @@ -61,7 +61,7 @@ App({ // 请求地址 request_url: "{{request_url}}", - // request_url: 'http://tp5-dev.com/', + request_url: 'http://tp5-dev.com/', // request_url: 'https://test.shopxo.net/', // 基础信息 diff --git a/public/appmini/old/weixin/pages/login/login.js b/public/appmini/old/weixin/pages/login/login.js index 14c802076..b6b3af692 100755 --- a/public/appmini/old/weixin/pages/login/login.js +++ b/public/appmini/old/weixin/pages/login/login.js @@ -150,6 +150,7 @@ Page({ e.detail.value['city'] = this.data.user.city; e.detail.value['gender'] = this.data.user.gender; e.detail.value['app_type'] = 'weixin'; + e.detail.value['weixin_unionid'] = this.data.user.weixin_unionid || ''; e.detail.value['referrer'] = (params == null) ? (this.data.user.referrer || 0) : (params.referrer || 0); if(app.fields_check(e.detail.value, validation)) {