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

Application/Admin/View/Promote/add.html

@@ -3,17 +3,17 @@
 <block name="body">
 <link rel="stylesheet" type="text/css" href="__CSS__/admin_table.css" media="all">
 <script type="text/javascript" src="__STATIC__/uploadify/jquery.uploadify.min.js"></script>
-<script type="text/javascript" src="__STATIC__/provincecityarea/AreaData_min.js"></script><!-- 
+<script type="text/javascript" src="__STATIC__/provincecityarea/AreaData_min.js"></script><!--
 <script type="text/javascript" src="__STATIC__/provincecityarea/jquery-1.7.min.js"></script> -->
-    
-    
+
+
     <div class="cf main-place top_nav_list navtab_list">
         <h3 class="page_title">新增推广员</h3>
         <p class="description_text">说明：此功是创建推广员时所需填写信息</p>
     </div>
-    
-    
-    
+
+
+
     <!-- 标签页导航 -->
 <div class="tab-wrap">
     

Application/Admin/View/Promote/edit.html

@@ -171,7 +171,7 @@
                         <td class="l">二级密码：</td>
                         <td class="r">
                            <input type="text" class="txt" name="second_pwd" value="">
-                          <span class="notice-text">二级密码为推广员后台会长代充时使用</span>
+                          <span class="notice-text">二级密码适用于推广后台会长代充与财务管理功能</span>
                         </td>
                     </tr>
                     <tr>