diff --git a/application/admin/controller/school/activity/Activity.php b/application/admin/controller/school/activity/Activity.php index 0cdfa2d..232c807 100644 --- a/application/admin/controller/school/activity/Activity.php +++ b/application/admin/controller/school/activity/Activity.php @@ -355,7 +355,7 @@ class Activity extends Backend $count += 1; } Db::commit(); - } catch (PDOException|Exception $e) { + } catch (PDOException|\Exception $e) { Db::rollback(); $this->error($e->getMessage()); } diff --git a/application/admin/controller/school/activity/order/OrderCode.php b/application/admin/controller/school/activity/order/OrderCode.php index 097b61d..a472920 100644 --- a/application/admin/controller/school/activity/order/OrderCode.php +++ b/application/admin/controller/school/activity/order/OrderCode.php @@ -55,15 +55,16 @@ class OrderCode extends Backend list($where, $sort, $order, $offset, $limit) = $this->buildparams(); $list = $this->model - ->with(['order','user']) + ->with(['order','user',"orderuser"]) ->where($where) ->order($sort, $order) ->paginate($limit); foreach ($list as $row) { - $row->getRelation('order')->visible(['order_no']); + $row->getRelation('order')->visible(['order_no',"status"]); $row->getRelation('user')->visible(['nickname','realname','mobile','avatar']); + $row->getRelation('orderuser')->visible(['nickname','mobile','avatar']); } $result = array("total" => $list->total(), "rows" => $list->items()); diff --git a/application/admin/model/school/activity/order/OrderCode.php b/application/admin/model/school/activity/order/OrderCode.php index ee91bd2..18ac273 100644 --- a/application/admin/model/school/activity/order/OrderCode.php +++ b/application/admin/model/school/activity/order/OrderCode.php @@ -67,4 +67,11 @@ class OrderCode extends Model { return $this->belongsTo('app\common\model\User', 'verification_user_id', 'id', [], 'LEFT')->setEagerlyType(0); } + + + public function orderuser() + { + return $this->belongsTo('app\common\model\User', 'user_id', 'id', [], 'LEFT')->setEagerlyType(0); + } + } diff --git a/application/admin/model/user/invoice/Apply.php b/application/admin/model/user/invoice/Apply.php index 4a1af20..c7dbdc1 100644 --- a/application/admin/model/user/invoice/Apply.php +++ b/application/admin/model/user/invoice/Apply.php @@ -31,12 +31,15 @@ class Apply extends Model 'invoice_type_text', 'invoicingtime_text' ]; - - + + public function getStatusList() { - return ['1' => __('Status 1'), '2' => __('Status 2'), '-3' => __('Status -3')]; + return ['1' => __('Status 1') + , '2' => __('Status 2') +// , '-3' => __('Status -3') + ]; } public function getApplyTypeList() diff --git a/application/admin/view/user/invoice/apply/edit.html b/application/admin/view/user/invoice/apply/edit.html index 7bdec3a..571ed86 100644 --- a/application/admin/view/user/invoice/apply/edit.html +++ b/application/admin/view/user/invoice/apply/edit.html @@ -49,7 +49,7 @@
- {foreach name="headTypeList" item="vo"} {/foreach} @@ -61,7 +61,7 @@
- {foreach name="invoiceTypeList" item="vo"} {/foreach} @@ -72,7 +72,7 @@
- +
@@ -81,31 +81,31 @@
- +
- +
- +
- +
- +
@@ -113,13 +113,13 @@
- +
- +
diff --git a/application/api/controller/school/Header.php b/application/api/controller/school/Header.php index 4601b5d..943b07a 100644 --- a/application/api/controller/school/Header.php +++ b/application/api/controller/school/Header.php @@ -203,6 +203,7 @@ class Header extends Base public function edit($ids = null){ //敏感词过滤 // $this->checkSensitivewords(["name","idnum"]); + if(! $ids) $ids = $this->request->param('ids/d', ''); $user_id = 0; $user = $this->auth->getUser();//登录用户 @@ -337,4 +338,33 @@ class Header extends Base + /** + * @ApiTitle( 发票详情) + * @ApiSummary(发票详情) + * @ApiMethod(GET) + * @ApiParams(name = "id", type = "int",required=true,description = "发票id") + * @ApiReturn({ + * + *}) + */ + public function applydetail(){ + $this->model = new Apply(); + $id = $this->request->get('id/d',''); + + if(empty($id)){ + $this->error(__('缺少必要参数')); + } + + try { + $res = $this->model->detail($id); + } catch (\Exception $e){ +// Log::log($e->getMessage()); + $this->error($e->getMessage(),['errcode'=>$e->getCode()]); + } + $this->success('获取成功', ['detail' => $res]); + } + + + + } \ No newline at end of file diff --git a/application/api/controller/school/NewActivity.php b/application/api/controller/school/NewActivity.php index 664acd0..c86a3e1 100644 --- a/application/api/controller/school/NewActivity.php +++ b/application/api/controller/school/NewActivity.php @@ -203,6 +203,9 @@ class NewActivity extends Base try { $res = $this->model->detail($id,$user_id); + + file_put_contents('activity'.date('Y_m_d').'.log',date('Y-m-d H:i:s')." ".json_encode($res).PHP_EOL,FILE_APPEND); + } catch (\Exception $e){ // Log::log($e->getMessage()); $this->error($e->getMessage(),['errcode'=>$e->getCode()]); diff --git a/application/api/controller/school/newactivity/ActivityDrafts.php b/application/api/controller/school/newactivity/ActivityDrafts.php index 2be42b5..5006105 100644 --- a/application/api/controller/school/newactivity/ActivityDrafts.php +++ b/application/api/controller/school/newactivity/ActivityDrafts.php @@ -157,6 +157,8 @@ class ActivityDrafts extends Base try { $res = $this->model->detail($id,$user_id); + file_put_contents('activityDrafts'.date('Y_m_d').'.log',date('Y-m-d H:i:s')." ".json_encode($res).PHP_EOL,FILE_APPEND); + } catch (\Exception $e){ // Log::log($e->getMessage()); $this->error($e->getMessage(),['errcode'=>$e->getCode()]); diff --git a/application/common/model/school/Area.php b/application/common/model/school/Area.php index 71e2186..fe1e4c2 100644 --- a/application/common/model/school/Area.php +++ b/application/common/model/school/Area.php @@ -18,4 +18,9 @@ class Area extends Model + public function child() + { + return $this->hasMany(self::class,'pid'); + } + } diff --git a/application/common/model/school/activity/Activity.php b/application/common/model/school/activity/Activity.php index e471ec4..c5a4e63 100644 --- a/application/common/model/school/activity/Activity.php +++ b/application/common/model/school/activity/Activity.php @@ -366,6 +366,9 @@ class Activity extends BaseModel $split_line = " - "; $time_arr = explode($split_line,$time); + if(!$time_arr)throw new \Exception("活动开始和结束时间格式错误！"); + if(count($time_arr) != 2) throw new \Exception("活动开始和结束时间格式错误！"); + $params["start_time"] = $time_arr[0] ; $params["end_time"] = $time_arr[1]; unset($params["time"]); @@ -376,6 +379,29 @@ class Activity extends BaseModel if(empty($start_time) || empty($end_time)){ throw new \Exception("请选择活动开始和结束时间".$time); } + + + if(!is_numeric($params["start_time"]) || !is_numeric($params["end_time"])){ + + // 转化时间戳 + $current_year = date('Y'); + $start_time_str = $params["start_time"]; + $end_time_str = $params["end_time"]; + + // 检查是否包含年份信息（4位数字） + if (!preg_match('/\d{4}/', $start_time_str)) { + $params["start_time"] = $current_year . '-' . $start_time_str; + } + if (!preg_match('/\d{4}/', $end_time_str)) { + $params["end_time"] = $current_year . '-' . $end_time_str; + } + + } + + + + + //转化时间戳 $start_time = $params["start_time"] && !is_numeric($params["start_time"]) ? strtotime($params["start_time"]) : $params["start_time"]; $end_time = $params["end_time"] && !is_numeric($params["end_time"]) ? strtotime($params["end_time"]) : $params["end_time"]; @@ -394,7 +420,10 @@ class Activity extends BaseModel $split_line = " - "; $time_arr = explode($split_line,$time); - if(!$time_arr) + if(!$time_arr)throw new \Exception("报名活动开始和结束时间格式错误！"); + if(count($time_arr) != 2) throw new \Exception("报名活动开始和结束时间格式错误！"); + + $params["sign_start_time"] = $time_arr[0] ; $params["sign_end_time"] = $time_arr[1]; @@ -406,6 +435,27 @@ class Activity extends BaseModel if(empty($sign_start_time) || empty($sign_end_time)){ throw new \Exception("请选择报名开始和结束时间".$time); } + + + if(!is_numeric($params["sign_start_time"]) || !is_numeric($params["sign_end_time"])){ + + // 转化时间戳 + $current_year = date('Y'); + $start_time_str = $params["sign_start_time"]; + $end_time_str = $params["sign_end_time"]; + + // 检查是否包含年份信息（4位数字） + if (!preg_match('/\d{4}/', $start_time_str)) { + $params["sign_start_time"] = $current_year . '-' . $start_time_str; + } + if (!preg_match('/\d{4}/', $end_time_str)) { + $params["sign_end_time"] = $current_year . '-' . $end_time_str; + } + + } + + + //转化时间戳 $sign_start_time = $params["sign_start_time"] && !is_numeric($params["sign_start_time"]) ? strtotime($params["sign_start_time"]) : $params["sign_start_time"]; $sign_end_time = $params["sign_end_time"] && !is_numeric($params["sign_end_time"]) ? strtotime($params["sign_end_time"]) : $params["sign_end_time"]; @@ -2204,7 +2254,7 @@ public static function getHaveActivityDelete($id){ */ public function activity_delete($id,$oper_type='user',$oper_id=0,$trans=false){ $activity = self::getHaveActivityDelete($id); - if(!$activity)throw new \Exception("可删除活动不存在！"); + if(!$activity)throw new \Exception("没有订单，且是未开始或报名中，才可删除！"); if($oper_type=='user' && $activity["user_id"] != $oper_id) throw new \Exception("您无权删除该活动"); diff --git a/application/common/model/school/activity/ActivityDrafts.php b/application/common/model/school/activity/ActivityDrafts.php index 2c7b47f..edffde2 100644 --- a/application/common/model/school/activity/ActivityDrafts.php +++ b/application/common/model/school/activity/ActivityDrafts.php @@ -272,6 +272,10 @@ class ActivityDrafts extends BaseModel $split_line = " - "; $time_arr = explode($split_line,$time); + if(!$time_arr)throw new \Exception("活动开始和结束时间格式错误！"); + if(count($time_arr) != 2) throw new \Exception("活动开始和结束时间格式错误！"); + + $params["start_time"] = $time_arr[0] ; $params["end_time"] = $time_arr[1]; unset($params["time"]); @@ -282,6 +286,25 @@ class ActivityDrafts extends BaseModel if(empty($start_time) || empty($end_time)){ throw new \Exception("请选择活动开始和结束时间".$time); } + + if(!is_numeric($params["start_time"]) || !is_numeric($params["end_time"])){ + + // 转化时间戳 + $current_year = date('Y'); + $start_time_str = $params["start_time"]; + $end_time_str = $params["end_time"]; + + // 检查是否包含年份信息（4位数字） + if (!preg_match('/\d{4}/', $start_time_str)) { + $params["start_time"] = $current_year . '-' . $start_time_str; + } + if (!preg_match('/\d{4}/', $end_time_str)) { + $params["end_time"] = $current_year . '-' . $end_time_str; + } + + } + + //转化时间戳 $start_time = $params["start_time"] && !is_numeric($params["start_time"]) ? strtotime($params["start_time"]) : $params["start_time"]; $end_time = $params["end_time"] && !is_numeric($params["end_time"]) ? strtotime($params["end_time"]) : $params["end_time"]; @@ -300,6 +323,11 @@ class ActivityDrafts extends BaseModel $split_line = " - "; $time_arr = explode($split_line,$time); + if(!$time_arr)throw new \Exception("报名活动开始和结束时间格式错误！"); + if(count($time_arr) != 2) throw new \Exception("报名活动开始和结束时间格式错误！"); + + + $params["sign_start_time"] = $time_arr[0] ; $params["sign_end_time"] = $time_arr[1]; unset($params["sign_time"]); @@ -310,6 +338,26 @@ class ActivityDrafts extends BaseModel if(empty($sign_start_time) || empty($sign_end_time)){ throw new \Exception("请选择报名开始和结束时间".$time); } + + + if(!is_numeric($params["sign_start_time"]) || !is_numeric($params["sign_end_time"])){ + + // 转化时间戳 + $current_year = date('Y'); + $start_time_str = $params["sign_start_time"]; + $end_time_str = $params["sign_end_time"]; + + // 检查是否包含年份信息（4位数字） + if (!preg_match('/\d{4}/', $start_time_str)) { + $params["sign_start_time"] = $current_year . '-' . $start_time_str; + } + if (!preg_match('/\d{4}/', $end_time_str)) { + $params["sign_end_time"] = $current_year . '-' . $end_time_str; + } + + } + + //转化时间戳 $sign_start_time = $params["sign_start_time"] && !is_numeric($params["sign_start_time"]) ? strtotime($params["sign_start_time"]) : $params["sign_start_time"]; $sign_end_time = $params["sign_end_time"] && !is_numeric($params["sign_end_time"]) ? strtotime($params["sign_end_time"]) : $params["sign_end_time"]; diff --git a/application/common/model/school/activity/order/Order.php b/application/common/model/school/activity/order/Order.php index 3fabf76..1d1100e 100644 --- a/application/common/model/school/activity/order/Order.php +++ b/application/common/model/school/activity/order/Order.php @@ -705,7 +705,8 @@ class Order extends BaseModel ->where("{$as}.idnum","in",$people_idnums) ->find(); if($orderCode){ - throw new \Exception("{$orderCode['name']}已经报过名了！请勿重复报名！"); +// throw new \Exception("{$orderCode['name']}已经报过名了！请勿重复报名！"); + throw new \Exception("该身份证号已报名！请勿重复报名！"); } @@ -951,6 +952,7 @@ class Order extends BaseModel "activity_order_id"=>$order["id"], "status" =>'3', "activity_id"=>$order['activity_id'], + "user_id"=>$order['user_id'], ]; if($people && isset($people[$i])){ $params["name"] = $people[$i]["name"]; diff --git a/application/common/model/user/invoice/Apply.php b/application/common/model/user/invoice/Apply.php index 04da287..eba1027 100644 --- a/application/common/model/user/invoice/Apply.php +++ b/application/common/model/user/invoice/Apply.php @@ -50,7 +50,10 @@ class Apply extends BaseModel public function getStatusList() { - return ['1' => __('Status 1'), '2' => __('Status 2'), '-3' => __('Status -3')]; + return ['1' => __('Status 1') + , '2' => __('Status 2') + , '-3' => __('Status -3') + ]; } public function getApplyTypeList() @@ -155,6 +158,33 @@ class Apply extends BaseModel + /** 通用详情(后台api版本) + * @param $params + * @param $trans + * @return $this + * @throws \Exception + */ + public function detail($id,$show_field=[],$except_field=[]){ + $row = $this->get($id); + if (!$row) { + throw new \Exception(__('No Results were found')); + } + $row->activityorders; + + + if($show_field){ + $row->visible($show_field); + } + if($except_field){ + $row->hidden($except_field); + } + + + return $row; + } + + + /** 申请发票 * @param $order_no 申请发票的订单号 * @param diff --git a/application/index/controller/Index.php b/application/index/controller/Index.php index 452ff98..252147c 100644 --- a/application/index/controller/Index.php +++ b/application/index/controller/Index.php @@ -13,6 +13,8 @@ class Index extends Frontend public function index() { + +// $this->redirect('/mobile_h5'); return $this->view->fetch(); } diff --git a/application/manystore/controller/school/activity/Activity.php b/application/manystore/controller/school/activity/Activity.php index 96ebfd1..68dd5d5 100644 --- a/application/manystore/controller/school/activity/Activity.php +++ b/application/manystore/controller/school/activity/Activity.php @@ -421,13 +421,16 @@ class Activity extends ManystoreBase Db::startTrans(); try { foreach ($list as $k => $v) { - $count += $v->delete(); + //当前申请状态 + $res = (new \app\common\model\school\activity\Activity())->activity_delete($v->id,'user',$v->user_id,true); + + $count += 1; } Db::commit(); } catch (PDOException $e) { Db::rollback(); $this->error($e->getMessage()); - } catch (Exception $e) { + } catch (\Exception $e) { Db::rollback(); $this->error($e->getMessage()); } diff --git a/application/manystore/controller/school/activity/order/OrderCode.php b/application/manystore/controller/school/activity/order/OrderCode.php index 88dab64..f34a88f 100644 --- a/application/manystore/controller/school/activity/order/OrderCode.php +++ b/application/manystore/controller/school/activity/order/OrderCode.php @@ -54,7 +54,7 @@ class OrderCode extends ManystoreBase list($where, $sort, $order, $offset, $limit) = $this->buildparams(); $as = $this->model->getWithAlisaName(); $list = $this->model - ->with(['schoolactivityorder','user','schoolactivity']) + ->with(['schoolactivityorder','user','schoolactivity',"orderuser"]) ->where("schoolactivity.user_id", SHOP_USER_ID) ->where($where) ->order($sort, $order) @@ -62,9 +62,10 @@ class OrderCode extends ManystoreBase foreach ($list as $row) { - $row->getRelation('schoolactivityorder')->visible(['order_no','pay_no']); + $row->getRelation('schoolactivityorder')->visible(['order_no','pay_no',"status"]); $row->getRelation('user')->visible(['nickname','mobile','avatar']); $row->getRelation('schoolactivity')->visible(['title','images']); + $row->getRelation('orderuser')->visible(['nickname','mobile','avatar']); } $result = array("total" => $list->total(), "rows" => $list->items()); diff --git a/application/manystore/model/school/activity/order/OrderCode.php b/application/manystore/model/school/activity/order/OrderCode.php index 5e4a961..38d6f13 100644 --- a/application/manystore/model/school/activity/order/OrderCode.php +++ b/application/manystore/model/school/activity/order/OrderCode.php @@ -75,4 +75,12 @@ class OrderCode extends BaseModel { return $this->belongsTo(Activity::class, 'activity_id', 'id', [], 'LEFT')->setEagerlyType(0); } + + + public function orderuser() + { + return $this->belongsTo('app\manystore\model\User', 'user_id', 'id', [], 'LEFT')->setEagerlyType(0); + } + + } diff --git a/application/manystore/model/user/invoice/Apply.php b/application/manystore/model/user/invoice/Apply.php index 88b91a1..4026fd2 100644 --- a/application/manystore/model/user/invoice/Apply.php +++ b/application/manystore/model/user/invoice/Apply.php @@ -32,12 +32,15 @@ class Apply extends BaseModel 'invoice_type_text', 'invoicingtime_text' ]; - - + + public function getStatusList() { - return ['1' => __('Status 1'), '2' => __('Status 2'), '-3' => __('Status -3')]; + return ['1' => __('Status 1') + , '2' => __('Status 2') +// , '-3' => __('Status -3') + ]; } public function getApplyTypeList() diff --git a/application/manystore/view/dashboard/index.html b/application/manystore/view/dashboard/index.html index c4873b5..2017bf2 100644 --- a/application/manystore/view/dashboard/index.html +++ b/application/manystore/view/dashboard/index.html @@ -185,209 +185,209 @@ -
-
-
- -
- {$totaluser} - {:__('Total user')} -
-
-
-
-
- -
- {$totalviews} - {:__('Total view')} -
-
-
-
-
- -
- {$totalorder} - {:__('Total order')} -
-
-
-
-
- -
- {$totalorderamount} - {:__('Total order amount')} -
-
-
-
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -
-
-
-
-
-
-
-
-
-
-
-
{$todayusersignup}
-
{:__('Today user signup')}
-
-
-
-
-
-
-
-
-
{$todayuserlogin}
-
{:__('Today user login')}
-
-
-
-
-
-
-
-
-
{$todayorder}
-
{:__('Today order')}
-
-
-
-
-
-
-
-
-
{$unsettleorder}
-
{:__('Unsettle order')}
-
-
-
-
-
-
-
-
-
{$sevendnu}
-
{:__('Seven dnu')}
-
-
-
-
-
-
-
-
-
{$sevendau}
-
{:__('Seven dau')}
-
-
-
-
-
-
-
-
-
-
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -
+ -
-
-
-
-
-
- {:__('Real time')} -
{:__('Category count')}
-
-
-

1234

-
1234
- {:__('Category count tips')} -
-
-
-
-
-
-
-
- {:__('Real time')} -
{:__('Attachment count')}
-
-
-

1043

-
2592
- {:__('Attachment count tips')} -
-
-
-
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -
-
-
-
- {:__('Real time')} -
{:__('Article count')}
-
-
+ + + + + + + + -
-
-

1234

-
- {:__('Comment count')} -
-
-
-

6754

-
- {:__('Like count')} -
-
-
-
-
-
-
-
-
-
-
- {:__('Real time')} -
{:__('News count')}
-
-
+ + + + + + + + + + + + + + + + + + + + + + + + + + -
-
-

5302

-
- {:__('Comment count')} -
-
-
-

8205

-
- {:__('Like count')} -
-
-
-
-
-
-
-
+ + + + + + + + + + + + + + + + + + +
diff --git a/extend/bw/sensitivewords/Vocabulary/最终敏感词库_去过敏常用词加强版.txt b/extend/bw/sensitivewords/Vocabulary/最终敏感词库_去过敏常用词加强版.txt index 5b147f6..6796023 100644 --- a/extend/bw/sensitivewords/Vocabulary/最终敏感词库_去过敏常用词加强版.txt +++ b/extend/bw/sensitivewords/Vocabulary/最终敏感词库_去过敏常用词加强版.txt @@ -279,7 +279,6 @@ G芭 HACKING HONGZHI HRICHINA -HTTP HUANET HuangJu ILLUSION @@ -1136,7 +1135,6 @@ hsey.info hsjs.qqww.us html.cicitv.in htsrh.info -http huaheshan.info huajianmin huanet @@ -5372,7 +5370,6 @@ z东 兴盛遍神州工厂变歌厅 兵力部署 兵种教材 -其他 其美仁增 具有中国特色的魔鬼辞典 养不起父母下岗 @@ -6798,8 +6795,6 @@ z东 发生关系 发生暴动 发电俏娇娃 -发票 -发票 管理 发票代开 发票代开保真 发票代理 @@ -7744,7 +7739,6 @@ z东 地匹哌酮 地县干部忙吃喝 地地道道流氓政权 -地址 地块规划 地塞米松 地奈德 @@ -9498,7 +9492,6 @@ z东 幻梦神话 幼b 幼交 -幼儿园 幼儿园又遭毒手 幼儿园砍杀 幼儿园被砍杀 @@ -9523,7 +9516,6 @@ z东 广东饶平钱东镇 广告代理 广告赚钱 -广场 广场上的共和国 广场上的热血 广场上的鲜血 @@ -9568,8 +9560,6 @@ z东 应召女郎 应召女郎* 应开生肖 -应招 -应聘不用交任何费用 底制 底裤 府软弱 @@ -9621,7 +9611,6 @@ z东 开发区的领导最逍遥 开发商猪坚强 开发商若要富先用金钱铺好路 -开发票 开发票公司 开发豆腐渣 开发身体养爹娘 @@ -9663,8 +9652,6 @@ z东 异议人士 弃欓 弄穴 -弓单 -弓弩 弓弩一百专卖店 弓弩专卖 弓弩专卖店 @@ -9689,12 +9676,10 @@ z东 弓弩麻醉箭 弓弩麻醉镖 弓月杏理 -弓箭 弓虽 弓虽女干 弓雖 引发清明京师民 -引導 引无数男人累断腰 引无数白领竞折腰 引无数美女竞折腰 @@ -9704,7 +9689,6 @@ z东 弘法体 弘法体* 弟大物勃 -弟子 弟子正念足 弟子的伟大 弟疼 @@ -15338,9 +15322,6 @@ z东 箍身箍勢式 管制刀具 管土地的是霸王 -管理 -管理员 -管理就是收费 管里 簡易炸蛋製作方法 簡肇棟 diff --git a/extend/bw/sensitivewords/Vocabulary/未命名.txt b/extend/bw/sensitivewords/Vocabulary/未命名.txt new file mode 100644 index 0000000..a41a3bc --- /dev/null +++ b/extend/bw/sensitivewords/Vocabulary/未命名.txt @@ -0,0 +1,330 @@ +# 政治敏感类 +反动 +颠覆 +煽动分裂 +侮辱国家 +诽谤国家 +侮辱领导人 +诽谤领导人 +民族仇恨 +民族歧视 +邪教 +迷信组织 +非法组织 +恐怖主义 +极端主义 +藏独 +台独 +疆独 +法轮功 +达赖 +热比娅 + +--- + +# 暴力、血腥、色情、低俗类 +杀戮 +肢解 +强奸 +性爱 +裸露 +色诱 +约炮 +包养 +吸毒 +贩毒 +赌球 +私彩 +管制刀具 +强奸 +乱伦 +群交 +淫秽 +性暗示 +性服务 +色情 +三级片 +AV +黄色 +SM +自慰 +卖淫 +嫖娼 +一夜情 +出轨 +小三 +性交易 +色诱 +约炮 +援交 +包养 +裸聊 +视频裸聊 +性奴 +淫荡 +色批 +流氓 +变态 +屌丝 +娘炮 +基佬 +百合 +同性恋 (非正常讨论) +同性交友 (非正常讨论) +一夜情 +约pao +啪啪啪 +做爱 +性幻想 +春宫 +口交 +肛交 +手淫 +色情片 +AV女优 +GV +成人影片 +成人用品 (非法销售) +情趣用品 (非法销售) +SM用品 +虐待 +暴力 +血腥 +残忍 +自杀 +割腕 +跳楼 +投毒 +枪击 +爆炸 +恐怖 +威胁 +打砸抢 +斗殴 +黑社会 +犯罪 +毒品 +麻醉剂 +大麻 +海洛因 +冰毒 +K粉 +摇头丸 +赌博 +博彩 +六合彩 +地下彩票 +赌大小 +扎金花 +牌九 +色子 +老虎机 +推筒子 +百家乐 +21点 +德州扑克 +赌神 +赌圣 + +--- + +# 广告法禁用词及虚假宣传类 +国家级 +最高级 +最佳 +第一 +顶级 +极品 +冠军 +独家 +绝无仅有 +万能 +史无前例 +空前绝后 +首个 +唯一 +最新 +最先进 +最优秀 +最权威 +最正宗 +特级 +极 +极致 +绝对 +彻底 +完全 +完美 +神 +神奇 +特效 +包治百病 +根治 +祖传秘方 +包赚不赔 +无效退款 +投资零风险 +立即见效 +快速致富 +保证收益 +承诺收益 +治愈一切 +延年益寿 +返老还童 +专家推荐 (未经授权或无资质) +权威认证 (未经授权或无资质) +热销 +爆款 +抢购 +限量 +稀有 +珍贵 + +--- + +# 敏感行业及产品类 +股票推荐 +内幕交易 +一夜暴富 +戒烟秘诀 +XX牌香烟 +彩票预测 +私烟 +水烟 +电子烟 (非法宣传) +酒驾 +醉驾 +替考 +作弊 +代写 +代孕 +试管婴儿 (非法宣传) +枪支 +弹药 +管制刀具 +弓弩 +仿真枪 +警用器械 +军用器械 +迷药 +蒙汗药 +泻药 +春药 +兴奋剂 +毒药 +假冒 +伪劣 +山寨 +盗版 +高仿 +克隆 +假钞 +走私 +文物 (非法交易) +野生动物 (非法交易) +象牙 +虎骨 +犀牛角 +熊胆 +管制药品 +处方药 (非法销售) +伟哥 +西地那非 +玻尿酸 (非法销售) +肉毒素 (非法销售) +整形 +整容 (非法医美广告) +医美 (非法医美广告) +微整形 (非法医美广告) +瘦脸针 +水光针 +溶脂针 +减肥药 (非法销售) +性病 +艾滋病 (传播恐慌或非法宣传) + +--- + +# 侵犯知识产权、隐私类 +盗版 +免费XX会员 (涉及侵权) +泄露手机号 +泄露身份证 +泄露银行卡 +个人信息贩卖 +侵权 +抄袭 +仿冒 +山寨 +盗用 +偷拍 +窃听 +隐私泄露 +个人数据 +用户数据 +黑客 +钓鱼 +木马 +病毒 +诈骗 +欺诈 + +--- + +# 社会公序良俗类 +喷子 +屌丝 +丑八怪 +地域黑 +仇富 +仇穷 +歧视 +侮辱 +谩骂 +人身攻击 +诽谤 +造谣 +抹黑 +煽动 +教唆 +引战 +负能量 +消极 +厌世 +抑郁 (滥用或不当引导) +自闭 (滥用或不当引导) +网络暴力 +人肉搜索 +恐吓 +威胁 +诅咒 +诅咒 +恶毒 +变态 +恶心 +低俗 +粗俗 +愚蠢 +傻逼 +神经病 +疯子 +白痴 +智障 +残疾 (歧视性言论) +病人 (歧视性言论) +弱智 +残废 +垃圾 +废物 +渣男 +渣女 +绿茶 +心机婊 +白莲花 +小三 +二奶 +卖国贼 +汉奸 +走狗 +叛徒 +叛国 \ No newline at end of file diff --git a/public/assets/js/backend/school/activity/activity.js b/public/assets/js/backend/school/activity/activity.js index e993f76..38ae903 100644 --- a/public/assets/js/backend/school/activity/activity.js +++ b/public/assets/js/backend/school/activity/activity.js @@ -165,6 +165,24 @@ define(['jquery', 'bootstrap', 'backend', 'csmtable', 'form'], function ($, unde // } }, + { + name: 'activity_code', + text: __('活动核销人员信息'), + title: __('活动核销人员信息'), + classname: 'btn btn-dialog', + icon: 'fa fa-cart-arrow-down', + dropdown : '更多', + url: activity_order_code_url, + callback: function (data) { + + }, + // visible: function (row) { + // return row.status == '2'||row.status == '3'; + // } + }, + + + { name: 'user', text: __('发布用户查看'), @@ -461,6 +479,11 @@ define(['jquery', 'bootstrap', 'backend', 'csmtable', 'form'], function ($, unde return 'school/activity/order/settle_log/index?activity_id='+row.id; } + var activity_order_code_url = function (row,dom) { + return 'school/activity/order/order_code/index?activity_id='+row.id; + } + + return Controller; }); diff --git a/public/assets/js/backend/school/activity/order/order.js b/public/assets/js/backend/school/activity/order/order.js index 6889ac4..8521a11 100644 --- a/public/assets/js/backend/school/activity/order/order.js +++ b/public/assets/js/backend/school/activity/order/order.js @@ -44,7 +44,7 @@ define(['jquery', 'bootstrap', 'backend', 'csmtable', 'form'], function ($, unde {field: 'status', title: __('Status'), searchList: {"-3":__('Status -3'),"0":__('Status 0'),"2":__('Status 2'),"3":__('Status 3'),"4":__('Status 4'),"5":__('Status 5'),"6":__('Status 6'),"7":__('Status 7'),"9":__('Status 9')}, formatter: Table.api.formatter.status}, - + {field: 'user_id', title: __('User_id')}, {field: 'user.nickname', title: __('User.nickname'), operate: 'LIKE'}, {field: 'user.realname',visible:false, title: __('User.realname'), operate: 'LIKE'}, {field: 'user.mobile',visible:false, title: __('User.mobile'), operate: 'LIKE'}, @@ -53,7 +53,7 @@ define(['jquery', 'bootstrap', 'backend', 'csmtable', 'form'], function ($, unde {field: 'pay_no', title: __('Pay_no'),visible:false, operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content}, - {field: 'user_id',visible:false, title: __('User_id')}, + {field: 'activity_id',visible:false, title: __('Activity_id')}, {field: 'activity_order_detail_id',visible:false, title: __('Activity_order_detail_id')}, {field: 'beforeprice', title: __('Beforeprice'), operate:'BETWEEN'}, diff --git a/public/assets/js/backend/school/activity/order/order_code.js b/public/assets/js/backend/school/activity/order/order_code.js index 64a98bf..5a3e474 100644 --- a/public/assets/js/backend/school/activity/order/order_code.js +++ b/public/assets/js/backend/school/activity/order/order_code.js @@ -31,9 +31,15 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin {field: 'id', title: __('Id')}, {field: 'activity_order_id', title: __('Activity_order_id')}, + {field: 'order.order_no',visible:false, title: __('Order.order_no'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content}, + + {field: 'order.status', title: __('订单状态'), searchList: {"-3":__('已取消'),"0":__('待支付'),"2":__('已报名'),"3":__('核销中'),"4":__('售后中'),"5":__('退款结算中'),"6":__('已退款'),"7":__('售后挂起'),"9":__('已完成')}, formatter: Table.api.formatter.status}, + + {field: 'name', title: __('姓名'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content}, {field: 'idnum', title: __('身份证号'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content}, + {field: 'orderuser.mobile', title: __('下单人手机号'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content}, @@ -41,16 +47,17 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin {field: 'miniurl', title: __('核销码内容'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content}, - {field: 'codeimage', title: __('Codeimage'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.image}, + {field: 'codeimage', title: __('Codeimage'),visible:false, operate: false, events: Table.api.events.image, formatter: Table.api.formatter.image}, - {field: 'codeoneimage', title: __('Codeoneimage'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.image}, + {field: 'codeoneimage', title: __('Codeoneimage'),visible:false, operate: false, events: Table.api.events.image, formatter: Table.api.formatter.image}, {field: 'status', title: __('Status'), searchList: {"3":__('Status 3'),"6":__('Status 6')}, formatter: Table.api.formatter.status}, {field: 'verificationtime', title: __('Verificationtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime}, {field: 'verification_user_id', title: __('Verification_user_id')}, {field: 'verification_type', title: __('Verification_type'), operate: 'LIKE'}, {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime}, {field: 'updatetime', title: __('Updatetime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime}, - {field: 'order.order_no',visible:false, title: __('Order.order_no'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content}, + + {field: 'activity_id', title: __('活动id')}, // {field: 'user.nickname', title: __('User.nickname'), operate: 'LIKE'}, // {field: 'user.realname', title: __('User.realname'), operate: 'LIKE'}, // {field: 'user.mobile', title: __('User.mobile'), operate: 'LIKE'}, diff --git a/public/assets/js/manystore/school/activity/activity.js b/public/assets/js/manystore/school/activity/activity.js index 5ec23b6..0a60c04 100644 --- a/public/assets/js/manystore/school/activity/activity.js +++ b/public/assets/js/manystore/school/activity/activity.js @@ -167,6 +167,24 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin + { + name: 'activity_code', + text: __('活动核销人员信息'), + title: __('活动核销人员信息'), + classname: 'btn btn-dialog', + icon: 'fa fa-cart-arrow-down', + dropdown : '更多', + url: activity_order_code_url, + callback: function (data) { + + }, + // visible: function (row) { + // return row.status == '2'||row.status == '3'; + // } + }, + + + { name: 'settle_log', text: __('活动生成的结算日志'), @@ -439,7 +457,9 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin return 'school/activity/order/settle_log/index?activity_id='+row.id; } - + var activity_order_code_url = function (row,dom) { + return 'school/activity/order/order_code/index?activity_id='+row.id; + } return Controller; diff --git a/public/assets/js/manystore/school/activity/order/order.js b/public/assets/js/manystore/school/activity/order/order.js index 11e629a..8b65e2e 100644 --- a/public/assets/js/manystore/school/activity/order/order.js +++ b/public/assets/js/manystore/school/activity/order/order.js @@ -44,7 +44,7 @@ define(['jquery', 'bootstrap', 'backend', 'csmtable', 'form'], function ($, unde {field: 'status', title: __('Status'), searchList: {"-3":__('Status -3'),"0":__('Status 0'),"2":__('Status 2'),"3":__('Status 3'),"4":__('Status 4'),"5":__('Status 5'),"6":__('Status 6'),"7":__('Status 7'),"9":__('Status 9')}, formatter: Table.api.formatter.status}, - + {field: 'user_id', title: __('User_id')}, {field: 'user.nickname', title: __('User.nickname'), operate: 'LIKE'}, {field: 'user.realname',visible:false, title: __('User.realname'), operate: 'LIKE'}, {field: 'user.mobile',visible:false, title: __('User.mobile'), operate: 'LIKE'}, @@ -53,7 +53,7 @@ define(['jquery', 'bootstrap', 'backend', 'csmtable', 'form'], function ($, unde {field: 'pay_no', title: __('Pay_no'),visible:false, operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content}, - {field: 'user_id',visible:false, title: __('User_id')}, + {field: 'activity_id',visible:false, title: __('Activity_id')}, {field: 'activity_order_detail_id',visible:false, title: __('Activity_order_detail_id')}, {field: 'beforeprice', title: __('Beforeprice'), operate:'BETWEEN'}, diff --git a/public/assets/js/manystore/school/activity/order/order_code.js b/public/assets/js/manystore/school/activity/order/order_code.js index dce711f..28c001e 100644 --- a/public/assets/js/manystore/school/activity/order/order_code.js +++ b/public/assets/js/manystore/school/activity/order/order_code.js @@ -31,26 +31,35 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin {field: 'id', title: __('Id')}, {field: 'activity_order_id', title: __('Activity_order_id')}, + {field: 'schoolactivityorder.order_no',visible:false, title: __('Schoolactivityorder.order_no'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content}, + + + {field: 'schoolactivityorder.status', title: __('订单状态'), searchList: {"-3":__('已取消'),"0":__('待支付'),"2":__('已报名'),"3":__('核销中'),"4":__('售后中'),"5":__('退款结算中'),"6":__('已退款'),"7":__('售后挂起'),"9":__('已完成')}, formatter: Table.api.formatter.status}, + + {field: 'name', title: __('姓名'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content}, {field: 'idnum', title: __('身份证号'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content}, + {field: 'orderuser.mobile', title: __('下单人手机号'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content}, {field: 'code', title: __('Code'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content}, {field: 'miniurl', title: __('核销码内容'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content}, - {field: 'codeimage', title: __('Codeimage'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.image}, + {field: 'codeimage', title: __('Codeimage'), operate: false,visible:false, events: Table.api.events.image, formatter: Table.api.formatter.image}, - {field: 'codeoneimage', title: __('Codeoneimage'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.image}, + {field: 'codeoneimage', title: __('Codeoneimage'), operate: false,visible:false, events: Table.api.events.image, formatter: Table.api.formatter.image}, {field: 'status', title: __('Status'), searchList: {"3":__('Status 3'),"6":__('Status 6')}, formatter: Table.api.formatter.status}, {field: 'verificationtime', title: __('Verificationtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime}, {field: 'verification_user_id', title: __('Verification_user_id')}, {field: 'verification_type', title: __('Verification_type'), operate: 'LIKE'}, {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime}, {field: 'updatetime', title: __('Updatetime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime}, - {field: 'schoolactivityorder.order_no',visible:false, title: __('Schoolactivityorder.order_no'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content}, + + {field: 'activity_id', title: __('活动id')}, + // {field: 'user.nickname', title: __('User.nickname'), operate: 'LIKE'}, // {field: 'user.realname', title: __('User.realname'), operate: 'LIKE'}, // {field: 'user.mobile', title: __('User.mobile'), operate: 'LIKE'},