修复提现相关bug，优化草稿箱逻辑

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());
         }

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());

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);
+    }
+
 }

application/admin/model/user/invoice/Apply.php

@@ -36,7 +36,10 @@ class Apply extends Model
 
     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()

application/admin/view/user/invoice/apply/edit.html

@@ -49,7 +49,7 @@
         <label class="control-label col-xs-12 col-sm-2">{:__('Head_type')}:</label>
         <div class="col-xs-12 col-sm-8">
                         
-            <select  id="c-head_type" disabled data-rule="required" class="form-control selectpicker" name="row[head_type]">
+            <select  id="c-head_type"  data-rule="required" class="form-control selectpicker" name="row[head_type]">
                 {foreach name="headTypeList" item="vo"}
                     <option value="{$key}" {in name="key" value="$row.head_type"}selected{/in}>{$vo}</option>
                 {/foreach}
@@ -61,7 +61,7 @@
         <label class="control-label col-xs-12 col-sm-2">{:__('Invoice_type')}:</label>
         <div class="col-xs-12 col-sm-8">
                         
-            <select  id="c-invoice_type" disabled data-rule="required" class="form-control selectpicker" name="row[invoice_type]">
+            <select  id="c-invoice_type"  data-rule="required" class="form-control selectpicker" name="row[invoice_type]">
                 {foreach name="invoiceTypeList" item="vo"}
                     <option value="{$key}" {in name="key" value="$row.invoice_type"}selected{/in}>{$vo}</option>
                 {/foreach}
@@ -72,7 +72,7 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Invoice_header')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-invoice_header" disabled data-rule="required" class="form-control" name="row[invoice_header]" type="text" value="{$row.invoice_header|htmlentities}">
+            <input id="c-invoice_header"  data-rule="required" class="form-control" name="row[invoice_header]" type="text" value="{$row.invoice_header|htmlentities}">
         </div>
     </div>
 
@@ -81,31 +81,31 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Tax_id')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-tax_id" disabled class="form-control" name="row[tax_id]" type="text" value="{$row.tax_id|htmlentities}">
+            <input id="c-tax_id"  class="form-control" name="row[tax_id]" type="text" value="{$row.tax_id|htmlentities}">
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Bank_deposit')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-bank_deposit" disabled class="form-control" name="row[bank_deposit]" type="text" value="{$row.bank_deposit|htmlentities}">
+            <input id="c-bank_deposit"  class="form-control" name="row[bank_deposit]" type="text" value="{$row.bank_deposit|htmlentities}">
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Bank_number')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-bank_number" disabled class="form-control" name="row[bank_number]" type="text" value="{$row.bank_number|htmlentities}">
+            <input id="c-bank_number"  class="form-control" name="row[bank_number]" type="text" value="{$row.bank_number|htmlentities}">
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Enterprise_address')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-enterprise_address" disabled class="form-control" name="row[enterprise_address]" type="text" value="{$row.enterprise_address|htmlentities}">
+            <input id="c-enterprise_address"  class="form-control" name="row[enterprise_address]" type="text" value="{$row.enterprise_address|htmlentities}">
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Enterprise_phone')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-enterprise_phone" disabled class="form-control" name="row[enterprise_phone]" type="text" value="{$row.enterprise_phone|htmlentities}">
+            <input id="c-enterprise_phone"  class="form-control" name="row[enterprise_phone]" type="text" value="{$row.enterprise_phone|htmlentities}">
         </div>
     </div>
 
@@ -113,13 +113,13 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Invoice_reservation_phone')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-invoice_reservation_phone" disabled data-rule="required" class="form-control" name="row[invoice_reservation_phone]" type="text" value="{$row.invoice_reservation_phone|htmlentities}">
+            <input id="c-invoice_reservation_phone"  data-rule="required" class="form-control" name="row[invoice_reservation_phone]" type="text" value="{$row.invoice_reservation_phone|htmlentities}">
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Invoice_reservation_email')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-invoice_reservation_email" disabled data-rule="required" class="form-control" name="row[invoice_reservation_email]" type="text" value="{$row.invoice_reservation_email|htmlentities}">
+            <input id="c-invoice_reservation_email"  data-rule="required" class="form-control" name="row[invoice_reservation_email]" type="text" value="{$row.invoice_reservation_email|htmlentities}">
         </div>
     </div>
 <!--    <div class="form-group">-->

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]);
+    }
+
+
+
+
 }

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()]);

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()]);

application/common/model/school/Area.php

@@ -18,4 +18,9 @@ class Area extends Model
 
 
 
+    public function child()
+    {
+        return $this->hasMany(self::class,'pid');
+    }
+
 }

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("您无权删除该活动");
 

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"];

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"];

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

application/index/controller/Index.php

@@ -13,6 +13,8 @@ class Index extends Frontend
 
     public function index()
     {
+
+//        $this->redirect('/mobile_h5');
         return $this->view->fetch();
     }
 

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());
             }

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());

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);
+    }
+
+
 }

application/manystore/model/user/invoice/Apply.php

@@ -37,7 +37,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()

application/manystore/view/dashboard/index.html

@@ -185,209 +185,209 @@
 
 
 
-                <div class="row">
+<!--                <div class="row">-->
-                    <div class="col-sm-3 col-xs-6">
+<!--                    <div class="col-sm-3 col-xs-6">-->
-                        <div class="sm-st clearfix">
+<!--                        <div class="sm-st clearfix">-->
-                            <span class="sm-st-icon st-red"><i class="fa fa-users"></i></span>
+<!--                            <span class="sm-st-icon st-red"><i class="fa fa-users"></i></span>-->
-                            <div class="sm-st-info">
+<!--                            <div class="sm-st-info">-->
-                                <span>{$totaluser}</span>
+<!--                                <span>{$totaluser}</span>-->
-                                {:__('Total user')}
+<!--                                {:__('Total user')}-->
-                            </div>
+<!--                            </div>-->
-                        </div>
+<!--                        </div>-->
-                    </div>
+<!--                    </div>-->
-                    <div class="col-sm-3 col-xs-6">
+<!--                    <div class="col-sm-3 col-xs-6">-->
-                        <div class="sm-st clearfix">
+<!--                        <div class="sm-st clearfix">-->
-                            <span class="sm-st-icon st-violet"><i class="fa fa-book"></i></span>
+<!--                            <span class="sm-st-icon st-violet"><i class="fa fa-book"></i></span>-->
-                            <div class="sm-st-info">
+<!--                            <div class="sm-st-info">-->
-                                <span>{$totalviews}</span>
+<!--                                <span>{$totalviews}</span>-->
-                                {:__('Total view')}
+<!--                                {:__('Total view')}-->
-                            </div>
+<!--                            </div>-->
-                        </div>
+<!--                        </div>-->
-                    </div>
+<!--                    </div>-->
-                    <div class="col-sm-3 col-xs-6">
+<!--                    <div class="col-sm-3 col-xs-6">-->
-                        <div class="sm-st clearfix">
+<!--                        <div class="sm-st clearfix">-->
-                            <span class="sm-st-icon st-blue"><i class="fa fa-shopping-bag"></i></span>
+<!--                            <span class="sm-st-icon st-blue"><i class="fa fa-shopping-bag"></i></span>-->
-                            <div class="sm-st-info">
+<!--                            <div class="sm-st-info">-->
-                                <span>{$totalorder}</span>
+<!--                                <span>{$totalorder}</span>-->
-                                {:__('Total order')}
+<!--                                {:__('Total order')}-->
-                            </div>
+<!--                            </div>-->
-                        </div>
+<!--                        </div>-->
-                    </div>
+<!--                    </div>-->
-                    <div class="col-sm-3 col-xs-6">
+<!--                    <div class="col-sm-3 col-xs-6">-->
-                        <div class="sm-st clearfix">
+<!--                        <div class="sm-st clearfix">-->
-                            <span class="sm-st-icon st-green"><i class="fa fa-cny"></i></span>
+<!--                            <span class="sm-st-icon st-green"><i class="fa fa-cny"></i></span>-->
-                            <div class="sm-st-info">
+<!--                            <div class="sm-st-info">-->
-                                <span>{$totalorderamount}</span>
+<!--                                <span>{$totalorderamount}</span>-->
-                                {:__('Total order amount')}
+<!--                                {:__('Total order amount')}-->
-                            </div>
+<!--                            </div>-->
-                        </div>
+<!--                        </div>-->
-                    </div>
+<!--                    </div>-->
-                </div>
+<!--                </div>-->
 
-                <div class="row">
+<!--                <div class="row">-->
-                    <div class="col-lg-8">
+<!--                    <div class="col-lg-8">-->
-                        <div id="echart" class="btn-refresh" style="height:200px;width:100%;"></div>
+<!--                        <div id="echart" class="btn-refresh" style="height:200px;width:100%;"></div>-->
-                    </div>
+<!--                    </div>-->
-                    <div class="col-lg-4">
+<!--                    <div class="col-lg-4">-->
-                        <div class="card sameheight-item stats">
+<!--                        <div class="card sameheight-item stats">-->
-                            <div class="card-block">
+<!--                            <div class="card-block">-->
-                                <div class="row row-sm stats-container">
+<!--                                <div class="row row-sm stats-container">-->
-                                    <div class="col-xs-6 stat-col">
+<!--                                    <div class="col-xs-6 stat-col">-->
-                                        <div class="stat-icon"><i class="fa fa-rocket"></i></div>
+<!--                                        <div class="stat-icon"><i class="fa fa-rocket"></i></div>-->
-                                        <div class="stat">
+<!--                                        <div class="stat">-->
-                                            <div class="value"> {$todayusersignup}</div>
+<!--                                            <div class="value"> {$todayusersignup}</div>-->
-                                            <div class="name"> {:__('Today user signup')}</div>
+<!--                                            <div class="name"> {:__('Today user signup')}</div>-->
-                                        </div>
+<!--                                        </div>-->
-                                        <div class="progress">
+<!--                                        <div class="progress">-->
-                                            <div class="progress-bar progress-bar-success" style="width: 30%"></div>
+<!--                                            <div class="progress-bar progress-bar-success" style="width: 30%"></div>-->
-                                        </div>
+<!--                                        </div>-->
-                                    </div>
+<!--                                    </div>-->
-                                    <div class="col-xs-6 stat-col">
+<!--                                    <div class="col-xs-6 stat-col">-->
-                                        <div class="stat-icon"><i class="fa fa-shopping-cart"></i></div>
+<!--                                        <div class="stat-icon"><i class="fa fa-shopping-cart"></i></div>-->
-                                        <div class="stat">
+<!--                                        <div class="stat">-->
-                                            <div class="value"> {$todayuserlogin}</div>
+<!--                                            <div class="value"> {$todayuserlogin}</div>-->
-                                            <div class="name"> {:__('Today user login')}</div>
+<!--                                            <div class="name"> {:__('Today user login')}</div>-->
-                                        </div>
+<!--                                        </div>-->
-                                        <div class="progress">
+<!--                                        <div class="progress">-->
-                                            <div class="progress-bar progress-bar-success" style="width: 25%"></div>
+<!--                                            <div class="progress-bar progress-bar-success" style="width: 25%"></div>-->
-                                        </div>
+<!--                                        </div>-->
-                                    </div>
+<!--                                    </div>-->
-                                    <div class="col-xs-6  stat-col">
+<!--                                    <div class="col-xs-6  stat-col">-->
-                                        <div class="stat-icon"><i class="fa fa-line-chart"></i></div>
+<!--                                        <div class="stat-icon"><i class="fa fa-line-chart"></i></div>-->
-                                        <div class="stat">
+<!--                                        <div class="stat">-->
-                                            <div class="value"> {$todayorder}</div>
+<!--                                            <div class="value"> {$todayorder}</div>-->
-                                            <div class="name"> {:__('Today order')}</div>
+<!--                                            <div class="name"> {:__('Today order')}</div>-->
-                                        </div>
+<!--                                        </div>-->
-                                        <div class="progress">
+<!--                                        <div class="progress">-->
-                                            <div class="progress-bar progress-bar-success" style="width: 25%"></div>
+<!--                                            <div class="progress-bar progress-bar-success" style="width: 25%"></div>-->
-                                        </div>
+<!--                                        </div>-->
-                                    </div>
+<!--                                    </div>-->
-                                    <div class="col-xs-6  stat-col">
+<!--                                    <div class="col-xs-6  stat-col">-->
-                                        <div class="stat-icon"><i class="fa fa-users"></i></div>
+<!--                                        <div class="stat-icon"><i class="fa fa-users"></i></div>-->
-                                        <div class="stat">
+<!--                                        <div class="stat">-->
-                                            <div class="value"> {$unsettleorder}</div>
+<!--                                            <div class="value"> {$unsettleorder}</div>-->
-                                            <div class="name"> {:__('Unsettle order')}</div>
+<!--                                            <div class="name"> {:__('Unsettle order')}</div>-->
-                                        </div>
+<!--                                        </div>-->
-                                        <div class="progress">
+<!--                                        <div class="progress">-->
-                                            <div class="progress-bar progress-bar-success" style="width: 25%"></div>
+<!--                                            <div class="progress-bar progress-bar-success" style="width: 25%"></div>-->
-                                        </div>
+<!--                                        </div>-->
-                                    </div>
+<!--                                    </div>-->
-                                    <div class="col-xs-6  stat-col">
+<!--                                    <div class="col-xs-6  stat-col">-->
-                                        <div class="stat-icon"><i class="fa fa-list-alt"></i></div>
+<!--                                        <div class="stat-icon"><i class="fa fa-list-alt"></i></div>-->
-                                        <div class="stat">
+<!--                                        <div class="stat">-->
-                                            <div class="value"> {$sevendnu}</div>
+<!--                                            <div class="value"> {$sevendnu}</div>-->
-                                            <div class="name"> {:__('Seven dnu')}</div>
+<!--                                            <div class="name"> {:__('Seven dnu')}</div>-->
-                                        </div>
+<!--                                        </div>-->
-                                        <div class="progress">
+<!--                                        <div class="progress">-->
-                                            <div class="progress-bar progress-bar-success" style="width: 25%"></div>
+<!--                                            <div class="progress-bar progress-bar-success" style="width: 25%"></div>-->
-                                        </div>
+<!--                                        </div>-->
-                                    </div>
+<!--                                    </div>-->
-                                    <div class="col-xs-6 stat-col">
+<!--                                    <div class="col-xs-6 stat-col">-->
-                                        <div class="stat-icon"><i class="fa fa-dollar"></i></div>
+<!--                                        <div class="stat-icon"><i class="fa fa-dollar"></i></div>-->
-                                        <div class="stat">
+<!--                                        <div class="stat">-->
-                                            <div class="value"> {$sevendau}</div>
+<!--                                            <div class="value"> {$sevendau}</div>-->
-                                            <div class="name"> {:__('Seven dau')}</div>
+<!--                                            <div class="name"> {:__('Seven dau')}</div>-->
-                                        </div>
+<!--                                        </div>-->
-                                        <div class="progress">
+<!--                                        <div class="progress">-->
-                                            <div class="progress-bar progress-bar-success" style="width: 25%"></div>
+<!--                                            <div class="progress-bar progress-bar-success" style="width: 25%"></div>-->
-                                        </div>
+<!--                                        </div>-->
-                                    </div>
+<!--                                    </div>-->
-                                </div>
+<!--                                </div>-->
-                            </div>
+<!--                            </div>-->
-                        </div>
+<!--                        </div>-->
-                    </div>
+<!--                    </div>-->
-                </div>
+<!--                </div>-->
 
-                <div class="row" style="margin-top:15px;">
+<!--                <div class="row" style="margin-top:15px;">-->
 
-                    <div class="col-lg-12">
+<!--                    <div class="col-lg-12">-->
-                    </div>
+<!--                    </div>-->
-                    <div class="col-xs-6 col-md-3">
+<!--                    <div class="col-xs-6 col-md-3">-->
-                        <div class="panel bg-blue">
+<!--                        <div class="panel bg-blue">-->
-                            <div class="panel-body">
+<!--                            <div class="panel-body">-->
-                                <div class="panel-title">
+<!--                                <div class="panel-title">-->
-                                    <span class="label label-success pull-right">{:__('Real time')}</span>
+<!--                                    <span class="label label-success pull-right">{:__('Real time')}</span>-->
-                                    <h5>{:__('Category count')}</h5>
+<!--                                    <h5>{:__('Category count')}</h5>-->
-                                </div>
+<!--                                </div>-->
-                                <div class="panel-content">
+<!--                                <div class="panel-content">-->
-                                    <h1 class="no-margins">1234</h1>
+<!--                                    <h1 class="no-margins">1234</h1>-->
-                                    <div class="stat-percent font-bold text-gray"><i class="fa fa-commenting"></i> 1234</div>
+<!--                                    <div class="stat-percent font-bold text-gray"><i class="fa fa-commenting"></i> 1234</div>-->
-                                    <small>{:__('Category count tips')}</small>
+<!--                                    <small>{:__('Category count tips')}</small>-->
-                                </div>
+<!--                                </div>-->
-                            </div>
+<!--                            </div>-->
-                        </div>
+<!--                        </div>-->
-                    </div>
+<!--                    </div>-->
-                    <div class="col-xs-6 col-md-3">
+<!--                    <div class="col-xs-6 col-md-3">-->
-                        <div class="panel bg-aqua-gradient">
+<!--                        <div class="panel bg-aqua-gradient">-->
-                            <div class="panel-body">
+<!--                            <div class="panel-body">-->
-                                <div class="ibox-title">
+<!--                                <div class="ibox-title">-->
-                                    <span class="label label-info pull-right">{:__('Real time')}</span>
+<!--                                    <span class="label label-info pull-right">{:__('Real time')}</span>-->
-                                    <h5>{:__('Attachment count')}</h5>
+<!--                                    <h5>{:__('Attachment count')}</h5>-->
-                                </div>
+<!--                                </div>-->
-                                <div class="ibox-content">
+<!--                                <div class="ibox-content">-->
-                                    <h1 class="no-margins">1043</h1>
+<!--                                    <h1 class="no-margins">1043</h1>-->
-                                    <div class="stat-percent font-bold text-gray"><i class="fa fa-modx"></i> 2592</div>
+<!--                                    <div class="stat-percent font-bold text-gray"><i class="fa fa-modx"></i> 2592</div>-->
-                                    <small>{:__('Attachment count tips')}</small>
+<!--                                    <small>{:__('Attachment count tips')}</small>-->
-                                </div>
+<!--                                </div>-->
-                            </div>
+<!--                            </div>-->
-                        </div>
+<!--                        </div>-->
-                    </div>
+<!--                    </div>-->
 
-                    <div class="col-xs-6 col-md-3">
+<!--                    <div class="col-xs-6 col-md-3">-->
-                        <div class="panel bg-purple-gradient">
+<!--                        <div class="panel bg-purple-gradient">-->
-                            <div class="panel-body">
+<!--                            <div class="panel-body">-->
-                                <div class="ibox-title">
+<!--                                <div class="ibox-title">-->
-                                    <span class="label label-primary pull-right">{:__('Real time')}</span>
+<!--                                    <span class="label label-primary pull-right">{:__('Real time')}</span>-->
-                                    <h5>{:__('Article count')}</h5>
+<!--                                    <h5>{:__('Article count')}</h5>-->
-                                </div>
+<!--                                </div>-->
-                                <div class="ibox-content">
+<!--                                <div class="ibox-content">-->
 
-                                    <div class="row">
+<!--                                    <div class="row">-->
-                                        <div class="col-md-6">
+<!--                                        <div class="col-md-6">-->
-                                            <h1 class="no-margins">1234</h1>
+<!--                                            <h1 class="no-margins">1234</h1>-->
-                                            <div class="font-bold"><i class="fa fa-commenting"></i>
+<!--                                            <div class="font-bold"><i class="fa fa-commenting"></i>-->
-                                                <small>{:__('Comment count')}</small>
+<!--                                                <small>{:__('Comment count')}</small>-->
-                                            </div>
+<!--                                            </div>-->
-                                        </div>
+<!--                                        </div>-->
-                                        <div class="col-md-6">
+<!--                                        <div class="col-md-6">-->
-                                            <h1 class="no-margins">6754</h1>
+<!--                                            <h1 class="no-margins">6754</h1>-->
-                                            <div class="font-bold"><i class="fa fa-heart"></i>
+<!--                                            <div class="font-bold"><i class="fa fa-heart"></i>-->
-                                                <small>{:__('Like count')}</small>
+<!--                                                <small>{:__('Like count')}</small>-->
-                                            </div>
+<!--                                            </div>-->
-                                        </div>
+<!--                                        </div>-->
-                                    </div>
+<!--                                    </div>-->
-                                </div>
+<!--                                </div>-->
-                            </div>
+<!--                            </div>-->
-                        </div>
+<!--                        </div>-->
-                    </div>
+<!--                    </div>-->
-                    <div class="col-xs-6 col-md-3">
+<!--                    <div class="col-xs-6 col-md-3">-->
-                        <div class="panel bg-green-gradient">
+<!--                        <div class="panel bg-green-gradient">-->
-                            <div class="panel-body">
+<!--                            <div class="panel-body">-->
-                                <div class="ibox-title">
+<!--                                <div class="ibox-title">-->
-                                    <span class="label label-primary pull-right">{:__('Real time')}</span>
+<!--                                    <span class="label label-primary pull-right">{:__('Real time')}</span>-->
-                                    <h5>{:__('News count')}</h5>
+<!--                                    <h5>{:__('News count')}</h5>-->
-                                </div>
+<!--                                </div>-->
-                                <div class="ibox-content">
+<!--                                <div class="ibox-content">-->
 
-                                    <div class="row">
+<!--                                    <div class="row">-->
-                                        <div class="col-md-6">
+<!--                                        <div class="col-md-6">-->
-                                            <h1 class="no-margins">5302</h1>
+<!--                                            <h1 class="no-margins">5302</h1>-->
-                                            <div class="font-bold"><i class="fa fa-commenting"></i>
+<!--                                            <div class="font-bold"><i class="fa fa-commenting"></i>-->
-                                                <small>{:__('Comment count')}</small>
+<!--                                                <small>{:__('Comment count')}</small>-->
-                                            </div>
+<!--                                            </div>-->
-                                        </div>
+<!--                                        </div>-->
-                                        <div class="col-md-6">
+<!--                                        <div class="col-md-6">-->
-                                            <h1 class="no-margins">8205</h1>
+<!--                                            <h1 class="no-margins">8205</h1>-->
-                                            <div class="font-bold"><i class="fa fa-user"></i>
+<!--                                            <div class="font-bold"><i class="fa fa-user"></i>-->
-                                                <small>{:__('Like count')}</small>
+<!--                                                <small>{:__('Like count')}</small>-->
-                                            </div>
+<!--                                            </div>-->
-                                        </div>
+<!--                                        </div>-->
-                                    </div>
+<!--                                    </div>-->
-                                </div>
+<!--                                </div>-->
-                            </div>
+<!--                            </div>-->
-                        </div>
+<!--                        </div>-->
-                    </div>
+<!--                    </div>-->
-                </div>
+<!--                </div>-->
             </div>
 <!--            <div class="tab-pane fade" id="two">-->
 <!--                <div class="row">-->

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东
 箍身箍勢式
 管制刀具
 管土地的是霸王
-管理
-管理员
-管理就是收费
 管里
 簡易炸蛋製作方法
 簡肇棟

extend/bw/sensitivewords/Vocabulary/未命名.txt

@@ -0,0 +1,330 @@
+# 政治敏感类
+反动
+颠覆
+煽动分裂
+侮辱国家
+诽谤国家
+侮辱领导人
+诽谤领导人
+民族仇恨
+民族歧视
+邪教
+迷信组织
+非法组织
+恐怖主义
+极端主义
+藏独
+台独
+疆独
+法轮功
+达赖
+热比娅
+
+---
+
+# 暴力、血腥、色情、低俗类
+杀戮
+肢解
+强奸
+性爱
+裸露
+色诱
+约炮
+包养
+吸毒
+贩毒
+赌球
+私彩
+管制刀具
+强奸
+乱伦
+群交
+淫秽
+性暗示
+性服务
+色情
+三级片
+AV
+黄色
+SM
+自慰
+卖淫
+嫖娼
+一夜情
+出轨
+小三
+性交易
+色诱
+约炮
+援交
+包养
+裸聊
+视频裸聊
+性奴
+淫荡
+色批
+流氓
+变态
+屌丝
+娘炮
+基佬
+百合
+同性恋 (非正常讨论)
+同性交友 (非正常讨论)
+一夜情
+约pao
+啪啪啪
+做爱
+性幻想
+春宫
+口交
+肛交
+手淫
+色情片
+AV女优
+GV
+成人影片
+成人用品 (非法销售)
+情趣用品 (非法销售)
+SM用品
+虐待
+暴力
+血腥
+残忍
+自杀
+割腕
+跳楼
+投毒
+枪击
+爆炸
+恐怖
+威胁
+打砸抢
+斗殴
+黑社会
+犯罪
+毒品
+麻醉剂
+大麻
+海洛因
+冰毒
+K粉
+摇头丸
+赌博
+博彩
+六合彩
+地下彩票
+赌大小
+扎金花
+牌九
+色子
+老虎机
+推筒子
+百家乐
+21点
+德州扑克
+赌神
+赌圣
+
+---
+
+# 广告法禁用词及虚假宣传类
+国家级
+最高级
+最佳
+第一
+顶级
+极品
+冠军
+独家
+绝无仅有
+万能
+史无前例
+空前绝后
+首个
+唯一
+最新
+最先进
+最优秀
+最权威
+最正宗
+特级
+极
+极致
+绝对
+彻底
+完全
+完美
+神
+神奇
+特效
+包治百病
+根治
+祖传秘方
+包赚不赔
+无效退款
+投资零风险
+立即见效
+快速致富
+保证收益
+承诺收益
+治愈一切
+延年益寿
+返老还童
+专家推荐 (未经授权或无资质)
+权威认证 (未经授权或无资质)
+热销
+爆款
+抢购
+限量
+稀有
+珍贵
+
+---
+
+# 敏感行业及产品类
+股票推荐
+内幕交易
+一夜暴富
+戒烟秘诀
+XX牌香烟
+彩票预测
+私烟
+水烟
+电子烟 (非法宣传)
+酒驾
+醉驾
+替考
+作弊
+代写
+代孕
+试管婴儿 (非法宣传)
+枪支
+弹药
+管制刀具
+弓弩
+仿真枪
+警用器械
+军用器械
+迷药
+蒙汗药
+泻药
+春药
+兴奋剂
+毒药
+假冒
+伪劣
+山寨
+盗版
+高仿
+克隆
+假钞
+走私
+文物 (非法交易)
+野生动物 (非法交易)
+象牙
+虎骨
+犀牛角
+熊胆
+管制药品
+处方药 (非法销售)
+伟哥
+西地那非
+玻尿酸 (非法销售)
+肉毒素 (非法销售)
+整形
+整容 (非法医美广告)
+医美 (非法医美广告)
+微整形 (非法医美广告)
+瘦脸针
+水光针
+溶脂针
+减肥药 (非法销售)
+性病
+艾滋病 (传播恐慌或非法宣传)
+
+---
+
+# 侵犯知识产权、隐私类
+盗版
+免费XX会员 (涉及侵权)
+泄露手机号
+泄露身份证
+泄露银行卡
+个人信息贩卖
+侵权
+抄袭
+仿冒
+山寨
+盗用
+偷拍
+窃听
+隐私泄露
+个人数据
+用户数据
+黑客
+钓鱼
+木马
+病毒
+诈骗
+欺诈
+
+---
+
+# 社会公序良俗类
+喷子
+屌丝
+丑八怪
+地域黑
+仇富
+仇穷
+歧视
+侮辱
+谩骂
+人身攻击
+诽谤
+造谣
+抹黑
+煽动
+教唆
+引战
+负能量
+消极
+厌世
+抑郁 (滥用或不当引导)
+自闭 (滥用或不当引导)
+网络暴力
+人肉搜索
+恐吓
+威胁
+诅咒
+诅咒
+恶毒
+变态
+恶心
+低俗
+粗俗
+愚蠢
+傻逼
+神经病
+疯子
+白痴
+智障
+残疾 (歧视性言论)
+病人 (歧视性言论)
+弱智
+残废
+垃圾
+废物
+渣男
+渣女
+绿茶
+心机婊
+白莲花
+小三
+二奶
+卖国贼
+汉奸
+走狗
+叛徒
+叛国

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;
 });

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'},

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'},

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;

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'},

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'},