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

---
 application/api/controller/User.php | 6 +++---
 extend/base/Wechat.php              | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/application/api/controller/User.php b/application/api/controller/User.php
index 65e2097dd..0d1abdb70 100755
--- a/application/api/controller/User.php
+++ b/application/api/controller/User.php
@@ -127,14 +127,14 @@ class User extends Common
         $user = UserService::UserInfo('alipay_openid', $this->data_post['openid']);
         if(empty($user))
         {
-            $result['nick_name'] = isset($this->data_post['nickName']) ? $this->data_post['nickName'] : '';
+            $this->data_post['nick_name'] = isset($this->data_post['nickName']) ? $this->data_post['nickName'] : '';
             $this->data_post['gender'] = empty($this->data_post['gender']) ? 0 : ($this->data_post['gender'] == 'f') ? 1 : 2;
             return UserService::AuthUserProgram($this->data_post, 'alipay_openid');
         } else {
             $user['is_mandatory_bind_mobile'] = intval(MyC('common_user_is_mandatory_bind_mobile'));
             return DataReturn('授权成功', 0, $user);
         }
-        return DataReturn(empty($this->data_post) ? '获取用户信息失败' : $result, -100);
+        return DataReturn('获取用户信息失败', -100);
     }
 
     /**
@@ -187,7 +187,7 @@ class User extends Common
             [
                 'checked_type'      => 'empty',
                 'key_name'          => 'iv',
-                'error_msg'         => 'iv数据为空',
+                'error_msg'         => 'iv为空,请重试',
             ]
         ];
         $ret = ParamsChecked($this->data_post, $p);
diff --git a/extend/base/Wechat.php b/extend/base/Wechat.php
index 4025ced9b..1101533cd 100755
--- a/extend/base/Wechat.php
+++ b/extend/base/Wechat.php
@@ -74,7 +74,7 @@ class Wechat
         $data = json_decode($result, true);
         if($data == NULL)
         {
-            return '解析失败、请重试！';
+            return '解析失败,请重试！';
         }
         if($data['watermark']['appid'] != $this->_appid )
         {