From 17fe54d82701e46307166d7e51e23822207883d9 Mon Sep 17 00:00:00 2001
From: devil_gong <devil_gong@wochacha.com>
Date: Tue, 16 Jul 2019 21:35:34 +0800
Subject: [PATCH] baidu

---
 application/api/controller/User.php             | 1 +
 public/appmini/old/baidu/app.js                 | 2 +-
 public/appmini/old/baidu/pages/login/login.js   | 1 +
 public/appmini/old/baidu/pages/login/login.swan | 2 +-
 public/appmini/old/baidu/project.swan.json      | 2 +-
 5 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/application/api/controller/User.php b/application/api/controller/User.php
index 6d0150700..d24f1f449 100755
--- a/application/api/controller/User.php
+++ b/application/api/controller/User.php
@@ -235,6 +235,7 @@ class User extends Common
             'secret'    => 'C9Gg744cBqQ3zvbC5uOPMg9yWpmuQ8O7',
         ];
         $result = (new \base\BaiduAuth())->GetAuthUserInfo($_POST);
+        print_r($result);die;
         if($result['status'] == 0)
         {
             return UserService::AuthUserProgram($result, 'baidu_openid');
diff --git a/public/appmini/old/baidu/app.js b/public/appmini/old/baidu/app.js
index d9156dfc2..24507b5c9 100755
--- a/public/appmini/old/baidu/app.js
+++ b/public/appmini/old/baidu/app.js
@@ -220,7 +220,7 @@ App({
     swan.login({
       success: function (res) {
         swan.request({
-          url: self.get_request_url("BaiduUserAuth", "User"),
+          url: self.get_request_url("baiduuserauth", "user"),
           method: "POST",
           data: {
             authcode: res.code,
diff --git a/public/appmini/old/baidu/pages/login/login.js b/public/appmini/old/baidu/pages/login/login.js
index 66506b86a..ff99489b4 100755
--- a/public/appmini/old/baidu/pages/login/login.js
+++ b/public/appmini/old/baidu/pages/login/login.js
@@ -30,6 +30,7 @@ Page({
    * 登录授权事件
    */
   get_user_info_event() {
+    console.log(1)
     app.user_auth_login(this, 'user_auth_back_event');
   },
 
diff --git a/public/appmini/old/baidu/pages/login/login.swan b/public/appmini/old/baidu/pages/login/login.swan
index 4beaf1035..30e2f5e73 100755
--- a/public/appmini/old/baidu/pages/login/login.swan
+++ b/public/appmini/old/baidu/pages/login/login.swan
@@ -11,5 +11,5 @@
 
 <view s-if="user == null" class="user-login tc">
   <view class="cr-888 fs-12">确认登录授权，为您提供更优质的服务</view>
-  <button type="primary" size="mini" bindgetuserinfo="get_user_info_event">授权登录</button>
+  <button type="primary" size="mini" bindtap="get_user_info_event">授权登录</button>
 </view>
diff --git a/public/appmini/old/baidu/project.swan.json b/public/appmini/old/baidu/project.swan.json
index 0fb44d340..b3c20f6e2 100644
--- a/public/appmini/old/baidu/project.swan.json
+++ b/public/appmini/old/baidu/project.swan.json
@@ -1 +1 @@
-{"appid":"16634987","host":"baiduboxapp","setting":{"urlCheck":false},"swan":{"baiduboxapp":{"extensionJsVersion":"","swanJsVersion":"3.30.43"}}}
\ No newline at end of file
+{"appid":"16634987","cloudTesting":{"forcePreview":false},"host":"baiduboxapp","preview":{"packageId":218644},"setting":{"urlCheck":false},"swan":{"baiduboxapp":{"extensionJsVersion":"","swanJsVersion":"3.30.43"}}}
\ No newline at end of file
-- 
GitLab