Merge branch 'test'

application/index/controller/Member.php

@@ -249,7 +249,7 @@ class Member extends Basic{
                 $where['a.first_login_time'] = ['between time', [$params['first_login_start'] . ' 00:00:00', $where['a.first_login_time'] = $params['first_login_end'] . ' 23:59:59']];
             }
 
-            $fields = 'a.id,a.user_nick,a.user_name,a.user_phone,a.user_pic,a.create_time,a.user_pswd,a.referrer_id,a.registration_time,a.user_name,a.last_login_ip,a.status';
+            $fields = 'a.id,a.user_nick,a.user_name,a.user_phone,a.user_pic,a.create_time,a.user_pswd,a.referrer_id,a.registration_time,a.user_name,a.last_login_ip,a.status,a.first_login_time';
 
             try {
                 $data['list'] = $this->user->getUserAgent($pageNo, $pageSize, 'a.id DESC', $fields, $where, $type);

application/index/view/auth/auth_rule_index.html

 {layout name="global/frame_tpl" /}
 <!--关联js元素-->
 <input type="hidden" class="page-load" id="auth_rule_index" />
+<style>
+	
+	.title-0{
+		font-weight: bold;
+		font-size: 15px;
+	}
+</style>
 <div id="page-content-wrapper">
     <div class="container">
         <div class="row">

application/index/view/auth/index.html

 {layout name="global/frame_tpl" /}
 <!--角色管理页面-->
 <input type="hidden" class="page-load" id="auth" />
+<style>
+	
+	.title-0{
+		font-weight: bold;
+		font-size: 15px;
+	}
+</style>
 <div id="page-content-wrapper">
     <div class="container">
         <div class="row">

public/resource/template/auth_rule_index_template_tpl.html

@@ -38,9 +38,10 @@
     [% for(var item in it){ %]
 
     [% if(it[item]['pid']!=0){ %]
-    <option value="[%= it[item]['id'] %]">[%= it[item]["title_show"] %]</option>
+    	
+    <option value="[%= it[item]['id'] %]" class="[%= 'title-' + it[item]['level'] %]">[%= it[item]["title_show"] %]</option>
     [% }else{ %]
-    <option value="[%= it[item]['id'] %]">[%= it[item]["title_show"] %]</option>
+    <option value="[%= it[item]['id'] %]" class="[%= 'title-' + it[item]['level'] %]">[%= it[item]["title_show"] %]</option>
     [% } %]
 
     [% } %]

public/resource/template/auth_template_tpl.html

@@ -37,11 +37,16 @@
     [% } %]
 
     [% if(it[item]['is']!=0){ %]
+    	
     <input type="checkbox" name="rules"  value="[%= it[item]['id'] %]" checked="checked">
-    [%= it[item]["title_show"] %]<br>
+    <!--[%= it[item]["title_show"] %]<br>-->
+    <span class="[%= 'title-' + it[item]['level'] %]">[%= it[item]["title_show"] %]</span><br>
+    	
     [% }else{ %]
     <input type="checkbox" name="rules" value="[%= it[item]['id'] %]" >
-    [%= it[item]["title_show"] %]<br>
+    <!--[%= it[item]["title_show"] %]<br>-->
+    <span class="[%= 'title-' + it[item]['level'] %]">[%= it[item]["title_show"] %]</span><br>
+    	
     [% } %]
 
     [% } %]

public/resource/template/user_template_tpl.html

@@ -25,7 +25,7 @@
             [% } %]
         </td>
         <td>
-            [% if (it[item]['last_login_ip'] == null){ %]
+            [% if (it[item]['first_login_time'] == null){ %]
                 否
             [% }else{ %]
                 是