From 1a7cc885e4425c70a388207dd176d8325c8c36e4 Mon Sep 17 00:00:00 2001
From: devil <fuxiang.gong@qq.com>
Date: Mon, 2 Nov 2020 15:23:19 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/controller/Appmini.php | 10 +++++-----
 changelog.txt                            |  1 +
 sourcecode/alipay/app.json               |  2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/application/admin/controller/Appmini.php b/application/admin/controller/Appmini.php
index fc1e23880..76f4a598a 100755
--- a/application/admin/controller/Appmini.php
+++ b/application/admin/controller/Appmini.php
@@ -140,16 +140,16 @@ class Appmini extends Common
 		}
 
 		// 配置内容
-        $app_mini_title = MyC('common_app_mini_weixin_title');
-        $app_mini_describe = MyC('common_app_mini_weixin_describe');
-        if(empty($app_mini_title) || empty($app_mini_describe))
+        $title = MyC('common_app_mini_'.$this->params['application_name'].'_title');
+        $describe = MyC('common_app_mini_'.$this->params['application_name'].'_describe');
+        if(empty($title) || empty($describe))
         {
             return DataReturn('配置信息不能为空', -1);
         }
 
 		// 开始操作
-		$this->params['app_mini_title'] = $app_mini_title;
-		$this->params['app_mini_describe'] = $app_mini_describe;
+		$this->params['app_mini_title'] = $title;
+		$this->params['app_mini_describe'] = $describe;
 		return AppMiniService::Created($this->params);
 	}
 
diff --git a/changelog.txt b/changelog.txt
index 3e178feb7..17b7bc698 100755
--- a/changelog.txt
+++ b/changelog.txt
@@ -33,6 +33,7 @@ web端
 	4. 钱包插件支持修改余额输入操作密码、提现支持配置最低金额
 	5. 分销插件新增收益总额自动升级，新增指定商品返现、复购优惠、推广达标返现模式
 	6. 新增活动配置插件、可首页展示活动、独立活动首页和详情页面
+	7. 多语言插件支持近200多种语言翻译
 
 
 +=========================================================+
diff --git a/sourcecode/alipay/app.json b/sourcecode/alipay/app.json
index 6ccc1c9e6..6d686e492 100644
--- a/sourcecode/alipay/app.json
+++ b/sourcecode/alipay/app.json
@@ -66,7 +66,7 @@
     "pages/plugins/exchangerate/currency/currency"
   ],
   "window": {
-    "defaultTitle": "shopxo",
+    "defaultTitle": "{{application_title}}",
     "titleBarColor": "#d2364c",
     "backgroundColor": "#f5f5f5"
   },
-- 
GitLab