From 1e4c5d60c8b97fa85e21be84899379b012047bdf Mon Sep 17 00:00:00 2001
From: Devil
Date: Sat, 24 Apr 2021 23:56:52 +0800
Subject: [PATCH] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E5=9C=A8=E7=BA=BF=E6=9B=B4?=
=?UTF-8?q?=E6=96=B0+=E6=8F=92=E4=BB=B6=E5=9C=A8=E7=BA=BF=E6=9B=B4?=
=?UTF-8?q?=E6=96=B0=E5=BC=80=E5=8F=91=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
application/admin/controller/Common.php | 2 ++
.../admin/view/default/index/init.html | 4 ++--
.../view/default/pluginsadmin/index.html | 4 ++--
.../admin/view/default/public/footer.html | 16 +++++++++++--
application/service/PluginsUpgradeService.php | 4 ++++
application/service/StoreService.php | 18 ++++++++-------
application/service/SystemUpgradeService.php | 4 ++++
changelog.txt | 18 ++++++++++++++-
public/static/admin/default/js/common.js | 23 ++++++++++++++++++-
9 files changed, 77 insertions(+), 16 deletions(-)
diff --git a/application/admin/controller/Common.php b/application/admin/controller/Common.php
index a65ce4ec1..0eba895e3 100755
--- a/application/admin/controller/Common.php
+++ b/application/admin/controller/Common.php
@@ -270,9 +270,11 @@ class Common extends Controller
// 站点商店信息
$site_store_info = StoreService::SiteStoreInfo();
+ //print_r($site_store_info);
if(empty($site_store_info))
{
$res = StoreService::SiteStoreAccountsBindHandle();
+
if($res['code'] == 0)
{
$site_store_info = StoreService::SiteStoreInfo();
diff --git a/application/admin/view/default/index/init.html b/application/admin/view/default/index/init.html
index 066d5024e..54ee7593e 100755
--- a/application/admin/view/default/index/init.html
+++ b/application/admin/view/default/index/init.html
@@ -10,9 +10,9 @@
{{if !empty($site_store_info) and !empty($site_store_info['user'])}}
{{$site_store_info.user.user_name_view}}
- 修改
+ 修改
{{else /}}
- 绑定ShopXO商店账户
+ 绑定ShopXO商店账户
{{/if}}
diff --git a/application/admin/view/default/pluginsadmin/index.html b/application/admin/view/default/pluginsadmin/index.html
index 52e3f0393..e33f1f8e3 100755
--- a/application/admin/view/default/pluginsadmin/index.html
+++ b/application/admin/view/default/pluginsadmin/index.html
@@ -26,10 +26,10 @@
保存
取消
- {{if empty($site_store_info)}}
+ {{if empty($site_store_info) or empty($site_store_info['user'])}}
3. 绑定ShopXO应用商店帐号、获取插件最新版本信息、在线安装及更新
- 绑定ShopXO商店账户
+ 绑定ShopXO商店账户
{{/if}}
diff --git a/application/admin/view/default/public/footer.html b/application/admin/view/default/public/footer.html
index 46f5a3011..89e646b6f 100755
--- a/application/admin/view/default/public/footer.html
+++ b/application/admin/view/default/public/footer.html
@@ -1,7 +1,9 @@