From 306eb704b97eae71f1d3b21d81fbdb413d2a0a84 Mon Sep 17 00:00:00 2001
From: gongfuxiang <2499232802@qq.com>
Date: Wed, 2 Jan 2019 02:02:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E4=BF=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/api/controller/User.php | 4 ++--
 public/appmini/old/wechat/app.js    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/application/api/controller/User.php b/application/api/controller/User.php
index 1593caf1f..fc0186d5d 100644
--- a/application/api/controller/User.php
+++ b/application/api/controller/User.php
@@ -112,7 +112,7 @@ class User extends Common
      */
     public function WechatUserAuth()
     {
-        $result = (new \base\Wechat('111', '222'))->GetAuthSessionKey(input('authcode'));
+        $result = (new \base\Wechat('wxdaafcb5682165b02', 'e6e46d2f4b04078771a2cd78c95d400b'))->GetAuthSessionKey(input('authcode'));
         if($result !== false)
         {
             return DataReturn('授权登录成功', 0, $result);
@@ -130,7 +130,7 @@ class User extends Common
      */
     public function WechatUserInfo()
     {
-        $result = (new \base\Wechat('100', '200'))->DecryptData(R('encrypted_data'), input('iv'), input('openid'));
+        $result = (new \base\Wechat('wxdaafcb5682165b02', 'e6e46d2f4b04078771a2cd78c95d400b'))->DecryptData(R('encrypted_data'), input('iv'), input('openid'));
 
         if(is_array($result))
         {
diff --git a/public/appmini/old/wechat/app.js b/public/appmini/old/wechat/app.js
index fa8687fb5..1dd05fa14 100755
--- a/public/appmini/old/wechat/app.js
+++ b/public/appmini/old/wechat/app.js
@@ -309,7 +309,7 @@ App({
             dataType: 'json',
             header: { 'content-type': 'application/x-www-form-urlencoded' },
             success: (res) => {
-              if (res.data.state == 'ok') {
+              if (res.data.code == 0) {
                 wx.setStorage({
                   key: $this.data.cache_user_login_key,
                   data: res.data.data
@@ -354,7 +354,7 @@ App({
           header: { 'content-type': 'application/x-www-form-urlencoded' },
           success: (res) => {
             wx.hideLoading();
-            if (res.data.state == 'ok') {
+            if (res.data.code == 0) {
               wx.setStorage({
                 key: $this.data.cache_user_info_key,
                 data: res.data.data