From 158bc4a19e0d988fcbc011d0c069b1ca660eda40 Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Sun, 28 Nov 2021 11:44:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=BA=97=E8=B4=A6=E5=8F=B7=E6=9C=AA?=
 =?UTF-8?q?=E7=BB=91=E5=AE=9A=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/controller/Plugins.php              |  8 +++++++-
 app/admin/view/default/public/tips_error.html | 14 +++++++++-----
 app/service/PluginsUpgradeService.php         |  2 +-
 app/service/StoreService.php                  |  4 ++--
 app/service/SystemUpgradeService.php          |  2 +-
 5 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/app/admin/controller/Plugins.php b/app/admin/controller/Plugins.php
index 7079eff64..aa27875d1 100755
--- a/app/admin/controller/Plugins.php
+++ b/app/admin/controller/Plugins.php
@@ -104,12 +104,18 @@ class Plugins extends Common
             return ApiService::ApiDataReturn(($ret['code'] == 0) ? $ret['data'] : $ret);
         }
 
+        // 正确则返回视图内容
         if($ret['code'] == 0)
         {
-            // 默认则是视图内容
             return $ret['data'];
         }
 
+        // 是否未绑定商店账号
+        if($ret['code'] == -300)
+        {
+            MyViewAssign('ext_html', '<p class="am-margin-top-sm"><button type="button" class="am-btn am-btn-secondary am-radius am-btn-xs am-margin-left-xs am-icon-gg store-accounts-event"> 绑定ShopXO商店账户</button></p>');
+        }
+
         // 调用失败
         MyViewAssign('msg', $ret['msg']);
         return MyView('public/tips_error');
diff --git a/app/admin/view/default/public/tips_error.html b/app/admin/view/default/public/tips_error.html
index 3afaab6b3..791a2e94c 100755
--- a/app/admin/view/default/public/tips_error.html
+++ b/app/admin/view/default/public/tips_error.html
@@ -3,11 +3,15 @@
 <!-- right content start  -->
 <div class="content-right">
     <div class="content">
-        <div class="table-no"><i class="am-icon-warning cr-999"></i>
-            {{if isset($msg)}}
-                {{$msg}}
-            {{else /}}
-                异常错误
+        <div class="table-no">
+            <p>
+                <i class="am-icon-warning cr-999"></i>
+                {{if isset($msg)}}{{$msg}}{{else /}}异常错误{{/if}}
+            </p>
+
+            <!-- 扩展内容  -->
+            {{if !empty($ext_html)}}
+                {{$ext_html|raw}}
             {{/if}}
         </div>
     </div>
diff --git a/app/service/PluginsUpgradeService.php b/app/service/PluginsUpgradeService.php
index 2552cce3a..a5cfdeb9c 100644
--- a/app/service/PluginsUpgradeService.php
+++ b/app/service/PluginsUpgradeService.php
@@ -188,7 +188,7 @@ class PluginsUpgradeService
         $password = MyC('common_store_password');
         if(empty($accounts) || empty($password))
         {
-            return DataReturn('请先绑定应用商店帐号', -1);
+            return DataReturn('请先绑定应用商店帐号', -300);
         }
 
         // 获取信息
diff --git a/app/service/StoreService.php b/app/service/StoreService.php
index d382cecf0..9d36aa7f3 100644
--- a/app/service/StoreService.php
+++ b/app/service/StoreService.php
@@ -217,7 +217,7 @@ class StoreService
         $password = MyC('common_store_password');
         if(empty($accounts) || empty($password))
         {
-            return DataReturn('请先绑定应用商店帐号', -1);
+            return DataReturn('请先绑定应用商店帐号', -300);
         }
 
         // 获取信息
@@ -249,7 +249,7 @@ class StoreService
             $password = MyC('common_store_password');
             if(empty($accounts) || empty($password))
             {
-                return DataReturn('请先绑定应用商店帐号', -1);
+                return DataReturn('请先绑定应用商店帐号', -300);
             }
 
             // 获取更新信息
diff --git a/app/service/SystemUpgradeService.php b/app/service/SystemUpgradeService.php
index 40ee3a656..de3208954 100644
--- a/app/service/SystemUpgradeService.php
+++ b/app/service/SystemUpgradeService.php
@@ -305,7 +305,7 @@ class SystemUpgradeService
         $password = MyC('common_store_password');
         if(empty($accounts) || empty($password))
         {
-            return DataReturn('请先绑定应用商店帐号', -1);
+            return DataReturn('请先绑定应用商店帐号', -300);
         }
 
         // 获取信息