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

Application/Admin/View/Member/login_record.html

@@ -25,6 +25,16 @@
       height:26px;line-height:26px;font-size:12px;
     }
     .select2-results__option[aria-selected] {font-size:12px;}
+    .page a {
+        float: left;
+        height: 28px;
+        border: 1px solid #DDD;
+        text-align: center;
+        line-height: 30px;
+        color: #3399d5;
+        padding: 0 14px;
+        width: auto;
+    }
 </style>
     <!-- 标题栏 -->
     <div class="cf main-place top_nav_list navtab_list">
@@ -166,6 +176,7 @@
     <script type="text/javascript">
         //导航高亮
         highlight_subnav("{:U('Member/login_record')}");
+
         $(function () {
             <volist name = ":I('get.')" id = "vo" > Think.setValue('{$key}', "{$vo}");
             </volist >

Application/Home/View/default/Finance/withdrawRecord.html

@@ -206,8 +206,7 @@
 
   <script type="text/javascript">
       $().ready(function () {
-          setValue('row', '{:I("get.row",10)}');
-
+        setValue('row', '{:I("get.row",10)}');
           var date = "{$setdate}";
           $('#sdate').datetimepicker({
               format: 'yyyy-mm-dd',