From 2cc2fd563b6368edea96afa2376b1e6eb1ef3d88 Mon Sep 17 00:00:00 2001
From: devil_gong <devil_gong@wochacha.com>
Date: Mon, 22 Jul 2019 15:20:06 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BE=E5=BA=A6=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/api/controller/User.php        | 4 ++--
 public/appmini/old/baidu/app.js            | 4 ++--
 public/appmini/old/baidu/app.json          | 2 +-
 public/appmini/old/baidu/project.swan.json | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/application/api/controller/User.php b/application/api/controller/User.php
index e969f054b..9cf765514 100755
--- a/application/api/controller/User.php
+++ b/application/api/controller/User.php
@@ -227,12 +227,12 @@ class User extends Common
      */
     public function BaiduUserAuth()
     {
-        $params['config'] = [
+        $this->data_post['config'] = [
             'id'        => MyC('common_app_mini_baidu_appid'),
             'key'       => MyC('common_app_mini_baidu_appkey'),
             'secret'    => MyC('common_app_mini_baidu_appsecret'),
         ];
-        $result = (new \base\BaiduAuth())->GetAuthUserInfo($params);
+        $result = (new \base\BaiduAuth())->GetAuthUserInfo($this->data_post);
         if($result['status'] == 0)
         {
             return UserService::AuthUserProgram($result['data'], 'baidu_openid');
diff --git a/public/appmini/old/baidu/app.js b/public/appmini/old/baidu/app.js
index d361cf8cc..2b53733b2 100755
--- a/public/appmini/old/baidu/app.js
+++ b/public/appmini/old/baidu/app.js
@@ -60,8 +60,8 @@ App({
     request_url: 'https://test.shopxo.net/',
 
     // 基础信息
-    application_title: "{{application_title}}",
-    application_describe: "{{application_describe}}"
+    application_title: "ShopXO",
+    application_describe: "国内领先企业级B2C开源电商系统！"
   },
 
   /**
diff --git a/public/appmini/old/baidu/app.json b/public/appmini/old/baidu/app.json
index f325a2101..df08bf59f 100755
--- a/public/appmini/old/baidu/app.json
+++ b/public/appmini/old/baidu/app.json
@@ -25,7 +25,7 @@
     "pages/user-goods-browse/user-goods-browse"
   ],
   "window": {
-    "navigationBarTitleText": "{{application_title}}",
+    "navigationBarTitleText": "ShopXO",
     "navigationBarBackgroundColor": "#d2364c"
   },
   "tabBar": {
diff --git a/public/appmini/old/baidu/project.swan.json b/public/appmini/old/baidu/project.swan.json
index 973b3ebe6..1a5a78834 100644
--- a/public/appmini/old/baidu/project.swan.json
+++ b/public/appmini/old/baidu/project.swan.json
@@ -1 +1 @@
-{"appid":"16634987","cloudTesting":{"forcePreview":false},"editor":{"curPath":"/data/www/project/shopxo/public/appmini/old/baidu/pages/goods-search/goods-search.js","expands":["/data/www/project/shopxo/public/appmini/old/baidu/pages","/data/www/project/shopxo/public/appmini/old/baidu/pages/index","/data/www/project/shopxo/public/appmini/old/baidu/pages/goods-detail","/data/www/project/shopxo/public/appmini/old/baidu/pages/goods-category","/data/www/project/shopxo/public/appmini/old/baidu/pages/goods-search"],"markdownUploadTimeMap":{},"paths":["/data/www/project/shopxo/public/appmini/old/baidu/pages/index/index.js","/data/www/project/shopxo/public/appmini/old/baidu/pages/goods-detail/goods-detail.js","/data/www/project/shopxo/public/appmini/old/baidu/pages/goods-category/goods-category.js","/data/www/project/shopxo/public/appmini/old/baidu/app.js","/data/www/project/shopxo/public/appmini/old/baidu/pages/goods-search/goods-search.js"],"recentlyFiles":["/data/www/project/shopxo/public/appmini/old/baidu/pages/goods-search/goods-search.js","/data/www/project/shopxo/public/appmini/old/baidu/pages/goods-category/goods-category.js","/data/www/project/shopxo/public/appmini/old/baidu/app.js","/data/www/project/shopxo/public/appmini/old/baidu/pages/index/index.js","/data/www/project/shopxo/public/appmini/old/baidu/pages/goods-detail/goods-detail.js"]},"host":"baiduboxapp","preview":{"packageId":222766},"setting":{"urlCheck":false},"swan":{"baiduboxapp":{"extensionJsVersion":"","swanJsVersion":"3.30.43"}}}
\ No newline at end of file
+{"appid":"16634987","cloudTesting":{"forcePreview":false},"editor":{"curPath":"/data/www/project/shopxo/public/appmini/old/baidu/pages/goods-search/goods-search.js","expands":["/data/www/project/shopxo/public/appmini/old/baidu/pages","/data/www/project/shopxo/public/appmini/old/baidu/pages/index","/data/www/project/shopxo/public/appmini/old/baidu/pages/goods-detail","/data/www/project/shopxo/public/appmini/old/baidu/pages/goods-category","/data/www/project/shopxo/public/appmini/old/baidu/pages/goods-search"],"markdownUploadTimeMap":{},"paths":["/data/www/project/shopxo/public/appmini/old/baidu/pages/index/index.js","/data/www/project/shopxo/public/appmini/old/baidu/pages/goods-detail/goods-detail.js","/data/www/project/shopxo/public/appmini/old/baidu/pages/goods-category/goods-category.js","/data/www/project/shopxo/public/appmini/old/baidu/app.js","/data/www/project/shopxo/public/appmini/old/baidu/pages/goods-search/goods-search.js"],"recentlyFiles":["/data/www/project/shopxo/public/appmini/old/baidu/pages/goods-search/goods-search.js","/data/www/project/shopxo/public/appmini/old/baidu/pages/goods-category/goods-category.js","/data/www/project/shopxo/public/appmini/old/baidu/app.js","/data/www/project/shopxo/public/appmini/old/baidu/pages/index/index.js","/data/www/project/shopxo/public/appmini/old/baidu/pages/goods-detail/goods-detail.js"]},"host":"baiduboxapp","preview":{"packageId":222766},"publish":{"version":"1.0.1.0"},"setting":{"urlCheck":false},"swan":{"baiduboxapp":{"extensionJsVersion":"","swanJsVersion":"3.30.43"}}}
\ No newline at end of file
-- 
GitLab