From 7dbcd75d68a500aca89cb42d603f37b2c63937de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E9=99=8C?= <xiaomo.drip@gmail.com>
Date: Sun, 1 Oct 2023 23:02:03 +0800
Subject: [PATCH] no message

---
 .../system/application/installedApplist.vue   | 37 ++++++++++++-------
 src/views/system/application/popInfo.vue      |  5 ++-
 2 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/src/views/system/application/installedApplist.vue b/src/views/system/application/installedApplist.vue
index 748411e..e72f256 100644
--- a/src/views/system/application/installedApplist.vue
+++ b/src/views/system/application/installedApplist.vue
@@ -4,7 +4,7 @@
             <el-table-column label="">
                 <template #default="scope">
                     <div class="tab-box dis-f al-item">
-                        <img :src="scope.row.icon" v-if="scope.row.icon" class="img" alt="">
+                        <img @click="installPlugin(scope.row)" :src="scope.row.icon" v-if="scope.row.icon" class="img" alt="">
                         <div class="info-box">
                             <div class="title">
                                 {{ scope.row.name }}
@@ -33,24 +33,22 @@
             </el-table-column>
             <el-table-column label="状态" width="80">
                 <template #default="scope">
-                    <el-switch v-model="scope.row.status" :before-change="()=>changeStatus(scope.row)" :loading="scope.row.changeStatusloading||false" />
+                    <el-switch v-model="scope.row.status" v-if="!scope.row.disabled" :before-change="()=>changeStatus(scope.row)" :loading="scope.row.changeStatusloading||false" />
                 </template>
             </el-table-column>
             <el-table-column label="操作" width="200" fixed="right" align="right">
                 <template #default="scope">
+                    <el-badge v-if="scope.row.upgrade" :value="scope.row.upgradeversion" style="margin-top: 10px; margin-right: 40px;">
+                        <el-button @click="upgrade(scope.row)" icon="x-icon-upgrade" style="font-size: 22px; padding: 10px 6px;"></el-button>
+                    </el-badge>
 
-                        <el-badge v-if="scope.row.upgrade" :value="scope.row.upgradeversion" style="margin-top: 10px; margin-right: 40px;">
-                            <el-button @click="upgrade(scope.row)" icon="x-icon-upgrade" style="font-size: 22px; padding: 10px 6px;"></el-button>
-                        </el-badge>
-
-                        <el-badge style="margin-top: 10px; margin-right: 10px;">
-                            <el-button @click="uninstall(scope.row, scope.$index)" icon="el-icon-delete" style="padding: 10px;"></el-button>
-                        </el-badge>
-
-                        <el-badge style="margin-top: 10px; margin-right: 10px;">
-                            <el-button @click="installPlugin(scope.row)" icon="el-icon-setting" style="padding: 10px;"></el-button>
-                        </el-badge>
+                    <el-badge v-if="!scope.row.disabled" style="margin-top: 10px; margin-right: 10px;">
+                        <el-button @click="uninstall(scope.row, scope.$index)" icon="el-icon-delete" style="padding: 10px;"></el-button>
+                    </el-badge>
 
+                    <el-badge style="margin-top: 10px; margin-right: 10px;">
+                        <el-button @click="installPlugin(scope.row)" icon="el-icon-setting" style="padding: 10px;"></el-button>
+                    </el-badge>
                 </template>
             </el-table-column>
         </el-table>
@@ -114,7 +112,20 @@ export default {
             o.changeStatusloading = true;
             return this.$http.post('admin/application/upgrade', {app:o.app, upgradeversion:o.upgradeversion}).then((res) => {
                 o.changeStatusloading = false;
+
+                // 请先确认身份
+                if (res.code == 205) {
+                    this.$message.warning(res.message || "请前往在线升级频道登录X-PHP后进行升级");
+                    if (res.url) {
+                        this.$router.replace({
+                            path: res.url
+                        })    
+                    }
+                    return false;
+                }
+
                 if (res.code == 200) {
+                    this.loaddata();
                     this.$message.success(res.message || "操作成功")
                     return true;
                 }
diff --git a/src/views/system/application/popInfo.vue b/src/views/system/application/popInfo.vue
index d94063b..8d074ee 100644
--- a/src/views/system/application/popInfo.vue
+++ b/src/views/system/application/popInfo.vue
@@ -23,10 +23,13 @@
                             </span>
                         </div>
                     </div>
+
+
+
                     <div class="install-btn" @click="install" style="flex:0.2;" v-if="!info.installed">
                         安装
                     </div>
-                    <div v-else class="install-btn" @click="uninstall" style="flex:0.2;background: #9E9E9E; border-color: #9E9E9E;">
+                    <div class="install-btn" @click="uninstall" style="flex:0.2;background: #9E9E9E; border-color: #9E9E9E;">
                         卸载
                     </div>
                 </div>