wesmiler 更新第5期更新代码合并

app/weixin/service/Export.php

@@ -260,8 +260,8 @@ class Export
         // 其他访问统计
         $counts['login'] = Db::name('user')
             ->where(['user_type' => 2, 'user_status' => 1])
-            ->where('updated_at', '>=', date('Y-m-d', $time))
-            ->where('updated_at', '<=', date('Y-m-d', $time + 86400))
+            ->where('last_login_time', '>=', strtotime(date('Y-m-d', $time)))
+            ->where('last_login_time', '<=', strtotime(date('Y-m-d', $time + 86400)))
             ->count('id');
 
         //统计注销总人数

data/lang/admin_menu.php

@@ -67,6 +67,8 @@ return array (
   'ADMIN_PLUGIN_TOGGLE' => '插件启用禁用',
   'ADMIN_PLUGIN_UNINSTALL' => '卸载插件',
   'ADMIN_PLUGIN_UPDATE' => '插件更新',
+  'ADMIN_POOLS_DEFAULT' => '销售管理',
+  'ADMIN_POOLS_SETTING' => '坠海设置',
   'ADMIN_PULLWIRE_INDEX' => '牵线明细',
   'ADMIN_RBAC_AUTHORIZE' => '设置角色权限',
   'ADMIN_RBAC_AUTHORIZEPOST' => '角色授权提交',
@@ -91,6 +93,7 @@ return array (
   'ADMIN_ROUTE_LISTORDER' => '路由规则排序',
   'ADMIN_ROUTE_OPEN' => '路由规则启用',
   'ADMIN_ROUTE_SELECT' => '选择URL',
+  'ADMIN_SALES_DEFAULT' => '资源库管理',
   'ADMIN_SETTING_CLEARCACHE' => '清除缓存',
   'ADMIN_SETTING_DEFAULT' => '设置',
   'ADMIN_SETTING_PASSWORD' => '密码修改',

data/route/route.php

@@ -1,2 +1,3 @@
 <?php	return array (
+    'sale'=>'admin/public/sale'
 );

public/themes/admin_simpleboot3/admin/rbac/index.html

@@ -36,6 +36,10 @@
 								<!-- <a href="javascript:openIframeDialog('{:url('rbac/member',array('id'=>$vo['id']))}','成员管理');">成员管理</a> | -->
 								<span class="btn btn-xs btn-primary disabled">{:lang('EDIT')}</span>
 								<span class="btn btn-xs btn-danger disabled">{:lang('DELETE')}</span>
+							<elseif condition="$vo['id'] eq 6 ">
+								<a class="btn btn-xs btn-primary" href="{:url('Rbac/authorize',array('id'=>$vo['id']))}">{:lang('ROLE_SETTING')}</a>
+								<span class="btn btn-xs btn-primary disabled">{:lang('EDIT')}</span>
+								<span class="btn btn-xs btn-danger disabled">{:lang('DELETE')}</span>
 							<else />
 								<a class="btn btn-xs btn-primary" href="{:url('Rbac/authorize',array('id'=>$vo['id']))}">{:lang('ROLE_SETTING')}</a>
 								<!-- <a href="javascript:openIframeDialog('{:url('rbac/member',array('id'=>$vo['id']))}','成员管理');">成员管理</a>| -->

public/themes/admin_simpleboot3/admin/user/add.html

@@ -26,6 +26,18 @@
 				</div>
 			</div>
 			<div class="form-group">
+				<label for="input-real_name" class="col-sm-2 control-label"><span class="form-required">*</span>{:lang('REALNAME')}</label>
+				<div class="col-md-6 col-sm-10">
+					<input type="text" class="form-control" id="input-real_name" name="real_name">
+				</div>
+			</div>
+			<div class="form-group">
+				<label for="input-mobile" class="col-sm-2 control-label"><span class="form-required">*</span>{:lang('MOBILE')}</label>
+				<div class="col-md-6 col-sm-10">
+					<input type="text" class="form-control" id="input-mobile" name="mobile">
+				</div>
+			</div>
+			<div class="form-group">
 				<label for="input-user_email" class="col-sm-2 control-label"><span class="form-required">*</span>{:lang('ROLE')}</label>
 				<div class="col-md-6 col-sm-10">
 					<foreach name="roles" item="vo">

public/themes/admin_simpleboot3/admin/user/edit.html

@@ -27,6 +27,18 @@
 				</div>
 			</div>
 			<div class="form-group">
+				<label for="input-real_name" class="col-sm-2 control-label"><span class="form-required">*</span>{:lang('REALNAME')}</label>
+				<div class="col-md-6 col-sm-10">
+					<input type="text" class="form-control" id="input-real_name" name="real_name" value="{$real_name}">
+				</div>
+			</div>
+			<div class="form-group">
+				<label for="input-mobile" class="col-sm-2 control-label"><span class="form-required">*</span>{:lang('MOBILE')}</label>
+				<div class="col-md-6 col-sm-10">
+					<input type="text" class="form-control" id="input-mobile" name="mobile" value="{$mobile}">
+				</div>
+			</div>
+			<div class="form-group">
 				<label for="input-user_email" class="col-sm-2 control-label"><span class="form-required">*</span>{:lang('ROLE')}</label>
 				<div class="col-md-6 col-sm-10">
 					<foreach name="roles" item="vo">

public/themes/admin_simpleboot3/admin/user/index.html

@@ -20,6 +20,8 @@
 				<tr>
 					<th width="50">ID</th>
 					<th>{:lang('USERNAME')}</th>
+					<th>{:lang('REALNAME')}</th>
+					<th>{:lang('MOBILE')}</th>
 					<th>{:lang('LAST_LOGIN_IP')}</th>
 					<th>{:lang('LAST_LOGIN_TIME')}</th>
 					<th>{:lang('EMAIL')}</th>
@@ -33,6 +35,8 @@
 				<tr>
 					<td>{$vo.id}</td>
 					<td><if condition="$vo['user_url']"><a href="{$vo.user_url}" target="_blank" title="{$vo.signature}">{$vo.user_login}</a><else />{$vo.user_login}</if></td>
+					<td>{$vo.real_name}</td>
+					<td>{$vo.mobile}</td>
 					<td>{$vo.last_login_ip}</td>
 					<td>
 						<if condition="$vo['last_login_time'] eq 0">

vendor/thinkcmf/cmf-app/src/admin/controller/PublicController.php

@@ -26,7 +26,6 @@ class PublicController extends AdminBaseController
     { 
         $loginAllowed = session("__LOGIN_BY_CMF_ADMIN_PW__");
         if (empty($loginAllowed)) {
-            //$this->error('非法登录!', cmf_get_root() . '/');
             return redirect(cmf_get_root() . "/admin");
         }
 
@@ -50,6 +49,7 @@ class PublicController extends AdminBaseController
     {
         $loginAllowed = session("__LOGIN_BY_CMF_ADMIN_PW__");
         if (empty($loginAllowed)) {
+            session("__LOGIN_BY_CMF_ADMIN_PW__", 1);
             return redirect(cmf_get_root() . "/sale");
         }
 

vendor/thinkcmf/cmf-app/src/admin/controller/UserController.php

@@ -135,7 +135,7 @@ class UserController extends AdminBaseController
                     $this->error($result);
                 } else {
                     $_POST['user_pass'] = cmf_password($_POST['user_pass']);
-                    $_POST['user_type'] = in_array(3, $role_ids)? 3 : 1;
+                    $_POST['user_type'] = in_array(6, $role_ids) && count($role_ids) == 1? 3 : 1;
                     $result             = DB::name('user')->insertGetId($_POST);
                     if ($result !== false) {
                         //$role_user_model=M("RoleUser");
@@ -214,7 +214,7 @@ class UserController extends AdminBaseController
                 $role_ids = $this->request->param('role_id/a');
                 unset($_POST['role_id']);
                 $result = $this->validate($this->request->param(), 'User.edit');
-
+                $_POST['user_type'] = in_array(6, $role_ids) && count($role_ids) == 1? 3 : 1;
                 if ($result !== true) {
                     // 验证失败 输出错误信息
                     $this->error($result);

vendor/thinkcmf/cmf-app/src/admin/lang/zh-cn.php

@@ -15,6 +15,8 @@ return [
     'CLOSE_TOP_MENU'    => '关闭顶部菜单',
     'WEBSITE_HOME_PAGE'                  => '网站首页',
     "NICKNAME"                           => '昵称',
+    "REALNAME"                           => '真实姓名',
+    "MOBILE"                             => '手机号',
     'GENDER'                             => '性别',
     "BIRTHDAY"                           => '生日',
     "WEBSITE"                            => '个人网址',