From baf7a16da5c1cc9bde05d5072bbf598046e05565 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: Wed, 8 Feb 2023 15:35:30 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AE=80=E5=8C=96=E4=B8=80=E7=B3=BB=E5=88=97?= =?UTF-8?q?=E6=93=8D=E4=BD=9C?= 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 | 9 ++- src/install/install.html | 16 ++--- src/static/web/css/admin.css | 28 ++++++--- src/static/web/css/style.css | 41 ++++++++++--- src/theme/dedebiz/foot.htm | 2 +- src/theme/dedebiz/top.htm | 8 +-- src/user/index_do.php | 2 +- src/user/reg_new.php | 6 +- src/user/templets/album_add.htm | 36 ++++++++++- src/user/templets/album_edit.htm | 6 +- src/user/templets/archives_add.htm | 7 ++- src/user/templets/archives_edit.htm | 6 +- src/user/templets/archives_sg_add.htm | 7 ++- src/user/templets/archives_sg_edit.htm | 6 +- src/user/templets/article_add.htm | 7 ++- src/user/templets/article_edit.htm | 6 +- src/user/templets/buy.htm | 4 +- src/user/templets/buy_action_payment.htm | 2 +- src/user/templets/content_list.htm | 4 +- src/user/templets/content_sg_list.htm | 4 +- src/user/templets/edit_baseinfo.htm | 78 ++++++++++-------------- src/user/templets/edit_email.htm | 2 +- src/user/templets/edit_face.htm | 4 +- src/user/templets/index.htm | 8 +-- src/user/templets/menu.htm | 20 ++---- src/user/templets/mypay.htm | 4 +- src/user/templets/operation.htm | 24 ++++---- src/user/templets/pm-main.htm | 18 +++--- src/user/templets/soft_add.htm | 9 ++- src/user/templets/soft_edit.htm | 8 +-- 31 files changed, 216 insertions(+), 168 deletions(-) diff --git a/src/admin/templets/album_add.htm b/src/admin/templets/album_add.htm index 7e9be0e3..ffdd0b2e 100644 --- a/src/admin/templets/album_add.htm +++ b/src/admin/templets/album_add.htm @@ -296,7 +296,7 @@ - +
手工上传： 选择本地图片（支持多选）上传图片（支持多选）
diff --git a/src/admin/templets/album_edit.htm b/src/admin/templets/album_edit.htm index 317c552b..7d87d58f 100644 --- a/src/admin/templets/album_edit.htm +++ b/src/admin/templets/album_edit.htm @@ -315,9 +315,8 @@ $fhtml .= ""; $fhtml .= ""; $fhtml .= ""; - $fhtml .= "
删除
"; - $fhtml .= "
名称：
"; - $fhtml .= "
更换：
"; + $fhtml .= "
名称：
"; + $fhtml .= "
更换删除
"; $fhtml .= ""; echo $fhtml; $j++; @@ -337,8 +336,8 @@ - - + +
增加新图片： 选择本地图片（支持多选）增加图片：上传图片（支持多选）
diff --git a/src/install/install.html b/src/install/install.html index 3a7731ad..47ccb189 100644 --- a/src/install/install.html +++ b/src/install/install.html @@ -43,15 +43,14 @@ - 数据库设置 + 数据库设置
- + -
数据库类型一般为MySQL，类型SQLite用于开发调试，不建议生产中使用
@@ -66,9 +65,8 @@
- + -
请注意DedeV6数据表前缀默认为biz_
@@ -78,7 +76,7 @@
- 站点设置 + 站点设置
@@ -89,18 +87,16 @@
- + -
请使用[0-9a-zA-Z_@!.-]以内范围字符
- + -
根目录安装时不必理会
diff --git a/src/static/web/css/admin.css b/src/static/web/css/admin.css index 13dceffc..970464ad 100644 --- a/src/static/web/css/admin.css +++ b/src/static/web/css/admin.css @@ -55,6 +55,11 @@ input { border-radius:.2rem; transition:all .3s } +input[type=file] { + padding:0; + height:auto; + border:0 +} input[type=button],input[type=submit],input[type=reset] { padding:.25rem .65rem; height:auto; @@ -64,9 +69,6 @@ input[type=button],input[type=submit],input[type=reset] { border:0; transition:all .3s } -input[type=file] { - border:0 -} input[type=radio],input[type=checkbox],input[type=radio]:focus,input[type=checkbox]:focus { height:auto; box-shadow:none; @@ -513,17 +515,17 @@ span.page-link { padding:.65rem; vertical-align:middle } -.fa { - font-size:14px!important; - color:inherit -} .btn-xs { padding:2px; line-height:12px; font-size:12px } .btn+.btn,.btn-text+.btn-text { - margin-left:1rem + margin-left:10px +} +.fa { + font-size:14px!important; + color:inherit } .admin-win { background:#f5f5f5; @@ -590,6 +592,16 @@ span.page-link { height:20px; border-radius:.2rem } +.file-relative { + position:relative +} +.file-absolute { + position:absolute; + top:0; + right:0; + opacity:0; + cursor:pointer +} #browsehappy { padding:20px 30px; font-size:14px; diff --git a/src/static/web/css/style.css b/src/static/web/css/style.css index 6240ee9d..9dd3e762 100644 --- a/src/static/web/css/style.css +++ b/src/static/web/css/style.css @@ -43,6 +43,11 @@ form.search { display:flex; width:100% } +input[type=file] { + padding:0; + height:auto; + border:0 +} .body-bg { background:#f5f5f5 } @@ -299,11 +304,16 @@ form.search { .form-control,.btn,.fa { font-size:14px!important } -.btn+.btn,.btn-text+.btn-text { - margin-left:1rem +.dedebiz-file { + position:absolute; + top:0; + right:0; + margin:0; + opacity:0; + cursor:pointer } -.rounded-md { - border-radius:30px!important +.btn+.btn,.btn-text+.btn-text { + margin-left:10px } .login-from { margin:6rem 0 @@ -337,9 +347,8 @@ form.search { border-bottom:1px solid #eee } .user-img { - margin-right:10px; - width:30px; - height:30px; + width:36px; + height:36px; border-radius:50%; border:1px solid #dee2e6 } @@ -370,8 +379,22 @@ form.search { background:#fff } .thumbnail-md { - max-width:200px; - max-height:120px + max-width:280px; + max-height:168px +} +.album-imgs img { + max-width:260px; + max-height:156px +} +.file-relative { + position:relative +} +.file-absolute { + position:absolute; + top:0; + right:0; + opacity:0; + cursor:pointer } #btnScrollTop { display:none; diff --git a/src/theme/dedebiz/foot.htm b/src/theme/dedebiz/foot.htm index 88f104f2..9861ce88 100644 --- a/src/theme/dedebiz/foot.htm +++ b/src/theme/dedebiz/foot.htm @@ -16,7 +16,7 @@ $.get("{dede:global.cfg_cmsurl/}/user/api.php?format=json",function(data) { let result = JSON.parse(data); if (result.code === 200) { - $("#_login").html(`${result.data.username}${result.data.username}`); + $("#_login").html(`${result.data.username}${result.data.username}`); $("#iptUsername").val(result.data.username); $("#iptUsername").attr("disabled", "disabled"); $(".areaValidate").hide(); diff --git a/src/theme/dedebiz/top.htm b/src/theme/dedebiz/top.htm index 35541418..0d932a53 100644 --- a/src/theme/dedebiz/top.htm +++ b/src/theme/dedebiz/top.htm @@ -1,10 +1,10 @@
- -
diff --git a/src/user/index_do.php b/src/user/index_do.php index 7ae90f0f..e27f6f62 100755 --- a/src/user/index_do.php +++ b/src/user/index_do.php @@ -216,7 +216,7 @@ else if ($fmdo == 'login') { //退出登录 else if ($dopost == "exit") { $cfg_ml->ExitCookie(); - ShowMsg("成功退出登录", "index.php", 0, 2000); + ShowMsg("已退出登录", "index.php", 0, 2000); exit(); } } else { diff --git a/src/user/reg_new.php b/src/user/reg_new.php index 16261541..7d3dbe11 100755 --- a/src/user/reg_new.php +++ b/src/user/reg_new.php @@ -15,7 +15,7 @@ if (!isset($dopost)) $dopost = ''; $step = empty($step) ? 1 : intval($step); if ($step == 1) { if ($cfg_ml->IsLogin()) { - ShowMsg('您已经登录，无需重新注册', 'index.php'); + ShowMsg('操作成功，请重新登录系统', 'index.php'); exit(); } if ($dopost == 'regbase') { @@ -96,7 +96,7 @@ if ($step == 1) { //模拟登录 $cfg_ml = new MemberLogin(7 * 3600); $rs = $cfg_ml->CheckUser($userid, $userpwd); - ShowMsg('您已经登录，无需重新注册', 'index.php'); + ShowMsg('操作成功，请重新登录系统', 'index.php'); exit; } else { ShowMsg("注册失败，请检查资料是否有误或与管理员联系", "-1"); @@ -109,7 +109,7 @@ if ($step == 1) { ShowMsg("您未填写基本信息，请填写基本信息", "index_do.php?fmdo=user&dopost=regnew"); exit; } else { - ShowMsg('您已经登录，无需重新注册', 'index.php'); + ShowMsg('操作成功，请重新登录系统', 'index.php'); exit; } } diff --git a/src/user/templets/album_add.htm b/src/user/templets/album_add.htm index 75d3a42c..971ccdda 100755 --- a/src/user/templets/album_add.htm +++ b/src/user/templets/album_add.htm @@ -21,7 +21,7 @@
  • 会员中心
  • 发布
    • - 返回 + 返回
    @@ -37,7 +37,10 @@
    -
    +
    + + 上传缩略图 +
    @@ -83,6 +86,35 @@ + + + 上传图片（支持多选） +
    +
    +
    + +

    图片1

    +
    +
    + +

    图片1

    +
    +
    + +

    图片2

    +
    +
    + +

    图片3

    +
    +
    + +

    图片4

    +
    +
    +
    + +
    diff --git a/src/user/templets/album_edit.htm b/src/user/templets/album_edit.htm index 1374578a..6db7cf93 100755 --- a/src/user/templets/album_edit.htm +++ b/src/user/templets/album_edit.htm @@ -21,7 +21,7 @@
  • 会员中心
  • 修改
    • - 返回 + 返回 @@ -42,8 +42,8 @@
    - - + + 修改缩略图
    diff --git a/src/user/templets/archives_add.htm b/src/user/templets/archives_add.htm index a3d08c26..d9f69ca9 100755 --- a/src/user/templets/archives_add.htm +++ b/src/user/templets/archives_add.htm @@ -21,7 +21,7 @@
  • 会员中心
  • 发布
    • - 返回 + 返回 @@ -36,7 +36,10 @@
    -
    +
    + + 上传缩略图 +
    diff --git a/src/user/templets/archives_edit.htm b/src/user/templets/archives_edit.htm index 20e79c84..319f42da 100755 --- a/src/user/templets/archives_edit.htm +++ b/src/user/templets/archives_edit.htm @@ -21,7 +21,7 @@
  • 会员中心
  • 修改
    • - 返回 + 返回 @@ -37,8 +37,8 @@
    - - + + 修改缩略图
    diff --git a/src/user/templets/archives_sg_add.htm b/src/user/templets/archives_sg_add.htm index dd185a1a..7f5528cd 100755 --- a/src/user/templets/archives_sg_add.htm +++ b/src/user/templets/archives_sg_add.htm @@ -21,7 +21,7 @@
  • 会员中心
  • 发布
    • - 返回 + 返回 @@ -36,7 +36,10 @@
    -
    +
    + + 上传缩略图 +
    diff --git a/src/user/templets/archives_sg_edit.htm b/src/user/templets/archives_sg_edit.htm index 0ea51e78..1b65547a 100755 --- a/src/user/templets/archives_sg_edit.htm +++ b/src/user/templets/archives_sg_edit.htm @@ -21,7 +21,7 @@
  • 会员中心
  • 修改
    • - 返回 + 返回 @@ -37,8 +37,8 @@
    - - + + 修改缩略图
    diff --git a/src/user/templets/article_add.htm b/src/user/templets/article_add.htm index 7e7066b8..a0e0de6d 100755 --- a/src/user/templets/article_add.htm +++ b/src/user/templets/article_add.htm @@ -21,7 +21,7 @@
  • 会员中心
  • 发布
    • - 返回 + 返回 @@ -36,7 +36,10 @@
    -
    +
    + + 上传缩略图 +
    diff --git a/src/user/templets/article_edit.htm b/src/user/templets/article_edit.htm index f877ecec..8cc545b0 100755 --- a/src/user/templets/article_edit.htm +++ b/src/user/templets/article_edit.htm @@ -21,7 +21,7 @@
  • 会员中心
  • 修改
    • - 返回 + 返回 @@ -41,8 +41,8 @@
    - - + + 修改缩略图
    diff --git a/src/user/templets/buy.htm b/src/user/templets/buy.htm index 874afbca..5da8f3ec 100755 --- a/src/user/templets/buy.htm +++ b/src/user/templets/buy.htm @@ -3,7 +3,7 @@ - 钱包积分-会员中心-<?php echo $cfg_webname;?> + 积分钱包-会员中心-<?php echo $cfg_webname;?> @@ -19,7 +19,7 @@ diff --git a/src/user/templets/buy_action_payment.htm b/src/user/templets/buy_action_payment.htm index a58f25a9..27cfa3e5 100755 --- a/src/user/templets/buy_action_payment.htm +++ b/src/user/templets/buy_action_payment.htm @@ -19,7 +19,7 @@