同步更新

src/admin/templets/member_main.htm

@@ -66,9 +66,9 @@
 					<td width="16%">头像/用户名/类型</td>
 					<td width="8%">公司名/昵称</td>
 					<td width="8%">等级</td>
-					<td width="16%">钱包</td>
+					<td width="16%">钱包积分</td>
 					<td width="6%">投稿限制</td>
-					<td width="14%">地址时间</td>
+					<td width="14%">地址/时间</td>
 					<td>操作</td>
 				</tr>
 				{dede:datalist empty='<tr><td colspan="9" align="center">暂无用户</td></tr>'}

src/admin/templets/member_toadmin.htm

@@ -85,7 +85,7 @@
 					<td class="admin-td"><input type="text" name="tname" id="tname" class="admin-input-sm"></td>
 				</tr>
 				<tr>
-					<td class="admin-td">电子邮箱：</td>
+					<td class="admin-td">邮箱：</td>
 					<td class="admin-td"><input type="text" name="email" id="email" class="admin-input-sm" value="<?php echo $row['email']?>"></td>
 				</tr>
 				<tr>

src/admin/templets/member_view.htm

@@ -58,7 +58,7 @@
 					<td><input type="text" name="pwd" id="pwd" class="admin-input-sm">（留空则不修改，只能用[0-9a-zA-Z_@!.-]以内范围的字符）</td>
 				</tr>
 				<tr>
-					<td class="admin-td">电子邮箱：</td>
+					<td class="admin-td">邮箱：</td>
 					<td class="admin-td"><input type="text" name="email" id="email" class="admin-input-sm" value="<?php echo $row['email']?>"></td>
 				</tr>
 				<tr>
@@ -70,7 +70,7 @@
 					</td>
 				</tr>
 				<tr>
-					<td class="admin-td">钱包</td>
+					<td class="admin-td">钱包积分：</td>
 					<td class="admin-td">
 						<span class="mr-1">金币：<input type="text" name="money" id="money" class="admin-input-xs" value="<?php echo $row['money'];?>"></span>
 						<span class="mr-1">积分：<input type="text" name="scores" id="scores" class="admin-input-xs" value="<?php echo $row['scores'];?>"></span>
@@ -150,14 +150,14 @@
 					</td>
 				</tr>
 				<tr>
-					<td class="admin-td">注册时间：</td>
+					<td class="admin-td">注册时间/地址：</td>
 					<td class="admin-td">
 						<span class="mr-1"><?php echo GetDateTimeMk($row['jointime'])?></span>
 						<span><?php echo $row['joinip']?></span>
 					</td>
 				</tr>
 				<tr>
-					<td class="admin-td">最近登录时间：</td>
+					<td class="admin-td">最近时间/地址：</td>
 					<td class="admin-td">
 						<span class="mr-1"><?php echo GetDateTimeMk($row['logintime'])?></span>
 						<span><?php echo $row['loginip']?></span>

src/admin/templets/sys_admin_user_add.htm

@@ -88,7 +88,7 @@
 					<td class="admin-td"><input type="text" name="tname" id="tname" class="admin-input-sm"></td>
 				</tr>
 				<tr>
-					<td class="admin-td">电子邮箱：</td>
+					<td class="admin-td">邮箱：</td>
 					<td class="admin-td"><input type="text" name="email" id="email" class="admin-input-sm"></td>
 				</tr>
 				<tr>

src/admin/templets/sys_admin_user_edit.htm

@@ -66,7 +66,7 @@
 					<td class="admin-td"><input type="text" name="tname" id="tname" value="<?php echo $row['tname']?>" class="admin-input-sm"></td>
 				</tr>
 				<tr>
-					<td class="admin-td">电子邮箱：</td>
+					<td class="admin-td">邮箱：</td>
 					<td class="admin-td"><input type="text" name="email" id="email" value="<?php echo $row['email']?>" class="admin-input-sm"></td>
 				</tr>
 				<tr>

src/install/sql-dfdata.txt

@@ -506,7 +506,7 @@ INSERT INTO `#@__channeltype` VALUES ('1','article','文档模型','#@__archives
 ('2','image','图片模型','#@__archives','#@__addonimages','album_add.php','content_i_list.php','album_edit.php','album_add.php','content_list.php','album_edit.php','<field:pagestyle itemname="页面风格" type="number" isnull="true" default="2" rename="" notsend="1" />\t\n<field:imgurls itemname="图片集合" type="img" isnull="true" rename="" page="split" />\t\n<field:body itemname="图集文档" autofield="0" notsend="0" type="htmltext" isnull="true" islist="0" maxlength="250" page=""></field:body>','','','1','1','1','-1','','10','0','1','1','标题','0','0'),
 ('3','soft','软件模型','#@__archives','#@__addonsoft','soft_add.php','content_i_list.php','soft_edit.php','','','','<field:filetype islist="1" itemname="文件类型" type="text" isnull="true" rename="" />\t\n<field:language islist="1" itemname="语言" type="text" isnull="true" rename="" />\t\n<field:softtype islist="1" itemname="软件类型" type="text" isnull="true" rename="" />\t\n<field:accredit islist="1" itemname="授权方式" type="text" isnull="true" rename="" />\t\n<field:os islist="1" itemname="操作系统" type="text" isnull="true" rename="" />\t\n<field:softrank islist="1" itemname="软件等级" type="int" isnull="true" default="3" rename="" function="GetRankStar(@me)" notsend="1" />\t\n<field:officialUrl itemname="官方网址" type="text" isnull="true" rename="" />\t\n<field:officialDemo itemname="演示网址" type="text" isnull="true" rename="" />\t\n<field:softsize itemname="软件大小" type="text" isnull="true" rename="" />\t\n<field:softlinks itemname="软件地址" type="softlinks" isnull="true" rename="" />\t\n<field:introduce itemname="详细介绍" type="htmltext" isnull="trnue" rename="" />\t\n<field:daccess islist="1" itemname="下载级别" type="int" isnull="true" default="0" rename="" function="" notsend="1" />\t\n<field:needmoney islist="1" itemname="需要金币" type="int" isnull="true" default="0" rename="" function="" notsend="1" />','filetype,language,softtype,os,accredit,softrank','','1','1','1','-1','','10','0','1','1','标题','0','0'),
 ('-1','spec','专题模型','#@__archives','#@__addonspec','spec_add.php','content_s_list.php','spec_edit.php','','','','<field:note type="specialtopic" isnull="true" rename="" />','','','1','1','0','-1','','10','0','1','1','标题','0','0'),
-('-8','infos','分类模型','#@__archives','#@__addoninfos','archives_sg_add.php','content_sg_list.php','archives_sg_edit.php','archives_sg_add.php','content_sg_list.php','archives_sg_edit.php','<field:channel itemname="栏目id" autofield="0" notsend="0" type="int" isnull="true" islist="1" default="0" maxlength="10" page=""></field:channel>\t\n<field:arcrank itemname="浏览权限" autofield="0" notsend="0" type="int" isnull="true" islist="1" default="0" maxlength="5" page=""></field:arcrank>\t\n<field:mid itemname="会员id" autofield="0" notsend="0" type="int" isnull="true" islist="1" default="0" maxlength="8" page=""></field:mid>\t\n<field:click itemname="点击" autofield="0" notsend="0" type="int" isnull="true" islist="1" default="0" maxlength="10" page=""></field:click>\t\n<field:title itemname="标题" autofield="0" notsend="0" type="text" isnull="true" islist="1" default="0" maxlength="60" page=""></field:title>\t\n<field:senddate itemname="发布时间" autofield="0" notsend="0" type="int" isnull="true" islist="1" default="0" maxlength="10" page=""></field:senddate>\t\n<field:flag itemname="推荐属性" autofield="0" notsend="0" type="checkbox" isnull="true" islist="1" default="0" maxlength="10" page=""></field:flag>\t\n<field:litpic itemname="缩略图" autofield="0" notsend="0" type="text" isnull="true" islist="1" default="0" maxlength="60" page=""></field:litpic>\t\n<field:userip itemname="会员IP" autofield="0" notsend="0" type="text" isnull="true" islist="0" default="0" maxlength="15" page=""></field:userip>\t\n<field:lastpost itemname="最后评论时间" autofield="0" notsend="0" type="int" isnull="true" islist="1" default="0" maxlength="10" page=""></field:lastpost>\t\n<field:scores itemname="评论积分" autofield="0" notsend="0" type="int" isnull="true" islist="1" default="0" maxlength="8" page=""></field:scores>\t\n<field:goodpost itemname="好评数" autofield="0" notsend="0" type="int" isnull="true" islist="1" default="0" maxlength="8" page=""></field:goodpost>\t\n<field:badpost itemname="差评数" autofield="0" notsend="0" type="int" isnull="true" islist="1" default="0" maxlength="8" page=""></field:badpost>\t\n<field:nativeplace itemname="地区" autofield="1" notsend="0" type="stepselect" isnull="true" islist="1" default="0" maxlength="250" page="">\t\n</field:nativeplace>\t\n<field:infotype itemname="信息类型" autofield="1" notsend="0" type="stepselect" isnull="true" islist="1" default="0" maxlength="250" page="">\t\n</field:infotype>\t\n<field:body itemname="信息文档" autofield="1" notsend="0" type="htmltext" isnull="true" islist="0" maxlength="250" page="">\t\n</field:body>\t\n<field:endtime itemname="截止日期" autofield="1" notsend="0" type="datetime" isnull="true" islist="1" maxlength="250" page="">\t\n</field:endtime>\t\n<field:linkman itemname="联系人" autofield="1" notsend="0" type="text" isnull="true" islist="0" maxlength="50" page="">\t\n</field:linkman>\t\n<field:tel itemname="联系电话" autofield="1" notsend="0" type="text" isnull="true" islist="0" maxlength="50" page="">\t\n</field:tel>\t\n<field:email itemname="电子邮箱" autofield="1" notsend="0" type="text" isnull="true" islist="0" maxlength="50" page="">\t\n</field:email>\t\n<field:address itemname="地址" autofield="1" notsend="0" type="text" isnull="true" islist="0" maxlength="100" page="">\t\n</field:address>\t\n','channel,arcrank,mid,click,title,senddate,flag,litpic,lastpost,scores,goodpost,badpost,nativeplace,infotype,endtime','','-1','1','1','-1','','0','0','0','1','信息标题','0','0');
+('-8','infos','分类模型','#@__archives','#@__addoninfos','archives_sg_add.php','content_sg_list.php','archives_sg_edit.php','archives_sg_add.php','content_sg_list.php','archives_sg_edit.php','<field:channel itemname="栏目id" autofield="0" notsend="0" type="int" isnull="true" islist="1" default="0" maxlength="10" page=""></field:channel>\t\n<field:arcrank itemname="浏览权限" autofield="0" notsend="0" type="int" isnull="true" islist="1" default="0" maxlength="5" page=""></field:arcrank>\t\n<field:mid itemname="会员id" autofield="0" notsend="0" type="int" isnull="true" islist="1" default="0" maxlength="8" page=""></field:mid>\t\n<field:click itemname="点击" autofield="0" notsend="0" type="int" isnull="true" islist="1" default="0" maxlength="10" page=""></field:click>\t\n<field:title itemname="标题" autofield="0" notsend="0" type="text" isnull="true" islist="1" default="0" maxlength="60" page=""></field:title>\t\n<field:senddate itemname="发布时间" autofield="0" notsend="0" type="int" isnull="true" islist="1" default="0" maxlength="10" page=""></field:senddate>\t\n<field:flag itemname="推荐属性" autofield="0" notsend="0" type="checkbox" isnull="true" islist="1" default="0" maxlength="10" page=""></field:flag>\t\n<field:litpic itemname="缩略图" autofield="0" notsend="0" type="text" isnull="true" islist="1" default="0" maxlength="60" page=""></field:litpic>\t\n<field:userip itemname="会员IP" autofield="0" notsend="0" type="text" isnull="true" islist="0" default="0" maxlength="15" page=""></field:userip>\t\n<field:lastpost itemname="最后评论时间" autofield="0" notsend="0" type="int" isnull="true" islist="1" default="0" maxlength="10" page=""></field:lastpost>\t\n<field:scores itemname="评论积分" autofield="0" notsend="0" type="int" isnull="true" islist="1" default="0" maxlength="8" page=""></field:scores>\t\n<field:goodpost itemname="好评数" autofield="0" notsend="0" type="int" isnull="true" islist="1" default="0" maxlength="8" page=""></field:goodpost>\t\n<field:badpost itemname="差评数" autofield="0" notsend="0" type="int" isnull="true" islist="1" default="0" maxlength="8" page=""></field:badpost>\t\n<field:nativeplace itemname="地区" autofield="1" notsend="0" type="stepselect" isnull="true" islist="1" default="0" maxlength="250" page="">\t\n</field:nativeplace>\t\n<field:infotype itemname="信息类型" autofield="1" notsend="0" type="stepselect" isnull="true" islist="1" default="0" maxlength="250" page="">\t\n</field:infotype>\t\n<field:body itemname="信息文档" autofield="1" notsend="0" type="htmltext" isnull="true" islist="0" maxlength="250" page="">\t\n</field:body>\t\n<field:endtime itemname="截止日期" autofield="1" notsend="0" type="datetime" isnull="true" islist="1" maxlength="250" page="">\t\n</field:endtime>\t\n<field:linkman itemname="联系人" autofield="1" notsend="0" type="text" isnull="true" islist="0" maxlength="50" page="">\t\n</field:linkman>\t\n<field:tel itemname="联系电话" autofield="1" notsend="0" type="text" isnull="true" islist="0" maxlength="50" page="">\t\n</field:tel>\t\n<field:email itemname="邮箱" autofield="1" notsend="0" type="text" isnull="true" islist="0" maxlength="50" page="">\t\n</field:email>\t\n<field:address itemname="地址" autofield="1" notsend="0" type="text" isnull="true" islist="0" maxlength="100" page="">\t\n</field:address>\t\n','channel,arcrank,mid,click,title,senddate,flag,litpic,lastpost,scores,goodpost,badpost,nativeplace,infotype,endtime','','-1','1','1','-1','','0','0','0','1','信息标题','0','0');
 
 INSERT INTO `#@__co_onepage` VALUES ('5','www.dedebiz.com','DedeBIZ','1','gb2312','<div class="content">{@body}<div class="cupage">'),
 ('4','www.techweb.com.cn','Techweb','1','gb2312','<div class="content_txt">{@body}</div>\t\n'),

src/theme/dedebiz/article_infos.htm

@@ -48,8 +48,8 @@
 						<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>
-						<p>联系电话：{dede:field.tel/}</p>
-						<p>电子邮箱：{dede:field.email/}</p>
+						<p>电话：{dede:field.tel/}</p>
+						<p>邮箱：{dede:field.email/}</p>
 						<p>地址：{dede:field.address/}</p>
 					</div>
 					<div class="py-3">{dede:field.body/}</div>

src/user/templets/edit_baseinfo.htm

@@ -100,8 +100,8 @@
 								<div class="col-sm-9"><input type="text" name="newsafeanswer" id="iptNewsafeanswer" class="form-control"></div>
 							</div>
 							<div class="form-group row">
-								<label for="iptEmail" class="col-sm-3 col-form-label">电子邮箱</label>
-								<div class="col-sm-9"><input type="email" name="email" id="iptEmail" class="form-control" placeholder="每个邮箱只能注册一个帐号，修改电子邮箱必须填写正确安全问题答案"></div>
+								<label for="iptEmail" class="col-sm-3 col-form-label">邮箱</label>
+								<div class="col-sm-9"><input type="email" name="email" id="iptEmail" class="form-control" placeholder="每个邮箱只能注册一个帐号，修改邮箱必须填写正确安全问题答案"></div>
 							</div>
 							<div class="form-group row">
 								<label for="iptEmail" class="col-sm-3 col-form-label">性别</label>