From 0de02aa25e6b22b794a653d8065840d30cd16a2c Mon Sep 17 00:00:00 2001
From: gongfuxiang <2499232802@qq.com>
Date: Sat, 2 Mar 2019 00:17:20 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/index/lang/zh-cn.php                       | 10 +++++-----
 application/index/view/default/personal/index.html     |  8 ++++++--
 application/index/view/default/safety/email_info.html  |  4 ++--
 application/index/view/default/safety/index.html       |  4 ++--
 application/index/view/default/safety/mobile_info.html |  4 ++--
 .../index/view/default/safety/new_email_info.html      |  4 ++--
 .../index/view/default/safety/new_mobile_info.html     |  4 ++--
 .../index/view/default/user/email_reg_info.html        |  4 ++--
 .../index/view/default/user/forget_pwd_info.html       |  4 ++--
 application/index/view/default/user/sms_reg_info.html  |  4 ++--
 public/static/index/default/css/common.css             |  4 ++--
 11 files changed, 29 insertions(+), 25 deletions(-)

diff --git a/application/index/lang/zh-cn.php b/application/index/lang/zh-cn.php
index 7f5f7f3ed..dd95bc78c 100755
--- a/application/index/lang/zh-cn.php
+++ b/application/index/lang/zh-cn.php
@@ -112,8 +112,8 @@ return array(
             'nickname'          =>  array('name' => '昵称'),
             'gender_text'       =>  array('name' => '性别'),
             'birthday_text'     =>  array('name' => '生日'),
-            'mobile_security'   =>  array('name' => '手机号码', 'tips' => '<a href="'.MyUrl('index/safety/MobileInfo').'">修改</a>'),
-            'email_security'    =>  array('name' => '电子邮箱', 'tips' => '<a href="'.MyUrl('index/safety/EmailInfo').'">修改</a>'),
+            'mobile_security'   =>  array('name' => '手机号码', 'tips' => '<a href="{path}">修改</a>', 'path' => 'index/safety/mobileinfo'),
+            'email_security'    =>  array('name' => '电子邮箱', 'tips' => '<a href="{path}">修改</a>', 'path' => 'index/safety/mobileinfo'),
             'add_time_text'     =>  array('name' => '注册时间'),
             'upd_time_text'     =>  array('name' => '最后更新时间'),
         ),
@@ -124,7 +124,7 @@ return array(
             array(
                     'title'     =>  '登录密码',
                     'msg'       =>  '互联网存在被盗风险，建议您定期更改密码以保护安全。',
-                    'url'       =>  MyUrl('index/safety/loginpwdinfo'),
+                    'path'      =>  'index/safety/loginpwdinfo',
                     'type'      =>  'loginpwd',
                 ),
             array(
@@ -132,7 +132,7 @@ return array(
                     'no_msg'    =>  '您还没有绑定手机号码',
                     'ok_msg'    =>  '已绑定手机 #accounts#',
                     'tips'      =>  '可用于登录，密码找回，账户安全管理校验，接受账户提醒通知。',
-                    'url'       =>  MyUrl('index/safety/mobileinfo'),
+                    'path'      =>  'index/safety/mobileinfo',
                     'type'      =>  'mobile',
                 ),
             array(
@@ -140,7 +140,7 @@ return array(
                     'no_msg'    =>  '您还没有绑定电子邮箱',
                     'ok_msg'    =>  '已绑定电子邮箱 #accounts#',
                     'tips'      =>  '可用于登录，密码找回，账户安全管理校验，接受账户提醒邮件。',
-                    'url'       =>  MyUrl('index/safety/emailinfo'),
+                    'path'      =>  'index/safety/emailinfo',
                     'type'      =>  'email',
                 ),
         ),
diff --git a/application/index/view/default/personal/index.html b/application/index/view/default/personal/index.html
index 7d921381d..8d8c367f5 100755
--- a/application/index/view/default/personal/index.html
+++ b/application/index/view/default/personal/index.html
@@ -38,8 +38,12 @@
                             {{else /}}
 								{{$user[$k]}}
 							{{/if}}
-							{{if isset($v['tips'])}}
-								<span class="span-edit">{{$v.tips|raw}}</span>
+							{{if !empty($v['tips'])}}
+                                {{if !empty($v['path'])}}
+                                    <span class="span-edit">{{:str_replace('{path}', MyUrl($v['path']), $v['tips'])}}</span>
+                                {{else /}}
+                                    <span class="span-edit">{{$v.tips|raw}}</span>
+                                {{/if}}
 							{{/if}}
 						</dd>
 					{{/if}}
diff --git a/application/index/view/default/safety/email_info.html b/application/index/view/default/safety/email_info.html
index 06832aee3..06b56cd0f 100755
--- a/application/index/view/default/safety/email_info.html
+++ b/application/index/view/default/safety/email_info.html
@@ -56,8 +56,8 @@
 						<div class="base">
 							<input type="text" placeholder="图形验证码" maxlength="6" id="verify-img-value" data-validation-message="请输入有效的图形验证码" class="am-form-field am-radius" />
 							<div class="am-fl">
-								<img src="{{:MyUrl('index/safety/verifyentry')}}" class="am-radius c-p" id="verify-img" onClick='this.src="{{:MyUrl('index/safety/verifyentry')}}"' />
-								<a href="javascript:;" class="verify-tips" onClick="document.getElementById('verify-img').src='{{:MyUrl('index/safety/verifyentry')}}'">看不清换一张</a>
+								<img src="{{:MyUrl('index/safety/verifyentry')}}" class="am-radius c-p" id="verify-img" onClick="this.src=this.src+'#'+Math.random();" />
+								<a href="javascript:;" class="verify-tips" onClick="document.getElementById('verify-img').src='{{:MyUrl('index/safety/verifyentry')}}#'+Math.random();">看不清换一张</a>
 							</div>
 						</div>
 						<button type="button" class="am-btn am-btn-secondary am-radius am-btn-sm block btn-loading-example verify-submit-win" data-am-loading="{spinner:'circle-o-notch', loadingText:'发送中...'}" data-win="1">确认</button>
diff --git a/application/index/view/default/safety/index.html b/application/index/view/default/safety/index.html
index 26c6ecfb1..9d98e164d 100755
--- a/application/index/view/default/safety/index.html
+++ b/application/index/view/default/safety/index.html
@@ -44,9 +44,9 @@
 							{{/if}}
 						</div>
 						{{if empty($data[$v['type']]) and empty($v['msg'])}}
-							<a href="{{$v.url}}" class="am-btn am-btn-danger am-radius am-btn-xs am-fr">绑定</a>
+							<a href="{{:MyUrl($v['path'])}}" class="am-btn am-btn-danger am-radius am-btn-xs am-fr">绑定</a>
 						{{else /}}
-							<a href="{{$v.url}}" class="am-btn am-btn-secondary am-radius am-btn-xs am-fr">修改</a>
+							<a href="{{:MyUrl($v['path'])}}" class="am-btn am-btn-secondary am-radius am-btn-xs am-fr">修改</a>
 						{{/if}}
 					</div>
 				</section>
diff --git a/application/index/view/default/safety/mobile_info.html b/application/index/view/default/safety/mobile_info.html
index 470ee49c1..9a7af84ca 100755
--- a/application/index/view/default/safety/mobile_info.html
+++ b/application/index/view/default/safety/mobile_info.html
@@ -56,8 +56,8 @@
 						<div class="base">
 							<input type="text" placeholder="图形验证码" maxlength="6" id="verify-img-value" data-validation-message="请输入有效的图形验证码" class="am-form-field am-radius" />
 							<div class="am-fl">
-								<img src="{{:MyUrl('index/safety/verifyentry')}}" class="am-radius c-p" id="verify-img" onClick='this.src="{{:MyUrl('index/safety/verifyentry')}}"' />
-								<a href="javascript:;" class="verify-tips" onClick="document.getElementById('verify-img').src='{{:MyUrl('index/safety/verifyentry')}}'">看不清换一张</a>
+								<img src="{{:MyUrl('index/safety/verifyentry')}}" class="am-radius c-p" id="verify-img" onClick="this.src=this.src+'#'+Math.random();" />
+								<a href="javascript:;" class="verify-tips" onClick="document.getElementById('verify-img').src='{{:MyUrl('index/safety/verifyentry')}}#'+Math.random();">看不清换一张</a>
 							</div>
 						</div>
 						<button type="button" class="am-btn am-btn-secondary am-radius am-btn-sm block m-t-20 btn-loading-example verify-submit-win" data-am-loading="{spinner:'circle-o-notch', loadingText:'发送中...'}" data-win="1">确认</button>
diff --git a/application/index/view/default/safety/new_email_info.html b/application/index/view/default/safety/new_email_info.html
index a77fb4182..b8f2dff96 100755
--- a/application/index/view/default/safety/new_email_info.html
+++ b/application/index/view/default/safety/new_email_info.html
@@ -56,8 +56,8 @@
 						<div class="base">
 							<input type="text" placeholder="图形验证码" maxlength="6" id="verify-img-value" data-validation-message="请输入有效的图形验证码" class="am-form-field am-radius" />
 							<div class="am-fl">
-								<img src="{{:MyUrl('index/safety/verifyentry')}}" class="am-radius c-p" id="verify-img" onClick='this.src="{{:MyUrl('index/safety/verifyentry')}}"' />
-								<a href="javascript:;" class="verify-tips" onClick="document.getElementById('verify-img').src='{{:MyUrl('index/safety/verifyentry')}}'">看不清换一张</a>
+								<img src="{{:MyUrl('index/safety/verifyentry')}}" class="am-radius c-p" id="verify-img" onClick="this.src=this.src+'#'+Math.random();" />
+								<a href="javascript:;" class="verify-tips" onClick="document.getElementById('verify-img').src='{{:MyUrl('index/safety/verifyentry')}}#'+Math.random();">看不清换一张</a>
 							</div>
 						</div>
 						<button type="button" class="am-btn am-btn-secondary am-radius am-btn-sm block btn-loading-example verify-submit-win-new" data-am-loading="{spinner:'circle-o-notch', loadingText:'发送中...'}" data-win="1">确认</button>
diff --git a/application/index/view/default/safety/new_mobile_info.html b/application/index/view/default/safety/new_mobile_info.html
index cbf324dcc..3ba14600d 100755
--- a/application/index/view/default/safety/new_mobile_info.html
+++ b/application/index/view/default/safety/new_mobile_info.html
@@ -56,8 +56,8 @@
 						<div class="base">
 							<input type="text" placeholder="图形验证码" maxlength="6" id="verify-img-value" data-validation-message="请输入有效的图形验证码" class="am-form-field am-radius" />
 							<div class="am-fl">
-								<img src="{{:MyUrl('index/safety/verifyentry')}}" class="am-radius c-p" id="verify-img" onClick='this.src="{{:MyUrl('index/safety/verifyentry')}}"' />
-								<a href="javascript:;" class="verify-tips" onClick="document.getElementById('verify-img').src='{{:MyUrl('index/safety/verifyentry')}}'">看不清换一张</a>
+								<img src="{{:MyUrl('index/safety/verifyentry')}}" class="am-radius c-p" id="verify-img" onClick="this.src=this.src+'#'+Math.random();" />
+								<a href="javascript:;" class="verify-tips" onClick="document.getElementById('verify-img').src='{{:MyUrl('index/safety/verifyentry')}}#'+Math.random();">看不清换一张</a>
 							</div>
 						</div>
 						<button type="button" class="am-btn am-btn-secondary am-radius am-btn-sm block m-t-20 btn-loading-example verify-submit-win-new" data-am-loading="{spinner:'circle-o-notch', loadingText:'发送中...'}" data-win="1">确认</button>
diff --git a/application/index/view/default/user/email_reg_info.html b/application/index/view/default/user/email_reg_info.html
index 4b0331700..6f4c5f84d 100755
--- a/application/index/view/default/user/email_reg_info.html
+++ b/application/index/view/default/user/email_reg_info.html
@@ -69,8 +69,8 @@
 					<div class="base">
 						<input type="text" placeholder="图形验证码" maxlength="6" id="verify-img-value" data-validation-message="请输入有效的图形验证码" class="am-form-field am-radius" />
 						<div class="am-fl">
-							<img src="{{:MyUrl('index/user/userverifyentry', ['type'=>'reg'])}}" class="am-radius c-p" id="verify-img" onClick='this.src="{{:MyUrl('index/user/userverifyentry', ['type'=>'reg'])}}"' />
-							<a href="javascript:;" class="verify-tips" onClick="document.getElementById('verify-img').src='{{:MyUrl('index/user/userverifyentry', ['type'=>'reg'])}}'">看不清换一张</a>
+							<img src="{{:MyUrl('index/user/userverifyentry', ['type'=>'reg'])}}" class="am-radius c-p" id="verify-img" onClick="this.src=this.src+'#'+Math.random();" />
+							<a href="javascript:;" class="verify-tips" onClick="document.getElementById('verify-img').src='{{:MyUrl('index/user/userverifyentry', ['type'=>'reg'])}}#'+Math.random();">看不清换一张</a>
 						</div>
 					</div>
 					<button type="button" class="am-btn am-btn-secondary am-radius am-btn-sm block m-t-20 btn-loading-example verify-submit-win" data-am-loading="{spinner:'circle-o-notch', loadingText:'发送中...'}" data-win="1">确认</button>
diff --git a/application/index/view/default/user/forget_pwd_info.html b/application/index/view/default/user/forget_pwd_info.html
index 2daa82b10..9aa29b597 100755
--- a/application/index/view/default/user/forget_pwd_info.html
+++ b/application/index/view/default/user/forget_pwd_info.html
@@ -59,8 +59,8 @@
 					<div class="base">
 						<input type="text" placeholder="图形验证码" maxlength="6" id="verify-img-value" data-validation-message="请输入有效的图形验证码" class="am-form-field am-radius" />
 						<div class="am-fl">
-							<img src="{{:MyUrl('index/user/userverifyentry', ['type'=>'forget'])}}" class="am-radius c-p" id="verify-img" onClick='this.src="{{:MyUrl('index/user/userverifyentry', ['type'=>'forget'])}}"' />
-							<a href="javascript:;" class="verify-tips" onClick="document.getElementById('verify-img').src='{{:MyUrl('index/user/userverifyentry', ['type'=>'forget'])}}'">看不清换一张</a>
+							<img src="{{:MyUrl('index/user/userverifyentry', ['type'=>'forget'])}}" class="am-radius c-p" id="verify-img" onClick="this.src=this.src+'#'+Math.random();" />
+							<a href="javascript:;" class="verify-tips" onClick="document.getElementById('verify-img').src='{{:MyUrl('index/user/userverifyentry', ['type'=>'forget'])}}#'+Math.random();">看不清换一张</a>
 						</div>
 					</div>
 					<button type="button" class="am-btn am-btn-secondary am-radius am-btn-sm block m-t-20 btn-loading-example verify-submit-win" data-am-loading="{spinner:'circle-o-notch', loadingText:'发送中...'}" data-win="1">确认</button>
diff --git a/application/index/view/default/user/sms_reg_info.html b/application/index/view/default/user/sms_reg_info.html
index bbe71542e..c56003855 100755
--- a/application/index/view/default/user/sms_reg_info.html
+++ b/application/index/view/default/user/sms_reg_info.html
@@ -69,8 +69,8 @@
 					<div class="base">
 						<input type="text" placeholder="图形验证码" maxlength="6" id="verify-img-value" data-validation-message="请输入有效的图形验证码" class="am-form-field am-radius" />
 						<div class="am-fl">
-							<img src="{{:MyUrl('index/user/userverifyentry', ['type'=>'reg'])}}" class="am-radius c-p" id="verify-img" onClick='this.src="{{:MyUrl('index/user/userverifyentry', ['type'=>'reg'])}}"' />
-							<a href="javascript:;" class="verify-tips" onClick="document.getElementById('verify-img').src='{{:MyUrl('index/user/userverifyentry', ['type'=>'reg'])}}'">看不清换一张</a>
+							<img src="{{:MyUrl('index/user/userverifyentry', ['type'=>'reg'])}}" class="am-radius c-p" id="verify-img" onClick="this.src=this.src+'#'+Math.random();" />
+							<a href="javascript:;" class="verify-tips" onClick="document.getElementById('verify-img').src='{{:MyUrl('index/user/userverifyentry', ['type'=>'reg'])}}#'+Math.random();">看不清换一张</a>
 						</div>
 					</div>
 					<button type="button" class="am-btn am-btn-secondary am-radius am-btn-sm block m-t-20 btn-loading-example verify-submit-win" data-am-loading="{spinner:'circle-o-notch', loadingText:'发送中...'}" data-win="1">确认</button>
diff --git a/public/static/index/default/css/common.css b/public/static/index/default/css/common.css
index fc7ffdc9f..8ed3a6059 100755
--- a/public/static/index/default/css/common.css
+++ b/public/static/index/default/css/common.css
@@ -55,8 +55,8 @@ a:hover, a:focus { color: #d2364c; text-decoration: underline; }
 
 .spatic{width:100%; height:16px;}
 h5{float: right;color: #666;padding-right:20px;}
-
 input.add,input.min{width:15px}
+.c-p {cursor:pointer;}
 .last{border-right:none !important;}
 /*选项卡样式定义*/
 .am-nav-tabs,.am-tabs-bd{border-color:transparent ;}
@@ -695,7 +695,7 @@ background:url(../images/ibar_sprites.png) no-repeat;background-position:0px -23
 .user-content-body {-webkit-box-flex:1;-webkit-flex:1 0 auto;-ms-flex:1 0 auto;flex:1 0 auto; }
 .user-offcanvas-bar { z-index: 900; }
 @media only screen and (min-width:640px) {
-    .user-sidebar {display:block;position:static;background:none; border-top: 5px solid #ED5564;}
+    .user-sidebar {display:block;position:relative;background:none; border-top: 5px solid #ED5564;z-index: 0;}
     .user-offcanvas-bar {position:static;width:auto;background:none;-webkit-transform:translate3d(0,0,0);-ms-transform:translate3d(0,0,0);transform:translate3d(0,0,0);overflow-y:hidden;}
     .user-offcanvas-bar:after {content:none;}
     .user-main { padding: 0 5px; }
-- 
GitLab