From fac8a4b68e67564301208075497a09bb8ffeb232 Mon Sep 17 00:00:00 2001
From: devil_gong <devil_gong@wochacha.com>
Date: Fri, 28 Jun 2019 17:52:40 +0800
Subject: [PATCH] 1.6

---
 application/api/controller/User.php            | 10 +++++-----
 public/appmini/old/alipay/app.js               |  3 ++-
 public/appmini/old/alipay/pages/login/login.js | 10 ++++++++--
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/application/api/controller/User.php b/application/api/controller/User.php
index e56a8d8a9..1ef772f80 100755
--- a/application/api/controller/User.php
+++ b/application/api/controller/User.php
@@ -138,11 +138,11 @@ class User extends Common
                 'key_name'          => 'openid',
                 'error_msg'         => 'openid为空',
             ],
-            [
-                'checked_type'      => 'empty',
-                'key_name'          => 'userinfo',
-                'error_msg'         => '用户数据为空',
-            ],
+            // [
+            //     'checked_type'      => 'empty',
+            //     'key_name'          => 'userinfo',
+            //     'error_msg'         => '用户数据为空',
+            // ],
         ];
         $ret = ParamsChecked($this->data_post, $p);
         if($ret !== true)
diff --git a/public/appmini/old/alipay/app.js b/public/appmini/old/alipay/app.js
index ef406defa..3ae5f2e21 100644
--- a/public/appmini/old/alipay/app.js
+++ b/public/appmini/old/alipay/app.js
@@ -311,10 +311,11 @@ App({
   get_user_login_info(object, method, openid, userinfo) {
     my.showLoading({ content: "授权中..." });
     var $this = this;
+    userinfo['openid'] = openid;
     my.request({
       url: $this.get_request_url('alipayuserinfo', 'user'),
       method: 'POST',
-      data: { userinfo: userinfo, openid: openid },
+      data: userinfo,
       dataType: 'json',
       headers: { 'content-type': 'application/x-www-form-urlencoded' },
       success: (res) => {
diff --git a/public/appmini/old/alipay/pages/login/login.js b/public/appmini/old/alipay/pages/login/login.js
index 45bda15a7..03e8b06db 100644
--- a/public/appmini/old/alipay/pages/login/login.js
+++ b/public/appmini/old/alipay/pages/login/login.js
@@ -44,8 +44,14 @@ Page({
         //   content: userinfo,
         //   buttonText: '我知道了',
         // });
-        console.log(userinfo)
-        app.user_auth_login($this, 'user_auth_back_event', null);
+
+        // 字符串则转为json对象（兼容支付宝框架bug）
+        // if(typeof(userinfo) == 'string')
+        // {
+          userinfo = JSON.parse(userinfo.response);
+        //}
+        console.log(userinfo.response)
+        app.user_auth_login(this, 'user_auth_back_event', userinfo.response);
       }
     });
   },