diff --git a/src/admin/member_view.php b/src/admin/member_view.php
index 03ce3eda..d55636f4 100644
--- a/src/admin/member_view.php
+++ b/src/admin/member_view.php
@@ -32,7 +32,7 @@ function GetMemberTypeName($rank)
{
global $dsql;
if ($rank == 0) {
- return '普通会员';
+ return '注册会员';
} else {
$row = $dsql->GetOne("SELECT membername FROM `#@__arcrank` WHERE `rank`='".$rank."'");
return $row['membername'];
diff --git a/src/admin/templets/member_main.htm b/src/admin/templets/member_main.htm
index 6415a9fc..f1d7c664 100644
--- a/src/admin/templets/member_main.htm
+++ b/src/admin/templets/member_main.htm
@@ -50,7 +50,7 @@
<a href="member_main.php" class="btn btn-success btn-sm">所有会员</a>
<a href="member_main.php?spacesta=-2" class="btn btn-success btn-sm">禁言会员</a>
<a href="member_main.php?matt=1" class="btn btn-success btn-sm">推荐会员</a>
- <a href="member_main.php?matt=0" class="btn btn-success btn-sm">普通会员</a>
+ <a href="member_main.php?matt=0" class="btn btn-success btn-sm">注册会员</a>
</td>
</tr>
</table>
diff --git a/src/system/memberlogin.class.php b/src/system/memberlogin.class.php
index 80673c13..dbea5e76 100755
--- a/src/system/memberlogin.class.php
+++ b/src/system/memberlogin.class.php
@@ -528,7 +528,7 @@ class MemberLogin
{
global $dsql;
if ($this->M_Rank == 0) {
- return '普通会员';
+ return '注册会员';
} else {
$row = $dsql->GetOne("SELECT membername FROM `#@__arcrank` WHERE `rank`='".$this->M_Rank."'");
return $row['membername'];
@@ -545,17 +545,17 @@ class MemberLogin
{
$sta = '';
if ($this->M_Rank == 0) {
- $sta .= "您目前的身份是：普通会员";
+ $sta .= "您目前等级是：注册会员";
} else {
$row = $dsql->GetOne("SELECT membername FROM `#@__arcrank` WHERE `rank`='".$this->M_Rank."'");
- $sta .= "您目前的身份是：".$row['membername'];
+ $sta .= "您目前等级是：".$row['membername'];
$rs = $dsql->GetOne("SELECT id FROM `#@__admin` WHERE userid='".$this->M_LoginID."'");
if (!is_array($rs)) {
- if ($this->M_Rank > 10 && $this->M_HasDay > 0) $sta .= " 剩余<span class='text-primary'>".$this->M_HasDay."</span>天";
- elseif ($this->M_Rank > 10) $sta .= "<span class='text-danger'>会员已到期</span>";
+ if ($this->M_Rank > 10 && $this->M_HasDay > 0) $sta .= "，剩余<span class='text-primary'>".$this->M_HasDay."</span>天";
+ elseif ($this->M_Rank > 10) $sta .= "，<span class='text-danger'>会员已到期</span>";
}
}
- $sta .= " 积分<span class='text-primary'>{$this->M_Scores}</span>分 金币<span class='text-primary'>{$this->M_Money}</span>个 余额<span class='text-primary'>{$this->M_UserMoney}</span>元";
+ $sta .= "，积分<span class='text-primary'>{$this->M_Scores}</span>分，金币<span class='text-primary'>{$this->M_Money}</span>个，余额<span class='text-primary'>{$this->M_UserMoney}</span>元";
return $sta;
}
//获取能够发布文档的栏目
diff --git a/src/theme/dedebiz/article_article.htm b/src/theme/dedebiz/article_article.htm
index f70a53e4..6cae91fc 100644
--- a/src/theme/dedebiz/article_article.htm
+++ b/src/theme/dedebiz/article_article.htm
@@ -41,7 +41,7 @@
<span>时间：{dede:field.pubdate function="MyDate('Y-m-d',@me)"/}</span>
<span>来源：{dede:field.source/}</span>
<span>作者：{dede:field.writer/}</span>
- <span>浏览：<i id="_count">...</i>次</span>
+ <span>浏览：<script src="{dede:field name='phpurl'/}/count.php?view=yes&aid={dede:field name='id'/}&mid={dede:field name='mid'/}"></script>次</span>
</div>
<div class="py-3">{dede:field.body/}</div>
<div class="py-3">作者：{dede:adminname/}</div>
@@ -84,16 +84,5 @@
</div>
</main>
{dede:include filename='foot.htm'/}
- <script>
- //页面加载触发
- $(document).ready(function() {
- //获取文档点击数统计
- $.get("{dede:field name='phpurl'/}/count.php?format=json&view=yes&aid={dede:field.id/}&mid=1", function(
- data) {
- let result = JSON.parse(data);
- $("#_count").html(result.data.click);
- })
- });
- </script>
</body>
</html>
\ No newline at end of file
diff --git a/src/theme/dedebiz/article_default.htm b/src/theme/dedebiz/article_default.htm
index 93696c9d..b975ba69 100644
--- a/src/theme/dedebiz/article_default.htm
+++ b/src/theme/dedebiz/article_default.htm
@@ -39,7 +39,7 @@
<span>时间：{dede:field.pubdate function="MyDate('Y-m-d',@me)"/}</span>
<span>来源：{dede:field.source/}</span>
<span>作者：{dede:field.writer/}</span>
- <span>浏览：<i id="_count">...</i>次</span>
+ <span>浏览：<script src="{dede:field name='phpurl'/}/count.php?view=yes&aid={dede:field name='id'/}&mid={dede:field name='mid'/}"></script>次</span>
</div>
<div class="py-3">{dede:field.body/}</div>
<div class="py-3">作者：{dede:adminname/}</div>
@@ -97,16 +97,5 @@
</div>
</main>
{dede:include filename='foot.htm'/}
- <script>
- //页面加载触发
- $(document).ready(function() {
- //获取文档点击数统计
- $.get("{dede:field name='phpurl'/}/count.php?format=json&view=yes&aid={dede:field.id/}&mid=1&cid={dede:field.channel/}",
- function(data) {
- let result = JSON.parse(data);
- $("#_count").html(result.data.click);
- })
- });
- </script>
</body>
</html>
\ No newline at end of file
diff --git a/src/theme/dedebiz/article_default_sg.htm b/src/theme/dedebiz/article_default_sg.htm
index 3bb32fb9..057b58e2 100644
--- a/src/theme/dedebiz/article_default_sg.htm
+++ b/src/theme/dedebiz/article_default_sg.htm
@@ -42,7 +42,7 @@
<span>时间：{dede:field.pubdate function="MyDate('Y-m-d',@me)"/}</span>
<span>来源：{dede:field.source/}</span>
<span>作者：{dede:field.writer/}</span>
- <span>浏览：<i id="_count">...</i>次</span>
+ <span>浏览：<script src="{dede:field name='phpurl'/}/count.php?view=yes&aid={dede:field name='id'/}&mid={dede:field name='mid'/}"></script>次</span>
</div>
<div class="py-3">{dede:field.body/}</div>
<div class="py-3">作者：{dede:adminname/}</div>
@@ -100,16 +100,5 @@
</div>
</main>
{dede:include filename='foot.htm'/}
- <script>
- //页面加载触发
- $(document).ready(function() {
- //获取文档点击数统计
- $.get("{dede:field name='phpurl'/}/count.php?format=json&view=yes&aid={dede:field.id/}&mid=1&cid={dede:field.channel/}",
- function(data) {
- let result = JSON.parse(data);
- $("#_count").html(result.data.click);
- })
- });
- </script>
</body>
</html>
\ No newline at end of file
diff --git a/src/theme/dedebiz/article_image.htm b/src/theme/dedebiz/article_image.htm
index 5c20fd95..2ae8cade 100644
--- a/src/theme/dedebiz/article_image.htm
+++ b/src/theme/dedebiz/article_image.htm
@@ -87,7 +87,7 @@
<span>时间：{dede:field.pubdate function="MyDate('Y-m-d',@me)"/}</span>
<span>来源：{dede:field.source/}</span>
<span>作者：{dede:field.writer/}</span>
- <span>浏览：<i id="_count">...</i>次</span>
+ <span>浏览：<script src="{dede:field name='phpurl'/}/count.php?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'}
@@ -167,16 +167,5 @@
</div>
</main>
{dede:include filename='foot.htm'/}
- <script>
- //页面加载触发
- $(document).ready(function() {
- //获取文档点击数统计
- $.get("{dede:field name='phpurl'/}/count.php?format=json&view=yes&aid={dede:field.id/}&mid=1&cid={dede:field.channel/}",
- function(data) {
- let result = JSON.parse(data);
- $("#_count").html(result.data.click);
- })
- });
- </script>
</body>
</html>
\ No newline at end of file
diff --git a/src/theme/dedebiz/article_infos.htm b/src/theme/dedebiz/article_infos.htm
index a53cfff1..a795911e 100644
--- a/src/theme/dedebiz/article_infos.htm
+++ b/src/theme/dedebiz/article_infos.htm
@@ -38,13 +38,12 @@
<span>时间：{dede:field.pubdate function="MyDate('Y-m-d',@me)"/}</span>
<span>来源：{dede:field.source/}</span>
<span>作者：{dede:field.writer/}</span>
- <span>浏览：<i id="_count">...</i>次</span>
+ <span>浏览：<script src="{dede:field name='phpurl'/}/count.php?view=yes&aid={dede:field name='id'/}&mid={dede:field name='mid'/}"></script>次</span>
</div>
<div class="py-3">{dede:field name='image'/}</div>
<div class="py-3">
<p>所属区域：{dede:field.nativeplace/}</p>
<p>信息类型：{dede:field.infotype/}</p>
- <p>点击数：<i id="_count">...</i></p>
<p>发布时间：{dede:field.pubdate function="MyDate('Y-m-d H:i:s',@me)"/}</p>
<p>截止日期：{dede:field.endtime function="MyDate('Y-m-d H:m',@me)"/}</p>
<p>联系人：{dede:field.linkman/}</p>
@@ -81,16 +80,5 @@
</div>
</main>
{dede:include filename='foot.htm'/}
- <script>
- //页面加载触发
- $(document).ready(function() {
- //获取文档点击数统计
- $.get("{dede:field name='phpurl'/}/count.php?format=json&view=yes&aid={dede:field.id/}&mid=1&cid={dede:field.channel/}",
- function(data) {
- let result = JSON.parse(data);
- $("#_count").html(result.data.click);
- })
- });
- </script>
</body>
</html>
\ No newline at end of file
diff --git a/src/theme/dedebiz/article_soft.htm b/src/theme/dedebiz/article_soft.htm
index f9edaef7..cbe80702 100644
--- a/src/theme/dedebiz/article_soft.htm
+++ b/src/theme/dedebiz/article_soft.htm
@@ -38,8 +38,7 @@
<span>时间：{dede:field.pubdate function="MyDate('Y-m-d',@me)"/}</span>
<span>来源：{dede:field.source/}</span>
<span>作者：{dede:field.writer/}</span>
- <span>浏览：<i id="_count">...</i>次</span>
- <div class="alert alert-success mt-3">{dede:softmsg/}</div>
+ <span>浏览：<script src="{dede:field name='phpurl'/}/count.php?view=yes&aid={dede:field name='id'/}&mid={dede:field name='mid'/}"></script>次</span>
</div>
<div class="py-3">{dede:field name='image'/}</div>
<div class="py-3">
@@ -62,6 +61,7 @@
{dede:field name='softlinks'/}
</ul>
</div>
+ <div class="alert alert-success my-3">{dede:softmsg/}</div>
<div class="clearfix"></div>
{dede:include comment='文档顶踩模块' filename='widget_article_digg.htm'/}
<div class="row">
@@ -98,16 +98,5 @@
</div>
</main>
{dede:include filename='foot.htm'/}
- <script>
- //页面加载触发
- $(document).ready(function() {
- //获取文档点击数统计
- $.get("{dede:field name='phpurl'/}/count.php?format=json&view=yes&aid={dede:field.id/}&mid=1&cid={dede:field.channel/}",
- function(data) {
- let result = JSON.parse(data);
- $("#_count").html(result.data.click);
- })
- });
- </script>
</body>
</html>
\ No newline at end of file
diff --git a/src/theme/dedebiz/article_spec.htm b/src/theme/dedebiz/article_spec.htm
index bfa76e11..ae4800bb 100644
--- a/src/theme/dedebiz/article_spec.htm
+++ b/src/theme/dedebiz/article_spec.htm
@@ -39,12 +39,12 @@
<span>时间：{dede:field.pubdate function="MyDate('Y-m-d',@me)"/}</span>
<span>来源：{dede:field.source/}</span>
<span>作者：{dede:field.writer/}</span>
- <span>浏览：<i id="_count">...</i>次</span>
- <div class="alert alert-success mt-3">{dede:softmsg/}</div>
+ <span>浏览：<script src="{dede:field name='phpurl'/}/count.php?view=yes&aid={dede:field name='id'/}&mid={dede:field name='mid'/}"></script>次</span>
</div>
<div class="speciallist row py-3">{dede:field.note/}</div>
<div class="py-3">{dede:field.body/}</div>
<div class="py-3">作者：{dede:adminname/}</div>
+ <div class="alert alert-success my-3">{dede:softmsg/}</div>
<div class="clearfix"></div>
</div>
<div class="col-md-3">
diff --git a/src/user/config.php b/src/user/config.php
index ab4d1c70..cb301f32 100755
--- a/src/user/config.php
+++ b/src/user/config.php
@@ -184,7 +184,7 @@ function CheckRank($rank = 0, $money = 0)
$needname = "";
if ($cfg_ml->M_Rank == 0) {
$row = $dsql->GetOne("SELECT membername FROM `#@__arcrank` WHERE `rank`='$rank'");
- $myname = "普通会员";
+ $myname = "注册会员";
$needname = $row['membername'];
} else {
$dsql->SetQuery("SELECT membername From `#@__arcrank` WHERE `rank`='$rank' OR `rank`='".$cfg_ml->M_Rank."' ORDER BY `rank` DESC");
@@ -194,7 +194,7 @@ function CheckRank($rank = 0, $money = 0)
if ($row = $dsql->GetObject()) {
$myname = $row->membername;
} else {
- $myname = "普通会员";
+ $myname = "注册会员";
}
}
ShowMsg("需要<span class='text-primary'>$needname</span>才能浏览本页面<br>您目前等级是<span class='text-primary'>$myname</span>", "-1", 0, 5000);
diff --git a/src/user/templets/edit_baseinfo.htm b/src/user/templets/edit_baseinfo.htm
index 0acf58b9..1700210c 100755
--- a/src/user/templets/edit_baseinfo.htm
+++ b/src/user/templets/edit_baseinfo.htm
@@ -48,6 +48,11 @@
<input type="hidden" name="_csrf_token" value="<?php echo $GLOBALS['csrf_token'];?>">
<input type="hidden" name="dopost" value="save">
<input type="hidden" id="newface" name="newface" value="">
+ <div class="form-group row">
+ <div class="col-sm-12">
+ <div class="alert alert-info mb-0">会员资料修改需验证原登录密码，才能修改</div>
+ </div>
+ </div>
<div class="form-group row">
<label class="col-sm-3 col-form-label">会员名：</label>
<div class="col-sm-9 input-text"><?php echo $cfg_ml->M_LoginID;?></div>
@@ -66,7 +71,7 @@
</div>
<div class="form-group row">
<label for="iptOldpwd" class="col-sm-3 col-form-label">原登录密码：</label>
- <div class="col-sm-9"><input type="password" name="oldpwd" id="iptOldpwd" class="form-control w-75"></div>
+ <div class="col-sm-9"><input type="password" name="oldpwd" id="iptOldpwd" class="form-control w-75" placeholder="请输入原登录密码"></div>
</div>
<div class="form-group row">
<label for="iptUserpwd" class="col-sm-3 col-form-label">新密码：</label>
diff --git a/src/user/templets/index.htm b/src/user/templets/index.htm
index 75604c43..858eec67 100755
--- a/src/user/templets/index.htm
+++ b/src/user/templets/index.htm
@@ -29,8 +29,8 @@
<span class="btn btn-outline-warning btn-sm"><?php echo $cfg_ml->M_Honor;?></span>
</div>
<p class="mb-0">
- <span class="mr-1">积分：<?php echo $cfg_ml->M_Scores;?></span>
- <span class="mr-1">金币：<?php echo $cfg_ml->M_Money;?></span>
+ <span class="mr-2">积分：<?php echo $cfg_ml->M_Scores;?></span>
+ <span class="mr-2">金币：<?php echo $cfg_ml->M_Money;?></span>
<span>余额：<?php echo $cfg_ml->M_UserMoney;?></span>
</p>
</div>