调整上传按钮

src/install/sql-dfdata.txt

@@ -552,7 +552,7 @@ INSERT INTO `#@__scores` VALUES ('2','列兵','1','0','1'),
 INSERT INTO `#@__member_stowtype` VALUES ('sys','系统收藏','archives_do.php'),
 ('book','小说收藏','/book/book.php?bid');
 
-INSERT INTO `#@__softconfig` VALUES ('0','1','1','1','http://www.aaa.com | 下载地址一\t\nhttp://www.bbb.com | 下载地址二\t\nhttp://www.ccc.com | 下载地址三\t\n','<p>如果这个软件总是不能下载的请点击报告错误合作<br>\t\n下载本站资源，如果服务器暂不能下载请过一段时间重试<br>\t\n如果遇到什么问题，请联系我们，我们将在那里提供更多，更好的资源</p>','0','0','0','0');
+INSERT INTO `#@__softconfig` VALUES ('0','1','1','1','http://www.aaa.com | 下载地址一\t\nhttp://www.bbb.com | 下载地址二\t\nhttp://www.ccc.com | 下载地址三\t\n','<p>下载本站资源，服务器暂不能下载请过一段时间重试</p>','0','0','0','0');
 
 INSERT INTO `#@__stepselect` VALUES ('1','血型','blood','1','1'),
 ('2','体型','bodytype','1','1'),

src/static/web/css/admin.css

@@ -631,18 +631,18 @@ table,input,select,textarea,.search,.menu-body,.coolbg,.mysource,.mywriter,.pubd
 	border-radius:.35rem!important
 }
 .coolbg4,.pubdlg .title,.cke_top {
-	border-radius:.5rem .5rem 0 0
+	border-radius:.5rem .5rem 0 0!important
 }
 .submenu,.wsselect,.cke_bottom {
-	border-radius:0 0 .5rem .5rem
+	border-radius:0 0 .5rem .5rem!important
 }
 .page-item:first-child .page-link {
-	border-top-left-radius:.5rem;
-	border-bottom-left-radius:.5rem
+	border-top-left-radius:.5rem!important;
+	border-bottom-left-radius:.5rem!important
 }
 .page-item:last-child .page-link {
-	border-top-right-radius:.5rem;
-	border-bottom-right-radius:.5rem
+	border-top-right-radius:.5rem!important;
+	border-bottom-right-radius:.5rem!important
 }
 #selColor {
 	padding:0;

src/static/web/css/style.css

@@ -401,24 +401,24 @@ input[type=file] {
 	border-radius:.35rem!important
 }
 .cke_top,.item-theme-img img,.list-article-img img,.article-hot-img img {
-	border-radius:.5rem .5rem 0 0
+	border-radius:.5rem .5rem 0 0!important
 }
 .cke_bottom,.list-article-body {
-	border-radius:0 0 .5rem .5rem
+	border-radius:0 0 .5rem .5rem!important
 }
-#validateimg,.btnSend {
-	border-radius:0 .5rem .5rem 0
+#validateimg,.btn-send {
+	border-radius:0 .5rem .5rem 0!important
 }
 .rounded-circle {
 	border-radius:50%!important
 }
 .page-item:first-child .page-link {
-	border-top-left-radius:.5rem;
-	border-bottom-left-radius:.5rem
+	border-top-left-radius:.5rem!important;
+	border-bottom-left-radius:.5rem!important
 }
 .page-item:last-child .page-link {
-	border-top-right-radius:.5rem;
-	border-bottom-right-radius:.5rem
+	border-top-right-radius:.5rem!important;
+	border-bottom-right-radius:.5rem!important
 }
 .input-group:not(.has-validation)>.custom-file:not(:last-child) .custom-file-label,.input-group:not(.has-validation)>.custom-file:not(:last-child) .custom-file-label::after,.input-group:not(.has-validation)>.custom-select:not(:last-child),.input-group:not(.has-validation)>.form-control:not(:last-child) {
 	border-top-right-radius:0!important;

src/static/web/js/user.album.js

@@ -37,12 +37,9 @@ function MakeUpload(mnum) {
 			dsel = " ";
 			dplay = "display:none";
 		}
-		fhtml = '';
-		fhtml += "<div><label><input type='checkbox' name='isokcheck"+startNum+"' id='isokcheck"+startNum+"' value='1' "+dsel+" onClick='CheckSelTable("+startNum+")'> 显示图片"+startNum+"上传框</label></div>";
-		fhtml += "<div id=\"seltb"+startNum+"\" style=\""+dplay+"\">";
-		fhtml += "<p>图片"+startNum+"：<input type='text' name='imgfile"+startNum+"' class='form-control w-50 mr-2' placeholder='请输入网址'></p>";
-		fhtml += "<p>图片简介：<textarea name='imgmsg"+startNum+"' class='form-control'></textarea></p>";
-		fhtml += "</div>";
+		fhtml = "";
+		fhtml += "<div class='mb-3'><label class='mb-0'><input type='checkbox' name='isokcheck" + startNum + "' id='isokcheck" + startNum + "' value='1' "+dsel+" onClick='CheckSelTable(" + startNum + ")'> 显示图片" + startNum + "上传框</label></div>";
+		fhtml += "<div id=\"seltb" + startNum + "\" class='form-group' style=\"" + dplay + "\"><label>图片" + startNum + "上传：</label><div class='input-group mb-3'><input type='text' name='imgfile" + startNum + "' class='form-control' placeholder='请输入网址'><div class='input-group-append'><span class='btn btn-success btn-send'>选择</span></div></div><label>图片" + startNum + "简介：</label><textarea name='imgmsg" + startNum + "' class='form-control'></textarea></div>";
 		upfield.innerHTML += fhtml;
 	}
 }

src/theme/dedebiz/widget_article_feedback.htm

@@ -1,7 +1,7 @@
 <div class="comment pt-3">
 	<h4>发表评论</h4>
 	<div id="feedback-alert"></div>
-	<div class="content pb-3"><textarea id="iptMsg" name="msg" class="form-control" placeholder="请输入..." required></textarea></div>
+	<div class="content pb-3"><textarea id="iptMsg" name="msg" class="form-control" placeholder="请输入..."></textarea></div>
 	<div class="post pb-3">
 		<div class="dcmp-userinfo" id="_ajax_feedback">
 			<div class="form-group">
@@ -99,14 +99,14 @@
 				ShowAlert(`._feedback_reply[for="${fid}"]`, `评论失败：${result.msg}`, "danger");
 			}
 		})
-		$(`._feedback_reply[for="${fid}"]`).find(".btnSend").attr("disabled", "disabled");
+		$(`._feedback_reply[for="${fid}"]`).find(".btn-send").attr("disabled", "disabled");
 	}
 	//回复某个评论
 	function ReplyFeedback(fid) {
 		let replyPannel = `<div class="form-group">
 			<div class="input-group">
 				<input type="text" class="form-control iptReplyContent">
-				<button type="button" class="btn btn-success btnSend" onClick='SendReplyFeedback(${fid})'>评论</button>
+				<button type="button" class="btn btn-success btn-send" onClick='SendReplyFeedback(${fid})'>评论</button>
 			</div>
 		</div>`;
 		$.get("{dede:global.cfg_cmsurl/}/user/api.php?format=json", function(result) {

src/user/login.php

@@ -11,7 +11,7 @@
 require_once(dirname(__FILE__)."/config.php");
 $gourl = RemoveXSS($gourl);
 if ($cfg_ml->IsLogin()) {
-    ShowMsg('您已经登录，无需重新注册', 'index.php');
+    ShowMsg('正在登录会员中心，请稍等', 'index.php');
     exit();
 }
 require_once(dirname(__FILE__)."/templets/login.htm");

src/user/templets/album_add.htm

@@ -81,8 +81,9 @@
 								<div id="spagelist" style="display:none">每页图片数：<input name="pagpicnum" id="pagpicnum" class="form-control w-25" value="<?php echo $cfg_album_pagesize;?>"></div>
 							</div>
 							<div class="form-group">
-								<span>图片数目：<input type="text" name="picnum" value="5" id="picnum" class="form-control w-25"></span>
-								<button type="button" name="kkkup" id="kkkup2" class="btn btn-success btn-sm" onclick="MakeUpload(0);">添加</button>（最大60幅）
+								<span>图片数目：</span>
+								<input type="text" name="picnum" value="5" id="picnum" class="form-control w-25">
+								<button type="button" name="kkkup" id="kkkup2" class="btn btn-success btn-sm" onclick="MakeUpload(0);">添加</button>
 							</div>
 							<div id="uploadfield"></div>
 							<script>

src/user/templets/album_edit.htm

@@ -84,25 +84,29 @@
 								<div id="spagelist" style="<?php if ($abinfo->GetAtt('value')!=2) echo 'display:none';?>">每页图片数：<input name="pagpicnum" id="pagpicnum" class="form-control w-25" value="<?php echo $abinfo->GetAtt('pagpicnum');?>"></div>
 							</div>
 							<div class="form-group">
-								<span>图片数目：<input type="text" name="picnum" value="5" id="picnum" class="form-control w-25 mr-2"></span>
-								<button type="button" name="kkkup" id="kkkup2" class="btn btn-success btn-sm" onclick="MakeUpload(0);">添加</button>（最大60幅）
+								<span>图片数目：</span>
+								<input type="text" name="picnum" value="5" id="picnum" class="form-control w-25 mr-2">
+								<button type="button" name="kkkup" id="kkkup2" class="btn btn-success btn-sm" onclick="MakeUpload(0);">添加</button>
 							</div>
-							<div id="uploadfield"></div>
 							<?php
 							$j = 1;
 							if (is_array($dtp->CTags))
 							{
 								foreach($dtp->CTags as $ctag){
-									if ($ctag->GetName()=="img"){
+									if ($ctag->GetName()=="img") {
 							?>
-							<div><label><input type="checkbox" name="isokcheck<?php echo $j;?>" id="isokcheck<?php echo $j;?>" value="1" onclick="CheckSelTable(<?php echo $j;?>)" checked="1"> 显示隐藏图片<?php echo $j;?>选框</label></div>
-							<div id="seltb<?php echo $j;?>">
-								<p>本地上传：<input type="text" name="imgfile<?php echo $j;?>" class="form-control w-50 mr-2" placeholder="请输入网址"><span class="btn btn-success btn-sm">选择</span></p>
-								<p>
-									<div id="divpicview<?php echo $j;?>" class="divpre"></div>
-									<img src="<?php echo trim($ctag->GetInnerText());?>" id="picview<?php echo $j;?>" name="picview<?php echo $j;?>">
-								</p>
-								<p>简介：<textarea name="imgmsg<?php echo $j;?>" class="form-control"><?php echo trim($ctag->GetAtt('text'))?></textarea></p>
+							<div class="mb-3">
+								<label class="mb-0"><input type="checkbox" name="isokcheck<?php echo $j;?>" id="isokcheck<?php echo $j;?>" value="1" onclick="CheckSelTable(<?php echo $j;?>)" checked="1"> 显示图片<?php echo $j;?>上传框</label>
+							</div>
+							<div id="seltb<?php echo $j;?>" class="mb-3">
+								<div class="mb-3"><img src="<?php echo trim($ctag->GetInnerText());?>" class="thumbnail-md"></div>
+								<label>图片<?php echo $j;?>上传：</label>
+								<div class="input-group mb-3">
+									<input type="text" name="imgfile<?php echo $j;?>" class="form-control" placeholder="请输入网址">
+									<div class="input-group-append"><span class="btn btn-success btn-send">选择</span></div>
+								</div>
+								<label>图片<?php echo $j;?>简介：</label>
+								<textarea name="imgmsg<?php echo $j;?>" class="form-control"><?php echo trim($ctag->GetAtt('text'))?></textarea>
 							</div>
 							<?php
 							$j++;
@@ -111,9 +115,7 @@
 							}
 							$dtp->Clear();
 							?>
-							<script>
-								startNum = <?php echo $j;?>;
-							</script>
+							<div id="uploadfield"></div>
 							<div class="text-center">
 								<button type="submit" class="btn btn-success btn-sm">提交</button>
 								<button type="reset" class="btn btn-outline-success btn-sm" onclick="location.reload();">重置</button>
@@ -125,5 +127,8 @@
 		</main>
 		<?php pasterTempletDiy('foot.htm');?>
 		<?php include(DEDEMEMBER."/templets/widget_litpic.htm");?>
+		<script>
+			startNum = <?php echo $j;?>;
+		</script>
 	</body>
 </html>

src/user/templets/soft_add.htm

@@ -134,10 +134,10 @@
 							<div class="form-row">
 								<div class="form-group col-md-6">
 									<label for="softsize">软件大小</label>
-									<div class="input-group ">
+									<div class="input-group">
 										<input type="text" name="softsize" id="softsize" class="form-control">
 										<div class="input-group-append">
-											<select name="unit" id="unit" class="form-control">
+											<select name="unit" id="unit" class="form-control btn-send">
 												<option value="MB" selected="selected">MB</option>
 												<option value="KB">KB</option>
 												<option value="GB">GB</option>
@@ -156,14 +156,19 @@
 								<div class="col-sm-10"><?php GetEditor("body","",400,"Member");?></div>
 							</div>
 							<div class="form-group">
-								<p>下载地址：<input type="text" name="softurl1" id="softurl1" class="form-control"></p>
-								<p>下载名称：<input type="text" name="servermsg1" id="servermsg1" class="form-control" value="下载"></p>
+								<label>下载地址：</label>
+								<div class="input-group mb-3">
+									<input type="text" name="softurl1" id="softurl1" class="form-control d-inline-block w-75">
+									<div class="input-group-append"><span class="btn btn-success btn-send">选择</span></div>
+								</div>
+								<label>下载名称：</label>
+								<input type="text" name="servermsg1" id="servermsg1" class="form-control" value="本地下载">
 							</div>
 							<div class="form-group">
-								<label>其它地址：</label>
+								<span>其它地址：</span>
 								<input type="text" name="picnum" id="picnum" value="5" class="form-control w-25 mr-2">
 								<button type="button" name="kkkup" id="kkkup2" onclick="MakeUpload();" class="btn btn-success btn-sm">添加地址</button>
-								<button type="button" name="Submit3" id="btsh3" onclick="ShowHideAddr();" class="btn btn-success btn-sm">隐藏地址</button>（最多为12个链接）
+								<button type="button" name="Submit3" id="btsh3" onclick="ShowHideAddr();" class="btn btn-success btn-sm">隐藏地址</button>
 							</div>										
 							<div id="morelink" style="display:none">
 								<?php echo "<div id='uploadfield'></div>";?>
@@ -187,8 +192,7 @@
 				morelinkobj.style.display = "block";
 				if (endNum > 12) endNum = 12;
 				for (startNum; startNum <= endNum; startNum++) {
-					upfield.innerHTML += "<p>下载地址" + startNum + "：<input type='text' name='softurl" + startNum + "' value='http://' class='form-control'></p>";
-					upfield.innerHTML += "<p>下载名称" + startNum + "：<input type='text' name='servermsg" + startNum + "' class='form-control'></p>";
+					upfield.innerHTML += "<div class='form-group'><label>下载地址" + startNum + "：</label><div class='input-group mb-3'><input type='text' name='softurl" + startNum + "' value='http://' class='form-control'><div class='input-group-append'><span class='btn btn-success btn-send'>选择</span></div></div><label>下载名称" + startNum + "：</label><input type='text' name='servermsg" + startNum + "' class='form-control'></div>";
 				}
 			}
 			function ShowHideAddr() {

src/user/templets/soft_edit.htm

@@ -159,14 +159,19 @@
 								</div>
 							</div>
 							<div class="form-group">
-								<p>下载地址：<input type="text" name="softurl1" id="softurl1" class="form-control w-50"></p>
-								<p>下载名称：<input type="text" name="servermsg1" id="servermsg1" class="form-control" value="下载"></p>
+								<label>下载地址：</label>
+								<div class="input-group mb-3">
+									<input type="text" name="softurl1" id="softurl1" class="form-control w-50">
+									<div class="input-group-append"><span class="btn btn-success btn-send">选择</span></div>
+								</div>
+								<label>下载名称：</label>
+								<input type="text" name="servermsg1" id="servermsg1" class="form-control" value="本地下载">
 							</div>
 							<div class="form-group">
-								<label>其它地址：</label>
+								<span>其它地址：</span>
 								<input type="text" name="picnum" id="picnum" value="5" class="form-control w-25">
 								<button type="button" name="kkkup" id="kkkup2" onclick="MakeUpload();" class="btn btn-success btn-sm">添加地址</button>
-								<button type="button" name="Submit3" id="btsh3" onclick="ShowHideAddr();" class="btn btn-success btn-sm">隐藏地址</button> (最多为12个链接）
+								<button type="button" name="Submit3" id="btsh3" onclick="ShowHideAddr();" class="btn btn-success btn-sm">隐藏地址</button>
 							</div>
 							<div id="morelink">
 								<?php
@@ -193,8 +198,7 @@
 				morelinkobj.style.display = "block";
 				if (endNum > 12) endNum = 12;
 				for (startNum; startNum <= endNum; startNum++) {
-					upfield.innerHTML += "<p>下载地址" + startNum + "：<input type='text' name='softurl" + startNum + "' value='http://' class='form-control w-50'></p>";
-					upfield.innerHTML += "<p>下载名称" + startNum + "：<input type='text' name='servermsg" + startNum + "' class='form-control'></p>";
+					upfield.innerHTML += "<div class='form-group'><label>下载地址" + startNum + "：</label><div class='input-group mb-3'><input type='text' name='softurl" + startNum + "' value='http://' class='form-control'><div class='input-group-append'><span class='btn btn-success btn-send'>选择</span></div></div><label>下载名称" + startNum + "：</label><input type='text' name='servermsg" + startNum + "' class='form-control'></div>";
 				}
 			}
 			function ShowHideAddr() {