diff --git a/application/admin/controller/Dashboard.php b/application/admin/controller/Dashboard.php index 2dd2e06..214b5b7 100644 --- a/application/admin/controller/Dashboard.php +++ b/application/admin/controller/Dashboard.php @@ -77,7 +77,7 @@ class Dashboard extends Backend $this->assignconfig('column', array_keys($userlist)); $this->assignconfig('userdata', array_values($userlist)); - + $this->getAuthMsg(); return $this->view->fetch(); } diff --git a/application/admin/controller/Third.php b/application/admin/controller/Third.php index ac7dc77..3d52ed4 100644 --- a/application/admin/controller/Third.php +++ b/application/admin/controller/Third.php @@ -30,6 +30,8 @@ class Third extends Backend public function index() { $this->relationSearch = true; + $this->searchFields = ["id","user_id","user.nickname","user.realname","user.mobile"]; + //设置过滤方法 $this->request->filter(['strip_tags']); if ($this->request->isAjax()) { diff --git a/application/admin/controller/auth/Admin.php b/application/admin/controller/auth/Admin.php index 85f8fb4..4dad0d2 100644 --- a/application/admin/controller/auth/Admin.php +++ b/application/admin/controller/auth/Admin.php @@ -61,6 +61,10 @@ class Admin extends Backend $this->view->assign('groupdata', $groupdata); $this->assignconfig("admin", ['id' => $this->auth->id]); + $this->getCity(); + + $this->view->assign("addressCityListJson", json_encode($this->model->getAddressCityList(), JSON_UNESCAPED_UNICODE)); + } /** diff --git a/application/admin/controller/dyqc/ManystoreShop.php b/application/admin/controller/dyqc/ManystoreShop.php index 0795b38..5856d3f 100644 --- a/application/admin/controller/dyqc/ManystoreShop.php +++ b/application/admin/controller/dyqc/ManystoreShop.php @@ -2,7 +2,10 @@ namespace app\admin\controller\dyqc; +use app\admin\model\Admin; use app\common\controller\Backend; +use fast\Tree; +use think\Model; /** * 店铺管理 @@ -18,6 +21,7 @@ class ManystoreShop extends Backend */ protected $model = null; + public function _initialize() { parent::_initialize(); @@ -68,4 +72,158 @@ class ManystoreShop extends Backend return $this->view->fetch(); } + + + /** + * Selectpage的实现方法 + * + * 当前方法只是一个比较通用的搜索匹配,请按需重载此方法来编写自己的搜索逻辑,$where按自己的需求写即可 + * 这里示例了所有的参数，所以比较复杂，实现上自己实现只需简单的几行即可 + * + */ + protected function selectpage() + { + //设置过滤方法 + $this->request->filter(['trim', 'strip_tags', 'htmlspecialchars']); + + //搜索关键词,客户端输入以空格分开,这里接收为数组 + $word = (array)$this->request->request("q_word/a"); + //当前页 + $page = $this->request->request("pageNumber"); + //分页大小 + $pagesize = $this->request->request("pageSize"); + //搜索条件 + $andor = $this->request->request("andOr", "and", "strtoupper"); + //排序方式 + $orderby = (array)$this->request->request("orderBy/a"); + //显示的字段 + $field = $this->request->request("showField"); + //主键 + $primarykey = $this->request->request("keyField"); + //主键值 + $primaryvalue = $this->request->request("keyValue"); + //搜索字段 + $searchfield = (array)$this->request->request("searchField/a"); + //自定义搜索条件 + $custom = (array)$this->request->request("custom/a"); + //是否返回树形结构 + $istree = $this->request->request("isTree", 0); + $ishtml = $this->request->request("isHtml", 0); + if ($istree) { + $word = []; + $pagesize = 999999; + } + $order = []; + foreach ($orderby as $k => $v) { + $order[$v[0]] = $v[1]; + } + $field = $field ? $field : 'name'; + + //如果有primaryvalue,说明当前是初始化传值 + if ($primaryvalue !== null) { + $where = [$primarykey => ['in', $primaryvalue]]; + $pagesize = 999999; + } else { + $where = function ($query) use ($word, $andor, $field, $searchfield, $custom) { + $logic = $andor == 'AND' ? '&' : '|'; + $searchfield = is_array($searchfield) ? implode($logic, $searchfield) : $searchfield; + $searchfield = str_replace(',', $logic, $searchfield); + $word = array_filter(array_unique($word)); + if (count($word) == 1) { + $query->where($searchfield, "like", "%" . reset($word) . "%"); + } else { + $query->where(function ($query) use ($word, $searchfield) { + foreach ($word as $index => $item) { + $query->whereOr(function ($query) use ($item, $searchfield) { + $query->where($searchfield, "like", "%{$item}%"); + }); + } + }); + } + if ($custom && is_array($custom)) { + foreach ($custom as $k => $v) { + if (is_array($v) && 2 == count($v)) { + $query->where($k, trim($v[0]), $v[1]); + } else { + $query->where($k, '=', $v); + } + } + } + }; + } + $adminIds = $this->getDataLimitAdminIds(); + if (is_array($adminIds)) { + $this->model->where($this->dataLimitField, 'in', $adminIds); + } + + $shopIds = Admin::getHaveShopId($this->auth->id); + if(is_array($shopIds)){ + $this->model->where('id',"in",$shopIds); + } + + + $list = []; + $total = $this->model->where($where)->count(); + if ($total > 0) { + + $shopIds = Admin::getHaveShopId($this->auth->id); + if(is_array($shopIds)){ + $this->model->where('id',"in",$shopIds); + } + + + if (is_array($adminIds)) { + $this->model->where($this->dataLimitField, 'in', $adminIds); + } + + $fields = is_array($this->selectpageFields) ? $this->selectpageFields : ($this->selectpageFields && $this->selectpageFields != '*' ? explode(',', $this->selectpageFields) : []); + + //如果有primaryvalue,说明当前是初始化传值,按照选择顺序排序 + if ($primaryvalue !== null && preg_match("/^[a-z0-9_\-]+$/i", $primarykey)) { + $primaryvalue = array_unique(is_array($primaryvalue) ? $primaryvalue : explode(',', $primaryvalue)); + //修复自定义data-primary-key为字符串内容时，给排序字段添加上引号 + $primaryvalue = array_map(function ($value) { + return '\'' . $value . '\''; + }, $primaryvalue); + + $primaryvalue = implode(',', $primaryvalue); + + $this->model->orderRaw("FIELD(`{$primarykey}`, {$primaryvalue})"); + } else { + $this->model->order($order); + } + + $datalist = $this->model->where($where) + ->page($page, $pagesize) + ->select(); + + foreach ($datalist as $index => $item) { + unset($item['password'], $item['salt']); + if ($this->selectpageFields == '*') { + $result = [ + $primarykey => $item[$primarykey] ?? '', + $field => $item[$field] ?? '', + ]; + } else { + $result = array_intersect_key(($item instanceof Model ? $item->toArray() : (array)$item), array_flip($fields)); + } + $result['pid'] = isset($item['pid']) ? $item['pid'] : (isset($item['parent_id']) ? $item['parent_id'] : 0); + $list[] = $result; + } + if ($istree && !$primaryvalue) { + $tree = Tree::instance(); + $tree->init(collection($list)->toArray(), 'pid'); + $list = $tree->getTreeList($tree->getTreeArray(0), $field); + if (!$ishtml) { + foreach ($list as &$item) { + $item = str_replace(' ', ' ', $item); + } + unset($item); + } + } + } + //这里一定要返回有list这个字段,total是可选的,如果total<=list的数量,则会隐藏分页按钮 + return json(['list' => $list, 'total' => $total]); + } + } diff --git a/application/admin/controller/manystore/Index.php b/application/admin/controller/manystore/Index.php index a32b36a..dd893a7 100644 --- a/application/admin/controller/manystore/Index.php +++ b/application/admin/controller/manystore/Index.php @@ -2,6 +2,7 @@ namespace app\admin\controller\manystore; +use app\admin\model\Admin; use app\admin\model\school\classes\ClassesLib; use app\admin\model\school\classes\Teacher; use app\admin\model\school\classes\Verification; @@ -53,17 +54,20 @@ class Index extends Backend protected $success_auth = false; protected $error_auth = false; + protected $qSwitch = true; + protected $qFields = ["user_id"]; + public function _initialize() { - parent::_initialize(); - $this->model = new Manystore(); $this->shopModel = new ManystoreShop(); + parent::_initialize(); $this->view->assign("statusList", $this->shopModel->getStatusList()); $this->view->assign("typeList", $this->shopModel->getTypeList()); $this->view->assign("shop_backend_url", config("site.shop_backend_url")); $this->getCity(); + $this->getAuthMsg(); } @@ -123,6 +127,8 @@ class Index extends Backend { //当前是否为关联查询 $this->relationSearch = true; + $this->searchFields = ["id","nickname","shop.tel","shop.desc","shop.legal_entity","shop.name","shop.address","shop.address_detail","shop.address_city"]; + //设置过滤方法 $this->request->filter(['strip_tags', 'trim']); if ($this->request->isAjax()) { @@ -276,6 +282,23 @@ class Index extends Backend $params["avatar"] = $user["avatar"] ?:"/assets/img/avatar.png"; + //判断省市区编码是否在授权列表内 + ["provinces" =>$provinces,"citys"=> $citys, "districts"=>$districts,"address_citys"=>$address_citys] = Admin::getHaveCity($this->auth->id); + $province = $shop["province"]; + $city = $shop["city"]; + $district = $shop["district"]; + if(is_array($address_citys))$address_citys = implode(",",$address_citys); + + if(is_array($provinces)){ + if(!in_array($province,$provinces))throw new \Exception("您选择的省份不在您的授权范围({$address_citys})内"); + } + if(is_array($citys)){ + if(!in_array($city,$citys))throw new \Exception("您选择的城市不在您的授权范围({$address_citys})内"); + } + if(is_array($districts)){ + if(!in_array($district,$districts))throw new \Exception("您选择的区县不在您的授权范围({$address_citys})内"); + } + //独立地点需传定位信息 // if(empty($params["address_city"]) @@ -500,7 +523,7 @@ class Index extends Backend db()->commit(); }catch (\Exception $e){ db()->rollback(); - $this->error($e->getMessage().$e->getFile().$e->getLine()); + $this->error($e->getMessage()); } $this->success(); } diff --git a/application/admin/controller/manystore/UserAuth.php b/application/admin/controller/manystore/UserAuth.php index 1d00b8f..df215c7 100644 --- a/application/admin/controller/manystore/UserAuth.php +++ b/application/admin/controller/manystore/UserAuth.php @@ -38,6 +38,7 @@ class UserAuth extends Backend parent::_initialize(); $this->view->assign("statusList", $this->model->getStatusList()); + $this->getAuthMsg(); } @@ -56,6 +57,7 @@ class UserAuth extends Backend { //当前是否为关联查询 $this->relationSearch = true; + $this->searchFields = ["id","user_id","shop.name","user.nickname","user.realname","user.mobile"]; //设置过滤方法 $this->request->filter(['strip_tags', 'trim']); if ($this->request->isAjax()) { diff --git a/application/admin/controller/school/Message.php b/application/admin/controller/school/Message.php index 6c89041..abc2c8e 100644 --- a/application/admin/controller/school/Message.php +++ b/application/admin/controller/school/Message.php @@ -46,6 +46,8 @@ class Message extends Backend { //当前是否为关联查询 $this->relationSearch = true; + $this->searchFields = ["id","title","desc","messageevent.name","messageevent.event","messageevent.selfmail_title","messageevent.selfmail_template_text", "to_id","user.nickname","user.realname","user.mobile"]; + //设置过滤方法 $this->request->filter(['strip_tags', 'trim']); if ($this->request->isAjax()) { diff --git a/application/admin/controller/school/MessageConfig.php b/application/admin/controller/school/MessageConfig.php index e4e4ca8..9a7938a 100644 --- a/application/admin/controller/school/MessageConfig.php +++ b/application/admin/controller/school/MessageConfig.php @@ -17,6 +17,7 @@ class MessageConfig extends Backend * @var \app\admin\model\school\MessageConfig */ protected $model = null; + protected $searchFields = ["id","name","event","selfmail_title","selfmail_template_text"]; public function _initialize() { diff --git a/application/admin/controller/school/SearchCity.php b/application/admin/controller/school/SearchCity.php index dc97ed7..4aae749 100644 --- a/application/admin/controller/school/SearchCity.php +++ b/application/admin/controller/school/SearchCity.php @@ -22,7 +22,7 @@ class SearchCity extends Backend { parent::_initialize(); $this->model = new \app\admin\model\school\SearchCity; - + $this->getCity(); } diff --git a/application/admin/controller/school/classes/Blacklist.php b/application/admin/controller/school/classes/Blacklist.php index a5db744..d307eb2 100644 --- a/application/admin/controller/school/classes/Blacklist.php +++ b/application/admin/controller/school/classes/Blacklist.php @@ -43,6 +43,8 @@ class Blacklist extends Backend { //当前是否为关联查询 $this->relationSearch = true; + $this->searchFields = ["id","user_id","user.nickname","user.realname","user.mobile"]; + //设置过滤方法 $this->request->filter(['strip_tags', 'trim']); if ($this->request->isAjax()) { diff --git a/application/admin/controller/school/classes/Cate.php b/application/admin/controller/school/classes/Cate.php index 5a335f5..276882f 100644 --- a/application/admin/controller/school/classes/Cate.php +++ b/application/admin/controller/school/classes/Cate.php @@ -17,6 +17,7 @@ class Cate extends Backend * @var \app\admin\model\school\classes\Cate */ protected $model = null; + protected $searchFields = ["id","name"]; public function _initialize() { diff --git a/application/admin/controller/school/classes/ClassesLib.php b/application/admin/controller/school/classes/ClassesLib.php index 94a47cf..7461776 100644 --- a/application/admin/controller/school/classes/ClassesLib.php +++ b/application/admin/controller/school/classes/ClassesLib.php @@ -60,10 +60,12 @@ class ClassesLib extends Backend $this->view->assign("classesTypeList", $this->model->getClassesTypeList()); $this->view->assign("classesTypeListJson", json_encode($this->model->getClassesTypeList(), JSON_UNESCAPED_UNICODE)); + $this->view->assign("classes_number_only_one", config("site.classes_number_only_one")); $this->view->assign("specStatusList", (new \app\admin\model\school\classes\ClassesSpec)->getStatusList()); $this->getCity(); + $this->getAuthMsg(); } @@ -82,6 +84,7 @@ class ClassesLib extends Backend { //当前是否为关联查询 $this->relationSearch = true; + $this->searchFields = ["id","title","address","address_detail","address_city","user.nickname","user.realname","user.mobile","shop.name"]; //设置过滤方法 $this->request->filter(['strip_tags', 'trim']); if ($this->request->isAjax()) { @@ -89,26 +92,48 @@ class ClassesLib extends Backend if ($this->request->request('keyField')) { return $this->selectpage(); } - list($where, $sort, $order, $offset, $limit) = $this->buildparams(); + list($where, $sort, $order, $offset, $limit, $page, $alias, $bind, $excludearray) = $this->buildparams(null, null, ["has_expire"]); + + if (isset($excludearray['has_expire']['value']) && $excludearray['has_expire']['value']) { + $has_expire = $excludearray['has_expire']['value']; + $as = (new \app\common\model\school\classes\ClassesLib())->getWithAlisaName(); + switch ($has_expire) { + case '1': //查过期 + $expireWhere = [ + $as . '.end_time', '<=', time(), + ]; + break; + case '2': //查未过期 + $expireWhere = [ + $as . '.end_time', '>', time(), + ]; + break; + default: + } + + } else { + $expireWhere = [[]]; + } $list = $this->model - ->with(['manystore','shop','user','admin']) - ->where($where) - ->order($sort, $order) - ->paginate($limit); + ->with(['manystore', 'shop', 'user', 'admin']) + ->where($where) + ->where(...$expireWhere) + ->order($sort, $order) + ->paginate($limit); foreach ($list as $row) { - - $row->getRelation('manystore')->visible(['nickname']); - $row->getRelation('shop')->visible(['name','image','address_city','province','city','district','address','address_detail']); - $row->getRelation('user')->visible(['nickname','realname','mobile','avatar']); - $row->getRelation('admin')->visible(['nickname']); - } - $rows = $list->items(); - $types = \app\admin\model\school\classes\Type::column("name", 'id'); - foreach ($rows as $k=>&$v){ - $v["classes_type_name"] = $types[$v["classes_type"]] ?? "无" ; + $row->getRelation('manystore')->visible(['nickname']); + $row->getRelation('shop')->visible(['name', 'image', 'address_city', 'province', 'city', 'district', 'address', 'address_detail']); + $row->getRelation('user')->visible(['nickname', 'realname', 'mobile', 'avatar']); + $row->getRelation('admin')->visible(['nickname']); + } + $rows = $list->items(); + $types = \app\admin\model\school\classes\Type::column("name", 'id'); + + foreach ($rows as $k => &$v) { + $v["classes_type_name"] = $types[$v["classes_type"]] ?? "无"; } $result = array("total" => $list->total(), "rows" => $rows); @@ -188,6 +213,7 @@ class ClassesLib extends Backend if($row[$k]!=$params[$k]){ //当修改参数不在允许修改的字段中 if(!in_array($k,$this->no_auth_fields)){ +// var_dump($row[$k],$params[$k]); $this->have_auth = true;break; @@ -469,6 +495,8 @@ class ClassesLib extends Backend } $this->update_check($params,$row); + + $spec = $params["spec"] ?? []; // var_dump($spec); @@ -492,6 +520,7 @@ class ClassesLib extends Backend //删除规格 foreach ($delete_spec_ids as $k=>$delete_spec){ + (new \app\common\model\school\classes\ClassesSpec)->updateCheck($delete_spec["id"]); $delete_spec->delete(); diff --git a/application/admin/controller/school/classes/ClassesSpec.php b/application/admin/controller/school/classes/ClassesSpec.php index 755b242..7371d11 100644 --- a/application/admin/controller/school/classes/ClassesSpec.php +++ b/application/admin/controller/school/classes/ClassesSpec.php @@ -59,6 +59,8 @@ class ClassesSpec extends Backend { //当前是否为关联查询 $this->relationSearch = true; + $this->searchFields = ["id","name","lib.title"]; + //设置过滤方法 $this->request->filter(['strip_tags', 'trim']); if ($this->request->isAjax()) { diff --git a/application/admin/controller/school/classes/Evaluate.php b/application/admin/controller/school/classes/Evaluate.php index 69b82ca..8127b3c 100644 --- a/application/admin/controller/school/classes/Evaluate.php +++ b/application/admin/controller/school/classes/Evaluate.php @@ -56,6 +56,8 @@ class Evaluate extends Backend { //当前是否为关联查询 $this->relationSearch = true; + $this->searchFields = ["id","message_text","user_id","classesorder.order_no","classesorder.pay_no","lib.title","teacher.name","shop.name","user.nickname","user.realname","user.mobile"]; + //设置过滤方法 $this->request->filter(['strip_tags', 'trim']); if ($this->request->isAjax()) { diff --git a/application/admin/controller/school/classes/Label.php b/application/admin/controller/school/classes/Label.php index 7f120b6..74cf960 100644 --- a/application/admin/controller/school/classes/Label.php +++ b/application/admin/controller/school/classes/Label.php @@ -17,6 +17,7 @@ class Label extends Backend * @var \app\admin\model\school\classes\Label */ protected $model = null; + protected $searchFields = ["id","name"]; public function _initialize() { diff --git a/application/admin/controller/school/classes/Teacher.php b/application/admin/controller/school/classes/Teacher.php index 319dd80..1506895 100644 --- a/application/admin/controller/school/classes/Teacher.php +++ b/application/admin/controller/school/classes/Teacher.php @@ -2,6 +2,7 @@ namespace app\admin\controller\school\classes; +use app\admin\model\Admin; use app\common\controller\Backend; use app\common\model\manystore\UserAuth; use app\common\model\User; @@ -43,6 +44,7 @@ class Teacher extends Backend $this->view->assign("statusList", $this->model->getStatusList()); $this->view->assign("recommendList", $this->model->getRecommendList()); + $this->getAuthMsg(); } @@ -61,6 +63,8 @@ class Teacher extends Backend { //当前是否为关联查询 $this->relationSearch = true; + $this->searchFields = ["id","name","user.nickname","user.realname","user.mobile"]; + //设置过滤方法 $this->request->filter(['strip_tags', 'trim']); if ($this->request->isAjax()) { @@ -93,145 +97,6 @@ class Teacher extends Backend - /** - * Selectpage的实现方法 - * - * 当前方法只是一个比较通用的搜索匹配,请按需重载此方法来编写自己的搜索逻辑,$where按自己的需求写即可 - * 这里示例了所有的参数，所以比较复杂，实现上自己实现只需简单的几行即可 - * - */ - protected function selectpage() - { - //设置过滤方法 - $this->request->filter(['trim', 'strip_tags', 'htmlspecialchars']); - - //搜索关键词,客户端输入以空格分开,这里接收为数组 - $word = (array)$this->request->request("q_word/a"); - //当前页 - $page = $this->request->request("pageNumber"); - //分页大小 - $pagesize = $this->request->request("pageSize"); - //搜索条件 - $andor = $this->request->request("andOr", "and", "strtoupper"); - //排序方式 - $orderby = (array)$this->request->request("orderBy/a"); - //显示的字段 - $field = $this->request->request("showField"); - //主键 - $primarykey = $this->request->request("keyField"); - //主键值 - $primaryvalue = $this->request->request("keyValue"); - //搜索字段 - $searchfield = (array)$this->request->request("searchField/a"); - //自定义搜索条件 - $custom = (array)$this->request->request("custom/a"); - //是否返回树形结构 - $istree = $this->request->request("isTree", 0); - $ishtml = $this->request->request("isHtml", 0); - if ($istree) { - $word = []; - $pagesize = 999999; - } - $order = []; - foreach ($orderby as $k => $v) { - $order[$v[0]] = $v[1]; - } - $field = $field ? $field : 'name'; - - //如果有primaryvalue,说明当前是初始化传值 - if ($primaryvalue !== null) { - $where = [$primarykey => ['in', $primaryvalue]]; - $pagesize = 999999; - } else { - $where = function ($query) use ($word, $andor, $field, $searchfield, $custom) { - $logic = $andor == 'AND' ? '&' : '|'; - $searchfield = is_array($searchfield) ? implode($logic, $searchfield) : $searchfield; - $searchfield = str_replace(',', $logic, $searchfield); - $word = array_filter(array_unique($word)); - if (count($word) == 1) { - $query->where($searchfield, "like", "%" . reset($word) . "%"); - } else { - $query->where(function ($query) use ($word, $searchfield) { - foreach ($word as $index => $item) { - $query->whereOr(function ($query) use ($item, $searchfield) { - $query->where($searchfield, "like", "%{$item}%"); - }); - } - }); - } - if ($custom && is_array($custom)) { - foreach ($custom as $k => $v) { - if (is_array($v) && 2 == count($v)) { - $query->where($k, trim($v[0]), $v[1]); - } else { - $query->where($k, '=', $v); - } - } - } - }; - } - $adminIds = $this->getDataLimitAdminIds(); - if (is_array($adminIds)) { - $this->model->where($this->dataLimitField, 'in', $adminIds); - } - $list = []; - $total = $this->model->where($where)->count(); - if ($total > 0) { - if (is_array($adminIds)) { - $this->model->where($this->dataLimitField, 'in', $adminIds); - } - - $fields = is_array($this->selectpageFields) ? $this->selectpageFields : ($this->selectpageFields && $this->selectpageFields != '*' ? explode(',', $this->selectpageFields) : []); - - //如果有primaryvalue,说明当前是初始化传值,按照选择顺序排序 - if ($primaryvalue !== null && preg_match("/^[a-z0-9_\-]+$/i", $primarykey)) { - $primaryvalue = array_unique(is_array($primaryvalue) ? $primaryvalue : explode(',', $primaryvalue)); - //修复自定义data-primary-key为字符串内容时，给排序字段添加上引号 - $primaryvalue = array_map(function ($value) { - return '\'' . $value . '\''; - }, $primaryvalue); - - $primaryvalue = implode(',', $primaryvalue); - - $this->model->orderRaw("FIELD(`{$primarykey}`, {$primaryvalue})"); - } else { - $this->model->order($order); - } - - $datalist = $this->model->where($where) - ->page($page, $pagesize) - ->select(); - - foreach ($datalist as $index => $item) { - unset($item['password'], $item['salt']); - if ($this->selectpageFields == '*') { - $result = [ - $primarykey => $item[$primarykey] ?? '', - $field => $item[$field] ?? '', - - ]; - } else { - $result = array_intersect_key(($item instanceof Model ? $item->toArray() : (array)$item), array_flip($fields)); - } - $result['pid'] = isset($item['pid']) ? $item['pid'] : (isset($item['parent_id']) ? $item['parent_id'] : 0); - $list[] = $result; - } - if ($istree && !$primaryvalue) { - $tree = Tree::instance(); - $tree->init(collection($list)->toArray(), 'pid'); - $list = $tree->getTreeList($tree->getTreeArray(0), $field); - if (!$ishtml) { - foreach ($list as &$item) { - $item = str_replace(' ', ' ', $item); - } - unset($item); - } - } - } - //这里一定要返回有list这个字段,total是可选的,如果total<=list的数量,则会隐藏分页按钮 - return json(['list' => $list, 'total' => $total]); - } - protected function updateCheck($id,$params=[],$row=null){ diff --git a/application/admin/controller/school/classes/Type.php b/application/admin/controller/school/classes/Type.php index e745c54..492f0b0 100644 --- a/application/admin/controller/school/classes/Type.php +++ b/application/admin/controller/school/classes/Type.php @@ -17,6 +17,7 @@ class Type extends Backend * @var \app\admin\model\school\classes\Type */ protected $model = null; + protected $searchFields = ["id","name"]; public function _initialize() { diff --git a/application/admin/controller/school/classes/Verification.php b/application/admin/controller/school/classes/Verification.php index 5e9f7b3..8a46f69 100644 --- a/application/admin/controller/school/classes/Verification.php +++ b/application/admin/controller/school/classes/Verification.php @@ -37,6 +37,7 @@ class Verification extends Backend parent::_initialize(); $this->view->assign("statusList", $this->model->getStatusList()); + $this->getAuthMsg(); } @@ -55,6 +56,7 @@ class Verification extends Backend { //当前是否为关联查询 $this->relationSearch = true; + $this->searchFields = ["id","shop.name","user.nickname","user.realname","user.mobile"]; //设置过滤方法 $this->request->filter(['strip_tags', 'trim']); if ($this->request->isAjax()) { diff --git a/application/admin/controller/school/classes/VirtualUser.php b/application/admin/controller/school/classes/VirtualUser.php index 2e8adee..b28a617 100644 --- a/application/admin/controller/school/classes/VirtualUser.php +++ b/application/admin/controller/school/classes/VirtualUser.php @@ -52,6 +52,7 @@ class VirtualUser extends Backend { //当前是否为关联查询 $this->relationSearch = true; + $this->searchFields = ["id","nickname","lib.title"]; //设置过滤方法 $this->request->filter(['strip_tags', 'trim']); if ($this->request->isAjax()) { @@ -83,9 +84,6 @@ class VirtualUser extends Backend - - - /** * 添加 * diff --git a/application/admin/controller/school/classes/hourorder/Order.php b/application/admin/controller/school/classes/hourorder/Order.php index 781eca5..5584a6e 100644 --- a/application/admin/controller/school/classes/hourorder/Order.php +++ b/application/admin/controller/school/classes/hourorder/Order.php @@ -34,6 +34,7 @@ class Order extends Backend $this->view->assign("statusList", $this->model->getStatusList()); $this->view->assign("authStatusList", $this->model->getAuthStatusList()); + $this->getAuthMsg(); } @@ -52,6 +53,9 @@ class Order extends Backend { //当前是否为关联查询 $this->relationSearch = true; + $this->searchFields = ["id","order_no","classesorder.order_no","classesorder.pay_no","user_id","spec.name","detail.title","user.nickname","user.realname","user.mobile"]; + + //设置过滤方法 $this->request->filter(['strip_tags', 'trim']); if ($this->request->isAjax()) { diff --git a/application/admin/controller/school/classes/order/Order.php b/application/admin/controller/school/classes/order/Order.php index 447277a..246bd6c 100644 --- a/application/admin/controller/school/classes/order/Order.php +++ b/application/admin/controller/school/classes/order/Order.php @@ -27,6 +27,7 @@ class Order extends Backend $this->view->assign("beforeStatusList", $this->model->getBeforeStatusList()); $this->view->assign("serverStatusList", $this->model->getServerStatusList()); $this->view->assign("resultStatusList", $this->model->getResultStatusList()); + $this->getAuthMsg(); } @@ -45,6 +46,8 @@ class Order extends Backend { //当前是否为关联查询 $this->relationSearch = true; + $this->searchFields = ["id","order_no","pay_no","user_id","code","shop.name","detail.title","user.nickname","user.realname","user.mobile"]; + //设置过滤方法 $this->request->filter(['strip_tags', 'trim']); if ($this->request->isAjax()) { @@ -121,9 +124,20 @@ class Order extends Backend $classes_order = $params["id"]; $reason = $params["reason"]; + $model = (new \app\common\model\school\classes\order\ServiceOrder()); $remark = "总后台管理员帮忙下售后单"; - $model->afterSales($classes_order,$reason,$remark,'admin',$this->auth->id,true); + $order = $model->afterSales($classes_order,$reason,$remark,'admin',$this->auth->id,true); + + $price = $params["price"]; + $status = "yes"; + $reject_reason = ""; + $reject_images = ""; + $model = (new \app\common\model\school\classes\order\ServiceOrder()); + $model->shopConfirmation($order["order_no"],$status,$price,$reject_reason,$reject_images,0,true,'admin',$this->auth->id,true); + + + }catch (\Exception $e){ $this->error($e->getMessage()); } @@ -134,9 +148,9 @@ class Order extends Backend if (!$row) { $this->error(__('No Results were found')); } - + $order_info = \app\common\model\school\classes\order\ServiceOrder::getCost("43246634123432564",$ids,"",[],true); // $row = $this->model->get($param['ids']); - $this->view->assign('row', $row); + $this->view->assign('row',array_merge($row->toArray(),$order_info)); return $this->view->fetch(); } diff --git a/application/admin/controller/school/classes/order/ServiceOrder.php b/application/admin/controller/school/classes/order/ServiceOrder.php index 3ce84d8..92fbd13 100644 --- a/application/admin/controller/school/classes/order/ServiceOrder.php +++ b/application/admin/controller/school/classes/order/ServiceOrder.php @@ -27,6 +27,7 @@ class ServiceOrder extends Backend $this->view->assign("salesTypeList", $this->model->getSalesTypeList()); $this->view->assign("platformList", $this->model->getPlatformList()); $this->view->assign("payTypeList", $this->model->getPayTypeList()); + $this->getAuthMsg(); } @@ -45,6 +46,9 @@ class ServiceOrder extends Backend { //当前是否为关联查询 $this->relationSearch = true; + + $this->searchFields = ["id","order_no","classesorder.order_no","classesorder.pay_no","user_id","shop.name","detail.title","user.nickname","user.realname","user.mobile"]; + //设置过滤方法 $this->request->filter(['strip_tags', 'trim']); if ($this->request->isAjax()) { diff --git a/application/admin/controller/user/User.php b/application/admin/controller/user/User.php index 982b856..4c3f5b2 100644 --- a/application/admin/controller/user/User.php +++ b/application/admin/controller/user/User.php @@ -36,6 +36,8 @@ class User extends Backend { //设置过滤方法 $this->request->filter(['strip_tags', 'trim']); + $this->searchFields = ["id","nickname","realname","mobile"]; + if ($this->request->isAjax()) { //如果发送的来源是Selectpage，则转发到Selectpage if ($this->request->request('keyField')) { diff --git a/application/admin/lang/zh-cn/auth/admin.php b/application/admin/lang/zh-cn/auth/admin.php index 4ef8d85..f0910f7 100644 --- a/application/admin/lang/zh-cn/auth/admin.php +++ b/application/admin/lang/zh-cn/auth/admin.php @@ -11,4 +11,5 @@ return [ 'Username must be 3 to 30 characters' => '用户名只能由3-30位数字、字母、下划线组合', 'Please input correct password' => '密码长度必须在6-30位之间，不能包含空格', 'Password must be 6 to 30 characters' => '密码长度必须在6-30位之间，不能包含空格', + 'Area_json' => '限定区域', ]; diff --git a/application/admin/lang/zh-cn/manystore/user_auth.php b/application/admin/lang/zh-cn/manystore/user_auth.php index a820a9e..f4370b9 100644 --- a/application/admin/lang/zh-cn/manystore/user_auth.php +++ b/application/admin/lang/zh-cn/manystore/user_auth.php @@ -2,7 +2,7 @@ return [ 'Shop_id' => '机构shopid', - 'User_id' => '授权用户', + 'User_id' => '授权前台用户', 'Status' => '授权状态', 'Status 0' => '待确认', 'Set status to 0'=> '设为待确认', @@ -13,11 +13,11 @@ return [ 'Auth_time' => '授权确认时间', 'Createtime' => '发起时间', 'Update_time' => '修改时间', - 'Shop.name' => '店铺名称', - 'User.nickname' => '昵称', - 'User.avatar' => '头像', + 'Shop.name' => '机构名称', + 'User.nickname' => '授权前台用户昵称', + 'User.avatar' => '授权前台用户头像', 'Add' => '添加用户授权申请', 'Delete'=>'取消授权', 'Del'=>'取消授权', - 'User.mobile'=>'用户手机号', + 'User.mobile'=>'授权前台用户手机号', ]; diff --git a/application/admin/lang/zh-cn/school/classes/classes_lib.php b/application/admin/lang/zh-cn/school/classes/classes_lib.php index ef9bcd5..18b1361 100644 --- a/application/admin/lang/zh-cn/school/classes/classes_lib.php +++ b/application/admin/lang/zh-cn/school/classes/classes_lib.php @@ -2,11 +2,15 @@ return [ 'Manystore_id' => '机构账号id', - 'Shop_id' => '机构id', - 'User_id' => '主讲师用户id', + 'Shop_id' => '机构', + 'User_id' => '主讲师用户', 'Classes_cate_ids' => '标签', 'Classes_label_ids' => '热门', + 'Has_expire' => '是否过期', + 'Has_expire 1' => '往期课程', + 'Has_expire 2' => '进行中课程', + 'Start_time' => '开始时间', 'End_time' => '结束时间', @@ -15,22 +19,22 @@ return [ 'Add_type 1' => '机构', 'Add_type 2' => '总后台', 'Add_id' => '添加人id', - 'Title' => '标题', - 'Headimage' => '头图', - 'Images' => '轮播图', - 'Type' => '地点类型', + 'Title' => '课程名称', + 'Headimage' => '课程头图', + 'Images' => '课程轮播图', + 'Type' => '课程地点类型', 'Type out' => '户外', 'Type in' => '室内', 'Classes_num' => '核销次数', 'Address_type' => '地址类型', - 'Address_type 1' => '按机构', - 'Address_type 2' => '独立位置', + 'Address_type 1' => '机构内授课', + 'Address_type 2' => '特定位置授课', 'Address_city' => '城市选择', 'Province' => '省编号', 'City' => '市编号', 'District' => '县区编号', - 'Address' => '店铺地址', - 'Address_detail' => '店铺详细地址', + 'Address' => '地址', + 'Address_detail' => '详细地址', 'Longitude' => '经度', 'Latitude' => '纬度', 'Classes_date_text' => '上课日期', @@ -73,19 +77,19 @@ return [ 'Updatetime' => '修改时间', 'Deletetime' => '删除时间', 'Manystore.nickname' => '昵称', - 'Shop.name' => '店铺名称', - 'Shop.image' => '封面图', - 'Shop.address_city' => '城市选择', - 'Shop.province' => '省编号', - 'Shop.city' => '市编号', - 'Shop.district' => '县区编号', + 'Shop.name' => '机构名称', + 'Shop.image' => '机构封面图', + 'Shop.address_city' => '机构城市选择', + 'Shop.province' => '机构省编号', + 'Shop.city' => '机构市编号', + 'Shop.district' => '机构县区编号', 'Shop.address' => '机构地址', 'Shop.address_detail' => '机构详细地址', - 'User.nickname' => '昵称', - 'User.realname' => '真实姓名', - 'User.mobile' => '手机号', - 'User.avatar' => '头像', - 'Admin.nickname' => '昵称', + 'User.nickname' => '讲师用户昵称', + 'User.realname' => '讲师用户真实姓名', + 'User.mobile' => '讲师用户手机号', + 'User.avatar' => '讲师用户头像', + 'Admin.nickname' => '管理员昵称', 'Limit_num' => '总限定人数', 'Sign_num' => '总已报名人数', 'Verification_num' => '总已核销人数', diff --git a/application/admin/lang/zh-cn/school/classes/classes_spec.php b/application/admin/lang/zh-cn/school/classes/classes_spec.php index bde5a6e..56db14c 100644 --- a/application/admin/lang/zh-cn/school/classes/classes_spec.php +++ b/application/admin/lang/zh-cn/school/classes/classes_spec.php @@ -2,7 +2,7 @@ return [ 'Classes_lib_id' => '课程id', - 'Name' => '规格名', + 'Name' => '每节课名', 'Time' => '课时开始结束时间', 'Start_time' => '开始时间', 'End_time' => '结束时间', @@ -18,6 +18,6 @@ return [ 'Createtime' => '创建时间', 'Updatetime' => '修改时间', 'Deletetime' => '删除时间', - 'Lib.title' => '标题', - 'Lib.headimage' => '头图' + 'Lib.title' => '课程名称', + 'Lib.headimage' => '课程头图' ]; diff --git a/application/admin/lang/zh-cn/school/classes/collect.php b/application/admin/lang/zh-cn/school/classes/collect.php index ba6f3cc..e0ce716 100644 --- a/application/admin/lang/zh-cn/school/classes/collect.php +++ b/application/admin/lang/zh-cn/school/classes/collect.php @@ -5,10 +5,10 @@ return [ 'Classes_lib_id' => '课程id', 'Weigh' => '权重', 'Createtime' => '创建时间', - 'User.nickname' => '昵称', - 'User.realname' => '真实姓名', - 'User.mobile' => '手机号', - 'User.avatar' => '头像', - 'Lib.title' => '标题', - 'Lib.headimage' => '头图' + 'User.nickname' => '收藏人昵称', + 'User.realname' => '收藏人真实姓名', + 'User.mobile' => '收藏人手机号', + 'User.avatar' => '收藏人头像', + 'Lib.title' => '课程名称', + 'Lib.headimage' => '课程头图' ]; diff --git a/application/admin/lang/zh-cn/school/classes/evaluate.php b/application/admin/lang/zh-cn/school/classes/evaluate.php index 909256c..096a0d3 100644 --- a/application/admin/lang/zh-cn/school/classes/evaluate.php +++ b/application/admin/lang/zh-cn/school/classes/evaluate.php @@ -6,7 +6,7 @@ return [ 'Classes_lib_id' => '课程', 'Classes_order_id' => '课程订单', 'Manystore_id' => '机构账号', - 'Shop_id' => '机构店铺', + 'Shop_id' => '机构', 'Teacher_id' => '老师', 'Image' => '评价人头像', 'Nickname' => '评价人昵称', @@ -26,16 +26,16 @@ return [ 'Weigh' => '权重', 'Createtime' => '创建时间', 'Updatetime' => '修改时间', - 'User.nickname' => '昵称', - 'User.realname' => '真实姓名', - 'User.mobile' => '手机号', - 'User.avatar' => '头像', - 'Lib.title' => '标题', - 'Lib.headimage' => '头图', - 'Order.order_no' => '订单号', - 'Manystore.nickname' => '昵称', - 'Shop.name' => '店铺名称', - 'Shop.logo' => '品牌LOGO', + 'User.nickname' => '评价人昵称', + 'User.realname' => '评价人真实姓名', + 'User.mobile' => '评价人手机号', + 'User.avatar' => '评价人头像', + 'Lib.title' => '课程名称', + 'Lib.headimage' => '课程头图', + 'Order.order_no' => '课程单号', + 'Manystore.nickname' => '机构账号昵称', + 'Shop.name' => '机构名称', + 'Shop.logo' => '机构LOGO', 'Teacher.name' => '教师名', 'Teacher.head_image' => '教师头像' ]; diff --git a/application/admin/lang/zh-cn/school/classes/hourorder/order.php b/application/admin/lang/zh-cn/school/classes/hourorder/order.php index d9fb0de..44fbe1e 100644 --- a/application/admin/lang/zh-cn/school/classes/hourorder/order.php +++ b/application/admin/lang/zh-cn/school/classes/hourorder/order.php @@ -1,7 +1,7 @@ '订单号', + 'Order_no' => '预约单号', 'Edit'=>'修改用户预约的课时', 'Add'=>'帮用户预约课时', @@ -20,7 +20,7 @@ return [ 'User_id' => '下单人id', 'Classes_order_detail_id' => '订单课程id', 'Classes_lib_id' => '课程id', - 'Name' => '课程规格名', + 'Name' => '本节课名', 'Start_time' => '开始时间', 'End_time' => '结束时间', 'Limit_num' => '本课时限定人数（0不限制）', @@ -42,13 +42,13 @@ return [ 'Createtime' => '创建时间', 'Updatetime' => '修改时间', 'Deletetime' => '删除时间', - 'Order.order_no' => '订单号', - 'Spec.name' => '规格名', - 'User.nickname' => '昵称', - 'User.realname' => '真实姓名', - 'User.mobile' => '手机号', - 'User.avatar' => '头像', - 'Detail.title' => '标题', - 'Detail.headimage' => '头图', - 'Lib.title' => '标题' + 'Order.order_no' => '课程单号', + 'Spec.name' => '本节课名', + 'User.nickname' => '预约用户昵称', + 'User.realname' => '预约用户真实姓名', + 'User.mobile' => '预约用户手机号', + 'User.avatar' => '预约用户头像', + 'Detail.title' => '课程名称', + 'Detail.headimage' => '课程头图', + 'Lib.title' => '课程名称' ]; diff --git a/application/admin/lang/zh-cn/school/classes/hourorder/order_log.php b/application/admin/lang/zh-cn/school/classes/hourorder/order_log.php index 8ad69ca..8657d25 100644 --- a/application/admin/lang/zh-cn/school/classes/hourorder/order_log.php +++ b/application/admin/lang/zh-cn/school/classes/hourorder/order_log.php @@ -13,5 +13,5 @@ return [ 'Set status to 3' => '设为已完成', 'Log_text' => '记录内容', 'Createtime' => '创建时间', - 'Order.order_no' => '订单号' + 'Order.order_no' => '课程单号' ]; diff --git a/application/admin/lang/zh-cn/school/classes/order/order.php b/application/admin/lang/zh-cn/school/classes/order/order.php index 24e1a0d..dbf3ccb 100644 --- a/application/admin/lang/zh-cn/school/classes/order/order.php +++ b/application/admin/lang/zh-cn/school/classes/order/order.php @@ -1,12 +1,12 @@ '订单号', + 'Order_no' => '课程单号', 'Edit'=>'订单详情', 'Pay_no' => '微信支付单号', 'User_id' => '下单人id', 'Manystore_id' => '机构账号id', - 'Shop_id' => '机构店铺id', + 'Shop_id' => '机构id', 'Code' => '核销码', 'Codeimage' => '核销二维码图片', 'Codeoneimage' => '核销一维码图片', @@ -62,24 +62,24 @@ return [ 'Createtime' => '创建时间', 'Updatetime' => '修改时间', 'Deletetime' => '删除时间', - 'Manystore.nickname' => '昵称', - 'Manystore.avatar' => '头像', - 'User.nickname' => '昵称', - 'User.realname' => '真实姓名', - 'User.mobile' => '手机号', - 'User.avatar' => '头像', - 'Shop.name' => '店铺名称', - 'Shop.image' => '封面图', - 'Shop.address_city' => '城市选择', - 'Shop.province' => '省编号', - 'Shop.city' => '市编号', - 'Shop.district' => '县区编号', - 'Shop.address' => '店铺地址', - 'Shop.address_detail' => '店铺详细地址', - 'Lib.title' => '标题', - 'Lib.headimage' => '头图', - 'Detail.title' => '标题', - 'Detail.headimage' => '头图', - 'Admin.nickname' => '昵称', - 'Admin.avatar' => '头像' + 'Manystore.nickname' => '机构账号昵称', + 'Manystore.avatar' => '机构账号头像', + 'User.nickname' => '下单人昵称', + 'User.realname' => '下单人真实姓名', + 'User.mobile' => '下单人手机号', + 'User.avatar' => '下单人头像', + 'Shop.name' => '机构名称', + 'Shop.image' => '机构封面图', + 'Shop.address_city' => '机构城市选择', + 'Shop.province' => '机构省编号', + 'Shop.city' => '机构市编号', + 'Shop.district' => '机构县区编号', + 'Shop.address' => '机构地址', + 'Shop.address_detail' => '机构详细地址', + 'Lib.title' => '课程名称', + 'Lib.headimage' => '课程头图', + 'Detail.title' => '课程名称', + 'Detail.headimage' => '课程头图', + 'Admin.nickname' => '管理员昵称', + 'Admin.avatar' => '管理员头像' ]; diff --git a/application/admin/lang/zh-cn/school/classes/order/order_detail.php b/application/admin/lang/zh-cn/school/classes/order/order_detail.php index 4d0d227..6b6e210 100644 --- a/application/admin/lang/zh-cn/school/classes/order/order_detail.php +++ b/application/admin/lang/zh-cn/school/classes/order/order_detail.php @@ -3,7 +3,7 @@ return [ 'Classes_order_id' => '课程订单id', 'Manystore_id' => '机构账号id', - 'Shop_id' => '机构店铺id', + 'Shop_id' => '机构id', 'User_id' => '主讲师用户id', 'Classes_cate_ids' => '标签', 'Classes_label_ids' => '热门', @@ -12,13 +12,13 @@ return [ 'Add_type 1' => '机构', 'Add_type 2' => '总后台', 'Add_id' => '添加人id', - 'Title' => '标题', - 'Headimage' => '头图', - 'Images' => '轮播图', + 'Title' => '课程名称', + 'Headimage' => '课程头图', + 'Images' => '课程轮播图', 'Type' => '地点类型', 'Type out' => '户外', 'Type in' => '室内', - 'Classes_num' => '课时数', + 'Classes_num' => '核销数', 'Address_type' => '地址类型', 'Address_type 1' => '按机构', 'Address_type 2' => '独立位置', @@ -26,8 +26,8 @@ return [ 'Province' => '省编号', 'City' => '市编号', 'District' => '县区编号', - 'Address' => '店铺地址', - 'Address_detail' => '店铺详细地址', + 'Address' => '地址', + 'Address_detail' => '详细地址', 'Longitude' => '经度', 'Latitude' => '纬度', 'Classes_date_text' => '上课日期', @@ -46,19 +46,19 @@ return [ 'Createtime' => '创建时间', 'Updatetime' => '修改时间', 'Deletetime' => '删除时间', - 'Order.order_no' => '订单号', - 'Manystore.nickname' => '昵称', - 'Manystore.avatar' => '头像', - 'Shop.name' => '店铺名称', - 'Shop.image' => '封面图', - 'Shop.address_city' => '城市选择', - 'Shop.province' => '省编号', - 'Shop.city' => '市编号', - 'Shop.district' => '县区编号', - 'Shop.address' => '店铺地址', - 'Shop.address_detail' => '店铺详细地址', + 'Order.order_no' => '课程单号', + 'Manystore.nickname' => '机构账号昵称', + 'Manystore.avatar' => '机构账号头像', + 'Shop.name' => '机构名称', + 'Shop.image' => '机构封面图', + 'Shop.address_city' => '机构城市选择', + 'Shop.province' => '机构省编号', + 'Shop.city' => '机构市编号', + 'Shop.district' => '机构县区编号', + 'Shop.address' => '机构地址', + 'Shop.address_detail' => '机构详细地址', 'User.nickname' => '昵称', - 'User.realname' => '真实姓名', - 'User.mobile' => '手机号', - 'User.avatar' => '头像' + 'User.realname' => '下单人真实姓名', + 'User.mobile' => '下单人手机号', + 'User.avatar' => '下单人头像' ]; diff --git a/application/admin/lang/zh-cn/school/classes/order/service_order.php b/application/admin/lang/zh-cn/school/classes/order/service_order.php index 213eba4..a780200 100644 --- a/application/admin/lang/zh-cn/school/classes/order/service_order.php +++ b/application/admin/lang/zh-cn/school/classes/order/service_order.php @@ -53,17 +53,17 @@ return [ 'Checkouttime' => '结单时间', 'Createtime' => '创建时间', 'Updatetime' => '修改时间', - 'Order.order_no' => '订单号', + 'Order.order_no' => '课程订单号', 'Order.pay_no' => '微信支付单号', - 'User.nickname' => '昵称', - 'User.realname' => '真实姓名', - 'User.mobile' => '手机号', - 'User.avatar' => '头像', - 'Detail.title' => '标题', - 'Detail.headimage' => '头图', - 'Lib.title' => '标题', - 'Lib.headimage' => '头图', - 'Manystore.nickname' => '昵称', - 'Shop.name' => '店铺名称', - 'Shop.logo' => '品牌LOGO' + 'User.nickname' => '售后用户昵称', + 'User.realname' => '售后用户真实姓名', + 'User.mobile' => '售后用户手机号', + 'User.avatar' => '售后用户头像', + 'Detail.title' => '课程名称', + 'Detail.headimage' => '课程头图', + 'Lib.title' => '课程标题', + 'Lib.headimage' => '课程头图', + 'Manystore.nickname' => '机构账号昵称', + 'Shop.name' => '机构名称', + 'Shop.logo' => '机构LOGO' ]; diff --git a/application/admin/lang/zh-cn/school/classes/order/service_order_log.php b/application/admin/lang/zh-cn/school/classes/order/service_order_log.php index 04d5e2f..35f20b8 100644 --- a/application/admin/lang/zh-cn/school/classes/order/service_order_log.php +++ b/application/admin/lang/zh-cn/school/classes/order/service_order_log.php @@ -34,13 +34,12 @@ return [ 'Oper_type' => '记录人类型', 'Createtime' => '创建时间', 'Updatetime' => '修改时间', - 'Order.order_no' => '售后单号', - 'Order.order_no' => '订单号', + 'Order.order_no' => '课程订单号', 'Order.pay_no' => '微信支付单号', - 'User.nickname' => '昵称', - 'User.realname' => '真实姓名', - 'User.mobile' => '手机号', - 'User.avatar' => '头像', - 'Detail.title' => '标题', - 'Admin.nickname' => '昵称' + 'User.nickname' => '售后用户昵称', + 'User.realname' => '售后用户真实姓名', + 'User.mobile' => '售后用户手机号', + 'User.avatar' => '售后用户头像', + 'Detail.title' => '课程标题', + 'Admin.nickname' => '管理员昵称' ]; diff --git a/application/admin/lang/zh-cn/school/classes/teacher.php b/application/admin/lang/zh-cn/school/classes/teacher.php index 7a23407..4d426fd 100644 --- a/application/admin/lang/zh-cn/school/classes/teacher.php +++ b/application/admin/lang/zh-cn/school/classes/teacher.php @@ -2,8 +2,8 @@ return [ 'Manystore_id' => '机构账号id', - 'Shop_id' => '机构店铺id', - 'User_id' => '教师前台用户id', + 'Shop_id' => '机构', + 'User_id' => '教师前台用户', 'Name' => '教师名', 'Head_image' => '教师头像', 'Content' => '教师简介', @@ -18,19 +18,19 @@ return [ 'Createtime' => '创建时间', 'Updatetime' => '修改时间', 'Deletetime' => '删除时间', - 'User.nickname' => '昵称', - 'User.realname' => '真实姓名', - 'User.avatar' => '头像', - 'Manystore.nickname' => '昵称', - 'Shop.name' => '店铺名称', - 'Shop.logo' => '品牌LOGO', - 'Shop.image' => '封面图', - 'Shop.address_city' => '城市选择', - 'Shop.province' => '省编号', - 'Shop.city' => '市编号', - 'Shop.district' => '县区编号', - 'Shop.address' => '店铺地址', - 'Shop.address_detail' => '店铺详细地址', + 'User.nickname' => '绑定的前台用户昵称', + 'User.realname' => '绑定的前台用户真实姓名', + 'User.avatar' => '绑定的前台用户头像', + 'Manystore.nickname' => '机构账号昵称', + 'Shop.name' => '机构名称', + 'Shop.logo' => '机构LOGO', + 'Shop.image' => '机构封面图', + 'Shop.address_city' => '机构城市选择', + 'Shop.province' => '机构省编号', + 'Shop.city' => '机构市编号', + 'Shop.district' => '机构县区编号', + 'Shop.address' => '机构地址', + 'Shop.address_detail' => '机构详细地址', 'Recommend' => '平台首页推荐', 'Recommend 0' => '否', 'Recommend 1' => '是', diff --git a/application/admin/lang/zh-cn/school/classes/verification.php b/application/admin/lang/zh-cn/school/classes/verification.php index 1b58141..c5279ab 100644 --- a/application/admin/lang/zh-cn/school/classes/verification.php +++ b/application/admin/lang/zh-cn/school/classes/verification.php @@ -2,9 +2,9 @@ return [ 'Manystore_id' => '机构账号id', - 'Shop_id' => '机构店铺id', - 'User_id' => '用户id', - 'Classes_lib_ids' => '平台可核销的课程ids', + 'Shop_id' => '机构', + 'User_id' => '核销员前台用户', + 'Classes_lib_ids' => '平台可核销的课程', 'Status' => '状态', 'Status 1' => '开启', 'Set status to 1' => '设为开启', @@ -12,18 +12,18 @@ return [ 'Set status to 2' => '设为关闭', 'Createtime' => '创建时间', 'Updatetime' => '修改时间', - 'Manystore.nickname' => '昵称', - 'Manystore.avatar' => '头像', - 'Shop.name' => '店铺名称', - 'Shop.image' => '封面图', - 'Shop.address_city' => '城市选择', - 'Shop.province' => '省编号', - 'Shop.city' => '市编号', - 'Shop.district' => '县区编号', - 'Shop.address' => '店铺地址', - 'Shop.address_detail' => '店铺详细地址', - 'User.nickname' => '昵称', - 'User.realname' => '真实姓名', - 'User.mobile' => '手机号', - 'User.avatar' => '头像' + 'Manystore.nickname' => '机构账号昵称', + 'Manystore.avatar' => '机构账号头像', + 'Shop.name' => '机构名称', + 'Shop.image' => '机构封面图', + 'Shop.address_city' => '机构城市选择', + 'Shop.province' => '机构省编号', + 'Shop.city' => '机构市编号', + 'Shop.district' => '机构县区编号', + 'Shop.address' => '机构地址', + 'Shop.address_detail' => '机构详细地址', + 'User.nickname' => '核销员前台用户昵称', + 'User.realname' => '核销员前台用户真实姓名', + 'User.mobile' => '核销员前台用户手机号', + 'User.avatar' => '核销员前台用户头像' ]; diff --git a/application/admin/lang/zh-cn/school/classes/virtual_user.php b/application/admin/lang/zh-cn/school/classes/virtual_user.php index 8461481..7790a46 100644 --- a/application/admin/lang/zh-cn/school/classes/virtual_user.php +++ b/application/admin/lang/zh-cn/school/classes/virtual_user.php @@ -11,6 +11,6 @@ return [ 'Havetype' => '已报名', 'Havetype 1' => '是', 'Havetype 0' => '否', - 'Lib.title' => '标题', - 'Lib.headimage' => '头图' + 'Lib.title' => '课程名称', + 'Lib.headimage' => '课程头图' ]; diff --git a/application/admin/model/Admin.php b/application/admin/model/Admin.php index dbe6241..b01f3df 100644 --- a/application/admin/model/Admin.php +++ b/application/admin/model/Admin.php @@ -2,6 +2,8 @@ namespace app\admin\model; +use app\admin\model\school\SearchCity; +use app\common\model\dyqc\ManystoreShop; use think\Model; use think\Session; @@ -29,4 +31,68 @@ class Admin extends Model }); } + public function getAddressCityList(){ + return SearchCity::column("address_city","id"); + } + + + public static function getHaveShopId($adminId){ + $admin = self::get($adminId); + if(!$admin)throw new \Exception("管理员不存在"); + $area_json = $admin->area_json; + $shop_id = "*"; + if($area_json){ + $shop_id = []; + $searchCity = SearchCity::where("id","in",$area_json)->select(); + foreach ($searchCity as $item){ + $province = $item->province; + $city = $item->city; + $district = $item->district; + //查询在该区域的店铺id + $manystoreShop = new ManystoreShop; + if($province)$manystoreShop = $manystoreShop->where("province",$province); + if($city)$manystoreShop = $manystoreShop->where("city",$city); + if($district)$manystoreShop = $manystoreShop->where("district",$district); + $shop_id = array_merge($shop_id,$manystoreShop->column("id")); + } + } + return $shop_id; + } + + public static function getHaveCity($adminId){ + $admin = self::get($adminId); + if(!$admin)throw new \Exception("管理员不存在"); + $area_json = $admin->area_json; + $provinces = $citys = $districts = $address_citys = []; + if($area_json){ + $searchCity = SearchCity::where("id","in",$area_json)->select(); + foreach ($searchCity as $item){ + $address_citys[] = $item->address_city; + $province = $item->province; + if($province)$provinces[] = $province; + $city = $item->city; + if($city)$citys[] = $city; + $district = $item->district; + if($district)$districts[] = $district; + } + } + if(!$provinces)$provinces="*"; + if(!$citys)$citys="*"; + if(!$districts)$districts="*"; + if(!$address_citys)$address_citys="*"; + return compact("provinces","citys","districts","address_citys"); + } + + + + public static function checkAuthMsg($adminId){ + ["provinces" =>$provinces,"citys"=> $citys, "districts"=>$districts,"address_citys"=>$address_citys] = self::getHaveCity($adminId); + if(is_array($address_citys))$address_citys = implode(",",$address_citys); + //必要信息已完善 + return '
+ 您当前的区域管理权限为: '.$address_citys.' (能管理该区域下的机构信息，如果是*则不限制)
'; + + } + + } diff --git a/application/admin/model/school/classes/ClassesLib.php b/application/admin/model/school/classes/ClassesLib.php index a729d8f..1076c87 100644 --- a/application/admin/model/school/classes/ClassesLib.php +++ b/application/admin/model/school/classes/ClassesLib.php @@ -38,8 +38,30 @@ class ClassesLib extends Model 'selfhot_text', 'classes_cate_title', 'classes_label_title', + 'has_expire', ]; + public function getHasExpireList() + { + return ['1' => __('Has_expire 1'), '2' => __('Has_expire 2')]; + } + + + public function getHasExpireAttr($value, $data) + { + $end_time = (isset($data['end_time']) ? $data['end_time'] : ''); + if(!$end_time) return '2'; + + if( $end_time < time()) { + return '1'; + }else{ + return '2'; + } + + } + + + public function getClassesCateTitleAttr($value, $data) { $classes_cate_ids = (isset($data['classes_cate_ids']) ? $data['classes_cate_ids'] : ''); diff --git a/application/admin/view/auth/admin/add.html b/application/admin/view/auth/admin/add.html index 3cb174e..53865f3 100644 --- a/application/admin/view/auth/admin/add.html +++ b/application/admin/view/auth/admin/add.html @@ -42,6 +42,28 @@ {:build_radios('row[status]', ['normal'=>__('Normal'), 'hidden'=>__('Hidden')])} + + + +
+ +
+ + + + (没找到{:__('Area_json')}则点击按钮创建{:__('Area_json')}后重新下拉框选{:__('Area_json')} （不填为不限制）) + {:__('Add')} + + + +
+
+ + + + + + + +
+ +
+ + + + (没找到{:__('Area_json')}则点击按钮创建{:__('Area_json')}后重新下拉框选{:__('Area_json')} （不填为不限制）) + {:__('Add')} + + + +
+
+ + + + diff --git a/application/admin/view/common/control.html b/application/admin/view/common/control.html index 69bc449..555a078 100644 --- a/application/admin/view/common/control.html +++ b/application/admin/view/common/control.html @@ -63,9 +63,9 @@ -
-

{:__('Home')}

-
+ + +
diff --git a/application/admin/view/common/header.html b/application/admin/view/common/header.html index 5efa6b0..798d69e 100644 --- a/application/admin/view/common/header.html +++ b/application/admin/view/common/header.html @@ -24,9 +24,9 @@