From db565e6f6ee928e89e2da159739ac5f8d26a039b Mon Sep 17 00:00:00 2001
From: "HDM58\\hdm58" <hdm58@qq.com>
Date: Thu, 13 Jul 2023 11:26:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=BF=AB=E9=80=9F=E5=BC=80?=
 =?UTF-8?q?=E5=90=AFtab=E7=9A=84=E6=96=B9=E6=B3=95=EF=BC=8C=E9=98=B2?=
 =?UTF-8?q?=E6=AD=A2=E9=87=8D=E5=A4=8D=E6=89=93=E5=BC=80=E5=90=8C=E6=A0=B7?=
 =?UTF-8?q?=E7=9A=84tab=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/index.php                           |  4 ++--
 public/static/assets/gougu/module/admin.js | 26 +++++++++++++++++++++-
 2 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/public/index.php b/public/index.php
index 5c58973..6cba059 100644
--- a/public/index.php
+++ b/public/index.php
@@ -9,7 +9,7 @@
 namespace think;
 
 if (empty(file_exists(__DIR__ . '/../vendor/autoload.php'))) {
-    echo '您还未安装PHP依赖包，请输入命令安装：composer install，安装教程点击<a href="https://blog.gougucms.com/home/book/detail/bid/3/id/8.html" target="_blank">这里</a>。';
+    echo '您还未获取PHP依赖包，请输入命令获取：composer install，安装教程点击<a href="https://blog.gougucms.com/home/book/detail/bid/3/id/8.html" target="_blank">这里</a>。';
     exit;
 }
 require __DIR__ . '/../vendor/autoload.php';
@@ -18,7 +18,7 @@ require __DIR__ . '/../vendor/autoload.php';
 define('CMS_VERSION','4.60.28');
 
 // 定义Layui版本号
-define('LAYUI_VERSION','2.8.8');
+define('LAYUI_VERSION','2.8.10');
 
 // 定义项目目录
 define('CMS_ROOT', __DIR__ . '/../');
diff --git a/public/static/assets/gougu/module/admin.js b/public/static/assets/gougu/module/admin.js
index 1994ac7..f4fdca0 100644
--- a/public/static/assets/gougu/module/admin.js
+++ b/public/static/assets/gougu/module/admin.js
@@ -33,7 +33,31 @@ layui.define(['element'], function (exports) {
 		},
 		//从子页面打开新的Tab页面，防止id重复，使用时间戳作为唯一标识
 		sonAdd: function (url, title,id) {
-			this.tabAdd( id, url,title);
+			if ($(".layui-tab-title li[lay-id]").length <= 0) {
+				//打开新的tab项
+				this.tabAdd(id, url, title);
+			} else {
+				//否则判断该tab项是否以及存在
+				var isHas = false;
+				$.each($(".layui-tab-title li[lay-id]"), function () {
+					//如果点击左侧菜单栏所传入的id 在右侧tab项中的lay-id属性可以找到，则说明该tab项已经打开
+					if ($(this).attr("lay-id") == id) {
+						isHas = true;
+						$('[data-frameid="' + id + '"]').attr('src', url);
+						//最后不管是否新增tab，最后都转到要打开的选项页面上
+						tab.tabChange(id);
+					}
+				})
+				if (isHas == false) {
+					//标志为false 新增一个tab项
+					tab.tabAdd(id, url, title);
+				}
+			}
+			try {
+				layer.close(window.openTips);
+			} catch (e) {
+				console.log(e.message);
+			}
 		},
 		//根据传入的id传入到指定的tab项，并滚动定位
 		tabChange: function (id) {