From 5fbc5eb1fb01ae8094006bde4138fbb794ca8806 Mon Sep 17 00:00:00 2001 From: devil_gong Date: Thu, 31 Oct 2019 15:34:16 +0800 Subject: [PATCH] =?UTF-8?q?qq=E5=B0=8F=E7=A8=8B=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/admin/view/default/user/index.html | 6 ++++++ application/admin/view/default/user/save_info.html | 8 ++++++++ application/lang/zh-cn.php | 1 + application/service/UserService.php | 12 +++++++++++- public/appmini/old/qq/app.js | 4 ++-- public/appmini/old/qq/pages/login/login.js | 8 ++++---- public/appmini/old/qq/pages/login/login.qss | 12 ++++++------ 7 files changed, 38 insertions(+), 13 deletions(-) diff --git a/application/admin/view/default/user/index.html b/application/admin/view/default/user/index.html index 7f4e0989f..f8d2642d1 100755 --- a/application/admin/view/default/user/index.html +++ b/application/admin/view/default/user/index.html @@ -149,6 +149,12 @@
头条openid
{{if empty($v['toutiao_openid'])}}未知{{else /}}{{$v.toutiao_openid}}{{/if}}
+
QQopenid
+
{{if empty($v['qq_openid'])}}未知{{else /}}{{$v.qq_openid}}{{/if}}
+ +
QQunionid
+
{{if empty($v['qq_unionid'])}}未知{{else /}}{{$v.qq_unionid}}{{/if}}
+
微信openid
{{if empty($v['weixin_openid'])}}未知{{else /}}{{$v.weixin_openid}}{{/if}}
diff --git a/application/admin/view/default/user/save_info.html b/application/admin/view/default/user/save_info.html index d4685720a..64e24c994 100755 --- a/application/admin/view/default/user/save_info.html +++ b/application/admin/view/default/user/save_info.html @@ -45,6 +45,14 @@ +
+ + +
+
+ + +
diff --git a/application/lang/zh-cn.php b/application/lang/zh-cn.php index 2d4059156..122fb63e1 100755 --- a/application/lang/zh-cn.php +++ b/application/lang/zh-cn.php @@ -129,6 +129,7 @@ return array( 'weixin' => array('value' => 'weixin', 'name' => '微信小程序'), 'baidu' => array('value' => 'baidu', 'name' => '百度小程序'), 'toutiao' => array('value' => 'toutiao', 'name' => '头条小程序'), + 'qq' => array('value' => 'qq', 'name' => 'QQ小程序'), ), // 小程序url跳转类型 diff --git a/application/service/UserService.php b/application/service/UserService.php index 442325d58..c9311c441 100755 --- a/application/service/UserService.php +++ b/application/service/UserService.php @@ -316,6 +316,8 @@ class UserService 'alipay_openid' => isset($params['alipay_openid']) ? $params['alipay_openid'] : '', 'baidu_openid' => isset($params['baidu_openid']) ? $params['baidu_openid'] : '', 'toutiao_openid' => isset($params['toutiao_openid']) ? $params['toutiao_openid'] : '', + 'qq_openid' => isset($params['qq_openid']) ? $params['qq_openid'] : '', + 'qq_unionid' => isset($params['qq_unionid']) ? $params['qq_unionid'] : '', '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'] : '', @@ -1662,6 +1664,14 @@ class UserService { $data['weixin_unionid'] = $params['weixin_unionid']; } + + // QQ用户unionid + if(!empty($params['qq_unionid'])) + { + $data['qq_unionid'] = $params['qq_unionid']; + } + + // 用户信息处理 $user = self::AppUserInfoHandle(null, $field, $params['openid']); if(!empty($user)) { @@ -1697,7 +1707,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,weixin_unionid,weixin_web_openid,baidu_openid,toutiao_openid,integral,locking_integral'; + $field = 'id,username,nickname,mobile,email,avatar,alipay_openid,weixin_openid,weixin_unionid,weixin_web_openid,baidu_openid,toutiao_openid,qq_openid,qq_unionid,integral,locking_integral'; if(!empty($user_id)) { $user = self::UserInfo('id', $user_id, $field); diff --git a/public/appmini/old/qq/app.js b/public/appmini/old/qq/app.js index f93af39cc..5aba4e876 100755 --- a/public/appmini/old/qq/app.js +++ b/public/appmini/old/qq/app.js @@ -67,7 +67,7 @@ App({ // 请求地址 request_url: "{{request_url}}", request_url: 'http://tp5-dev.com/', - //request_url: 'https://test.shopxo.net/', + request_url: 'https://test.shopxo.net/', // 基础信息 application_title: "{{application_title}}", @@ -145,7 +145,7 @@ App({ return ( this.data.request_url + "index.php?s=/" + m + "/" + c + "/" + a + - "&application=app&application_client_type=weixin" + + "&application=app&application_client_type=qq" + "&token=" + token + "&ajax=ajax" + diff --git a/public/appmini/old/qq/pages/login/login.js b/public/appmini/old/qq/pages/login/login.js index e0866b828..a0cbdc2c1 100755 --- a/public/appmini/old/qq/pages/login/login.js +++ b/public/appmini/old/qq/pages/login/login.js @@ -141,16 +141,16 @@ Page({ var validation = [ {fields: 'mobile', msg: '请填写手机号码'}, {fields: 'verify', msg: '请填写验证码'}, - {fields: 'weixin_openid', msg: '授权id不能为空'} + {fields: 'qq_openid', msg: '授权id不能为空'} ]; - e.detail.value['weixin_openid'] = this.data.user.weixin_openid; + e.detail.value['qq_openid'] = this.data.user.qq_openid; e.detail.value['nickname'] = this.data.user.nickname; e.detail.value['avatar'] = this.data.user.avatar; e.detail.value['province'] = this.data.user.province; e.detail.value['city'] = this.data.user.city; e.detail.value['gender'] = this.data.user.gender; - e.detail.value['weixin_unionid'] = this.data.user.weixin_unionid || ''; - e.detail.value['app_type'] = 'weixin'; + e.detail.value['qq_unionid'] = this.data.user.qq_unionid || ''; + e.detail.value['app_type'] = 'qq'; e.detail.value['referrer'] = (params == null) ? (this.data.user.referrer || 0) : (params.referrer || 0); if(app.fields_check(e.detail.value, validation)) { diff --git a/public/appmini/old/qq/pages/login/login.qss b/public/appmini/old/qq/pages/login/login.qss index c899160a2..7dfa0b8e9 100755 --- a/public/appmini/old/qq/pages/login/login.qss +++ b/public/appmini/old/qq/pages/login/login.qss @@ -17,8 +17,8 @@ page{ .content input{ font-size: 28rpx; color: #4e4e4e; - height: 40px; - line-height: 40px; + height: 80rpx; + line-height: 80rpx; } .content .code{ margin: 20rpx 0; @@ -26,14 +26,14 @@ page{ position: relative; } .content .code .verify{ - width: 63%; + width: 58%; } .content .code .verify-sub{ border: solid 1px #ff6482; color: #ff6482; - width: 35%; - height: 35px; - line-height: 35px; + width: 40%; + height: 72rpx; + line-height: 40rpx; border-radius: 10rpx; position: absolute; top: 0; -- GitLab