From c09a013f5e67deb1b3ee02bdb60f6fc8c15ecf35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8F=99=E8=BF=B0=E3=80=81=E5=88=AB=E7=A6=BB?=
 <93301500+xushubieli@users.noreply.github.com>
Date: Fri, 2 Jun 2023 15:19:42 +0800
Subject: [PATCH] =?UTF-8?q?6.2.9=E5=9B=BE=E7=89=87=E5=89=8D=E5=8F=B0?=
 =?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/admin/templets/album_add.htm    |   2 +-
 src/admin/templets/album_edit.htm   |   2 +-
 src/static/web/css/style.css        |   2 +-
 src/system/common.inc.php           |   2 +-
 src/theme/dedebiz/article_image.htm | 124 ++++++++++++++--------------
 src/theme/dedebiz/widget_search.htm |   2 +-
 6 files changed, 67 insertions(+), 67 deletions(-)

diff --git a/src/admin/templets/album_add.htm b/src/admin/templets/album_add.htm
index 0187816c..04ed646f 100644
--- a/src/admin/templets/album_add.htm
+++ b/src/admin/templets/album_add.htm
@@ -215,7 +215,7 @@
 									<label>行 <input type="text" name="row" id="row" value="<?php echo $cfg_album_row;?>" class="admin-input-sm"></label>
 									<label>列 <input type="text" name="col" id="col" value="<?php echo $cfg_album_col;?>" class="admin-input-sm"></label>
 									<label>缩略图宽度限制：<input type="text" name="ddmaxwidth" id="ddmaxwidth" value="<?php echo $cfg_album_ddwidth;?>" class="admin-input-sm"> 像素</label>
-									<span>（系统仅是每页输出行x列张图片，实现需自行控制样式表）</span>
+									<span>（每页输出行x列张图片，实现需自行控制样式表）</span>
 								</td>
 							</tr>
 						</table>
diff --git a/src/admin/templets/album_edit.htm b/src/admin/templets/album_edit.htm
index bc1b7155..f76012fc 100644
--- a/src/admin/templets/album_edit.htm
+++ b/src/admin/templets/album_edit.htm
@@ -206,7 +206,7 @@
 									<label>行 <input type="text" name="row" id="row" value="<?php echo $irow;?>" class="admin-input-sm"></label>
 									<label>列 <input type="text" name="col" id="col" value="<?php echo $icol;?>" class="admin-input-sm"></label>
 									<label>缩略图宽度限制：<input type="text" name="ddmaxwidth" id="ddmaxwidth" value="<?php echo $ddmaxwidth;?>" class="admin-input-sm"> 像素</label>
-									<span>（系统仅是每页输出行x列张图片，实现需自行控制样式表）</span>
+									<span>（每页输出行x列张图片，实现需自行控制样式表）</span>
 								</td>
 							</tr>
 						</table>
diff --git a/src/static/web/css/style.css b/src/static/web/css/style.css
index c810a899..31272950 100644
--- a/src/static/web/css/style.css
+++ b/src/static/web/css/style.css
@@ -361,7 +361,7 @@ input[type=file] {
 	display:inline-block;
 	height:36px
 }
-.form-control,.btn,.fa {
+.form-control,.fa {
 	font-size:14px!important
 }
 .fa {
diff --git a/src/system/common.inc.php b/src/system/common.inc.php
index a208dc01..de024499 100755
--- a/src/system/common.inc.php
+++ b/src/system/common.inc.php
@@ -192,7 +192,7 @@ $cfg_soft_dir = $cfg_medias_dir.'/soft';
 $cfg_other_medias = $cfg_medias_dir.'/media';
 //软件摘要信息，请不要删除，否则系统无法正确接收系统漏洞或升级信息
 $cfg_version = 'V6';
-$cfg_version_detail = '6.2.8';//详细版本号
+$cfg_version_detail = '6.2.9';//详细版本号
 $cfg_soft_lang = 'utf-8';
 $cfg_soft_public = 'base';
 $cfg_softname = '得德系统';
diff --git a/src/theme/dedebiz/article_image.htm b/src/theme/dedebiz/article_image.htm
index d18a6311..7548cd50 100644
--- a/src/theme/dedebiz/article_image.htm
+++ b/src/theme/dedebiz/article_image.htm
@@ -14,6 +14,54 @@
 		<script>const PHPURL = '{dede:field name="phpurl"/}';</script>
 		<script src="{dede:global.cfg_cmsurl/}/static/web/js/jquery.min.js"></script>
 		<script src="{dede:global.cfg_cmsurl/}/static/web/js/bootstrap.min.js"></script>
+		<script>
+			var shortname = "{dede:global.art_shortname/}";
+			var npage = parseInt("{dede:field name = 'nowpage'/}");
+			var totalpage = parseInt("{dede:field name = 'totalpage'/}");
+			var namehand = "{dede:field name='namehand'/}";
+			var displaytype = "{dede:field name='displaytype'/}";
+			var gtimer = null;
+			//大图
+			function dPlayBig() {
+				var imgObj = document.getElementById("bigimg");
+				window.open(imgObj.src);
+			}
+			//停止幻灯
+			function dStopPlay() {
+				if (gtimer) clearTimeout(gtimer);
+				else dPlayNext();
+			}
+			//开始幻灯
+			function dStartPlay() {
+				if (npage != totalpage) {
+					gtimer = setTimeout("dPlayNext()", 1000);
+				}
+			}
+			//上一张
+			function dPlayPre() {
+				if (npage < 2) {
+					ShowMsg("这是第一页");
+				} else {
+					if (npage == 2) {
+						if (namehand != '') location.href = namehand + shortname;
+						else location.href = "/apps/view.php?aid={dede:field name='id'/}";
+					} else if (displaytype == 'st' && namehand != '') {
+						location.href = namehand + "-" + (npage - 1) + shortname;
+					} else {
+						location.href = "/apps/view.php?aid={dede:field name='id'/}&pageno=" + (npage - 1);
+					}
+				}
+			}
+			//下一张
+			function dPlayNext() {
+				if (npage == totalpage) {
+					ShowMsg("没有了哦");
+			} 	else {
+					if (displaytype == 'st' && namehand != '') location.href = namehand + "-" + (npage + 1) + shortname;
+					else location.href = "/apps/view.php?aid={dede:field name='id'/}&pageno=" + (npage + 1);
+				}
+			}
+		</script>
 	</head>
 	<body class="body-bg">
 		{dede:include filename='top.htm'/}
@@ -39,33 +87,33 @@
 							<span><img src="{dede:field.face/}" class="user-img-xs mr-1">{dede:field.uname/}</span>
 							<span><i class="fa fa-calendar mr-1"></i>{dede:field.pubdate function="MyDate('Y-m-d',@me)"/}</span>
 							<span><i class="fa fa-globe mr-1"></i>{dede:field.source/}</span>
-							<span><i class="fa fa-eye mr-1"></i><script src="{dede:field name='phpurl'/}/count.php?view=yes&aid={dede:field name='id'/}&mid={dede:field name='mid'/}"></script>次</span>
+							<span><i class="fa fa-eye mr-1"></i><script src="{dede:field name='phpurl'/}/count.php?/apps/view=yes&aid={dede:field name='id'/}&mid={dede:field name='mid'/}"></script>次</span>
 						</div>
 						<div class="picbox py-3">
 							{dede:field name='pagestyle' alt='输出不同的图片头信息' runphp='yes'}
 							if (@me==3) {
-								@me = '<ul class="e8">';
+								@me = '<div class="row">';
 							} else if (@me==2) {
 								@me = "<div class='text-center mb-3'>
-									<a href='javascript:dPlayBig();' class='btn btn-success'>原始图片</a>
-									<a href='javascript:dPlayPre();' class='btn btn-success'>上一张</a>
-									<a href='javascript:dPlayNext();' class='btn btn-success'>下一张</a>
-									<a href='javascript:dStopPlay();' class='btn btn-success'>自动 / 暂停播放</a>
+									<a href='javascript:dPlayBig();' class='btn btn-success btn-sm'>原图片</a>
+									<a href='javascript:dPlayPre();' class='btn btn-success btn-sm'>上一张</a>
+									<a href='javascript:dPlayNext();' class='btn btn-success btn-sm'>下一张</a>
+									<a href='javascript:dStopPlay();' class='btn btn-success btn-sm'>自动/暂停播放</a>
 								</div>";
 							} else {
 								@me = '';
 							}
 							{/dede:field}
-							<!-- 如果使用的是多页单图模式幻灯，把href里的链接改为 javascript:dPlayNext(); 表示点击看下一页 -->
-							{dede:field name='imgurls' alt='输出不同的图片信息'}
-							[field:pagestyle runphp='yes'] @me= (@me==3 ? '<li>' : '');[/field:pagestyle]
-							<p><a href='[field:linkurl/]' [field:pagestyle runphp='yes' ] @me=(@me==3 ? 'class="pic"' : '' ); [/field:pagestyle]><img src='[field:imgsrc/]' id='bigimg' [field:imgwidth/] alt='[field:alttext/]' title='[field:alttext/]'></a></p>
-							<div class='text-center'><a href='[field:linkurl/]' [field:pagestyle runphp='yes' ]@me=(@me==3 ? 'class="title"' : '' );[/field:pagestyle]>（[field:alttext/]）</a></div>
-							[field:pagestyle runphp='yes'] @me = (@me==3 ? '</li>' : ''); [/field:pagestyle]
-							{/dede:field}
+								<!--如果使用的是多页单图模式幻灯，把href里的链接改为javascript:dPlayNext();表示点击看下一页-->
+								{dede:field name='imgurls' alt='输出不同的图片信息'}
+								[field:pagestyle runphp='yes'] @me= (@me==3 ? '<div class="col-4">' : '');[/field:pagestyle]
+								<p><a href='[field:linkurl/]'><img src='[field:imgsrc/]' id='bigimg' alt='[field:alttext/]' title='[field:alttext/]'></a></p>
+								<p class='text-center'><a href='[field:linkurl/]'>（[field:alttext/]）</a></p>
+								[field:pagestyle runphp='yes'] @me = (@me==3 ? '</div>' : ''); [/field:pagestyle]
+								{/dede:field}
 							{dede:field name='pagestyle' alt='输出不同的图片尾信息' runphp='yes'}
 							if (@me==3) {
-								@me = '</ul>';
+								@me = '</div>';
 							} else if (@me==2) {
 								@me = "<script>dStartPlay();</script>";
 							} else {
@@ -103,53 +151,5 @@
 			</div>
 		</main>
 		{dede:include filename='foot.htm'/}
-		<script>
-			var shortname = "{dede:global.art_shortname/}";
-			var npage = parseInt("{dede:field name = 'nowpage'/}");
-			var totalpage = parseInt("{dede:field name = 'totalpage'/}");
-			var namehand = "{dede:field name='namehand'/}";
-			var displaytype = "{dede:field name='displaytype'/}";
-			var gtimer = null;
-			//大图
-			function dPlayBig() {
-				var imgObj = document.getElementById("bigimg");
-				window.open(imgObj.src);
-			}
-			//停止幻灯
-			function dStopPlay() {
-				if (gtimer) clearTimeout(gtimer);
-				else dPlayNext();
-			}
-			//开始幻灯
-			function dStartPlay() {
-				if (npage != totalpage) {
-					gtimer = setTimeout("dPlayNext()", 10000);
-				}
-			}
-			//上一张
-			function dPlayPre() {
-				if (npage < 2) {
-					ShowMsg("这是第一页");
-				} else {
-					if (npage == 2) {
-						if (namehand != '') location.href = namehand + shortname;
-						else location.href = "view.php?aid={dede:field name='id'/}";
-					} else if (displaytype == 'st' && namehand != '') {
-						location.href = namehand + "_" + (npage - 1) + shortname;
-					} else {
-						location.href = "view.php?aid={dede:field name='id'/}&pageno=" + (npage - 1);
-					}
-				}
-			}
-			//下一张
-			function dPlayNext() {
-				if (npage == totalpage) {
-					ShowMsg("没有了哦");
-			} 	else {
-					if (displaytype == 'st' && namehand != '') location.href = namehand + "_" + (npage + 1) + shortname;
-					else location.href = "view.php?aid={dede:field name='id'/}&pageno=" + (npage + 1);
-				}
-			}
-		</script>
 	</body>
 </html>
\ No newline at end of file
diff --git a/src/theme/dedebiz/widget_search.htm b/src/theme/dedebiz/widget_search.htm
index a198de9b..7e8f8db0 100644
--- a/src/theme/dedebiz/widget_search.htm
+++ b/src/theme/dedebiz/widget_search.htm
@@ -3,7 +3,7 @@
         <input type="hidden" name="kwtype" value="0">
         <div class="input-group">
             <input name="q" type="text" class="form-control" placeholder="请输入...">
-            <button type="submit" id="validateimg" class="btn btn-success"><i class="fa fa-search"></i></button>
+            <button type="submit" id="validateimg" class="btn btn-success btn-sm"><i class="fa fa-search"></i></button>
         </div>
     </form>
 </div>
\ No newline at end of file