diff --git a/application/admin/view/style/home_images/add.html b/application/admin/view/style/home_images/add.html
new file mode 100644
index 0000000..ebee74e
--- /dev/null
+++ b/application/admin/view/style/home_images/add.html
@@ -0,0 +1,47 @@
+
diff --git a/application/admin/view/style/home_images/edit.html b/application/admin/view/style/home_images/edit.html
new file mode 100644
index 0000000..d89e972
--- /dev/null
+++ b/application/admin/view/style/home_images/edit.html
@@ -0,0 +1,47 @@
+
diff --git a/application/admin/view/style/home_images/index.html b/application/admin/view/style/home_images/index.html
new file mode 100644
index 0000000..b45fd89
--- /dev/null
+++ b/application/admin/view/style/home_images/index.html
@@ -0,0 +1,29 @@
+
+ {:build_heading()}
+
+
+
diff --git a/application/admin/view/style/home_images/recyclebin.html b/application/admin/view/style/home_images/recyclebin.html
new file mode 100644
index 0000000..39fce1f
--- /dev/null
+++ b/application/admin/view/style/home_images/recyclebin.html
@@ -0,0 +1,25 @@
+
+ {:build_heading()}
+
+
+
diff --git a/application/api/controller/Index.php b/application/api/controller/Index.php
index 3fac732..74f685b 100644
--- a/application/api/controller/Index.php
+++ b/application/api/controller/Index.php
@@ -3,6 +3,7 @@
namespace app\api\controller;
use app\common\controller\Api;
+use app\common\model\style\HomeImages;
/**
* 首页接口
@@ -21,6 +22,22 @@ class Index extends Api
$this->success('请求成功');
}
+ /**
+ * 各种协议文章
+ * @ApiSummary(about_us 关于夜校 site.entry_agreement 入驻协议)
+ * @ApiMethod (GET)
+ */
+ public function agreement()
+ {
+
+ $data = [
+ 'about_us' => config("site.about_us"),
+ 'entry_agreement' => config("site.entry_agreement")
+ ];
+
+ $this->success(__('查询成功'), $data);
+ }
+
@@ -37,7 +54,24 @@ class Index extends Api
*/
public function init() {
- $this->success('',[]);
+ $home_data = [];
+ $home_data['top_image'] = [
+ 'type' => config('site.home_top_type'),
+ 'image' => cdnurl(config('site.home_top_image'), true),
+ 'url' => config('site.home_top_url'),
+ ];
+ //首页轮播图
+ $home_data['top_images'] = HomeImages::allList(1, 20);
+ $base_info = [
+ "site_name"=>config('site.name'),
+// "site_logo"=>cdnurl(config('site.logo'), true),
+ "site_beian"=>config('site.beian'),
+ "site_version"=>''.config('site.version'),
+ "site_city"=>config('site.the_city'),
+ "site_timezone"=>config('site.timezone'),
+ ];
+
+ $this->success('',["base_info"=>$base_info,"home_data"=>$home_data]);
}
diff --git a/application/api/controller/school/Teacher.php b/application/api/controller/school/Teacher.php
index e707493..aeb91f9 100644
--- a/application/api/controller/school/Teacher.php
+++ b/application/api/controller/school/Teacher.php
@@ -9,7 +9,7 @@ use app\common\model\school\classes\Teacher as Teachermodel;
*/
class Teacher extends Base
{
- protected $noNeedLogin = ["detail",'people','spec'];
+ protected $noNeedLogin = ["detail",'people','spec',"teacher_list"];
protected $noNeedRight = '*';
protected $model = null;
@@ -53,5 +53,60 @@ class Teacher extends Base
}
$this->success('获取成功', ['detail' => $res]);
}
+
+
+
+
+
+
+
+ /**
+ * @ApiTitle( 老师或专家列表（取决于搜索条件）)
+ * @ApiSummary(老师或专家列表（取决于搜索条件）)
+ * @ApiRoute(/api/school/teacher/teacher_list)
+ * @ApiMethod(GET)
+ * @ApiParams(name = "keywords", type = "string",required=false,description = "搜索关键字")
+ * @ApiParams(name = "page", type = "string",required=true,description = "页数")
+ * @ApiParams(name = "limit", type = "string",required=true,description = "条数")
+ * @ApiParams(name = "status", type = "string",required=false,description = "查展示专家请传1，非专家也查请传0")
+ * @ApiParams(name = "recommend", type = "string",required=false,description = "平台首页推荐:0=否,1=是")
+ * @ApiParams(name = "shop_id", type = "string",required=false,description = "机构店铺id")
+ * @ApiParams(name = "user_id", type = "string",required=false,description = "教师用户id")
+ * @ApiReturn({
+ *
+ *})
+ */
+ public function teacher_list()
+ {
+ $user_id = 0;
+ $user = $this->auth->getUser();//登录用户
+ if($user)$user_id = $user['id'];
+ $params=[];
+ $page = $this->request->get('page/d', 0); //页数
+ $limit = $this->request->get('limit/d', 0); //条数
+ $params['keywords'] = $this->request->get('keywords/s', ''); //搜索关键字
+ $params['status'] = $this->request->get('status/s', ''); //搜索关键字
+ $params['recommend'] = $this->request->get('recommend/s', ''); //搜索关键字
+ $params['shop_id'] = $this->request->get('shop_id/d', ''); //搜索关键字
+ $params['user_id'] = $this->request->get('user_id/d', ''); //搜索关键字
+
+
+
+// $type = $this->request->get('type/s', ''); //筛选学员和教练单
+
+ try{
+ //当前申请状态
+ $res = $this->model::allList($page, $limit,$params);
+// if($user_id =='670153'){
+// file_put_contents("ceshi66.txt",(new AppointmentOrder())->getLastSql());
+// }
+ }catch (\Exception $e){
+
+ $this->error($e->getMessage());
+ }
+ $this->success('查询成功', $res);
+ }
+
+
}
diff --git a/application/common/controller/Backend.php b/application/common/controller/Backend.php
index 96fc3be..c8f5094 100644
--- a/application/common/controller/Backend.php
+++ b/application/common/controller/Backend.php
@@ -117,6 +117,32 @@ class Backend extends Controller
+ protected $have_auth = false;
+ protected $no_auth_fields = [];
+
+ protected function no_auth_fields_check($params,$row){
+
+ foreach ($params as $k=>$v){
+
+ //说明数值有变动
+ //$params[$k] 去掉两端空格
+ $params[$k] = trim($v);
+
+ if($row[$k]!=$params[$k]){
+ //当修改参数不在允许修改的字段中
+ if(!in_array($k,$this->no_auth_fields)){
+
+ $this->have_auth = true;break;
+
+ }
+ }
+
+ }
+
+ return $this->have_auth;
+
+ }
+
protected function checkAssemblyParameters(){
if(!$this->qSwitch)return false;
//得到所有get参数
diff --git a/application/common/controller/ManystoreBase.php b/application/common/controller/ManystoreBase.php
index e48f0ea..4f26628 100644
--- a/application/common/controller/ManystoreBase.php
+++ b/application/common/controller/ManystoreBase.php
@@ -6,6 +6,7 @@ use app\admin\controller\famysql\Field;
use app\common\model\dyqc\ManystoreShop;
use app\manystore\library\Auth;
use app\common\model\ManystoreConfig;
+use app\manystore\model\Manystore;
use think\Config;
use think\Controller;
use think\Hook;
@@ -121,6 +122,34 @@ class ManystoreBase extends Controller
+ protected $have_auth = false;
+ protected $no_auth_fields = [];
+
+ protected function no_auth_fields_check($params,$row){
+
+ foreach ($params as $k=>$v){
+
+ //说明数值有变动
+ //$params[$k] 去掉两端空格
+ $params[$k] = trim($v);
+
+ if($row[$k]!=$params[$k]){
+ //当修改参数不在允许修改的字段中
+ if(!in_array($k,$this->no_auth_fields)){
+
+ $this->have_auth = true;break;
+
+ }
+ }
+
+ }
+
+ return $this->have_auth;
+
+ }
+
+
+
protected function checkAssemblyParameters(){
if(!$this->qSwitch)return false;
@@ -206,6 +235,9 @@ class ManystoreBase extends Controller
$this->error(__('Please login first'), url('index/login', ['url' => $url]));
}
+
+
+
// 判断是否需要验证权限
if (!$this->auth->match($this->noNeedRight)) {
// 判断控制器和方法判断是否有对应权限
@@ -221,8 +253,21 @@ class ManystoreBase extends Controller
define('SHOP_ID', $this->auth->shop_id);
}
$manystoreShop = ManystoreShop::where("id",$this->auth->shop_id)->find();
+ if($manystoreShop){
+ $url = Session::get('referer');
+ $url = $url ? $url : $this->request->url();
+ if($manystoreShop["status"] !=1) {
+ $this->error(__('账号正处于审核中，无法进行任何操作！！'), url('index/login', ['url' => $url]));
+ }
+ $manystore = Manystore::where("id",$this->auth->id)->find();
+ if($manystore) {
+ if($manystore["status"]!="normal") $this->error(__('账号正处于审核中，无法进行任何操作！！'), url('index/login', ['url' => $url]));
+ }
+ }
+
+
if(!defined('SHOP_USER_ID')) {
- define('SHOP_USER_ID', $manystoreShop->user_id ?:0);
+ define('SHOP_USER_ID', $manystoreShop->user_id ?? 0);
}
diff --git a/application/common/model/Config.php b/application/common/model/Config.php
index d3f49ad..fc88289 100644
--- a/application/common/model/Config.php
+++ b/application/common/model/Config.php
@@ -95,12 +95,23 @@ class Config extends Model
* 读取分类分组列表
* @return array
*/
- public static function getGroupList()
+ public static function getGroupList($cates = null,$space = "-")
{
+
$groupList = config('site.configgroup');
+
foreach ($groupList as $k => &$v) {
$v = __($v);
}
+ //array_intersect
+ if($cates){
+ $cates = explode($space,$cates);
+ $cate_datas = [];
+ foreach ($cates as $cate) {
+ $cate_datas[$cate] = $cate ;
+ }
+ $groupList = array_intersect_key($groupList,$cate_datas);
+ }
return $groupList;
}
diff --git a/application/common/model/dyqc/ManystoreShop.php b/application/common/model/dyqc/ManystoreShop.php
index d053473..2fc5f47 100644
--- a/application/common/model/dyqc/ManystoreShop.php
+++ b/application/common/model/dyqc/ManystoreShop.php
@@ -164,6 +164,26 @@ class ManystoreShop extends BaseModel
}
+ public function checkFull($id){
+ $self = $this->get($id,['teachers']);
+// var_dump($self->toArray());
+ if(empty($self["address_city"])
+ || empty($self["province"])
+ || empty($self["city"])
+ || empty($self["district"])
+ || empty($self["longitude"])
+ || empty($self["latitude"])
+ || empty($self["name"])
+ || empty($self["image"])
+ || empty($self["images"])
+ || empty($self["content"])
+ || empty($self["tel"])
+ ) return false;
+
+ return true;
+ }
+
+
/** 机构详情
@@ -172,6 +192,9 @@ class ManystoreShop extends BaseModel
*/
public function detail($id){
$self = $this->get($id,['teachers']);
+ if(!$this->checkFull($id))throw new \Exception("当前机构未完善信息，暂时无法展示！");
+
+
//一对多隐藏字段方法
// foreach ($self['teachers'] as $k=>$v){
// $v->visible(['id','name','expert_image','expert_content']);
@@ -296,6 +319,12 @@ class ManystoreShop extends BaseModel
$shop['auth_time']= 0;
$shop["admin_id"] = 0;
$shop->save();
+
+ $store = Manystore::where("shop_id",$shop['id'])->find();
+ $store["status"] = 'hidden';
+ $store->save();
+
+
//调用订单事件
$data = ['shop' => $shop];
\think\Hook::listen('shop_apply_after', $data);
@@ -374,7 +403,7 @@ public function getDefaultPassword($type,$user_id,$params){
public function creatShop($type,$user_id,$params){
-
+ $params["user_id"] = $user_id;
//商家附表
$shop = (new self);
$shop_info = $shop->allowField(true)->save($params);
@@ -384,6 +413,7 @@ public function creatShop($type,$user_id,$params){
//账号主表
$manystore_params = [
"nickname" => $params["name"],
+ "user_id"=>$user_id,
];
$manystore_params["username"] = $params["tel"] ?: self::$pinyin->permalink($manystore_params["nickname"]);
$manystore_params["email"] = $manystore_params["username"] . "@xx.com";
@@ -395,6 +425,7 @@ public function creatShop($type,$user_id,$params){
$manystore_params['password'] = md5(md5($manystore_params['password']) . $manystore_params['salt']);
$manystore_params['avatar'] = '/assets/img/avatar.png'; //设置新管理员默认头像。
$manystore_params['is_main'] = 1;
+ $manystore_params['status'] = "hidden";
$model = new Manystore();
$result = $model->allowField(true)->save($manystore_params);
@@ -466,7 +497,7 @@ public static function getAuthInfo($user_id){
}
//如果是申请成功，取店铺id
if($auth_status == '1'){
- $shop_id = $apply_info['shop_id'];
+ $shop_id = $apply_info['id'];
}
diff --git a/application/common/model/school/classes/Teacher.php b/application/common/model/school/classes/Teacher.php
index e106808..a7d8b0a 100644
--- a/application/common/model/school/classes/Teacher.php
+++ b/application/common/model/school/classes/Teacher.php
@@ -2,10 +2,11 @@
namespace app\common\model\school\classes;
+use app\common\model\BaseModel;
use think\Model;
use traits\model\SoftDelete;
-class Teacher extends Model
+class Teacher extends BaseModel
{
use SoftDelete;
@@ -92,4 +93,74 @@ class Teacher extends Model
+
+
+ /**得到基础条件
+ * @param $status
+ * @param null $model
+ * @param string $alisa
+ */
+ public static function getBaseWhere($whereData = [], $model = null, $alisa = '',$with = false)
+ {
+
+ if (!$model) {
+ $model = new static;
+ if ($alisa&&!$with) $model = $model->alias($alisa);
+ }
+ if ($alisa) $alisa = $alisa . '.';
+ $tableFields = (new static)->getTableFields();
+ foreach ($tableFields as $fields)
+ {
+ if(in_array($fields, ['status']))continue;
+// if (isset($whereData[$fields]) && $whereData[$fields]) $model = $model->where("{$alisa}{$fields}", '=', $whereData[$fields]);
+
+ if (isset($whereData[$fields]) && $whereData[$fields]){
+ if(is_array($whereData[$fields])){
+ $model = $model->where("{$alisa}{$fields}", $whereData[$fields][0], $whereData[$fields][1]);
+ }else{
+ $model = $model->where("{$alisa}{$fields}", '=', $whereData[$fields]);
+ }
+
+ }
+
+
+ }
+ if (isset($whereData['status']) && $whereData['status']) $model = $model->where("{$alisa}status", 'in', $whereData['status']);
+ if (isset($whereData['not_status']) && $whereData['not_status']) $model = $model->where("{$alisa}status", 'not in', $whereData['not_status']);
+
+ if (isset($whereData['recommend']) && ($whereData['recommend'] ==='0' || $whereData['recommend'] ==='1')) $model = $model->where("{$alisa}recommend", 'in', $whereData['recommend']);
+
+
+ if (isset($whereData['keywords'])&&$whereData['keywords']) $model = $model->where("{$alisa}name|{$alisa}id", '=', $whereData['keywords']);
+ if (isset($whereData['time'])&&$whereData['time']){
+ $model = $model->time($whereData['time']);
+ }
+ if (isset($whereData['user_id']) && $whereData['user_id']) $model = $model->where("{$alisa}user_id", '=', $whereData['user_id']);
+
+ if (isset($whereData['shop_id']) && $whereData['shop_id']) $model = $model->where("{$alisa}shop_id", 'in', $whereData['shop_id']);
+
+ return $model;
+ }
+
+
+
+
+
+
+ public static function allList($page, $limit,$params=[]){
+ $with_field = [
+ 'user'=>['nickname','mobile','avatar','realname'],
+ 'base'=>['*'],
+ ];
+ $alisa = (new self)->getWithAlisaName();
+ $sort = "{$alisa}.recommend desc,{$alisa}.weigh desc,{$alisa}.id desc";
+// if(!empty($params['status'])){
+// $params['status'] = '1';
+// }
+ return (new self)->getBaseList($params, $page, $limit,$sort,$with_field);
+ }
+
+
+
+
}
diff --git a/application/common/model/style/HomeImages.php b/application/common/model/style/HomeImages.php
new file mode 100644
index 0000000..dc221f5
--- /dev/null
+++ b/application/common/model/style/HomeImages.php
@@ -0,0 +1,76 @@
+getPk();
+ $row->getQuery()->where($pk, $row[$pk])->update(['weigh' => $row[$pk]]);
+ }
+ });
+ }
+
+
+ public function getTypeList()
+ {
+ return ['in' => __('Type in'), 'out' => __('Type out')];
+ }
+
+
+ public function getTypeTextAttr($value, $data)
+ {
+ $value = $value ? $value : (isset($data['type']) ? $data['type'] : '');
+ $list = $this->getTypeList();
+ return isset($list[$value]) ? $list[$value] : '';
+ }
+
+
+ public function getImageAttr($value, $data)
+ {
+ if (!empty($value)) return cdnurl($value, true);
+ }
+
+
+
+ public static function allList($page, $limit,$params=[]){
+
+
+ $sort = "weigh desc,id desc";
+// if(!empty($params['status'])){
+// $params['status'] = '1';
+// }
+ return (new self)->getBaseList($params, $page, $limit,$sort);
+ }
+
+
+}
diff --git a/application/manystore/controller/school/classes/ClassesLib.php b/application/manystore/controller/school/classes/ClassesLib.php
index b7458f7..ab6cfe5 100644
--- a/application/manystore/controller/school/classes/ClassesLib.php
+++ b/application/manystore/controller/school/classes/ClassesLib.php
@@ -201,7 +201,7 @@ class ClassesLib extends ManystoreBase
$this->error("店铺不存在");
}
$params["manystore_id"] = $manystore["id"];
-
+ if(!(new \app\common\model\dyqc\ManystoreShop)->checkFull($shop_id))$this->error("您的认证信息未完善，请您先去完善！");
//验证老师id
$teacher_id = $params['teacher_id'];
diff --git a/application/manystore/model/Manystore.php b/application/manystore/model/Manystore.php
index 87552aa..6feba29 100644
--- a/application/manystore/model/Manystore.php
+++ b/application/manystore/model/Manystore.php
@@ -31,4 +31,15 @@ class Manystore extends Model
return $encrypt($password . $salt);
}
+
+ public function shop()
+ {
+ return $this->belongsTo('app\admin\model\manystore\Shop', 'shop_id', 'id', [], 'LEFT')->setEagerlyType(0);
+ }
+
+ public function user()
+ {
+ return $this->belongsTo('app\admin\model\User', 'user_id', 'id', [], 'LEFT')->setEagerlyType(0);
+ }
+
}
diff --git a/application/manystore/model/ManystoreShop.php b/application/manystore/model/ManystoreShop.php
index 07f0c9e..ac59e87 100644
--- a/application/manystore/model/ManystoreShop.php
+++ b/application/manystore/model/ManystoreShop.php
@@ -22,12 +22,60 @@ class ManystoreShop extends Model
// 追加属性
protected $append = [
+ 'type_text',
'status_text',
+ 'auth_time_text',
'create_time_text',
'update_time_text'
];
+
+
+
+ public function getTypeList()
+ {
+ return ['1' => __('Type 1'), '2' => __('Type 2')];
+ }
+
+
+
+
+ public function getTypeTextAttr($value, $data)
+ {
+ $value = $value ? $value : (isset($data['type']) ? $data['type'] : '');
+ $list = $this->getTypeList();
+ return isset($list[$value]) ? $list[$value] : '';
+ }
+
+
+
+
+ public function getAuthTimeTextAttr($value, $data)
+ {
+ $value = $value ? $value : (isset($data['auth_time']) ? $data['auth_time'] : '');
+ return is_numeric($value) ? date("Y-m-d H:i:s", $value) : $value;
+ }
+
+
+
+
+ public function getUpdateTimeTextAttr($value, $data)
+ {
+ $value = $value ? $value : (isset($data['update_time']) ? $data['update_time'] : '');
+ return is_numeric($value) ? date("Y-m-d H:i:s", $value) : $value;
+ }
+
+ protected function setAuthTimeAttr($value)
+ {
+ return $value === '' ? null : ($value && !is_numeric($value) ? strtotime($value) : $value);
+ }
+
+
+
+
+
+
public function getStatusList()
{
return ['0' => __('Status 0'), '1' => __('Status 1'), '2' => __('Status 2')];
@@ -49,11 +97,6 @@ class ManystoreShop extends Model
}
- public function getUpdateTimeTextAttr($value, $data)
- {
- $value = $value ? $value : (isset($data['update_time']) ? $data['update_time'] : '');
- return is_numeric($value) ? date("Y-m-d H:i:s", $value) : $value;
- }
protected function setCreateTimeAttr($value)
{
diff --git a/application/manystore/view/school/classes/classes_lib/edit.html b/application/manystore/view/school/classes/classes_lib/edit.html
index 923b498..dacdb6f 100644
--- a/application/manystore/view/school/classes/classes_lib/edit.html
+++ b/application/manystore/view/school/classes/classes_lib/edit.html
@@ -134,7 +134,7 @@
-
+
diff --git a/public/assets/js/backend/manystore/index.js b/public/assets/js/backend/manystore/index.js
index fd46db0..d93bb29 100644
--- a/public/assets/js/backend/manystore/index.js
+++ b/public/assets/js/backend/manystore/index.js
@@ -18,18 +18,51 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
// 初始化表格
table.bootstrapTable({
url: $.fn.bootstrapTable.defaults.extend.index_url,
+ pk: 'id',
+ fixedColumns: true,
+ fixedRightNumber: 1,
columns: [
[
- {field: 'state', checkbox: true, },
+ {checkbox: true},
+ {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
+ ,
{field: 'id', title: 'ID'},
+
{field: 'username', title: __('Username')},
{field: 'nickname', title: __('Nickname')},
{field: 'email', title: __('Email')},
{field: 'status', title: __("Status"), formatter: Table.api.formatter.status},
+ {field: 'shop.status', title: __('Auth_status'), searchList: {"0":__('Auth_status 0'),"1":__('Auth_status 1'),"2":__('Auth_status 2')}, formatter: Table.api.formatter.status},
+ {field: 'user_id', title: __('User_id'),visible:false},
+ {field: 'shop.type', title: __('Type'), searchList: {"1":__('Type 1'),"2":__('Type 2')}, formatter: Table.api.formatter.normal},
+
+ {field: 'user.nickname', title: __('User.nickname'), operate: 'LIKE'},
+ {field: 'user.mobile', title: __('User.mobile'), operate: 'LIKE'},
+ {field: 'user.avatar', title: __('User.avatar'), operate: 'LIKE', events: Table.api.events.image, formatter: Table.api.formatter.image},
+
+
+
+ {field: 'shop.name', title: __('申请姓名|机构名'), operate: 'LIKE'},
+ {field: 'shop.logo', title: __('Logo'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.image},
+ {field: 'shop.image', title: __('Image'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.image},
+ {field: 'shop.address_city', title: __('Address_city'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
+ {field: 'shop.province', title: __('Province'),visible:false},
+ {field: 'shop.city', title: __('City'),visible:false},
+ {field: 'shop.district', title: __('District'),visible:false},
+ {field: 'shop.address', title: __('Address'), operate: 'LIKE',visible:false},
+ {field: 'shop.address_detail', title: __('Address_detail'), operate: 'LIKE',visible:false},
+
+
+ {field: 'shop.yyzz_images', title: __('Yyzz_images'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.images},
+ {field: 'shop.front_idcard_image', title: __('身份证正面'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.image},
+ {field: 'shop.reverse_idcard_image', title: __('身份证反面'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.image},
+ {field: 'shop.tel', title: __('Tel'), operate: 'LIKE'},
+
+
+
+
{field: 'logintime', title: __('Login time'), formatter: Table.api.formatter.datetime, operate: 'RANGE', addclass: 'datetimerange', sortable: true},
- {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: function (value, row, index) {
- return Table.api.formatter.operate.call(this, value, row, index);
- }}
+
]
]
});
diff --git a/public/assets/js/backend/school/classes/teacher.js b/public/assets/js/backend/school/classes/teacher.js
index bef979a..780197c 100644
--- a/public/assets/js/backend/school/classes/teacher.js
+++ b/public/assets/js/backend/school/classes/teacher.js
@@ -34,6 +34,8 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
{field: 'name', title: __('Name'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
{field: 'head_image', title: __('Head_image'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.image},
{field: 'status', title: __('Status'), searchList: {"1":__('Status 1'),"2":__('Status 2')}, formatter: Table.api.formatter.status},
+ {field: 'recommend', title: __('Recommend'), searchList: {"0":__('Recommend 0'),"1":__('Recommend 1')}, formatter: Table.api.formatter.normal},
+
{field: 'expert_image', title: __('Expert_image'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.image},
{field: 'weigh', title: __('Weigh'), operate: false},
{field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
diff --git a/public/assets/js/backend/style/home_images.js b/public/assets/js/backend/style/home_images.js
new file mode 100644
index 0000000..abfbfa3
--- /dev/null
+++ b/public/assets/js/backend/style/home_images.js
@@ -0,0 +1,115 @@
+define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefined, Backend, Table, Form) {
+
+ var Controller = {
+ index: function () {
+ // 初始化表格参数配置
+ Table.api.init({
+ extend: {
+ index_url: 'style/home_images/index' + location.search,
+ add_url: 'style/home_images/add',
+ edit_url: 'style/home_images/edit',
+ del_url: 'style/home_images/del',
+ multi_url: 'style/home_images/multi',
+ import_url: 'style/home_images/import',
+ table: 'school_home_images',
+ }
+ });
+
+ var table = $("#table");
+
+ // 初始化表格
+ table.bootstrapTable({
+ url: $.fn.bootstrapTable.defaults.extend.index_url,
+ pk: 'id',
+ sortName: 'weigh',
+ columns: [
+ [
+ {checkbox: true},
+ {field: 'id', title: __('Id')},
+ {field: 'image', title: __('Image'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.image},
+ {field: 'type', title: __('Type'), searchList: {"in":__('Type in'),"out":__('Type out')}, formatter: Table.api.formatter.normal},
+ {field: 'url', title: __('Url'), operate: 'LIKE', formatter: Table.api.formatter.url},
+ {field: 'weigh', title: __('Weigh'), operate: false},
+ {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
+ {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
+ ]
+ ]
+ });
+
+ // 为表格绑定事件
+ Table.api.bindevent(table);
+ },
+ recyclebin: function () {
+ // 初始化表格参数配置
+ Table.api.init({
+ extend: {
+ 'dragsort_url': ''
+ }
+ });
+
+ var table = $("#table");
+
+ // 初始化表格
+ table.bootstrapTable({
+ url: 'style/home_images/recyclebin' + location.search,
+ pk: 'id',
+ sortName: 'id',
+ columns: [
+ [
+ {checkbox: true},
+ {field: 'id', title: __('Id')},
+ {
+ field: 'deletetime',
+ title: __('Deletetime'),
+ operate: 'RANGE',
+ addclass: 'datetimerange',
+ formatter: Table.api.formatter.datetime
+ },
+ {
+ field: 'operate',
+ width: '140px',
+ title: __('Operate'),
+ table: table,
+ events: Table.api.events.operate,
+ buttons: [
+ {
+ name: 'Restore',
+ text: __('Restore'),
+ classname: 'btn btn-xs btn-info btn-ajax btn-restoreit',
+ icon: 'fa fa-rotate-left',
+ url: 'style/home_images/restore',
+ refresh: true
+ },
+ {
+ name: 'Destroy',
+ text: __('Destroy'),
+ classname: 'btn btn-xs btn-danger btn-ajax btn-destroyit',
+ icon: 'fa fa-times',
+ url: 'style/home_images/destroy',
+ refresh: true
+ }
+ ],
+ formatter: Table.api.formatter.operate
+ }
+ ]
+ ]
+ });
+
+ // 为表格绑定事件
+ Table.api.bindevent(table);
+ },
+
+ add: function () {
+ Controller.api.bindevent();
+ },
+ edit: function () {
+ Controller.api.bindevent();
+ },
+ api: {
+ bindevent: function () {
+ Form.api.bindevent($("form[role=form]"));
+ }
+ }
+ };
+ return Controller;
+});