Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev

Application/Home/View/default/Download/listsIndex.html

@@ -61,7 +61,7 @@
     </div>
     <div class="trunk-content article">
       <div class="trunk-search clearfix">
-        <form action="{:U('download/index')}" method="post" enctype="multipart/form-data">
+        <form action="{:U('download/listsIndex')}" method="post" enctype="multipart/form-data">
 
           <div class="form-group fl">
             <input type="text" name="dataname" class="txt normal_txt" id="uid" placeholder="请输入数据名称"

Application/Home/View/default/Public/promote_base.html

@@ -93,7 +93,7 @@
                          <div class="subNav jssubNav"><i class="prev_icon icon_fenbao"></i><span>安全管理</span><i class="arrow_icon"></i></div>
 			<div class="navContent jsnavContent">
 				<!--							<a href="{:U('Apply/app_index')}" class="<if condition='CONTROLLER_NAME eq Apply and ACTION_NAME eq app_index '>active</if> ">APP列表</a>-->
-				<a href="{:U('Download/listsindex')}" class="<if condition='CONTROLLER_NAME eq Apply and (ACTION_NAME eq index or ACTION_NAME eq my_game or ACTION_NAME eq my_game_ch or ACTION_NAME eq child_game ) '>active</if> ">下载日志管理</a>
+				<a href="{:U('Download/listsIndex')}" class="<if condition='CONTROLLER_NAME eq Apply and (ACTION_NAME eq index or ACTION_NAME eq my_game or ACTION_NAME eq my_game_ch or ACTION_NAME eq child_game ) '>active</if> ">下载日志管理</a>
                                 <a href="{:U('Safe/modifyloginpassword')}" class="<if condition='CONTROLLER_NAME eq Safe and (ACTION_NAME eq modifyloginpassword or ACTION_NAME eq my_game or ACTION_NAME eq my_game_ch or ACTION_NAME eq child_game ) '>active</if> ">修改登录密码</a>
 				<a href="{:U('Safe/setSafeIndex')}" class="<if condition='CONTROLLER_NAME eq Safe and (ACTION_NAME eq setSafeIndex or ACTION_NAME eq my_game or ACTION_NAME eq my_game_ch or ACTION_NAME eq child_game ) '>active</if> ">设置安全密码</a>
                                 <a href="{:U('Safe/modifyBaseInfo')}" class="<if condition='CONTROLLER_NAME eq Safe and (ACTION_NAME eq modifyBaseInfo or ACTION_NAME eq my_game or ACTION_NAME eq my_game_ch or ACTION_NAME eq child_game ) '>active</if> ">用户基本信息</a>

Application/Home/View/default/Query/achievement.html

@@ -129,7 +129,7 @@
           
         </div>
         <div class="pagenation clearfix">
-           <a id="sch-btn" data-href="{:U('download/achievement_data_export',array_merge(['parent_id'=>$parentid],I('post.')))}" class="ajax-get">导出</a>
+           <a id="sch-btn" href="{:U('download/achievement_data_export',array_merge(['parent_id'=>$parentid],I('post.')))}" class="ajax-get">导出</a>
           {$pagination}
         </div>
     </div>

Application/Home/View/default/Safe/modifyBaseInfo.html

@@ -64,7 +64,7 @@
                   <table class="table2" style="margin-top:20px;margin-left:30px;width:100%" >
        
                       <tr>
-                        <td class="l" style="font-size:17px">真实姓名：</td>
+                        <td class="l">真实姓名：</td>
                         <td class="r"><input type="text" class="input txt" name="username" id="password" style="width:430px" placeholder="{$promoteinfo['real_name']}" value="{$promoteinfo['real_name']}">
                         <span id="password_tip"></span></td>
                       </tr>

Application/Home/View/default/Safe/modifyloginpassword.html

@@ -58,7 +58,7 @@
                   <table class="table2" style="margin-top:20px;margin-left:30px">
        
                       <tr>
-                        <td class="l" style="font-size:17px">旧密码：</td>
+                        <td class="l">旧密码：</td>
                         <td class="r"><input type="password" class="input txt" name="oldpwd" id="password" style="width:430px" placeholder="旧密码">
                         <span id="password_tip"></span></td>
                       </tr>

Application/Home/View/default/Safe/setSafeIndex.html

@@ -47,7 +47,7 @@
                   <table class="table2" style="margin-top:50px;margin-left:50px">
        
                       <tr>
-                        <td class="l" style="font-size:17px">新密码：</td>
+                        <td class="l">新密码：</td>
                         <td class="r"><input type="password" class="input txt" name="password" id="password" style="width:430px" placeholder="新密码">
                         <span id="password_tip"></span></td>
                       </tr>