diff --git a/application/admin/controller/school/activity/Activity.php b/application/admin/controller/school/activity/Activity.php
index fe96682..37e7ab5 100644
--- a/application/admin/controller/school/activity/Activity.php
+++ b/application/admin/controller/school/activity/Activity.php
@@ -9,6 +9,7 @@ use think\db\exception\ModelNotFoundException;
 use think\exception\DbException;
 use think\exception\PDOException;
 use think\exception\ValidateException;
+use think\Url;
 
 /**
  * 活动
@@ -98,6 +99,9 @@ class Activity extends Backend
     {
         //当前是否为关联查询
         $this->relationSearch = true;
+
+        $this->searchFields = ["id","title","address","address_detail","address_city","user.nickname","user.realname","user.mobile"];
+
         //设置过滤方法
         $this->request->filter(['strip_tags', 'trim']);
         if ($this->request->isAjax()) {
@@ -119,7 +123,14 @@ class Activity extends Backend
 				$row->getRelation('admin')->visible(['nickname','avatar']);
             }
 
-            $result = array("total" => $list->total(), "rows" => $list->items());
+            $rows = $list->items();
+            foreach ($rows as $k=>&$v){
+                $v["miniqrcode_link"] = Url::build("/school/activity/activity/miniqrcode", ["ids" => $v["id"]]);
+            }
+            $result = array("total" => $list->total(), "rows" => $rows);
+
+
+//            $result = array("total" => $list->total(), "rows" => $list->items());
 
             return json($result);
         }
@@ -133,7 +144,7 @@ class Activity extends Backend
      * @return string
      * @throws \think\Exception
      */
-    public function add()
+    public function add($row=null)
     {
         if (false === $this->request->isPost()) {
             return $this->view->fetch();
@@ -188,6 +199,39 @@ class Activity extends Backend
         $this->success();
     }
 
+
+
+
+
+    /**
+     * 复制课程
+     *
+     * @param $ids
+     * @return string
+     * @throws DbException
+     * @throws \think\Exception
+     */
+    public function copy($ids = null)
+    {
+        $row = $this->model->get($ids);
+        if (!$row) {
+            $this->error(__('No Results were found'));
+        }
+        $adminIds = $this->getDataLimitAdminIds();
+        if (is_array($adminIds) && !in_array($row[$this->dataLimitField], $adminIds)) {
+            $this->error(__('You have no permission'));
+        }
+        if (false === $this->request->isPost()) {
+            $this->view->assign('row', $row);
+            return $this->view->fetch();
+        }
+
+        $this->add($row);
+    }
+
+
+
+
     /**
      * 编辑
      *
@@ -340,4 +384,88 @@ class Activity extends Backend
 
 
 
+
+
+
+
+    /**
+     * 跳转链接
+     * @return string
+     * @throws \think\Exception
+     * @throws \think\db\exception\BindParamException
+     * @throws \think\exception\DbException
+     * @throws \think\exception\PDOException
+     */
+    public function url($ids = ''){
+        $param = $this->request->param();
+        if($this->request->isPost()){
+            try{
+                if(isset($param['ids']))$ids = $param['ids'];
+                //设置模拟资格
+                $url =  \app\common\model\school\activity\Activity::getPath($ids);
+
+            }catch (\Exception $e){
+                $this->error($e->getMessage());
+            }
+            $this->success($url);
+        }
+        $row = $this->model->get($ids);
+        $this->view->assign('vo', $row);
+        return $this->view->fetch();
+    }
+
+
+    /**
+     * 微信小程序码
+     * @return string
+     * @throws \think\Exception
+     * @throws \think\db\exception\BindParamException
+     * @throws \think\exception\DbException
+     * @throws \think\exception\PDOException
+     */
+    public function miniqrcode($ids = ''){
+        $param = $this->request->param();
+        try{
+            if(isset($param['ids']))$ids = $param['ids'];
+            //设置模拟资格
+            $url =  \app\common\model\school\activity\Activity::getMiniQrcodeLink($ids);
+
+        }catch (\Exception $e){
+            $this->error($e->getMessage());
+        }
+
+        return $url["response"];
+    }
+
+
+
+
+    /**
+     * 查看微信小程序码
+     * @return string
+     * @throws \think\Exception
+     * @throws \think\db\exception\BindParamException
+     * @throws \think\exception\DbException
+     * @throws \think\exception\PDOException
+     */
+    public function lookminiqrcode($ids = ''){
+        $param = $this->request->param();
+        if($this->request->isPost()){
+            try{
+                if(isset($param['ids']))$ids = $param['ids'];
+                //设置模拟资格
+                $url =  \app\common\model\school\activity\Activity::getMiniQrcodeLink($ids);
+
+            }catch (\Exception $e){
+                $this->error($e->getMessage());
+            }
+            $this->success("生成小程序码成功",null,$url);
+        }
+        $row = $this->model->get($ids);
+        $this->view->assign('vo', $row);
+        return $this->view->fetch();
+    }
+
+
+
 }
diff --git a/application/admin/controller/school/activity/order/Order.php b/application/admin/controller/school/activity/order/Order.php
index cbfdf8b..31e998d 100644
--- a/application/admin/controller/school/activity/order/Order.php
+++ b/application/admin/controller/school/activity/order/Order.php
@@ -45,6 +45,10 @@ class Order extends Backend
     {
         //当前是否为关联查询
         $this->relationSearch = true;
+
+        $this->searchFields = ["id","refund_error","refund_no","order_no","pay_no","user_id","detail.title","user.nickname","user.realname","user.mobile"];
+
+
         //设置过滤方法
         $this->request->filter(['strip_tags', 'trim']);
         if ($this->request->isAjax()) {
@@ -74,4 +78,129 @@ class Order extends Backend
         return $this->view->fetch();
     }
 
+
+
+    /**
+     * 订单未支付取消
+     * @return string
+     * @throws \think\Exception
+     * @throws \think\db\exception\BindParamException
+     * @throws \think\exception\DbException
+     * @throws \think\exception\PDOException
+     */
+    public function freecancel($ids = ''){
+        $param = $this->request->param();
+        if($this->request->isPost()){
+            try{
+                if(isset($param['ids']))$ids = $param['ids'];
+                //设置模拟资格
+                $model = (new \app\common\model\school\activity\order\Order);
+                $model->freecancel($ids,0,true,'admin',$this->auth->id,true);
+
+            }catch (\Exception $e){
+                $this->error($e->getMessage());
+            }
+            $this->success('取消成功!');
+        }
+        $row = $this->model->get($ids);
+        $this->view->assign('vo', $row);
+        return $this->view->fetch();
+    }
+
+
+
+    /**
+     * 订单已支付取消
+     * @return string
+     * @throws \think\Exception
+     * @throws \think\db\exception\BindParamException
+     * @throws \think\exception\DbException
+     * @throws \think\exception\PDOException
+     */
+    public function paidcancel($ids = ''){
+        $param = $this->request->param();
+        if($this->request->isPost()){
+            try{
+                if(isset($param['ids']))$ids = $param['ids'];
+                //设置模拟资格
+                $model = (new \app\common\model\school\activity\order\Order);
+                $model->paidcancel($ids,0,true,'admin',$this->auth->id,false,true);
+
+            }catch (\Exception $e){
+                $this->error($e->getMessage());
+            }
+            $this->success('取消成功!');
+        }
+        $row = $this->model->get($ids);
+        $this->view->assign('vo', $row);
+        return $this->view->fetch();
+    }
+
+
+
+
+
+
+    /**
+     * 后台核销
+     * @return string
+     * @throws \think\Exception
+     * @throws \think\db\exception\BindParamException
+     * @throws \think\exception\DbException
+     * @throws \think\exception\PDOException
+     */
+    public function verification($ids = ''){
+        $param = $this->request->param();
+        if($this->request->isPost()){
+            try{
+                if(isset($param['ids']))$ids = $param['ids'];
+                //设置模拟资格
+                $model = (new \app\common\model\school\classes\activity\order\Order);
+                $model->verification($ids,0,true,'admin',$this->auth->id,true);
+
+
+            }catch (\Exception $e){
+                $this->error($e->getMessage());
+            }
+            $this->success('核销成功!');
+        }
+        $row = $this->model->get($ids);
+        $this->view->assign('vo', $row);
+        return $this->view->fetch();
+    }
+
+
+
+
+
+    /**
+     * 退款重试
+     * @return string
+     * @throws \think\Exception
+     * @throws \think\db\exception\BindParamException
+     * @throws \think\exception\DbException
+     * @throws \think\exception\PDOException
+     */
+    public function refund($ids = ''){
+        $param = $this->request->param();
+        if($this->request->isPost()){
+            try{
+                if(isset($param['ids']))$ids = $param['ids'];
+                //设置模拟资格
+                $model = (new \app\common\model\school\activity\order\Order);
+                $model->orderRefund($ids,null,'admin',$this->auth->id,true,true);
+
+
+            }catch (\Exception $e){
+                $this->error($e->getMessage());
+            }
+            $this->success('已重新发起退款，如果是第三方支付请等待回调!');
+        }
+        $row = $this->model->get($ids);
+        $this->view->assign('vo', $row);
+        return $this->view->fetch();
+    }
+
+
+
 }
diff --git a/application/admin/controller/school/activity/order/OrderCode.php b/application/admin/controller/school/activity/order/OrderCode.php
index 5fceda3..097b61d 100644
--- a/application/admin/controller/school/activity/order/OrderCode.php
+++ b/application/admin/controller/school/activity/order/OrderCode.php
@@ -41,6 +41,10 @@ class OrderCode extends Backend
     {
         //当前是否为关联查询
         $this->relationSearch = true;
+
+        $this->searchFields = ["id","order.refund_error","order.refund_no","order.order_no","order.pay_no","code","miniurl","user.nickname","user.realname","user.mobile"];
+
+
         //设置过滤方法
         $this->request->filter(['strip_tags', 'trim']);
         if ($this->request->isAjax()) {
@@ -69,4 +73,39 @@ class OrderCode extends Backend
         return $this->view->fetch();
     }
 
+
+
+
+
+
+    /**
+     * 后台核销
+     * @return string
+     * @throws \think\Exception
+     * @throws \think\db\exception\BindParamException
+     * @throws \think\exception\DbException
+     * @throws \think\exception\PDOException
+     */
+    public function verification($ids = ''){
+        $param = $this->request->param();
+        if($this->request->isPost()){
+            try{
+                if(isset($param['ids']))$ids = $param['ids'];
+                $orderCode = \app\common\model\school\activity\order\OrderCode::where("id","=",$ids)->find();
+                if(!$orderCode) throw new \Exception("核销码不存在！");
+                //设置模拟资格
+                $model = (new \app\common\model\school\activity\order\OrderCode);
+                $model->verification($orderCode["code"],0,false,'admin',$this->auth->id,true);
+
+
+            }catch (\Exception $e){
+                $this->error($e->getMessage());
+            }
+            $this->success('核销成功!');
+        }
+        $row = $this->model->get($ids);
+        $this->view->assign('vo', $row);
+        return $this->view->fetch();
+    }
+
 }
diff --git a/application/admin/controller/school/activity/order/OrderDetail.php b/application/admin/controller/school/activity/order/OrderDetail.php
index 20dccd1..451e2eb 100644
--- a/application/admin/controller/school/activity/order/OrderDetail.php
+++ b/application/admin/controller/school/activity/order/OrderDetail.php
@@ -27,6 +27,7 @@ class OrderDetail extends Backend
         $this->view->assign("newList", $this->model->getNewList());
         $this->view->assign("addTypeList", $this->model->getAddTypeList());
         $this->view->assign("feelList", $this->model->getFeelList());
+        $this->view->assign("cateListJson", json_encode((new \app\admin\model\school\activity\Activity)->getCateList(), JSON_UNESCAPED_UNICODE));
     }
 
 
@@ -45,6 +46,12 @@ class OrderDetail extends Backend
     {
         //当前是否为关联查询
         $this->relationSearch = true;
+
+
+        $this->searchFields = ["id","order.refund_error","order.refund_no","order.order_no","order.pay_no","title","user.nickname","user.realname","user.mobile"];
+
+
+
         //设置过滤方法
         $this->request->filter(['strip_tags', 'trim']);
         if ($this->request->isAjax()) {
@@ -63,7 +70,7 @@ class OrderDetail extends Backend
             foreach ($list as $row) {
                 
                 $row->getRelation('user')->visible(['nickname','realname','mobile','avatar']);
-				$row->getRelation('order')->visible(['order_no']);
+				$row->getRelation('order')->visible(['order_no',"totalprice","num"]);
 				$row->getRelation('activity')->visible(['title']);
             }
 
diff --git a/application/admin/controller/school/activity/order/SettleLog.php b/application/admin/controller/school/activity/order/SettleLog.php
index 2c19d63..6884667 100644
--- a/application/admin/controller/school/activity/order/SettleLog.php
+++ b/application/admin/controller/school/activity/order/SettleLog.php
@@ -41,6 +41,10 @@ class SettleLog extends Backend
     {
         //当前是否为关联查询
         $this->relationSearch = true;
+
+        $this->searchFields = ["id","order.refund_error","order.refund_no","order.order_no","order.pay_no","touser.nickname","touser.realname","touser.mobile",    "payuser.nickname","payuser.realname","payuser.mobile"];
+
+
         //设置过滤方法
         $this->request->filter(['strip_tags', 'trim']);
         if ($this->request->isAjax()) {
diff --git a/application/admin/controller/user/withdrawal/Userwithdrawal.php b/application/admin/controller/user/withdrawal/Userwithdrawal.php
index 98cfb6e..ab20bbd 100644
--- a/application/admin/controller/user/withdrawal/Userwithdrawal.php
+++ b/application/admin/controller/user/withdrawal/Userwithdrawal.php
@@ -41,6 +41,10 @@ class Userwithdrawal extends Backend
     {
         //当前是否为关联查询
         $this->relationSearch = true;
+
+        $this->searchFields = ["id","name","bank_name","bank_user_name","id_number","user.nickname","user.realname","user.mobile"];
+
+
         //设置过滤方法
         $this->request->filter(['strip_tags', 'trim']);
         if ($this->request->isAjax()) {
diff --git a/application/admin/controller/user/withdrawal/UserwithdrawalLog.php b/application/admin/controller/user/withdrawal/UserwithdrawalLog.php
index 4ede2c1..6dd5f66 100644
--- a/application/admin/controller/user/withdrawal/UserwithdrawalLog.php
+++ b/application/admin/controller/user/withdrawal/UserwithdrawalLog.php
@@ -43,6 +43,10 @@ class UserwithdrawalLog extends Backend
     {
         //当前是否为关联查询
         $this->relationSearch = true;
+
+        $this->searchFields = ["id","name","bank_name","bank_user_name","id_number","user.nickname","user.realname","user.mobile"];
+
+
         //设置过滤方法
         $this->request->filter(['strip_tags', 'trim']);
         if ($this->request->isAjax()) {
@@ -70,4 +74,84 @@ class UserwithdrawalLog extends Backend
         return $this->view->fetch();
     }
 
+
+
+
+
+
+
+    /**提现审核
+     * @return string
+     * @throws \think\Exception
+     * @throws \think\exception\DbException
+     */
+    public function auths($ids = ""){
+
+        if($this->request->isPost())
+        {
+            try{
+                $params = $this->request->post("row/a");
+
+
+                $auth_status = $params["status"];
+                $reason = $params["reason"];
+                $model = (new \app\common\model\user\withdrawal\UserwithdrawalLog);
+                $model->withdrawalReview($ids,$auth_status,$reason,true);
+
+            }catch (\Throwable $e){
+                $this->error($e->getMessage());
+            }
+
+            $this->success("已完成审核");
+        }
+
+        $row = $this->model->where(array('id'=>$ids))->find();
+        if (!$row) {
+            $this->error(__('No Results were found'));
+        }
+
+//        $row = $this->model->get($param['ids']);
+        $this->view->assign('row', $row);
+        return $this->view->fetch();
+    }
+
+
+
+
+
+    /**确认打款
+     * @return string
+     * @throws \think\Exception
+     * @throws \think\exception\DbException
+     */
+    public function paid($ids = ""){
+
+        if($this->request->isPost())
+        {
+            try{
+                $params = $this->request->post("row/a");
+
+
+                $remark = $params["remark"];
+                $model = (new \app\common\model\user\withdrawal\UserwithdrawalLog);
+                $model->paidAlready($ids,$remark,true);
+
+            }catch (\Throwable $e){
+                $this->error($e->getMessage());
+            }
+
+            $this->success("已完成审核");
+        }
+
+        $row = $this->model->where(array('id'=>$ids))->find();
+        if (!$row) {
+            $this->error(__('No Results were found'));
+        }
+
+//        $row = $this->model->get($param['ids']);
+        $this->view->assign('row', $row);
+        return $this->view->fetch();
+    }
+
+
 }
diff --git a/application/admin/lang/zh-cn/school/activity/order/order.php b/application/admin/lang/zh-cn/school/activity/order/order.php
index 7a3cb47..3acbc9b 100644
--- a/application/admin/lang/zh-cn/school/activity/order/order.php
+++ b/application/admin/lang/zh-cn/school/activity/order/order.php
@@ -3,9 +3,9 @@
 return [
     'Order_no'                 => '订单号',
     'Pay_no'                   => '微信支付单号',
-    'User_id'                  => '下单人用户id',
-    'Activity_id'              => '课程活动id',
-    'Activity_order_detail_id' => '订单课程活动id',
+    'User_id'                  => '下单人用户',
+    'Activity_id'              => '活动',
+    'Activity_order_detail_id' => '订单活动',
     'Beforeprice'              => '订单优惠前金额',
     'Totalprice'               => '订单应付金额',
     'Payprice'                 => '订单实付金额',
@@ -66,11 +66,12 @@ return [
     'Createtime'               => '创建时间',
     'Updatetime'               => '修改时间',
     'Deletetime'               => '删除时间',
-    'User.nickname'            => '昵称',
-    'User.realname'            => '真实姓名',
-    'User.mobile'              => '手机号',
-    'User.avatar'              => '头像',
-    'Activity.title'           => '标题',
-    'Activity.images'          => '轮播图',
-    'Detail.title'             => '标题'
+    'User.nickname'            => '下单人昵称',
+    'User.realname'            => '下单人真实姓名',
+    'User.mobile'              => '下单人手机号',
+    'User.avatar'              => '下单人头像',
+    'Activity.title'           => '活动标题',
+    'Activity.images'          => '活动轮播图',
+    'Detail.title'             => '活动标题',
+    'Edit'                => '详情'
 ];
diff --git a/application/admin/lang/zh-cn/school/activity/order/order_code.php b/application/admin/lang/zh-cn/school/activity/order/order_code.php
index e94eb0f..4e5d39d 100644
--- a/application/admin/lang/zh-cn/school/activity/order/order_code.php
+++ b/application/admin/lang/zh-cn/school/activity/order/order_code.php
@@ -11,14 +11,14 @@ return [
     'Status 6'             => '已核销',
     'Set status to 6'      => '设为已核销',
     'Verificationtime'     => '核销时间',
-    'Verification_user_id' => '核销人用户id',
+    'Verification_user_id' => '核销人ID',
     'Verification_type'    => '核销用户类型',
     'Createtime'           => '创建时间',
     'Updatetime'           => '修改时间',
     'Deletetime'           => '删除时间',
     'Order.order_no'       => '订单号',
-    'User.nickname'        => '昵称',
-    'User.realname'        => '真实姓名',
-    'User.mobile'          => '手机号',
-    'User.avatar'          => '头像'
+    'User.nickname'        => '核销人昵称',
+    'User.realname'        => '核销人真实姓名',
+    'User.mobile'          => '核销人手机号',
+    'User.avatar'          => '核销人头像'
 ];
diff --git a/application/admin/lang/zh-cn/school/activity/order/order_detail.php b/application/admin/lang/zh-cn/school/activity/order/order_detail.php
index 4927579..3567b14 100644
--- a/application/admin/lang/zh-cn/school/activity/order/order_detail.php
+++ b/application/admin/lang/zh-cn/school/activity/order/order_detail.php
@@ -2,8 +2,8 @@
 
 return [
     'User_id'           => '发布用户',
-    'Activity_order_id' => '活动订单id',
-    'Activity_id'       => '活动id',
+    'Activity_order_id' => '活动订单',
+    'Activity_id'       => '活动',
     'Title'             => '标题',
     'Images'            => '轮播图',
     'Address_city'      => '城市选择',
@@ -47,10 +47,12 @@ return [
     'Createtime'        => '创建时间',
     'Updatetime'        => '修改时间',
     'Deletetime'        => '删除时间',
-    'User.nickname'     => '昵称',
-    'User.realname'     => '真实姓名',
-    'User.mobile'       => '手机号',
-    'User.avatar'       => '头像',
-    'Order.order_no'    => '订单号',
-    'Activity.title'    => '标题'
+    'User.nickname'     => '发布用户昵称',
+    'User.realname'     => '发布用户真实姓名',
+    'User.mobile'       => '发布用户手机号',
+    'User.avatar'       => '发布用户头像',
+    'Order.order_no'    => '下单订单号',
+    'Activity.title'    => '活动标题',
+    "Order.totalprice"  => '订单总价',
+    'Edit'                => '详情'
 ];
diff --git a/application/admin/lang/zh-cn/school/activity/order/settle_log.php b/application/admin/lang/zh-cn/school/activity/order/settle_log.php
index 04dab54..ba226bf 100644
--- a/application/admin/lang/zh-cn/school/activity/order/settle_log.php
+++ b/application/admin/lang/zh-cn/school/activity/order/settle_log.php
@@ -29,5 +29,18 @@ return [
     'User.realname'     => '真实姓名',
     'User.mobile'       => '手机号',
     'User.avatar'       => '头像',
-    'Third.openname'    => '第三方会员昵称'
+    'Third.openname'    => '第三方会员昵称',
+
+
+    'Payuser.nickname'  => '支付用户昵称',
+    'Payuser.realname'  => '支付用户真实姓名',
+    'Payuser.mobile'    => '支付用户手机号',
+    'Payuser.avatar'    => '支付用户头像',
+
+
+    'Touser.nickname'  => '结算用户昵称',
+    'Touser.realname'  => '结算用户真实姓名',
+    'Touser.mobile'    => '结算用户手机号',
+    'Touser.avatar'    => '结算用户头像'
+
 ];
diff --git a/application/admin/lang/zh-cn/user/withdrawal/userwithdrawal.php b/application/admin/lang/zh-cn/user/withdrawal/userwithdrawal.php
index 314706a..016f5fc 100644
--- a/application/admin/lang/zh-cn/user/withdrawal/userwithdrawal.php
+++ b/application/admin/lang/zh-cn/user/withdrawal/userwithdrawal.php
@@ -8,6 +8,18 @@ return [
     'Createtime'     => '创建时间',
     'Updatetime'     => '修改时间',
     'Deletetime'     => '删除时间',
+    'Payuser.nickname'  => '昵称',
+    'Payuser.realname'  => '真实姓名',
+    'Payuser.mobile'    => '手机号',
+    'Payuser.avatar'    => '头像',
+
+
+    'Touser.nickname'  => '昵称',
+    'Touser.realname'  => '真实姓名',
+    'Touser.mobile'    => '手机号',
+    'Touser.avatar'    => '头像',
+
+
     'User.nickname'  => '昵称',
     'User.realname'  => '真实姓名',
     'User.mobile'    => '手机号',
diff --git a/application/admin/lang/zh-cn/user/withdrawal/userwithdrawal_log.php b/application/admin/lang/zh-cn/user/withdrawal/userwithdrawal_log.php
index d91bfe7..4c359d8 100644
--- a/application/admin/lang/zh-cn/user/withdrawal/userwithdrawal_log.php
+++ b/application/admin/lang/zh-cn/user/withdrawal/userwithdrawal_log.php
@@ -30,5 +30,6 @@ return [
     'User.nickname'       => '昵称',
     'User.realname'       => '真实姓名',
     'User.mobile'         => '手机号',
-    'User.avatar'         => '头像'
+    'User.avatar'         => '头像',
+    'Edit'                => '详情'
 ];
diff --git a/application/admin/view/school/activity/activity/copy.html b/application/admin/view/school/activity/activity/copy.html
new file mode 100644
index 0000000..191712a
--- /dev/null
+++ b/application/admin/view/school/activity/activity/copy.html
@@ -0,0 +1,371 @@
+<form id="edit-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
+
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('User_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-user_id" data-rule="required" data-source="user/user/index" data-field="mobile" data-format-item="{id} - {nickname} - {mobile}" class="form-control selectpage" name="row[user_id]" type="text" value="{$row.user_id|htmlentities}">
+
+            <span style="color: red">
+
+                                    (没找到用户则点击按钮创建用户后重新下拉框选用户)
+                                       <a data-url="user/user/changeuser" href="javascript:;" class="btn btn-success btn-changeuser {:$auth->check('user/user/changeuser')?'':'hide'}" title="根据手机号生成用户" ><i class="fa fa-plus"></i> 根据手机号生成用户</a>
+
+                                </span>
+
+        </div>
+
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Title')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-title" data-rule="required" class="form-control" name="row[title]" type="text" value="{$row.title|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Images')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <div class="input-group">
+                <input id="c-images" data-rule="required" class="form-control" size="50" name="row[images]" type="text" value="{$row.images|htmlentities}">
+                <div class="input-group-addon no-border no-padding">
+                    <span><button type="button" id="faupload-images" class="btn btn-danger faupload" data-input-id="c-images" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp,image/webp" data-multiple="true" data-preview-id="p-images"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
+                    <span><button type="button" id="fachoose-images" class="btn btn-primary fachoose" data-input-id="c-images" data-mimetype="image/*" data-multiple="true"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
+                </div>
+                <span class="msg-box n-right" for="c-images"></span>
+            </div>
+            <ul class="row list-inline faupload-preview" id="p-images"></ul>
+        </div>
+    </div>
+
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Cate_ids')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-cate_ids" data-rule="required" data-max-select-limit="3" data-source="school/activity/cate/index"  data-params='{"custom[status]":"1"}' data-multiple="true" class="form-control selectpage" name="row[cate_ids]" type="text" value="{$row.cate_ids|htmlentities}">
+
+            <span style="color: red">
+                                    (没找到{:__('Cate_ids')}则点击按钮创建{:__('Cate_ids')}后重新下拉框选{:__('Cate_ids')})
+                                       <a href="javascript:;" data-url="school/activity/cate/index" class="btn btn-success btn-changeuser {:$auth->check('school/activity/cate/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>
+
+             </span>
+        </div>
+    </div>
+
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Refund_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-refund_id" data-source="school/activity/refund/index" data-field="title"  class="form-control selectpage" name="row[refund_id]" type="text" value="{$row.refund_id|htmlentities}">
+            <span style="color: red">
+
+                                    (没找到退款策略则点击按钮创建退款策略后重新下拉框选退款策略)
+                                       <a data-url="school/activity/refund/index" href="javascript:;" class="btn btn-success btn-changeuser {:$auth->check('school/activity/refund/index')?'':'hide'}" title="退款策略" ><i class="fa fa-plus"></i> 创建新退款策略</a>
+
+                                </span>
+        </div>
+    </div>
+
+
+<!--    <div class="form-group">-->
+<!--        <label class="control-label col-xs-12 col-sm-2">{:__('Address_city')}:</label>-->
+<!--        <div class="col-xs-12 col-sm-8">-->
+<!--            <div class='control-relative'><input id="c-address_city" class="form-control" data-toggle="city-picker" name="row[address_city]" type="text" value="{$row.address_city|htmlentities}"></div>-->
+<!--        </div>-->
+<!--    </div>-->
+<!--    <div class="form-group">-->
+<!--        <label class="control-label col-xs-12 col-sm-2">{:__('Cate_ids')}:</label>-->
+<!--        <div class="col-xs-12 col-sm-8">-->
+<!--            <input id="c-cate_ids" data-rule="required" data-source="cate/index" data-multiple="true" class="form-control selectpage" name="row[cate_ids]" type="text" value="{$row.cate_ids|htmlentities}">-->
+<!--        </div>-->
+<!--    </div>-->
+<!--    <div class="form-group">-->
+<!--        <label class="control-label col-xs-12 col-sm-2">{:__('Province')}:</label>-->
+<!--        <div class="col-xs-12 col-sm-8">-->
+<!--            <input id="c-province" class="form-control" name="row[province]" type="number" value="{$row.province|htmlentities}">-->
+<!--        </div>-->
+<!--    </div>-->
+<!--    <div class="form-group">-->
+<!--        <label class="control-label col-xs-12 col-sm-2">{:__('City')}:</label>-->
+<!--        <div class="col-xs-12 col-sm-8">-->
+<!--            <input id="c-city" class="form-control" name="row[city]" type="number" value="{$row.city|htmlentities}">-->
+<!--        </div>-->
+<!--    </div>-->
+<!--    <div class="form-group">-->
+<!--        <label class="control-label col-xs-12 col-sm-2">{:__('District')}:</label>-->
+<!--        <div class="col-xs-12 col-sm-8">-->
+<!--            <input id="c-district" class="form-control" name="row[district]" type="number" value="{$row.district|htmlentities}">-->
+<!--        </div>-->
+<!--    </div>-->
+<!--    <div class="form-group">-->
+<!--        <label class="control-label col-xs-12 col-sm-2">{:__('Address')}:</label>-->
+<!--        <div class="col-xs-12 col-sm-8">-->
+<!--            <input id="c-address" class="form-control" name="row[address]" type="text" value="{$row.address|htmlentities}">-->
+<!--        </div>-->
+<!--    </div>-->
+<!--    <div class="form-group">-->
+<!--        <label class="control-label col-xs-12 col-sm-2">{:__('Address_detail')}:</label>-->
+<!--        <div class="col-xs-12 col-sm-8">-->
+<!--            <input id="c-address_detail" class="form-control" name="row[address_detail]" type="text" value="{$row.address_detail|htmlentities}">-->
+<!--        </div>-->
+<!--    </div>-->
+<!--    <div class="form-group">-->
+<!--        <label class="control-label col-xs-12 col-sm-2">{:__('Longitude')}:</label>-->
+<!--        <div class="col-xs-12 col-sm-8">-->
+<!--            <input id="c-longitude" class="form-control" name="row[longitude]" type="text" value="{$row.longitude|htmlentities}">-->
+<!--        </div>-->
+<!--    </div>-->
+<!--    <div class="form-group">-->
+<!--        <label class="control-label col-xs-12 col-sm-2">{:__('Latitude')}:</label>-->
+<!--        <div class="col-xs-12 col-sm-8">-->
+<!--            <input id="c-latitude" class="form-control" name="row[latitude]" type="text" value="{$row.latitude|htmlentities}">-->
+<!--        </div>-->
+<!--    </div>-->
+
+
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Address')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <div class='control-relative'>
+                <input id="c-address"  class="form-control form-control"
+                       data-lat-id="c-latitude" data-lng-id="c-longitude" data-rule="required" readonly data-input-id="c-address" data-toggle="addresspicker" name="row[address]" value="{$row.address}" type="text" placeholder="请地图选址。如调起地图失败请检查插件《地图位置(经纬度)选择》是否安装">
+            </div>
+        </div>
+    </div>
+
+    <div class="form-group" style="display: none">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Longitude')}:</label>
+        <div class="col-xs-12 col-sm-3">
+            <input id="c-longitude"  readonly class="form-control" name="row[longitude]" type="text" value="{$row.longitude}">
+        </div>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Latitude')}:</label>
+        <div class="col-xs-12 col-sm-3">
+            <input id="c-latitude"  readonly class="form-control" name="row[latitude]" type="text" value="{$row.latitude}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Address_detail')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-address_detail" class="form-control" data-rule="required" name="row[address_detail]" type="text" value="{$row.address_detail}" placeholder="请输入{:__('Address_detail')}">
+        </div>
+    </div>
+
+
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('报名开始结束时间')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-sign_time" class="form-control datetimerange"  data-rule="required" data-time-picker="true"  data-locale='{"format":"YYYY/MM/DD HH:mm"}'  placeholder="指定开始结束时间" name="row[sign_time]" type="text" value="{:$row.sign_start_time?datetime($row.sign_start_time):''} - {:$row.sign_end_time?datetime($row.sign_end_time):''}">
+        </div>
+    </div>
+
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('活动开始结束时间')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-time" class="form-control datetimerange"  data-rule="required" data-time-picker="true"  data-locale='{"format":"YYYY/MM/DD HH:mm"}'  placeholder="指定开始结束时间" name="row[time]" type="text" value="{:$row.start_time?datetime($row.start_time):''} - {:$row.end_time?datetime($row.end_time):''}">
+        </div>
+    </div>
+
+
+
+
+    <!--    <div class="form-group">-->
+<!--        <label class="control-label col-xs-12 col-sm-2">{:__('Start_time')}:</label>-->
+<!--        <div class="col-xs-12 col-sm-8">-->
+<!--            <input id="c-start_time" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[start_time]" type="text" value="{:$row.start_time?datetime($row.start_time):''}">-->
+<!--        </div>-->
+<!--    </div>-->
+<!--    <div class="form-group">-->
+<!--        <label class="control-label col-xs-12 col-sm-2">{:__('End_time')}:</label>-->
+<!--        <div class="col-xs-12 col-sm-8">-->
+<!--            <input id="c-end_time" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[end_time]" type="text" value="{:$row.end_time?datetime($row.end_time):''}">-->
+<!--        </div>-->
+<!--    </div>-->
+<!--    <div class="form-group">-->
+<!--        <label class="control-label col-xs-12 col-sm-2">{:__('Sign_start_time')}:</label>-->
+<!--        <div class="col-xs-12 col-sm-8">-->
+<!--            <input id="c-sign_start_time" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[sign_start_time]" type="text" value="{:$row.sign_start_time?datetime($row.sign_start_time):''}">-->
+<!--        </div>-->
+<!--    </div>-->
+<!--    <div class="form-group">-->
+<!--        <label class="control-label col-xs-12 col-sm-2">{:__('Sign_end_time')}:</label>-->
+<!--        <div class="col-xs-12 col-sm-8">-->
+<!--            <input id="c-sign_end_time" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[sign_end_time]" type="text" value="{:$row.sign_end_time?datetime($row.sign_end_time):''}">-->
+<!--        </div>-->
+<!--    </div>-->
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Price')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-price" data-rule="required" class="form-control" step="0.01" name="row[price]" type="number" value="{$row.price|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Stock')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-stock" data-rule="required" class="form-control" name="row[stock]" type="number" value="{$row.stock|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Content')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <textarea id="c-content" data-rule="required" class="form-control editor" rows="5" name="row[content]" cols="50">{$row.content|htmlentities}</textarea>
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            
+            <div class="radio">
+            {foreach name="statusList" item="vo"}
+            <label for="row[status]-{$key}"><input id="row[status]-{$key}" disabled name="row[status]" type="radio" value="{$key}" {in name="key" value="$row.status"}checked{/in} /> {$vo}</label>
+            {/foreach}
+            </div>
+
+        </div>
+    </div>
+<!--    <div class="form-group">-->
+<!--        <label class="control-label col-xs-12 col-sm-2">{:__('Cancel_type')}:</label>-->
+<!--        <div class="col-xs-12 col-sm-8">-->
+<!--                        -->
+<!--            <select  id="c-cancel_type" class="form-control selectpicker" name="row[cancel_type]">-->
+<!--                {foreach name="cancelTypeList" item="vo"}-->
+<!--                    <option value="{$key}" {in name="key" value="$row.cancel_type"}selected{/in}>{$vo}</option>-->
+<!--                {/foreach}-->
+<!--            </select>-->
+
+<!--        </div>-->
+<!--    </div>-->
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Weigh')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-weigh" class="form-control" name="row[weigh]" type="number" value="{$row.weigh|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Recommend')}:</label>
+        <div class="col-xs-12 col-sm-8">
+                        
+            <select  id="c-recommend" class="form-control selectpicker" name="row[recommend]">
+                {foreach name="recommendList" item="vo"}
+                    <option value="{$key}" {in name="key" value="$row.recommend"}selected{/in}>{$vo}</option>
+                {/foreach}
+            </select>
+
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Hot')}:</label>
+        <div class="col-xs-12 col-sm-8">
+                        
+            <select  id="c-hot" class="form-control selectpicker" name="row[hot]">
+                {foreach name="hotList" item="vo"}
+                    <option value="{$key}" {in name="key" value="$row.hot"}selected{/in}>{$vo}</option>
+                {/foreach}
+            </select>
+
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('New')}:</label>
+        <div class="col-xs-12 col-sm-8">
+                        
+            <select  id="c-new" class="form-control selectpicker" name="row[new]">
+                {foreach name="newList" item="vo"}
+                    <option value="{$key}" {in name="key" value="$row.new"}selected{/in}>{$vo}</option>
+                {/foreach}
+            </select>
+
+        </div>
+    </div>
+<!--    <div class="form-group">-->
+<!--        <label class="control-label col-xs-12 col-sm-2">{:__('Sale')}:</label>-->
+<!--        <div class="col-xs-12 col-sm-8">-->
+<!--            <input id="c-sale" class="form-control" name="row[sale]" type="number" value="{$row.sale|htmlentities}">-->
+<!--        </div>-->
+<!--    </div>-->
+<!--    <div class="form-group">-->
+<!--        <label class="control-label col-xs-12 col-sm-2">{:__('Views')}:</label>-->
+<!--        <div class="col-xs-12 col-sm-8">-->
+<!--            <input id="c-views" class="form-control" name="row[views]" type="number" value="{$row.views|htmlentities}">-->
+<!--        </div>-->
+<!--    </div>-->
+<!--    <div class="form-group">-->
+<!--        <label class="control-label col-xs-12 col-sm-2">{:__('Add_type')}:</label>-->
+<!--        <div class="col-xs-12 col-sm-8">-->
+<!--                        -->
+<!--            <select  id="c-add_type" data-rule="required" class="form-control selectpicker" name="row[add_type]">-->
+<!--                {foreach name="addTypeList" item="vo"}-->
+<!--                    <option value="{$key}" {in name="key" value="$row.add_type"}selected{/in}>{$vo}</option>-->
+<!--                {/foreach}-->
+<!--            </select>-->
+
+<!--        </div>-->
+<!--    </div>-->
+<!--    <div class="form-group">-->
+<!--        <label class="control-label col-xs-12 col-sm-2">{:__('Add_id')}:</label>-->
+<!--        <div class="col-xs-12 col-sm-8">-->
+<!--            <input id="c-add_id" data-rule="required" data-source="add/index" class="form-control selectpage" name="row[add_id]" type="text" value="{$row.add_id|htmlentities}">-->
+<!--        </div>-->
+<!--    </div>-->
+<!--    <div class="form-group">-->
+<!--        <label class="control-label col-xs-12 col-sm-2">{:__('Feel')}:</label>-->
+<!--        <div class="col-xs-12 col-sm-8">-->
+<!--                        -->
+<!--            <select  id="c-feel" class="form-control selectpicker" name="row[feel]">-->
+<!--                {foreach name="feelList" item="vo"}-->
+<!--                    <option value="{$key}" {in name="key" value="$row.feel"}selected{/in}>{$vo}</option>-->
+<!--                {/foreach}-->
+<!--            </select>-->
+
+<!--        </div>-->
+<!--    </div>-->
+<!--    <div class="form-group">-->
+<!--        <label class="control-label col-xs-12 col-sm-2">{:__('Sign_num')}:</label>-->
+<!--        <div class="col-xs-12 col-sm-8">-->
+<!--            <input id="c-sign_num" class="form-control" name="row[sign_num]" type="number" value="{$row.sign_num|htmlentities}">-->
+<!--        </div>-->
+<!--    </div>-->
+<!--    <div class="form-group">-->
+<!--        <label class="control-label col-xs-12 col-sm-2">{:__('Verification_num')}:</label>-->
+<!--        <div class="col-xs-12 col-sm-8">-->
+<!--            <input id="c-verification_num" class="form-control" name="row[verification_num]" type="number" value="{$row.verification_num|htmlentities}">-->
+<!--        </div>-->
+<!--    </div>-->
+<!--    <div class="form-group">-->
+<!--        <label class="control-label col-xs-12 col-sm-2">{:__('Collect')}:</label>-->
+<!--        <div class="col-xs-12 col-sm-8">-->
+<!--            <input id="c-collect" class="form-control" name="row[collect]" type="number" value="{$row.collect|htmlentities}">-->
+<!--        </div>-->
+<!--    </div>-->
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Auth_status')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            
+            <div class="radio">
+            {foreach name="authStatusList" item="vo"}
+            <label for="row[auth_status]-{$key}"><input id="row[auth_status]-{$key}" name="row[auth_status]" type="radio" value="{$key}" {in name="key" value="$row.auth_status"}checked{/in} /> {$vo}</label> 
+            {/foreach}
+            </div>
+
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Reason')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-reason" class="form-control" name="row[reason]" type="text" value="{$row.reason|htmlentities}">
+        </div>
+    </div>
+<!--    <div class="form-group">-->
+<!--        <label class="control-label col-xs-12 col-sm-2">{:__('Auth_time')}:</label>-->
+<!--        <div class="col-xs-12 col-sm-8">-->
+<!--            <input id="c-auth_time" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[auth_time]" type="text" value="{:$row.auth_time?datetime($row.auth_time):''}">-->
+<!--        </div>-->
+<!--    </div>-->
+<!--    <div class="form-group">-->
+<!--        <label class="control-label col-xs-12 col-sm-2">{:__('Canceltime')}:</label>-->
+<!--        <div class="col-xs-12 col-sm-8">-->
+<!--            <input id="c-canceltime" min="0" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[canceltime]" type="text" value="{:$row.canceltime?datetime($row.canceltime):''}">-->
+<!--        </div>-->
+<!--    </div>-->
+    <div class="form-group layer-footer">
+        <label class="control-label col-xs-12 col-sm-2"></label>
+        <div class="col-xs-12 col-sm-8">
+            <button type="submit" class="btn btn-primary btn-embossed disabled">{:__('OK')}</button>
+        </div>
+    </div>
+</form>
diff --git a/application/admin/view/school/activity/order/order/edit.html b/application/admin/view/school/activity/order/order/edit.html
index 43a87d4..21f6e27 100644
--- a/application/admin/view/school/activity/order/order/edit.html
+++ b/application/admin/view/school/activity/order/order/edit.html
@@ -1,60 +1,70 @@
 <form id="edit-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
+    {if condition="$row.refund_error"}
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('三方支付退款错误信息')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <!--            <input id="c-refund_error" class="form-control"  readonly disabled name="row[refund_error]" type="text" value="{$row.refund_error|htmlentities}">-->
+            <span style="color: red">{$row.refund_error}</span>
+        </div>
+    </div>
+    {/if}
+
 
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Order_no')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-order_no" class="form-control" name="row[order_no]" type="text" value="{$row.order_no|htmlentities}">
+            <input id="c-order_no" class="form-control" disabled name="row[order_no]" type="text" value="{$row.order_no|htmlentities}">
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Pay_no')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-pay_no" class="form-control" name="row[pay_no]" type="text" value="{$row.pay_no|htmlentities}">
+            <input id="c-pay_no" class="form-control" disabled name="row[pay_no]" type="text" value="{$row.pay_no|htmlentities}">
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('User_id')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-user_id" data-rule="required" data-source="user/user/index" data-field="nickname" class="form-control selectpage" name="row[user_id]" type="text" value="{$row.user_id|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Activity_id')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-activity_id" data-rule="required" data-source="school/activity/index" class="form-control selectpage" name="row[activity_id]" type="text" value="{$row.activity_id|htmlentities}">
+            <input id="c-user_id" data-rule="required" disabled data-source="user/user/index" data-field="nickname" class="form-control selectpage" name="row[user_id]" type="text" value="{$row.user_id|htmlentities}">
         </div>
     </div>
+<!--    <div class="form-group">-->
+<!--        <label class="control-label col-xs-12 col-sm-2">{:__('Activity_id')}:</label>-->
+<!--        <div class="col-xs-12 col-sm-8">-->
+<!--            <input id="c-activity_id" data-rule="required" data-source="school/activity/activity/index"  data-field="title"  class="form-control selectpage" name="row[activity_id]" type="text" value="{$row.activity_id|htmlentities}">-->
+<!--        </div>-->
+<!--    </div>-->
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Activity_order_detail_id')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-activity_order_detail_id" data-rule="required" data-source="school/activity/order/detail/index" class="form-control selectpage" name="row[activity_order_detail_id]" type="text" value="{$row.activity_order_detail_id|htmlentities}">
+            <input id="c-activity_order_detail_id" disabled  data-rule="required" data-source="school/activity/order/order_detail/index" data-field="title"  class="form-control selectpage" name="row[activity_order_detail_id]" type="text" value="{$row.activity_order_detail_id|htmlentities}">
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Beforeprice')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-beforeprice" class="form-control" step="0.01" name="row[beforeprice]" type="number" value="{$row.beforeprice|htmlentities}">
+            <input id="c-beforeprice" class="form-control" disabled step="0.01" name="row[beforeprice]" type="number" value="{$row.beforeprice|htmlentities}">
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Totalprice')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-totalprice" class="form-control" step="0.01" name="row[totalprice]" type="number" value="{$row.totalprice|htmlentities}">
+            <input id="c-totalprice" class="form-control" disabled step="0.01" name="row[totalprice]" type="number" value="{$row.totalprice|htmlentities}">
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Payprice')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-payprice" class="form-control" step="0.01" name="row[payprice]" type="number" value="{$row.payprice|htmlentities}">
+            <input id="c-payprice" class="form-control" disabled step="0.01" name="row[payprice]" type="number" value="{$row.payprice|htmlentities}">
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Pay_type')}:</label>
         <div class="col-xs-12 col-sm-8">
                         
-            <select  id="c-pay_type" class="form-control selectpicker" name="row[pay_type]">
+            <select  id="c-pay_type" class="form-control selectpicker" disabled  name="row[pay_type]">
                 {foreach name="payTypeList" item="vo"}
-                    <option value="{$key}" {in name="key" value="$row.pay_type"}selected{/in}>{$vo}</option>
+                    <option value="{$key}" {in name="key"   value="$row.pay_type"}selected{/in}>{$vo}</option>
                 {/foreach}
             </select>
 
@@ -66,180 +76,186 @@
             
             <div class="radio">
             {foreach name="statusList" item="vo"}
-            <label for="row[status]-{$key}"><input id="row[status]-{$key}" name="row[status]" type="radio" value="{$key}" {in name="key" value="$row.status"}checked{/in} /> {$vo}</label> 
+            <label for="row[status]-{$key}"><input id="row[status]-{$key}" disabled name="row[status]" type="radio" value="{$key}" {in name="key" value="$row.status"}checked{/in} /> {$vo}</label>
             {/foreach}
             </div>
 
         </div>
     </div>
+
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Total_refundprice')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-total_refundprice" class="form-control" disabled step="0.01" name="row[total_refundprice]" type="number" value="{$row.total_refundprice|htmlentities}">
+        </div>
+    </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Before_status')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Real_refundprice')}:</label>
         <div class="col-xs-12 col-sm-8">
-            
-            <div class="radio">
-            {foreach name="beforeStatusList" item="vo"}
-            <label for="row[before_status]-{$key}"><input id="row[before_status]-{$key}" name="row[before_status]" type="radio" value="{$key}" {in name="key" value="$row.before_status"}checked{/in} /> {$vo}</label> 
-            {/foreach}
-            </div>
-
+            <input id="c-real_refundprice" class="form-control" disabled step="0.01" name="row[real_refundprice]" type="number" value="{$row.real_refundprice|htmlentities}">
         </div>
     </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Sub_refundprice')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-sub_refundprice" class="form-control" disabled step="0.01" name="row[sub_refundprice]" type="number" value="{$row.sub_refundprice|htmlentities}">
+        </div>
+    </div>
+
+<!--    <div class="form-group">-->
+<!--        <label class="control-label col-xs-12 col-sm-2">{:__('Before_status')}:</label>-->
+<!--        <div class="col-xs-12 col-sm-8">-->
+<!--            -->
+<!--            <div class="radio">-->
+<!--            {foreach name="beforeStatusList" item="vo"}-->
+<!--            <label for="row[before_status]-{$key}"><input id="row[before_status]-{$key}" name="row[before_status]" type="radio" value="{$key}" {in name="key" value="$row.before_status"}checked{/in} /> {$vo}</label> -->
+<!--            {/foreach}-->
+<!--            </div>-->
+
+<!--        </div>-->
+<!--    </div>-->
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Server_status')}:</label>
         <div class="col-xs-12 col-sm-8">
             
             <div class="radio">
             {foreach name="serverStatusList" item="vo"}
-            <label for="row[server_status]-{$key}"><input id="row[server_status]-{$key}" name="row[server_status]" type="radio" value="{$key}" {in name="key" value="$row.server_status"}checked{/in} /> {$vo}</label> 
+            <label for="row[server_status]-{$key}"><input disabled id="row[server_status]-{$key}" name="row[server_status]" type="radio" value="{$key}" {in name="key" value="$row.server_status"}checked{/in} /> {$vo}</label>
             {/foreach}
             </div>
 
         </div>
     </div>
+
+
+
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Canceltime')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-canceltime" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[canceltime]" type="text" value="{:$row.canceltime?datetime($row.canceltime):''}">
+            <input id="c-canceltime" class="form-control datetimepicker" disabled data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[canceltime]" type="text" value="{:$row.canceltime?datetime($row.canceltime):''}">
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Paytime')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-paytime" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[paytime]" type="text" value="{:$row.paytime?datetime($row.paytime):''}">
+            <input id="c-paytime" class="form-control datetimepicker" disabled data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[paytime]" type="text" value="{:$row.paytime?datetime($row.paytime):''}">
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Auth_time')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-auth_time" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[auth_time]" type="text" value="{:$row.auth_time?datetime($row.auth_time):''}">
+            <input id="c-auth_time" class="form-control datetimepicker" disabled data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[auth_time]" type="text" value="{:$row.auth_time?datetime($row.auth_time):''}">
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Reservation_time')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-reservation_time" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[reservation_time]" type="text" value="{:$row.reservation_time?datetime($row.reservation_time):''}">
+            <input id="c-reservation_time" class="form-control datetimepicker" disabled data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[reservation_time]" type="text" value="{:$row.reservation_time?datetime($row.reservation_time):''}">
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Finishtime')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-finishtime" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[finishtime]" type="text" value="{:$row.finishtime?datetime($row.finishtime):''}">
+            <input id="c-finishtime" class="form-control datetimepicker" disabled data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[finishtime]" type="text" value="{:$row.finishtime?datetime($row.finishtime):''}">
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Refundtime')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-refundtime" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[refundtime]" type="text" value="{:$row.refundtime?datetime($row.refundtime):''}">
+            <input id="c-refundtime" class="form-control datetimepicker"  disabled data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[refundtime]" type="text" value="{:$row.refundtime?datetime($row.refundtime):''}">
         </div>
     </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Total_refundprice')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-total_refundprice" class="form-control" step="0.01" name="row[total_refundprice]" type="number" value="{$row.total_refundprice|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Real_refundprice')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-real_refundprice" class="form-control" step="0.01" name="row[real_refundprice]" type="number" value="{$row.real_refundprice|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Sub_refundprice')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-sub_refundprice" class="form-control" step="0.01" name="row[sub_refundprice]" type="number" value="{$row.sub_refundprice|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Pay_json')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            
-            <dl class="fieldlist" data-name="row[pay_json]">
-                <dd>
-                    <ins>{:__('Key')}</ins>
-                    <ins>{:__('Value')}</ins>
-                </dd>
-                <dd><a href="javascript:;" class="btn btn-sm btn-success btn-append"><i class="fa fa-plus"></i> {:__('Append')}</a></dd>
-                <textarea name="row[pay_json]" class="form-control hide" cols="30" rows="5">{$row.pay_json|htmlentities}</textarea>
-            </dl>
+
+<!--    <div class="form-group">-->
+<!--        <label class="control-label col-xs-12 col-sm-2">{:__('Pay_json')}:</label>-->
+<!--        <div class="col-xs-12 col-sm-8">-->
+<!--            -->
+<!--            <dl class="fieldlist" data-name="row[pay_json]">-->
+<!--                <dd>-->
+<!--                    <ins>{:__('Key')}</ins>-->
+<!--                    <ins>{:__('Value')}</ins>-->
+<!--                </dd>-->
+<!--                <dd><a href="javascript:;" class="btn btn-sm btn-success btn-append"><i class="fa fa-plus"></i> {:__('Append')}</a></dd>-->
+<!--                <textarea name="row[pay_json]" class="form-control hide" cols="30" rows="5">{$row.pay_json|htmlentities}</textarea>-->
+<!--            </dl>-->
 
 
-        </div>
-    </div>
+<!--        </div>-->
+<!--    </div>-->
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Platform')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-platform" class="form-control" name="row[platform]" type="text" value="{$row.platform|htmlentities}">
+            <input id="c-platform" class="form-control" disabled  name="row[platform]" type="text" value="{$row.platform|htmlentities}">
         </div>
     </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Reason')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-reason" class="form-control" name="row[reason]" type="text" value="{$row.reason|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Auth_status')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            
-            <div class="radio">
-            {foreach name="authStatusList" item="vo"}
-            <label for="row[auth_status]-{$key}"><input id="row[auth_status]-{$key}" name="row[auth_status]" type="radio" value="{$key}" {in name="key" value="$row.auth_status"}checked{/in} /> {$vo}</label> 
-            {/foreach}
-            </div>
+<!--    <div class="form-group">-->
+<!--        <label class="control-label col-xs-12 col-sm-2">{:__('Reason')}:</label>-->
+<!--        <div class="col-xs-12 col-sm-8">-->
+<!--            <input id="c-reason" class="form-control" name="row[reason]" type="text" value="{$row.reason|htmlentities}">-->
+<!--        </div>-->
+<!--    </div>-->
+<!--    <div class="form-group">-->
+<!--        <label class="control-label col-xs-12 col-sm-2">{:__('Auth_status')}:</label>-->
+<!--        <div class="col-xs-12 col-sm-8">-->
+<!--            -->
+<!--            <div class="radio">-->
+<!--            {foreach name="authStatusList" item="vo"}-->
+<!--            <label for="row[auth_status]-{$key}"><input id="row[auth_status]-{$key}" name="row[auth_status]" type="radio" value="{$key}" {in name="key" value="$row.auth_status"}checked{/in} /> {$vo}</label> -->
+<!--            {/foreach}-->
+<!--            </div>-->
 
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Auth_user_id')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-auth_user_id" data-rule="required" data-source="auth/user/index" class="form-control selectpage" name="row[auth_user_id]" type="text" value="{$row.auth_user_id|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Auth_type')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-auth_type" class="form-control" name="row[auth_type]" type="text" value="{$row.auth_type|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Refund_no')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-refund_no" class="form-control" name="row[refund_no]" type="text" value="{$row.refund_no|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Refund_json')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            
-            <dl class="fieldlist" data-name="row[refund_json]">
-                <dd>
-                    <ins>{:__('Key')}</ins>
-                    <ins>{:__('Value')}</ins>
-                </dd>
-                <dd><a href="javascript:;" class="btn btn-sm btn-success btn-append"><i class="fa fa-plus"></i> {:__('Append')}</a></dd>
-                <textarea name="row[refund_json]" class="form-control hide" cols="30" rows="5">{$row.refund_json|htmlentities}</textarea>
-            </dl>
+<!--        </div>-->
+<!--    </div>-->
+<!--    <div class="form-group">-->
+<!--        <label class="control-label col-xs-12 col-sm-2">{:__('Auth_user_id')}:</label>-->
+<!--        <div class="col-xs-12 col-sm-8">-->
+<!--            <input id="c-auth_user_id" data-rule="required" data-source="auth/user/index" class="form-control selectpage" name="row[auth_user_id]" type="text" value="{$row.auth_user_id|htmlentities}">-->
+<!--        </div>-->
+<!--    </div>-->
+<!--    <div class="form-group">-->
+<!--        <label class="control-label col-xs-12 col-sm-2">{:__('Auth_type')}:</label>-->
+<!--        <div class="col-xs-12 col-sm-8">-->
+<!--            <input id="c-auth_type" class="form-control" name="row[auth_type]" type="text" value="{$row.auth_type|htmlentities}">-->
+<!--        </div>-->
+<!--    </div>-->
+<!--    <div class="form-group">-->
+<!--        <label class="control-label col-xs-12 col-sm-2">{:__('Refund_no')}:</label>-->
+<!--        <div class="col-xs-12 col-sm-8">-->
+<!--            <input id="c-refund_no" class="form-control" name="row[refund_no]" type="text" value="{$row.refund_no|htmlentities}">-->
+<!--        </div>-->
+<!--    </div>-->
+<!--    <div class="form-group">-->
+<!--        <label class="control-label col-xs-12 col-sm-2">{:__('Refund_json')}:</label>-->
+<!--        <div class="col-xs-12 col-sm-8">-->
+<!--            -->
+<!--            <dl class="fieldlist" data-name="row[refund_json]">-->
+<!--                <dd>-->
+<!--                    <ins>{:__('Key')}</ins>-->
+<!--                    <ins>{:__('Value')}</ins>-->
+<!--                </dd>-->
+<!--                <dd><a href="javascript:;" class="btn btn-sm btn-success btn-append"><i class="fa fa-plus"></i> {:__('Append')}</a></dd>-->
+<!--                <textarea name="row[refund_json]" class="form-control hide" cols="30" rows="5">{$row.refund_json|htmlentities}</textarea>-->
+<!--            </dl>-->
 
 
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Refund_error')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-refund_error" class="form-control" name="row[refund_error]" type="text" value="{$row.refund_error|htmlentities}">
-        </div>
-    </div>
+<!--        </div>-->
+<!--    </div>-->
+<!--    <div class="form-group">-->
+<!--        <label class="control-label col-xs-12 col-sm-2">{:__('Refund_error')}:</label>-->
+<!--        <div class="col-xs-12 col-sm-8">-->
+<!--            <input id="c-refund_error" class="form-control" disabled name="row[refund_error]" type="text" value="{$row.refund_error|htmlentities}">-->
+<!--        </div>-->
+<!--    </div>-->
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Refundsendtime')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-refundsendtime" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[refundsendtime]" type="text" value="{:$row.refundsendtime?datetime($row.refundsendtime):''}">
-        </div>
-    </div>
-    <div class="form-group layer-footer">
-        <label class="control-label col-xs-12 col-sm-2"></label>
-        <div class="col-xs-12 col-sm-8">
-            <button type="submit" class="btn btn-primary btn-embossed disabled">{:__('OK')}</button>
+            <input id="c-refundsendtime" class="form-control datetimepicker" disabled data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[refundsendtime]" type="text" value="{:$row.refundsendtime?datetime($row.refundsendtime):''}">
         </div>
     </div>
+<!--    <div class="form-group layer-footer">-->
+<!--        <label class="control-label col-xs-12 col-sm-2"></label>-->
+<!--        <div class="col-xs-12 col-sm-8">-->
+<!--            <button type="submit" class="btn btn-primary btn-embossed disabled">{:__('OK')}</button>-->
+<!--        </div>-->
+<!--    </div>-->
 </form>
diff --git a/application/admin/view/school/activity/order/order/index.html b/application/admin/view/school/activity/order/order/index.html
index b80270c..e06839a 100644
--- a/application/admin/view/school/activity/order/order/index.html
+++ b/application/admin/view/school/activity/order/order/index.html
@@ -17,9 +17,9 @@
                 <div class="widget-body no-padding">
                     <div id="toolbar" class="toolbar">
                         <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a>
-                        <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('school/activity/order/order/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>
+<!--                        <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('school/activity/order/order/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>-->
                         <a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('school/activity/order/order/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>
-                        <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('school/activity/order/order/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
+<!--                        <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('school/activity/order/order/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>-->
                         
 
                         <div class="dropdown btn-group {:$auth->check('school/activity/order/order/multi')?'':'hide'}">
@@ -35,7 +35,7 @@
                     </div>
                     <table id="table" class="table table-striped table-bordered table-hover table-nowrap"
                            data-operate-edit="{:$auth->check('school/activity/order/order/edit')}"
-                           data-operate-del="{:$auth->check('school/activity/order/order/del')}"
+                           data-operate-del="0"
                            width="100%">
                     </table>
                 </div>
diff --git a/application/admin/view/school/activity/order/order_code/index.html b/application/admin/view/school/activity/order/order_code/index.html
index e2fae5c..6d6996d 100644
--- a/application/admin/view/school/activity/order/order_code/index.html
+++ b/application/admin/view/school/activity/order/order_code/index.html
@@ -17,25 +17,25 @@
                 <div class="widget-body no-padding">
                     <div id="toolbar" class="toolbar">
                         <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a>
-                        <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('school/activity/order/order_code/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>
-                        <a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('school/activity/order/order_code/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>
-                        <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('school/activity/order/order_code/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
-                        
+<!--                        <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('school/activity/order/order_code/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>-->
+<!--                        <a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('school/activity/order/order_code/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>-->
+<!--                        <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('school/activity/order/order_code/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>-->
+<!--                        -->
 
-                        <div class="dropdown btn-group {:$auth->check('school/activity/order/order_code/multi')?'':'hide'}">
-                            <a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a>
-                            <ul class="dropdown-menu text-left" role="menu">
-                                {foreach name="statusList" item="vo"}
-                                <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:" data-params="status={$key}">{:__('Set status to ' . $key)}</a></li>
-                                {/foreach}
-                            </ul>
-                        </div>
+<!--                        <div class="dropdown btn-group {:$auth->check('school/activity/order/order_code/multi')?'':'hide'}">-->
+<!--                            <a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a>-->
+<!--                            <ul class="dropdown-menu text-left" role="menu">-->
+<!--                                {foreach name="statusList" item="vo"}-->
+<!--                                <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:" data-params="status={$key}">{:__('Set status to ' . $key)}</a></li>-->
+<!--                                {/foreach}-->
+<!--                            </ul>-->
+<!--                        </div>-->
 
                         <a class="btn btn-success btn-recyclebin btn-dialog {:$auth->check('school/activity/order/order_code/recyclebin')?'':'hide'}" href="school/activity/order/order_code/recyclebin" title="{:__('Recycle bin')}"><i class="fa fa-recycle"></i> {:__('Recycle bin')}</a>
                     </div>
                     <table id="table" class="table table-striped table-bordered table-hover table-nowrap"
-                           data-operate-edit="{:$auth->check('school/activity/order/order_code/edit')}"
-                           data-operate-del="{:$auth->check('school/activity/order/order_code/del')}"
+                           data-operate-edit="0"
+                           data-operate-del="0"
                            width="100%">
                     </table>
                 </div>
diff --git a/application/admin/view/school/activity/order/order_detail/edit.html b/application/admin/view/school/activity/order/order_detail/edit.html
index 5d8beb7..f1ed9a3 100644
--- a/application/admin/view/school/activity/order/order_detail/edit.html
+++ b/application/admin/view/school/activity/order/order_detail/edit.html
@@ -3,32 +3,32 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('User_id')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-user_id" data-rule="required" data-source="user/user/index" data-field="nickname" class="form-control selectpage" name="row[user_id]" type="text" value="{$row.user_id|htmlentities}">
+            <input id="c-user_id" data-rule="required" disabled data-source="user/user/index" data-field="nickname" class="form-control selectpage" name="row[user_id]" type="text" value="{$row.user_id|htmlentities}">
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Activity_order_id')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-activity_order_id" data-rule="required" data-source="school/activity/order/index" class="form-control selectpage" name="row[activity_order_id]" type="text" value="{$row.activity_order_id|htmlentities}">
+            <input id="c-activity_order_id" data-rule="required" disabled data-source="school/activity/order/order/index"  data-field="order_no"  class="form-control selectpage" name="row[activity_order_id]" type="text" value="{$row.activity_order_id|htmlentities}">
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Activity_id')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-activity_id" data-rule="required" data-source="school/activity/index" class="form-control selectpage" name="row[activity_id]" type="text" value="{$row.activity_id|htmlentities}">
+            <input id="c-activity_id" data-rule="required" disabled data-source="school/activity/activity/index"  data-field="title" class="form-control selectpage" name="row[activity_id]" type="text" value="{$row.activity_id|htmlentities}">
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Title')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-title" data-rule="required" class="form-control" name="row[title]" type="text" value="{$row.title|htmlentities}">
+            <input id="c-title" data-rule="required" disabled class="form-control" name="row[title]" type="text" value="{$row.title|htmlentities}">
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Images')}:</label>
         <div class="col-xs-12 col-sm-8">
             <div class="input-group">
-                <input id="c-images" data-rule="required" class="form-control" size="50" name="row[images]" type="text" value="{$row.images|htmlentities}">
+                <input id="c-images" data-rule="required" disabled class="form-control" size="50" name="row[images]" type="text" value="{$row.images|htmlentities}">
                 <div class="input-group-addon no-border no-padding">
                     <span><button type="button" id="faupload-images" class="btn btn-danger faupload" data-input-id="c-images" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp,image/webp" data-multiple="true" data-preview-id="p-images"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
                     <span><button type="button" id="fachoose-images" class="btn btn-primary fachoose" data-input-id="c-images" data-mimetype="image/*" data-multiple="true"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
@@ -38,113 +38,178 @@
             <ul class="row list-inline faupload-preview" id="p-images"></ul>
         </div>
     </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Address_city')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <div class='control-relative'><input id="c-address_city" class="form-control" data-toggle="city-picker" name="row[address_city]" type="text" value="{$row.address_city|htmlentities}"></div>
-        </div>
-    </div>
+<!--    <div class="form-group">-->
+<!--        <label class="control-label col-xs-12 col-sm-2">{:__('Address_city')}:</label>-->
+<!--        <div class="col-xs-12 col-sm-8">-->
+<!--            <div class='control-relative'><input id="c-address_city" class="form-control" data-toggle="city-picker" name="row[address_city]" type="text" value="{$row.address_city|htmlentities}"></div>-->
+<!--        </div>-->
+<!--    </div>-->
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Cate_ids')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-cate_ids" data-rule="required" data-source="cate/index" data-multiple="true" class="form-control selectpage" name="row[cate_ids]" type="text" value="{$row.cate_ids|htmlentities}">
+            <input id="c-cate_ids" data-rule="required" disabled data-max-select-limit="3" data-source="school/activity/cate/index"  data-params='{"custom[status]":"1"}' data-multiple="true" class="form-control selectpage" name="row[cate_ids]" type="text" value="{$row.cate_ids|htmlentities}">
+
+<!--            <span style="color: red">-->
+<!--                                    (没找到{:__('Cate_ids')}则点击按钮创建{:__('Cate_ids')}后重新下拉框选{:__('Cate_ids')})-->
+<!--                                       <a href="javascript:;" data-url="school/activity/cate/index" class="btn btn-success btn-changeuser {:$auth->check('school/activity/cate/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>-->
+
+<!--             </span>-->
         </div>
     </div>
+<!--    <div class="form-group">-->
+<!--        <label class="control-label col-xs-12 col-sm-2">{:__('Province')}:</label>-->
+<!--        <div class="col-xs-12 col-sm-8">-->
+<!--            <input id="c-province" class="form-control" name="row[province]" type="number" value="{$row.province|htmlentities}">-->
+<!--        </div>-->
+<!--    </div>-->
+<!--    <div class="form-group">-->
+<!--        <label class="control-label col-xs-12 col-sm-2">{:__('City')}:</label>-->
+<!--        <div class="col-xs-12 col-sm-8">-->
+<!--            <input id="c-city" class="form-control" name="row[city]" type="number" value="{$row.city|htmlentities}">-->
+<!--        </div>-->
+<!--    </div>-->
+<!--    <div class="form-group">-->
+<!--        <label class="control-label col-xs-12 col-sm-2">{:__('District')}:</label>-->
+<!--        <div class="col-xs-12 col-sm-8">-->
+<!--            <input id="c-district" class="form-control" name="row[district]" type="number" value="{$row.district|htmlentities}">-->
+<!--        </div>-->
+<!--    </div>-->
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Province')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Refund_id')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-province" class="form-control" name="row[province]" type="number" value="{$row.province|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('City')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-city" class="form-control" name="row[city]" type="number" value="{$row.city|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('District')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-district" class="form-control" name="row[district]" type="number" value="{$row.district|htmlentities}">
+            <input id="c-refund_id" disabled data-source="school/activity/refund/index" data-field="title"  class="form-control selectpage" name="row[refund_id]" type="text" value="{$row.refund_id|htmlentities}">
+<!--            <span style="color: red">-->
+
+<!--                                    (没找到退款策略则点击按钮创建退款策略后重新下拉框选退款策略)-->
+<!--                                       <a data-url="school/activity/refund/index" href="javascript:;" class="btn btn-success btn-changeuser {:$auth->check('school/activity/refund/index')?'':'hide'}" title="退款策略" ><i class="fa fa-plus"></i> 创建新退款策略</a>-->
+
+<!--                                </span>-->
         </div>
     </div>
+
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Address')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-address" class="form-control" name="row[address]" type="text" value="{$row.address|htmlentities}">
+            <div class='control-relative'>
+                <input id="c-address"  class="form-control form-control"
+                       data-lat-id="c-latitude" data-lng-id="c-longitude" data-rule="required" readonly data-input-id="c-address" data-toggle="addresspicker" name="row[address]" value="{$row.address}" type="text" placeholder="请地图选址。如调起地图失败请检查插件《地图位置(经纬度)选择》是否安装">
+            </div>
+        </div>
+    </div>
+
+    <div class="form-group" style="display: none">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Longitude')}:</label>
+        <div class="col-xs-12 col-sm-3">
+            <input id="c-longitude"  readonly class="form-control" name="row[longitude]" type="text" value="{$row.longitude}">
+        </div>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Latitude')}:</label>
+        <div class="col-xs-12 col-sm-3">
+            <input id="c-latitude"  readonly class="form-control" name="row[latitude]" type="text" value="{$row.latitude}">
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Address_detail')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-address_detail" class="form-control" name="row[address_detail]" type="text" value="{$row.address_detail|htmlentities}">
+            <input id="c-address_detail" disabled class="form-control" data-rule="required" name="row[address_detail]" type="text" value="{$row.address_detail}" placeholder="请输入{:__('Address_detail')}">
         </div>
     </div>
+
+
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Longitude')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('报名开始结束时间')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-longitude" class="form-control" name="row[longitude]" type="text" value="{$row.longitude|htmlentities}">
+            <input id="c-sign_time" disabled class="form-control datetimerange"  data-rule="required" data-time-picker="true"  data-locale='{"format":"YYYY/MM/DD HH:mm"}'  placeholder="指定开始结束时间" name="row[sign_time]" type="text" value="{:$row.sign_start_time?datetime($row.sign_start_time):''} - {:$row.sign_end_time?datetime($row.sign_end_time):''}">
         </div>
     </div>
+
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Latitude')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('活动开始结束时间')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-latitude" class="form-control" name="row[latitude]" type="text" value="{$row.latitude|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Start_time')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-start_time" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[start_time]" type="text" value="{:$row.start_time?datetime($row.start_time):''}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('End_time')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-end_time" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[end_time]" type="text" value="{:$row.end_time?datetime($row.end_time):''}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Sign_start_time')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-sign_start_time" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[sign_start_time]" type="text" value="{:$row.sign_start_time?datetime($row.sign_start_time):''}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Sign_end_time')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-sign_end_time" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[sign_end_time]" type="text" value="{:$row.sign_end_time?datetime($row.sign_end_time):''}">
+            <input id="c-time" disabled class="form-control datetimerange"  data-rule="required" data-time-picker="true"  data-locale='{"format":"YYYY/MM/DD HH:mm"}'  placeholder="指定开始结束时间" name="row[time]" type="text" value="{:$row.start_time?datetime($row.start_time):''} - {:$row.end_time?datetime($row.end_time):''}">
         </div>
     </div>
+
+
+
+
+
+    <!--    <div class="form-group">-->
+<!--        <label class="control-label col-xs-12 col-sm-2">{:__('Address')}:</label>-->
+<!--        <div class="col-xs-12 col-sm-8">-->
+<!--            <input id="c-address" class="form-control" name="row[address]" type="text" value="{$row.address|htmlentities}">-->
+<!--        </div>-->
+<!--    </div>-->
+<!--    <div class="form-group">-->
+<!--        <label class="control-label col-xs-12 col-sm-2">{:__('Address_detail')}:</label>-->
+<!--        <div class="col-xs-12 col-sm-8">-->
+<!--            <input id="c-address_detail" class="form-control" name="row[address_detail]" type="text" value="{$row.address_detail|htmlentities}">-->
+<!--        </div>-->
+<!--    </div>-->
+<!--    <div class="form-group">-->
+<!--        <label class="control-label col-xs-12 col-sm-2">{:__('Longitude')}:</label>-->
+<!--        <div class="col-xs-12 col-sm-8">-->
+<!--            <input id="c-longitude" class="form-control" name="row[longitude]" type="text" value="{$row.longitude|htmlentities}">-->
+<!--        </div>-->
+<!--    </div>-->
+<!--    <div class="form-group">-->
+<!--        <label class="control-label col-xs-12 col-sm-2">{:__('Latitude')}:</label>-->
+<!--        <div class="col-xs-12 col-sm-8">-->
+<!--            <input id="c-latitude" class="form-control" name="row[latitude]" type="text" value="{$row.latitude|htmlentities}">-->
+<!--        </div>-->
+<!--    </div>-->
+<!--    <div class="form-group">-->
+<!--        <label class="control-label col-xs-12 col-sm-2">{:__('Start_time')}:</label>-->
+<!--        <div class="col-xs-12 col-sm-8">-->
+<!--            <input id="c-start_time" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[start_time]" type="text" value="{:$row.start_time?datetime($row.start_time):''}">-->
+<!--        </div>-->
+<!--    </div>-->
+<!--    <div class="form-group">-->
+<!--        <label class="control-label col-xs-12 col-sm-2">{:__('End_time')}:</label>-->
+<!--        <div class="col-xs-12 col-sm-8">-->
+<!--            <input id="c-end_time" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[end_time]" type="text" value="{:$row.end_time?datetime($row.end_time):''}">-->
+<!--        </div>-->
+<!--    </div>-->
+<!--    <div class="form-group">-->
+<!--        <label class="control-label col-xs-12 col-sm-2">{:__('Sign_start_time')}:</label>-->
+<!--        <div class="col-xs-12 col-sm-8">-->
+<!--            <input id="c-sign_start_time" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[sign_start_time]" type="text" value="{:$row.sign_start_time?datetime($row.sign_start_time):''}">-->
+<!--        </div>-->
+<!--    </div>-->
+<!--    <div class="form-group">-->
+<!--        <label class="control-label col-xs-12 col-sm-2">{:__('Sign_end_time')}:</label>-->
+<!--        <div class="col-xs-12 col-sm-8">-->
+<!--            <input id="c-sign_end_time" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[sign_end_time]" type="text" value="{:$row.sign_end_time?datetime($row.sign_end_time):''}">-->
+<!--        </div>-->
+<!--    </div>-->
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Price')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-price" data-rule="required" class="form-control" step="0.01" name="row[price]" type="number" value="{$row.price|htmlentities}">
+            <input id="c-price" disabled data-rule="required" class="form-control" step="0.01" name="row[price]" type="number" value="{$row.price|htmlentities}">
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Stock')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-stock" data-rule="required" class="form-control" name="row[stock]" type="number" value="{$row.stock|htmlentities}">
+            <input id="c-stock" disabled data-rule="required" class="form-control" name="row[stock]" type="number" value="{$row.stock|htmlentities}">
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Content')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <textarea id="c-content" data-rule="required" class="form-control editor" rows="5" name="row[content]" cols="50">{$row.content|htmlentities}</textarea>
+            <textarea id="c-content" disabled data-rule="required" class="form-control editor" rows="5" name="row[content]" cols="50">{$row.content|htmlentities}</textarea>
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Weigh')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-weigh" class="form-control" name="row[weigh]" type="number" value="{$row.weigh|htmlentities}">
+            <input id="c-weigh" disabled class="form-control" name="row[weigh]" type="number" value="{$row.weigh|htmlentities}">
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Recommend')}:</label>
         <div class="col-xs-12 col-sm-8">
                         
-            <select  id="c-recommend" class="form-control selectpicker" name="row[recommend]">
+            <select  id="c-recommend" disabled class="form-control selectpicker" name="row[recommend]">
                 {foreach name="recommendList" item="vo"}
                     <option value="{$key}" {in name="key" value="$row.recommend"}selected{/in}>{$vo}</option>
                 {/foreach}
@@ -156,7 +221,7 @@
         <label class="control-label col-xs-12 col-sm-2">{:__('Hot')}:</label>
         <div class="col-xs-12 col-sm-8">
                         
-            <select  id="c-hot" class="form-control selectpicker" name="row[hot]">
+            <select  id="c-hot" disabled class="form-control selectpicker" name="row[hot]">
                 {foreach name="hotList" item="vo"}
                     <option value="{$key}" {in name="key" value="$row.hot"}selected{/in}>{$vo}</option>
                 {/foreach}
@@ -168,7 +233,7 @@
         <label class="control-label col-xs-12 col-sm-2">{:__('New')}:</label>
         <div class="col-xs-12 col-sm-8">
                         
-            <select  id="c-new" class="form-control selectpicker" name="row[new]">
+            <select  id="c-new" disabled class="form-control selectpicker" name="row[new]">
                 {foreach name="newList" item="vo"}
                     <option value="{$key}" {in name="key" value="$row.new"}selected{/in}>{$vo}</option>
                 {/foreach}
@@ -179,20 +244,20 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Sale')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-sale" class="form-control" name="row[sale]" type="number" value="{$row.sale|htmlentities}">
+            <input id="c-sale" class="form-control" disabled  name="row[sale]" type="number" value="{$row.sale|htmlentities}">
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Views')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-views" class="form-control" name="row[views]" type="number" value="{$row.views|htmlentities}">
+            <input id="c-views" class="form-control" disabled name="row[views]" type="number" value="{$row.views|htmlentities}">
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Add_type')}:</label>
         <div class="col-xs-12 col-sm-8">
                         
-            <select  id="c-add_type" data-rule="required" class="form-control selectpicker" name="row[add_type]">
+            <select  id="c-add_type" data-rule="required" disabled class="form-control selectpicker" name="row[add_type]">
                 {foreach name="addTypeList" item="vo"}
                     <option value="{$key}" {in name="key" value="$row.add_type"}selected{/in}>{$vo}</option>
                 {/foreach}
@@ -203,14 +268,14 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Add_id')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-add_id" data-rule="required" data-source="add/index" class="form-control selectpage" name="row[add_id]" type="text" value="{$row.add_id|htmlentities}">
+            <input id="c-add_id" data-rule="required" disabled class="form-control" name="row[add_id]" type="text" value="{$row.add_id|htmlentities}">
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Feel')}:</label>
         <div class="col-xs-12 col-sm-8">
                         
-            <select  id="c-feel" class="form-control selectpicker" name="row[feel]">
+            <select  id="c-feel" disabled class="form-control selectpicker" name="row[feel]">
                 {foreach name="feelList" item="vo"}
                     <option value="{$key}" {in name="key" value="$row.feel"}selected{/in}>{$vo}</option>
                 {/foreach}
@@ -221,25 +286,25 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Sign_num')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-sign_num" class="form-control" name="row[sign_num]" type="number" value="{$row.sign_num|htmlentities}">
+            <input id="c-sign_num"  disabled class="form-control" name="row[sign_num]" type="number" value="{$row.sign_num|htmlentities}">
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Verification_num')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-verification_num" class="form-control" name="row[verification_num]" type="number" value="{$row.verification_num|htmlentities}">
+            <input id="c-verification_num" disabled class="form-control" name="row[verification_num]" type="number" value="{$row.verification_num|htmlentities}">
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Collect')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-collect" class="form-control" name="row[collect]" type="number" value="{$row.collect|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group layer-footer">
-        <label class="control-label col-xs-12 col-sm-2"></label>
-        <div class="col-xs-12 col-sm-8">
-            <button type="submit" class="btn btn-primary btn-embossed disabled">{:__('OK')}</button>
+            <input id="c-collect" disabled class="form-control" name="row[collect]" type="number" value="{$row.collect|htmlentities}">
         </div>
     </div>
+<!--    <div class="form-group layer-footer">-->
+<!--        <label class="control-label col-xs-12 col-sm-2"></label>-->
+<!--        <div class="col-xs-12 col-sm-8">-->
+<!--            <button type="submit" class="btn btn-primary btn-embossed disabled">{:__('OK')}</button>-->
+<!--        </div>-->
+<!--    </div>-->
 </form>
diff --git a/application/admin/view/school/activity/order/order_detail/index.html b/application/admin/view/school/activity/order/order_detail/index.html
index 3081d6e..ef76813 100644
--- a/application/admin/view/school/activity/order/order_detail/index.html
+++ b/application/admin/view/school/activity/order/order_detail/index.html
@@ -7,9 +7,9 @@
                 <div class="widget-body no-padding">
                     <div id="toolbar" class="toolbar">
                         <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a>
-                        <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('school/activity/order/order_detail/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>
+<!--                        <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('school/activity/order/order_detail/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>-->
                         <a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('school/activity/order/order_detail/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>
-                        <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('school/activity/order/order_detail/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
+<!--                        <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('school/activity/order/order_detail/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>-->
                         
 
                         
@@ -18,7 +18,7 @@
                     </div>
                     <table id="table" class="table table-striped table-bordered table-hover table-nowrap"
                            data-operate-edit="{:$auth->check('school/activity/order/order_detail/edit')}"
-                           data-operate-del="{:$auth->check('school/activity/order/order_detail/del')}"
+                           data-operate-del="0"
                            width="100%">
                     </table>
                 </div>
@@ -27,3 +27,6 @@
         </div>
     </div>
 </div>
+<script >
+    var cateListJson = {$cateListJson};
+</script>
\ No newline at end of file
diff --git a/application/admin/view/school/activity/order/order_log/index.html b/application/admin/view/school/activity/order/order_log/index.html
index 5a715b9..a008600 100644
--- a/application/admin/view/school/activity/order/order_log/index.html
+++ b/application/admin/view/school/activity/order/order_log/index.html
@@ -17,25 +17,25 @@
                 <div class="widget-body no-padding">
                     <div id="toolbar" class="toolbar">
                         <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a>
-                        <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('school/activity/order/order_log/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>
-                        <a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('school/activity/order/order_log/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>
-                        <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('school/activity/order/order_log/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
-                        
+<!--                        <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('school/activity/order/order_log/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>-->
+<!--                        <a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('school/activity/order/order_log/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>-->
+<!--                        <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('school/activity/order/order_log/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>-->
+<!--                        -->
 
-                        <div class="dropdown btn-group {:$auth->check('school/activity/order/order_log/multi')?'':'hide'}">
-                            <a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a>
-                            <ul class="dropdown-menu text-left" role="menu">
-                                {foreach name="statusList" item="vo"}
-                                <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:" data-params="status={$key}">{:__('Set status to ' . $key)}</a></li>
-                                {/foreach}
-                            </ul>
-                        </div>
+<!--                        <div class="dropdown btn-group {:$auth->check('school/activity/order/order_log/multi')?'':'hide'}">-->
+<!--                            <a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a>-->
+<!--                            <ul class="dropdown-menu text-left" role="menu">-->
+<!--                                {foreach name="statusList" item="vo"}-->
+<!--                                <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:" data-params="status={$key}">{:__('Set status to ' . $key)}</a></li>-->
+<!--                                {/foreach}-->
+<!--                            </ul>-->
+<!--                        </div>-->
 
-                        <a class="btn btn-success btn-recyclebin btn-dialog {:$auth->check('school/activity/order/order_log/recyclebin')?'':'hide'}" href="school/activity/order/order_log/recyclebin" title="{:__('Recycle bin')}"><i class="fa fa-recycle"></i> {:__('Recycle bin')}</a>
+<!--                        <a class="btn btn-success btn-recyclebin btn-dialog {:$auth->check('school/activity/order/order_log/recyclebin')?'':'hide'}" href="school/activity/order/order_log/recyclebin" title="{:__('Recycle bin')}"><i class="fa fa-recycle"></i> {:__('Recycle bin')}</a>-->
                     </div>
                     <table id="table" class="table table-striped table-bordered table-hover table-nowrap"
-                           data-operate-edit="{:$auth->check('school/activity/order/order_log/edit')}"
-                           data-operate-del="{:$auth->check('school/activity/order/order_log/del')}"
+                           data-operate-edit="0"
+                           data-operate-del="0"
                            width="100%">
                     </table>
                 </div>
diff --git a/application/admin/view/school/activity/order/settle_log/add.html b/application/admin/view/school/activity/order/settle_log/add.html
index 9f6b84d..399774d 100644
--- a/application/admin/view/school/activity/order/settle_log/add.html
+++ b/application/admin/view/school/activity/order/settle_log/add.html
@@ -3,25 +3,25 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Activity_order_id')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-activity_order_id" data-rule="required" data-source="school/activity/order/index" class="form-control selectpage" name="row[activity_order_id]" type="text" value="">
+            <input id="c-activity_order_id" data-rule="required" data-source="school/activity/order/order/index" data-field="order_no" class="form-control selectpage" name="row[activity_order_id]" type="text" value="">
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Withdrawal_log_id')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-withdrawal_log_id" data-rule="required" data-source="user/withdrawal/log/index" class="form-control selectpage" name="row[withdrawal_log_id]" type="text" value="">
+            <input id="c-withdrawal_log_id" data-source="user/withdrawal/userwithdrawal_log/index" data-field="id"  class="form-control selectpage" name="row[withdrawal_log_id]" type="text" value="">
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('To_user_id')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-to_user_id" data-rule="required" data-source="user/user/index" data-field="nickname" class="form-control selectpage" name="row[to_user_id]" type="text" value="">
+            <input id="c-to_user_id" data-rule="required" data-source="user/user/index" data-field="mobile" data-format-item="{id} - {nickname} - {mobile}"  class="form-control selectpage" name="row[to_user_id]" type="text" value="">
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Pay_user_id')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-pay_user_id" data-rule="required" data-source="third/index" class="form-control selectpage" name="row[pay_user_id]" type="text" value="">
+            <input id="c-pay_user_id" data-rule="required" data-source="user/user/index" data-field="mobile" data-format-item="{id} - {nickname} - {mobile}"  class="form-control selectpage" name="row[pay_user_id]" type="text" value="">
         </div>
     </div>
     <div class="form-group">
diff --git a/application/admin/view/school/activity/order/settle_log/edit.html b/application/admin/view/school/activity/order/settle_log/edit.html
index 13b21b2..50fbc84 100644
--- a/application/admin/view/school/activity/order/settle_log/edit.html
+++ b/application/admin/view/school/activity/order/settle_log/edit.html
@@ -3,25 +3,25 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Activity_order_id')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-activity_order_id" data-rule="required" data-source="school/activity/order/index" class="form-control selectpage" name="row[activity_order_id]" type="text" value="{$row.activity_order_id|htmlentities}">
+            <input id="c-activity_order_id" data-rule="required" data-source="school/activity/order/order/index" data-field="order_no" class="form-control selectpage" name="row[activity_order_id]" type="text" value="{$row.activity_order_id|htmlentities}">
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Withdrawal_log_id')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-withdrawal_log_id" data-rule="required" data-source="user/withdrawal/log/index" class="form-control selectpage" name="row[withdrawal_log_id]" type="text" value="{$row.withdrawal_log_id|htmlentities}">
+            <input id="c-withdrawal_log_id" data-source="user/withdrawal/userwithdrawal_log/index" data-field="id" class="form-control selectpage" name="row[withdrawal_log_id]" type="text" value="{$row.withdrawal_log_id|htmlentities}">
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('To_user_id')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-to_user_id" data-rule="required" data-source="user/user/index" data-field="nickname" class="form-control selectpage" name="row[to_user_id]" type="text" value="{$row.to_user_id|htmlentities}">
+            <input id="c-to_user_id" data-rule="required" data-source="user/user/index" data-field="mobile" data-format-item="{id} - {nickname} - {mobile}"    class="form-control selectpage" name="row[to_user_id]" type="text" value="{$row.to_user_id|htmlentities}">
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Pay_user_id')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-pay_user_id" data-rule="required" data-source="third/index" class="form-control selectpage" name="row[pay_user_id]" type="text" value="{$row.pay_user_id|htmlentities}">
+            <input id="c-pay_user_id" data-rule="required" data-source="user/user/index" data-field="mobile" data-format-item="{id} - {nickname} - {mobile}"  class="form-control selectpage" name="row[pay_user_id]" type="text" value="{$row.pay_user_id|htmlentities}">
         </div>
     </div>
     <div class="form-group">
diff --git a/application/admin/view/school/activity/order/settle_log/index.html b/application/admin/view/school/activity/order/settle_log/index.html
index 7383580..745f458 100644
--- a/application/admin/view/school/activity/order/settle_log/index.html
+++ b/application/admin/view/school/activity/order/settle_log/index.html
@@ -17,25 +17,25 @@
                 <div class="widget-body no-padding">
                     <div id="toolbar" class="toolbar">
                         <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a>
-                        <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('school/activity/order/settle_log/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>
-                        <a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('school/activity/order/settle_log/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>
-                        <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('school/activity/order/settle_log/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
-                        
+<!--                        <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('school/activity/order/settle_log/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>-->
+<!--                        <a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('school/activity/order/settle_log/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>-->
+<!--                        <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('school/activity/order/settle_log/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>-->
+<!--                        -->
 
-                        <div class="dropdown btn-group {:$auth->check('school/activity/order/settle_log/multi')?'':'hide'}">
-                            <a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a>
-                            <ul class="dropdown-menu text-left" role="menu">
-                                {foreach name="statusList" item="vo"}
-                                <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:" data-params="status={$key}">{:__('Set status to ' . $key)}</a></li>
-                                {/foreach}
-                            </ul>
-                        </div>
+<!--                        <div class="dropdown btn-group {:$auth->check('school/activity/order/settle_log/multi')?'':'hide'}">-->
+<!--                            <a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a>-->
+<!--                            <ul class="dropdown-menu text-left" role="menu">-->
+<!--                                {foreach name="statusList" item="vo"}-->
+<!--                                <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:" data-params="status={$key}">{:__('Set status to ' . $key)}</a></li>-->
+<!--                                {/foreach}-->
+<!--                            </ul>-->
+<!--                        </div>-->
 
-                        <a class="btn btn-success btn-recyclebin btn-dialog {:$auth->check('school/activity/order/settle_log/recyclebin')?'':'hide'}" href="school/activity/order/settle_log/recyclebin" title="{:__('Recycle bin')}"><i class="fa fa-recycle"></i> {:__('Recycle bin')}</a>
+<!--                        <a class="btn btn-success btn-recyclebin btn-dialog {:$auth->check('school/activity/order/settle_log/recyclebin')?'':'hide'}" href="school/activity/order/settle_log/recyclebin" title="{:__('Recycle bin')}"><i class="fa fa-recycle"></i> {:__('Recycle bin')}</a>-->
                     </div>
                     <table id="table" class="table table-striped table-bordered table-hover table-nowrap"
-                           data-operate-edit="{:$auth->check('school/activity/order/settle_log/edit')}"
-                           data-operate-del="{:$auth->check('school/activity/order/settle_log/del')}"
+                           data-operate-edit="0"
+                           data-operate-del="0"
                            width="100%">
                     </table>
                 </div>
diff --git a/application/admin/view/user/withdrawal/userwithdrawal/add.html b/application/admin/view/user/withdrawal/userwithdrawal/add.html
index 3d0dc81..7e20cb1 100644
--- a/application/admin/view/user/withdrawal/userwithdrawal/add.html
+++ b/application/admin/view/user/withdrawal/userwithdrawal/add.html
@@ -3,7 +3,13 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('User_id')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-user_id" data-rule="required" data-source="user/user/index" data-field="nickname" class="form-control selectpage" name="row[user_id]" type="text" value="">
+            <input id="c-user_id" data-rule="required" data-source="user/user/index" data-field="mobile" data-format-item="{id} - {nickname} - {mobile}" class="form-control selectpage" name="row[user_id]" type="text" value="">
+            <span style="color: red">
+
+                                    (没找到用户则点击按钮创建用户后重新下拉框选用户)
+                                       <a data-url="user/user/changeuser" href="javascript:;" class="btn btn-success btn-changeuser {:$auth->check('user/user/changeuser')?'':'hide'}" title="根据手机号生成用户" ><i class="fa fa-plus"></i> 根据手机号生成用户</a>
+
+                                </span>
         </div>
     </div>
     <div class="form-group">
diff --git a/application/admin/view/user/withdrawal/userwithdrawal/edit.html b/application/admin/view/user/withdrawal/userwithdrawal/edit.html
index 7ec544c..cc2dc50 100644
--- a/application/admin/view/user/withdrawal/userwithdrawal/edit.html
+++ b/application/admin/view/user/withdrawal/userwithdrawal/edit.html
@@ -3,8 +3,17 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('User_id')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-user_id" data-rule="required" data-source="user/user/index" data-field="nickname" class="form-control selectpage" name="row[user_id]" type="text" value="{$row.user_id|htmlentities}">
+            <input id="c-user_id" data-rule="required" data-source="user/user/index" data-field="mobile" data-format-item="{id} - {nickname} - {mobile}" class="form-control selectpage" name="row[user_id]" type="text" value="{$row.user_id|htmlentities}">
+
+            <span style="color: red">
+
+                                    (没找到用户则点击按钮创建用户后重新下拉框选用户)
+                                       <a data-url="user/user/changeuser" href="javascript:;" class="btn btn-success btn-changeuser {:$auth->check('user/user/changeuser')?'':'hide'}" title="根据手机号生成用户" ><i class="fa fa-plus"></i> 根据手机号生成用户</a>
+
+                                </span>
+
         </div>
+
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Name')}:</label>
diff --git a/application/admin/view/user/withdrawal/userwithdrawal_log/add.html b/application/admin/view/user/withdrawal/userwithdrawal_log/add.html
index a424aa1..91fd64f 100644
--- a/application/admin/view/user/withdrawal/userwithdrawal_log/add.html
+++ b/application/admin/view/user/withdrawal/userwithdrawal_log/add.html
@@ -51,7 +51,7 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('User_id')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-user_id" data-rule="required" data-source="user/user/index" data-field="nickname" class="form-control selectpage" name="row[user_id]" type="text" value="">
+            <input id="c-user_id" data-rule="required"  data-source="user/user/index" data-field="mobile" data-format-item="{id} - {nickname} - {mobile}"   class="form-control selectpage" name="row[user_id]" type="text" value="">
         </div>
     </div>
     <div class="form-group">
@@ -84,18 +84,18 @@
             <input id="c-bank_user_name" data-rule="required" class="form-control" name="row[bank_user_name]" type="text">
         </div>
     </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Paytime')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-paytime" data-rule="required" min="0" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[paytime]" type="text" value="{:date('Y-m-d H:i:s')}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Examinetime')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-examinetime" data-rule="required" min="0" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[examinetime]" type="text" value="{:date('Y-m-d H:i:s')}">
-        </div>
-    </div>
+<!--    <div class="form-group">-->
+<!--        <label class="control-label col-xs-12 col-sm-2">{:__('Paytime')}:</label>-->
+<!--        <div class="col-xs-12 col-sm-8">-->
+<!--            <input id="c-paytime" data-rule="required" min="0" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[paytime]" type="text" value="{:date('Y-m-d H:i:s')}">-->
+<!--        </div>-->
+<!--    </div>-->
+<!--    <div class="form-group">-->
+<!--        <label class="control-label col-xs-12 col-sm-2">{:__('Examinetime')}:</label>-->
+<!--        <div class="col-xs-12 col-sm-8">-->
+<!--            <input id="c-examinetime" data-rule="required" min="0" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[examinetime]" type="text" value="{:date('Y-m-d H:i:s')}">-->
+<!--        </div>-->
+<!--    </div>-->
     <div class="form-group layer-footer">
         <label class="control-label col-xs-12 col-sm-2"></label>
         <div class="col-xs-12 col-sm-8">
diff --git a/application/admin/view/user/withdrawal/userwithdrawal_log/auth.html b/application/admin/view/user/withdrawal/userwithdrawal_log/auth.html
new file mode 100644
index 0000000..25aea4a
--- /dev/null
+++ b/application/admin/view/user/withdrawal/userwithdrawal_log/auth.html
@@ -0,0 +1,88 @@
+<form id="edit-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
+
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Price')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-price" class="form-control" disabled step="0.01" name="row[price]" type="number" value="{$row.price|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Fee_price')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-fee_price" class="form-control" disabled step="0.01" name="row[fee_price]" type="number" value="{$row.fee_price|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Real_price')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-real_price" class="form-control" disabled step="0.01" name="row[real_price]" type="number" value="{$row.real_price|htmlentities}">
+        </div>
+    </div>
+
+
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('User_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-user_id" data-rule="required" disabled  data-source="user/user/index" data-field="mobile" data-format-item="{id} - {nickname} - {mobile}"   class="form-control selectpage" name="row[user_id]" type="text" value="{$row.user_id|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Type')}:</label>
+        <div class="col-xs-12 col-sm-8">
+
+            <select  id="c-type" class="form-control selectpicker" disabled name="row[type]">
+                {foreach name="typeList" item="vo"}
+                <option value="{$key}" {in name="key" value="$row.type"}selected{/in}>{$vo}</option>
+                {/foreach}
+            </select>
+
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Name')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-name" data-rule="required" disabled class="form-control" name="row[name]" type="text" value="{$row.name|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Bank_name')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-bank_name" data-rule="required" disabled class="form-control" name="row[bank_name]" type="text" value="{$row.bank_name|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Bank_user_name')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-bank_user_name" data-rule="required" disabled class="form-control" name="row[bank_user_name]" type="text" value="{$row.bank_user_name|htmlentities}">
+        </div>
+    </div>
+
+
+
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            
+            <div class="radio">
+            {foreach name="statusList" item="vo"}
+            <label for="row[status]-{$key}"><input id="row[status]-{$key}" name="row[status]" type="radio" value="{$key}" {in name="key" value="$row.status"}checked{/in} /> {$vo}</label> 
+            {/foreach}
+            </div>
+
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Reason')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-reason" class="form-control" name="row[reason]" type="text" value="{$row.reason|htmlentities}">
+        </div>
+    </div>
+
+
+    <div class="form-group layer-footer">
+        <label class="control-label col-xs-12 col-sm-2"></label>
+        <div class="col-xs-12 col-sm-8">
+            <button type="submit" class="btn btn-primary btn-embossed disabled">{:__('OK')}</button>
+        </div>
+    </div>
+</form>
diff --git a/application/admin/view/user/withdrawal/userwithdrawal_log/auths.html b/application/admin/view/user/withdrawal/userwithdrawal_log/auths.html
new file mode 100644
index 0000000..25aea4a
--- /dev/null
+++ b/application/admin/view/user/withdrawal/userwithdrawal_log/auths.html
@@ -0,0 +1,88 @@
+<form id="edit-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
+
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Price')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-price" class="form-control" disabled step="0.01" name="row[price]" type="number" value="{$row.price|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Fee_price')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-fee_price" class="form-control" disabled step="0.01" name="row[fee_price]" type="number" value="{$row.fee_price|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Real_price')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-real_price" class="form-control" disabled step="0.01" name="row[real_price]" type="number" value="{$row.real_price|htmlentities}">
+        </div>
+    </div>
+
+
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('User_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-user_id" data-rule="required" disabled  data-source="user/user/index" data-field="mobile" data-format-item="{id} - {nickname} - {mobile}"   class="form-control selectpage" name="row[user_id]" type="text" value="{$row.user_id|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Type')}:</label>
+        <div class="col-xs-12 col-sm-8">
+
+            <select  id="c-type" class="form-control selectpicker" disabled name="row[type]">
+                {foreach name="typeList" item="vo"}
+                <option value="{$key}" {in name="key" value="$row.type"}selected{/in}>{$vo}</option>
+                {/foreach}
+            </select>
+
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Name')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-name" data-rule="required" disabled class="form-control" name="row[name]" type="text" value="{$row.name|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Bank_name')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-bank_name" data-rule="required" disabled class="form-control" name="row[bank_name]" type="text" value="{$row.bank_name|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Bank_user_name')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-bank_user_name" data-rule="required" disabled class="form-control" name="row[bank_user_name]" type="text" value="{$row.bank_user_name|htmlentities}">
+        </div>
+    </div>
+
+
+
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            
+            <div class="radio">
+            {foreach name="statusList" item="vo"}
+            <label for="row[status]-{$key}"><input id="row[status]-{$key}" name="row[status]" type="radio" value="{$key}" {in name="key" value="$row.status"}checked{/in} /> {$vo}</label> 
+            {/foreach}
+            </div>
+
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Reason')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-reason" class="form-control" name="row[reason]" type="text" value="{$row.reason|htmlentities}">
+        </div>
+    </div>
+
+
+    <div class="form-group layer-footer">
+        <label class="control-label col-xs-12 col-sm-2"></label>
+        <div class="col-xs-12 col-sm-8">
+            <button type="submit" class="btn btn-primary btn-embossed disabled">{:__('OK')}</button>
+        </div>
+    </div>
+</form>
diff --git a/application/admin/view/user/withdrawal/userwithdrawal_log/edit.html b/application/admin/view/user/withdrawal/userwithdrawal_log/edit.html
index 040c283..57cdedb 100644
--- a/application/admin/view/user/withdrawal/userwithdrawal_log/edit.html
+++ b/application/admin/view/user/withdrawal/userwithdrawal_log/edit.html
@@ -3,19 +3,19 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Price')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-price" class="form-control" step="0.01" name="row[price]" type="number" value="{$row.price|htmlentities}">
+            <input id="c-price" class="form-control" disabled step="0.01" name="row[price]" type="number" value="{$row.price|htmlentities}">
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Fee_price')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-fee_price" class="form-control" step="0.01" name="row[fee_price]" type="number" value="{$row.fee_price|htmlentities}">
+            <input id="c-fee_price" class="form-control" disabled step="0.01" name="row[fee_price]" type="number" value="{$row.fee_price|htmlentities}">
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Real_price')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-real_price" class="form-control" step="0.01" name="row[real_price]" type="number" value="{$row.real_price|htmlentities}">
+            <input id="c-real_price" class="form-control" disabled step="0.01" name="row[real_price]" type="number" value="{$row.real_price|htmlentities}">
         </div>
     </div>
     <div class="form-group">
@@ -24,7 +24,7 @@
             
             <div class="radio">
             {foreach name="statusList" item="vo"}
-            <label for="row[status]-{$key}"><input id="row[status]-{$key}" name="row[status]" type="radio" value="{$key}" {in name="key" value="$row.status"}checked{/in} /> {$vo}</label> 
+            <label for="row[status]-{$key}"><input disabled id="row[status]-{$key}" name="row[status]" type="radio" value="{$key}" {in name="key" value="$row.status"}checked{/in} /> {$vo}</label>
             {/foreach}
             </div>
 
@@ -33,7 +33,7 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Reason')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-reason" class="form-control" name="row[reason]" type="text" value="{$row.reason|htmlentities}">
+            <input id="c-reason" class="form-control" disabled name="row[reason]" type="text" value="{$row.reason|htmlentities}">
         </div>
     </div>
     <div class="form-group">
@@ -42,7 +42,7 @@
             
             <div class="radio">
             {foreach name="withdrawalStatusList" item="vo"}
-            <label for="row[withdrawal_status]-{$key}"><input id="row[withdrawal_status]-{$key}" name="row[withdrawal_status]" type="radio" value="{$key}" {in name="key" value="$row.withdrawal_status"}checked{/in} /> {$vo}</label> 
+            <label for="row[withdrawal_status]-{$key}"><input disabled id="row[withdrawal_status]-{$key}" name="row[withdrawal_status]" type="radio" value="{$key}" {in name="key" value="$row.withdrawal_status"}checked{/in} /> {$vo}</label>
             {/foreach}
             </div>
 
@@ -51,14 +51,14 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('User_id')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-user_id" data-rule="required" data-source="user/user/index" data-field="nickname" class="form-control selectpage" name="row[user_id]" type="text" value="{$row.user_id|htmlentities}">
+            <input id="c-user_id" data-rule="required"  disabled data-source="user/user/index" data-field="mobile" data-format-item="{id} - {nickname} - {mobile}"   class="form-control selectpage" name="row[user_id]" type="text" value="{$row.user_id|htmlentities}">
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Type')}:</label>
         <div class="col-xs-12 col-sm-8">
                         
-            <select  id="c-type" class="form-control selectpicker" name="row[type]">
+            <select  id="c-type" class="form-control selectpicker" disabled name="row[type]">
                 {foreach name="typeList" item="vo"}
                     <option value="{$key}" {in name="key" value="$row.type"}selected{/in}>{$vo}</option>
                 {/foreach}
@@ -69,37 +69,37 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Name')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-name" data-rule="required" class="form-control" name="row[name]" type="text" value="{$row.name|htmlentities}">
+            <input id="c-name" data-rule="required"  disabled class="form-control" name="row[name]" type="text" value="{$row.name|htmlentities}">
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Bank_name')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-bank_name" data-rule="required" class="form-control" name="row[bank_name]" type="text" value="{$row.bank_name|htmlentities}">
+            <input id="c-bank_name" data-rule="required" disabled class="form-control" name="row[bank_name]" type="text" value="{$row.bank_name|htmlentities}">
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Bank_user_name')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-bank_user_name" data-rule="required" class="form-control" name="row[bank_user_name]" type="text" value="{$row.bank_user_name|htmlentities}">
+            <input id="c-bank_user_name" data-rule="required"  disabled class="form-control" name="row[bank_user_name]" type="text" value="{$row.bank_user_name|htmlentities}">
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Paytime')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-paytime" data-rule="required" min="0" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[paytime]" type="text" value="{:$row.paytime?datetime($row.paytime):''}">
+            <input id="c-paytime" data-rule="required"  disabled min="0" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[paytime]" type="text" value="{:$row.paytime?datetime($row.paytime):''}">
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Examinetime')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-examinetime" data-rule="required" min="0" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[examinetime]" type="text" value="{:$row.examinetime?datetime($row.examinetime):''}">
-        </div>
-    </div>
-    <div class="form-group layer-footer">
-        <label class="control-label col-xs-12 col-sm-2"></label>
-        <div class="col-xs-12 col-sm-8">
-            <button type="submit" class="btn btn-primary btn-embossed disabled">{:__('OK')}</button>
+            <input id="c-examinetime" data-rule="required"  disabled min="0" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[examinetime]" type="text" value="{:$row.examinetime?datetime($row.examinetime):''}">
         </div>
     </div>
+<!--    <div class="form-group layer-footer">-->
+<!--        <label class="control-label col-xs-12 col-sm-2"></label>-->
+<!--        <div class="col-xs-12 col-sm-8">-->
+<!--            <button type="submit" class="btn btn-primary btn-embossed disabled">{:__('OK')}</button>-->
+<!--        </div>-->
+<!--    </div>-->
 </form>
diff --git a/application/admin/view/user/withdrawal/userwithdrawal_log/index.html b/application/admin/view/user/withdrawal/userwithdrawal_log/index.html
index 7a5e3d4..0be9851 100644
--- a/application/admin/view/user/withdrawal/userwithdrawal_log/index.html
+++ b/application/admin/view/user/withdrawal/userwithdrawal_log/index.html
@@ -17,25 +17,25 @@
                 <div class="widget-body no-padding">
                     <div id="toolbar" class="toolbar">
                         <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a>
-                        <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('user/withdrawal/userwithdrawal_log/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>
+<!--                        <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('user/withdrawal/userwithdrawal_log/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>-->
                         <a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('user/withdrawal/userwithdrawal_log/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>
-                        <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('user/withdrawal/userwithdrawal_log/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
+<!--                        <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('user/withdrawal/userwithdrawal_log/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>-->
                         
 
-                        <div class="dropdown btn-group {:$auth->check('user/withdrawal/userwithdrawal_log/multi')?'':'hide'}">
-                            <a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a>
-                            <ul class="dropdown-menu text-left" role="menu">
-                                {foreach name="statusList" item="vo"}
-                                <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:" data-params="status={$key}">{:__('Set status to ' . $key)}</a></li>
-                                {/foreach}
-                            </ul>
-                        </div>
+<!--                        <div class="dropdown btn-group {:$auth->check('user/withdrawal/userwithdrawal_log/multi')?'':'hide'}">-->
+<!--                            <a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a>-->
+<!--                            <ul class="dropdown-menu text-left" role="menu">-->
+<!--                                {foreach name="statusList" item="vo"}-->
+<!--                                <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:" data-params="status={$key}">{:__('Set status to ' . $key)}</a></li>-->
+<!--                                {/foreach}-->
+<!--                            </ul>-->
+<!--                        </div>-->
 
                         
                     </div>
                     <table id="table" class="table table-striped table-bordered table-hover table-nowrap"
                            data-operate-edit="{:$auth->check('user/withdrawal/userwithdrawal_log/edit')}"
-                           data-operate-del="{:$auth->check('user/withdrawal/userwithdrawal_log/del')}"
+                           data-operate-del="0"
                            width="100%">
                     </table>
                 </div>
diff --git a/application/admin/view/user/withdrawal/userwithdrawal_log/paid.html b/application/admin/view/user/withdrawal/userwithdrawal_log/paid.html
new file mode 100644
index 0000000..c76711c
--- /dev/null
+++ b/application/admin/view/user/withdrawal/userwithdrawal_log/paid.html
@@ -0,0 +1,88 @@
+<form id="edit-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
+
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Price')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-price" class="form-control" disabled step="0.01" name="row[price]" type="number" value="{$row.price|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Fee_price')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-fee_price" class="form-control" disabled step="0.01" name="row[fee_price]" type="number" value="{$row.fee_price|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Real_price')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-real_price" class="form-control" disabled step="0.01" name="row[real_price]" type="number" value="{$row.real_price|htmlentities}">
+        </div>
+    </div>
+
+
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('User_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-user_id" data-rule="required" disabled  data-source="user/user/index" data-field="mobile" data-format-item="{id} - {nickname} - {mobile}"   class="form-control selectpage" name="row[user_id]" type="text" value="{$row.user_id|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Type')}:</label>
+        <div class="col-xs-12 col-sm-8">
+
+            <select  id="c-type" class="form-control selectpicker" disabled name="row[type]">
+                {foreach name="typeList" item="vo"}
+                <option value="{$key}" {in name="key" value="$row.type"}selected{/in}>{$vo}</option>
+                {/foreach}
+            </select>
+
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Name')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-name" data-rule="required" disabled class="form-control" name="row[name]" type="text" value="{$row.name|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Bank_name')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-bank_name" data-rule="required" disabled class="form-control" name="row[bank_name]" type="text" value="{$row.bank_name|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Bank_user_name')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-bank_user_name" data-rule="required" disabled class="form-control" name="row[bank_user_name]" type="text" value="{$row.bank_user_name|htmlentities}">
+        </div>
+    </div>
+
+
+<!--    <div class="form-group">-->
+<!--        <label class="control-label col-xs-12 col-sm-2">{:__('Withdrawal_status')}:</label>-->
+<!--        <div class="col-xs-12 col-sm-8">-->
+<!--            -->
+<!--            <div class="radio">-->
+<!--            {foreach name="withdrawalStatusList" item="vo"}-->
+<!--            <label for="row[withdrawal_status]-{$key}"><input id="row[withdrawal_status]-{$key}" name="row[withdrawal_status]" type="radio" value="{$key}" {in name="key" value="$row.withdrawal_status"}checked{/in} /> {$vo}</label> -->
+<!--            {/foreach}-->
+<!--            </div>-->
+
+<!--        </div>-->
+<!--    </div>-->
+
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('打款备注')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-remark" class="form-control" name="row[remark]" type="text" value="{$row.remark|htmlentities}">
+        </div>
+    </div>
+
+
+    <div class="form-group layer-footer">
+        <label class="control-label col-xs-12 col-sm-2"></label>
+        <div class="col-xs-12 col-sm-8">
+            <button type="submit" class="btn btn-primary btn-embossed disabled">{:__('OK')}</button>
+        </div>
+    </div>
+</form>
diff --git a/application/common/listener/activity/OrderHook.php b/application/common/listener/activity/OrderHook.php
index cf7ec6a..c957025 100644
--- a/application/common/listener/activity/OrderHook.php
+++ b/application/common/listener/activity/OrderHook.php
@@ -196,7 +196,7 @@ class OrderHook
     // 订单核销完成后
     public function activityOrderFinishAfter(&$params)
     {
-        ['order' => $order,"user_id"=>$user_id,"oper_type"=>$oper_type,"oper_id"=>$oper_id] = $params;
+        ['order' => $order] = $params;
 
 
         $order = Order::where("id" , $order["id"])->find();
diff --git a/application/common/model/school/activity/Activity.php b/application/common/model/school/activity/Activity.php
index 20625bc..b7f5688 100644
--- a/application/common/model/school/activity/Activity.php
+++ b/application/common/model/school/activity/Activity.php
@@ -3,6 +3,7 @@
 namespace app\common\model\school\activity;
 
 
+use app\common\library\Virtual;
 use app\common\model\BaseModel;
 use app\common\model\school\activity\order\Order;
 use app\common\model\school\activity\order\OrderCode;
@@ -1426,4 +1427,14 @@ class Activity extends BaseModel
        return compact("join_num","release_num");
     }
 
+
+
+    public static function getPath($id){
+        return Virtual::getPath("activity",["activity_id"=>$id]);
+    }
+
+    public static function getMiniQrcodeLink($id){
+        return Virtual::getMiniQrcodeLink("activity",["activity_id"=>$id]);
+    }
+
 }
diff --git a/application/common/model/school/activity/order/Detail.php b/application/common/model/school/activity/order/Detail.php
index fd212ca..a385f2c 100644
--- a/application/common/model/school/activity/order/Detail.php
+++ b/application/common/model/school/activity/order/Detail.php
@@ -8,5 +8,33 @@ class Detail extends Model
 {
     // 表名
     protected $name = 'school_activity_order_detail';
-    
+
+
+    public function getImagesAttr($value, $data)
+    {
+        $imagesArray = [];
+        if (!empty($value)) {
+            $imagesArray = explode(',', $value);
+            foreach ($imagesArray as &$v) {
+                $v = cdnurl($v, true);
+            }
+            return $imagesArray;
+        }
+        return $imagesArray;
+    }
+
+
+
+
+    public function setImagesAttr($value, $data)
+    {
+        $imagesArray = $value;
+        if (!empty($value) && is_array($value)) {
+            //转成逗号拼接字符串
+            $imagesArray = implode(',', $value);
+        }
+        return $imagesArray;
+    }
+
+
 }
diff --git a/application/common/model/school/activity/order/Order.php b/application/common/model/school/activity/order/Order.php
index 5c78b49..4b572f6 100644
--- a/application/common/model/school/activity/order/Order.php
+++ b/application/common/model/school/activity/order/Order.php
@@ -1667,7 +1667,7 @@ class Order extends BaseModel
                 $order['refund_no'] = get_order_sn();
 //                $order->save();
             }
-            if(!$refund_money)$refund_money = $order['sub_refundprice'];
+            if(!$refund_money)$refund_money = $order["total_refundprice"] ?: $order['sub_refundprice'];
             if($refund_money<=0)$refund_money = 0;
             if(!$refund_money)throw new \Exception("退款金额异常！");
 
diff --git a/application/common/model/school/activity/order/OrderCode.php b/application/common/model/school/activity/order/OrderCode.php
index 237a733..7cddcff 100644
--- a/application/common/model/school/activity/order/OrderCode.php
+++ b/application/common/model/school/activity/order/OrderCode.php
@@ -30,9 +30,20 @@ class OrderCode extends BaseModel
         'status_text',
         'verificationtime_text'
     ];
-    
 
-    
+
+    public function getCodeimageAttr($value, $data)
+    {
+        if (!empty($value)) return cdnurl($value, true);
+    }
+
+    public function getCodeoneimageAttr($value, $data)
+    {
+        if (!empty($value)) return cdnurl($value, true);
+    }
+
+
+
     public function getStatusList()
     {
         return ['3' => __('Status 3'), '6' => __('Status 6')];
@@ -110,10 +121,10 @@ class OrderCode extends BaseModel
 
         if(!in_array($order["status"],['2','3']))throw new \Exception("当前订单不可核销！");
         //过了可核销时间段
-        Activity::update_classes($order["activity_id"]);
+        (new Activity)->update_classes($order["activity_id"]);
         $activity = $order->activity;
         if(!$activity)throw new \Exception("活动异常！");
-        if($activity["status"] != "4")throw new \Exception("当前活动还不能核销！");
+        if($activity["status"] != "4")throw new \Exception("当前活动还不能核销！可能未到时间！");
 
         return $ordercode;
     }
@@ -147,11 +158,11 @@ class OrderCode extends BaseModel
 
 
         //调用订单取消事件
-        $data = ['order' => self::where("id",$order['id'])->find(),"user_id"=>$order["user_id"],"oper_type"=>$oper_type,"oper_id"=>$oper_id];
+        $data = ['order' => Order::where("id",$order['id'])->find(),"user_id"=>$order["user_id"],"oper_type"=>$oper_type,"oper_id"=>$oper_id];
         \think\Hook::listen('activity_order_verification_after', $data);
 
         //过了可核销时间段
-        Activity::update_classes($order["activity_id"]);
+        (new Activity)->update_classes($order["activity_id"]);
         return $ordercode;
 
     }
@@ -167,7 +178,7 @@ class OrderCode extends BaseModel
      */
     public  function verification($code,$user_id=0,$check=false,$oper_type='user',$oper_id=0,$trans=false){
         //得到可取消订单
-        $ordercode = self::getHaveVerificationOrderCode($code);
+        $ordercode = self::getHaveVerificationOrderCode($code,$check);
         $order = $ordercode->order;
         if($check){
             //用户操作权限检测
@@ -184,7 +195,7 @@ class OrderCode extends BaseModel
             //事务逻辑
             //更新订单状态
 
-            $ordercode = $this->forceVerification($code,$oper_type,$oper_id);
+            $ordercode = $this->forceVerification($code,$oper_type,$oper_id,$check);
 
             //检测订单完成状态
            Order::statisticsAndUpdateOrderFinish($order['id']);
@@ -196,7 +207,7 @@ class OrderCode extends BaseModel
             if($trans){
                 self::rollbackTrans();
             }
-            throw new \Exception($e->getMessage());
+            throw new \Exception($e->getMessage().$e->getFile().$e->getLine());
         }
         return $ordercode;
     }
diff --git a/application/common/model/school/activity/order/OrderDetail.php b/application/common/model/school/activity/order/OrderDetail.php
index 4a69ac9..a63e1b4 100644
--- a/application/common/model/school/activity/order/OrderDetail.php
+++ b/application/common/model/school/activity/order/OrderDetail.php
@@ -164,6 +164,35 @@ class OrderDetail extends BaseModel
     }
 
 
+
+    public function getImagesAttr($value, $data)
+    {
+        $imagesArray = [];
+        if (!empty($value)) {
+            $imagesArray = explode(',', $value);
+            foreach ($imagesArray as &$v) {
+                $v = cdnurl($v, true);
+            }
+            return $imagesArray;
+        }
+        return $imagesArray;
+    }
+
+
+
+
+    public function setImagesAttr($value, $data)
+    {
+        $imagesArray = $value;
+        if (!empty($value) && is_array($value)) {
+            //转成逗号拼接字符串
+            $imagesArray = implode(',', $value);
+        }
+        return $imagesArray;
+    }
+
+
+
     public function user()
     {
         return $this->belongsTo('app\common\model\User', 'user_id', 'id', [], 'LEFT')->setEagerlyType(0);
diff --git a/application/common/model/user/withdrawal/UserwithdrawalLog.php b/application/common/model/user/withdrawal/UserwithdrawalLog.php
index 047d962..3edca47 100644
--- a/application/common/model/user/withdrawal/UserwithdrawalLog.php
+++ b/application/common/model/user/withdrawal/UserwithdrawalLog.php
@@ -352,6 +352,7 @@ class UserwithdrawalLog extends BaseModel
             ->find();
         if(!$userwithdrawalLog) throw new \Exception("提现记录不存在");
         if($userwithdrawalLog['status']!='2') throw new \Exception("审核通过的订单才能标记打款");
+        if(!$remark) throw new \Exception("打款备注不能为空");
 //判断逻辑
         if($trans){
             self::beginTrans();
diff --git a/public/assets/js/backend/manystore/index.js b/public/assets/js/backend/manystore/index.js
index 1a7754d..b3dfd2e 100644
--- a/public/assets/js/backend/manystore/index.js
+++ b/public/assets/js/backend/manystore/index.js
@@ -119,209 +119,209 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                                     // }
                                 },
 
-                            {name: 'free',
-                                    text: '免登录进入机构专业版后台',
-                                    icon: 'fa fa-sign-in',
-                                    classname: 'btn btn-ajax',
-                                    url: $.fn.bootstrapTable.defaults.extend.free_url,
-                                    confirm: '确认免登录进入机构专业版后台？（专业版为老版本后台比API版本功能更多更全，但操作稍多一些）如果已登录其他机构，对方账号将被强制退出。',
-                                    dropdown : '更多',
-                                    success: function (data, ret) {
-                                        Layer.alert(ret.msg );
-                                        $(".btn-refresh").trigger("click");
-                                        //js获取当前域名
-
-
-                                        window.open(shop_backend_url, '_blank');
-                                    },
-                                    error: function (data, ret) {
-                                        Layer.alert(ret.msg);
-                                        return false;
-                                    },
-                                    visible: function (row) {
-                                        //显示条件 只能待入住订单
-                                        // if((row.status == 2 || row.status == 3) && row.mock_type == "base" && row.add_mock_status == "1" ){
-                                        return true;
-                                        // }
-                                        // return false;
-                                    }},
-                                {name: 'freeapi',
-                                    text: '免登录进入机构API版后台',
-                                    icon: 'fa fa-sign-in',
-                                    classname: 'btn btn-ajax',
-                                    url: $.fn.bootstrapTable.defaults.extend.freeapi_url,
-                                    confirm: '确认免登录进入机构API版后台？（API版本操作更简洁明了，但功能没有【专业版|老版本】后台的多）',
-                                    dropdown : '更多',
-                                    success: function (data, ret) {
-                                        Layer.alert(ret.msg );
-                                        $(".btn-refresh").trigger("click");
-                                        //js获取当前域名
-
-
-                                        window.open(shop_api_backend_url, '_blank');
-                                    },
-                                    error: function (data, ret) {
-                                        Layer.alert(ret.msg);
-                                        return false;
-                                    },
-                                    visible: function (row) {
-                                        //显示条件 只能待入住订单
-                                        // if((row.status == 2 || row.status == 3) && row.mock_type == "base" && row.add_mock_status == "1" ){
-                                        return true;
-                                        // }
-                                        // return false;
-                                    }},
-                                {
-                                    name: 'classes_spec',
-                                    text: __('机构课程'),
-                                    title: __('机构课程'),
-                                    classname: 'btn btn-dialog',
-                                    icon: 'fa fa-leanpub',
-                                    dropdown : '更多',
-                                    url: classes_spec_url,
-                                    callback: function (data) {
-
-                                    },
-                                    // visible: function (row) {
-                                    //     return row.status == '2'||row.status == '3';
-                                    // }
-                                },
-                                {
-                                    name: 'activity',
-                                    text: __('机构线上活动'),
-                                    title: __('机构线上活动'),
-                                    classname: 'btn btn-dialog',
-                                    icon: 'fa fa-leanpub',
-                                    dropdown : '更多',
-                                    url: activity_url,
-                                    callback: function (data) {
-
-                                    },
-                                    // visible: function (row) {
-                                    //     return row.paytime;
-                                    // }
-                                },
-
-                                {
-                                    name: 'teacher',
-                                    text: __('主讲老师信息'),
-                                    title: __('主讲老师信息'),
-                                    classname: 'btn btn-dialog',
-                                    icon: 'fa fa-user',
-                                    dropdown : '更多',
-                                    url: teacher_url,
-                                    callback: function (data) {
-
-                                    },
-                                    // visible: function (row) {
-                                    //     return row.status == '2'||row.status == '3';
-                                    // }
-                                },
-                                {
-                                    name: 'verification',
-                                    text: __('核销员信息'),
-                                    title: __('核销员信息'),
-                                    classname: 'btn btn-dialog',
-                                    icon: 'fa fa-user',
-                                    dropdown : '更多',
-                                    url: verification_url,
-                                    callback: function (data) {
-
-                                    },
-                                    // visible: function (row) {
-                                    //     return row.status == '2'||row.status == '3';
-                                    // }
-                                },
-                                {
-                                    name: 'virtual_user',
-                                    text: __('机构虚拟参与者'),
-                                    title: __('机构虚拟参与者'),
-                                    classname: 'btn  btn-dialog',
-                                    icon: 'fa fa-user',
-                                    dropdown : '更多',
-                                    url: virtual_user_url,
-                                    callback: function (data) {
-
-                                    },
-                                    // visible: function (row) {
-                                    //     return row.status == '2'||row.status == '3';
-                                    // }
-                                },
-                                {
-                                    name: 'order',
-                                    text: __('机构课程购买订单'),
-                                    title: __('机构课程购买订单'),
-                                    classname: 'btn btn-dialog',
-                                    icon: 'fa fa-cart-arrow-down',
-                                    dropdown : '更多',
-                                    url: order_url,
-                                    callback: function (data) {
-
-                                    },
-                                    // visible: function (row) {
-                                    //     return row.status == '2'||row.status == '3';
-                                    // }
-                                },
-                                {
-                                    name: 'hourorder',
-                                    text: __('机构课时预约记录'),
-                                    title: __('机构课时预约记录'),
-                                    classname: 'btn btn-dialog',
-                                    icon: 'fa fa-calendar',
-                                    dropdown : '更多',
-                                    url: hourorder_url,
-                                    callback: function (data) {
-
-                                    },
-                                    // visible: function (row) {
-                                    //     return row.status == '2'||row.status == '3';
-                                    // }
-                                },
-                                {
-                                    name: 'activity_order',
-                                    text: __('机构活动订单'),
-                                    title: __('机构活动订单'),
-                                    classname: 'btn btn-dialog',
-                                    icon: 'fa fa-cart-arrow-down',
-                                    dropdown : '更多',
-                                    url: activity_order_url,
-                                    callback: function (data) {
-
-                                    },
-                                    // visible: function (row) {
-                                    //     return row.status == '2'||row.status == '3';
-                                    // }
-                                },
-                                {
-                                    name: 'user_auth',
-                                    text: __('机构授权用户'),
-                                    title: __('机构授权用户'),
-                                    classname: 'btn btn-dialog',
-                                    icon: 'fa fa-user',
-                                    dropdown : '更多',
-                                    url: user_auth_url,
-                                    callback: function (data) {
-
-                                    },
-                                    // visible: function (row) {
-                                    //     return row.status == '2'||row.status == '3';
-                                    // }
-                                },
-                                {
-                                    name: 'evaluate',
-                                    text: __('查看用户评价'),
-                                    title: __('查看用户评价'),
-                                    classname: 'btn btn-dialog',
-                                    icon: 'fa fa-handshake-o',
-                                    dropdown : '更多',
-                                    url: evaluate_url,
-                                    callback: function (data) {
-
-                                    },
-                                    // visible: function (row) {
-                                    //     return row.classes_evaluate_id;
-                                    // }
-                                },
+                            // {name: 'free',
+                            //         text: '免登录进入机构专业版后台',
+                            //         icon: 'fa fa-sign-in',
+                            //         classname: 'btn btn-ajax',
+                            //         url: $.fn.bootstrapTable.defaults.extend.free_url,
+                            //         confirm: '确认免登录进入机构专业版后台？（专业版为老版本后台比API版本功能更多更全，但操作稍多一些）如果已登录其他机构，对方账号将被强制退出。',
+                            //         dropdown : '更多',
+                            //         success: function (data, ret) {
+                            //             Layer.alert(ret.msg );
+                            //             $(".btn-refresh").trigger("click");
+                            //             //js获取当前域名
+                            //
+                            //
+                            //             window.open(shop_backend_url, '_blank');
+                            //         },
+                            //         error: function (data, ret) {
+                            //             Layer.alert(ret.msg);
+                            //             return false;
+                            //         },
+                            //         visible: function (row) {
+                            //             //显示条件 只能待入住订单
+                            //             // if((row.status == 2 || row.status == 3) && row.mock_type == "base" && row.add_mock_status == "1" ){
+                            //             return true;
+                            //             // }
+                            //             // return false;
+                            //         }},
+                            //     {name: 'freeapi',
+                            //         text: '免登录进入机构API版后台',
+                            //         icon: 'fa fa-sign-in',
+                            //         classname: 'btn btn-ajax',
+                            //         url: $.fn.bootstrapTable.defaults.extend.freeapi_url,
+                            //         confirm: '确认免登录进入机构API版后台？（API版本操作更简洁明了，但功能没有【专业版|老版本】后台的多）',
+                            //         dropdown : '更多',
+                            //         success: function (data, ret) {
+                            //             Layer.alert(ret.msg );
+                            //             $(".btn-refresh").trigger("click");
+                            //             //js获取当前域名
+                            //
+                            //
+                            //             window.open(shop_api_backend_url, '_blank');
+                            //         },
+                            //         error: function (data, ret) {
+                            //             Layer.alert(ret.msg);
+                            //             return false;
+                            //         },
+                            //         visible: function (row) {
+                            //             //显示条件 只能待入住订单
+                            //             // if((row.status == 2 || row.status == 3) && row.mock_type == "base" && row.add_mock_status == "1" ){
+                            //             return true;
+                            //             // }
+                            //             // return false;
+                            //         }},
+                            //     {
+                            //         name: 'classes_spec',
+                            //         text: __('机构课程'),
+                            //         title: __('机构课程'),
+                            //         classname: 'btn btn-dialog',
+                            //         icon: 'fa fa-leanpub',
+                            //         dropdown : '更多',
+                            //         url: classes_spec_url,
+                            //         callback: function (data) {
+                            //
+                            //         },
+                            //         // visible: function (row) {
+                            //         //     return row.status == '2'||row.status == '3';
+                            //         // }
+                            //     },
+                            //     {
+                            //         name: 'activity',
+                            //         text: __('机构线上活动'),
+                            //         title: __('机构线上活动'),
+                            //         classname: 'btn btn-dialog',
+                            //         icon: 'fa fa-leanpub',
+                            //         dropdown : '更多',
+                            //         url: activity_url,
+                            //         callback: function (data) {
+                            //
+                            //         },
+                            //         // visible: function (row) {
+                            //         //     return row.paytime;
+                            //         // }
+                            //     },
+                            //
+                            //     {
+                            //         name: 'teacher',
+                            //         text: __('主讲老师信息'),
+                            //         title: __('主讲老师信息'),
+                            //         classname: 'btn btn-dialog',
+                            //         icon: 'fa fa-user',
+                            //         dropdown : '更多',
+                            //         url: teacher_url,
+                            //         callback: function (data) {
+                            //
+                            //         },
+                            //         // visible: function (row) {
+                            //         //     return row.status == '2'||row.status == '3';
+                            //         // }
+                            //     },
+                            //     {
+                            //         name: 'verification',
+                            //         text: __('核销员信息'),
+                            //         title: __('核销员信息'),
+                            //         classname: 'btn btn-dialog',
+                            //         icon: 'fa fa-user',
+                            //         dropdown : '更多',
+                            //         url: verification_url,
+                            //         callback: function (data) {
+                            //
+                            //         },
+                            //         // visible: function (row) {
+                            //         //     return row.status == '2'||row.status == '3';
+                            //         // }
+                            //     },
+                            //     {
+                            //         name: 'virtual_user',
+                            //         text: __('机构虚拟参与者'),
+                            //         title: __('机构虚拟参与者'),
+                            //         classname: 'btn  btn-dialog',
+                            //         icon: 'fa fa-user',
+                            //         dropdown : '更多',
+                            //         url: virtual_user_url,
+                            //         callback: function (data) {
+                            //
+                            //         },
+                            //         // visible: function (row) {
+                            //         //     return row.status == '2'||row.status == '3';
+                            //         // }
+                            //     },
+                            //     {
+                            //         name: 'order',
+                            //         text: __('机构课程购买订单'),
+                            //         title: __('机构课程购买订单'),
+                            //         classname: 'btn btn-dialog',
+                            //         icon: 'fa fa-cart-arrow-down',
+                            //         dropdown : '更多',
+                            //         url: order_url,
+                            //         callback: function (data) {
+                            //
+                            //         },
+                            //         // visible: function (row) {
+                            //         //     return row.status == '2'||row.status == '3';
+                            //         // }
+                            //     },
+                            //     {
+                            //         name: 'hourorder',
+                            //         text: __('机构课时预约记录'),
+                            //         title: __('机构课时预约记录'),
+                            //         classname: 'btn btn-dialog',
+                            //         icon: 'fa fa-calendar',
+                            //         dropdown : '更多',
+                            //         url: hourorder_url,
+                            //         callback: function (data) {
+                            //
+                            //         },
+                            //         // visible: function (row) {
+                            //         //     return row.status == '2'||row.status == '3';
+                            //         // }
+                            //     },
+                            //     {
+                            //         name: 'activity_order',
+                            //         text: __('机构活动订单'),
+                            //         title: __('机构活动订单'),
+                            //         classname: 'btn btn-dialog',
+                            //         icon: 'fa fa-cart-arrow-down',
+                            //         dropdown : '更多',
+                            //         url: activity_order_url,
+                            //         callback: function (data) {
+                            //
+                            //         },
+                            //         // visible: function (row) {
+                            //         //     return row.status == '2'||row.status == '3';
+                            //         // }
+                            //     },
+                            //     {
+                            //         name: 'user_auth',
+                            //         text: __('机构授权用户'),
+                            //         title: __('机构授权用户'),
+                            //         classname: 'btn btn-dialog',
+                            //         icon: 'fa fa-user',
+                            //         dropdown : '更多',
+                            //         url: user_auth_url,
+                            //         callback: function (data) {
+                            //
+                            //         },
+                            //         // visible: function (row) {
+                            //         //     return row.status == '2'||row.status == '3';
+                            //         // }
+                            //     },
+                            //     {
+                            //         name: 'evaluate',
+                            //         text: __('查看用户评价'),
+                            //         title: __('查看用户评价'),
+                            //         classname: 'btn btn-dialog',
+                            //         icon: 'fa fa-handshake-o',
+                            //         dropdown : '更多',
+                            //         url: evaluate_url,
+                            //         callback: function (data) {
+                            //
+                            //         },
+                            //         // visible: function (row) {
+                            //         //     return row.classes_evaluate_id;
+                            //         // }
+                            //     },
                                 //
                                 // {name: 'unsetmockauth',
                                 //     text: '取消加圈资格',
diff --git a/public/assets/js/backend/school/activity/activity.js b/public/assets/js/backend/school/activity/activity.js
index 3920ea3..5b58e44 100644
--- a/public/assets/js/backend/school/activity/activity.js
+++ b/public/assets/js/backend/school/activity/activity.js
@@ -1,4 +1,4 @@
-define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefined, Backend, Table, Form) {
+define(['jquery', 'bootstrap', 'backend', 'csmtable', 'form'], function ($, undefined, Backend, Table, Form) {
 
     var Controller = {
         index: function () {
@@ -8,10 +8,15 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     index_url: 'school/activity/activity/index' + location.search,
                     add_url: 'school/activity/activity/add'+ location.search,
                     edit_url: 'school/activity/activity/edit'+ location.search,
+                    copy_url: 'school/activity/activity/copy'+ location.search,
                     del_url: 'school/activity/activity/del',
                     cancel_url: 'school/activity/activity/cancel',
                     multi_url: 'school/activity/activity/multi',
                     import_url: 'school/activity/activity/import',
+
+                    lookminiqrcode_url: 'school/activity/activity/lookminiqrcode',
+                    miniqrcode_url: 'school/activity/activity/miniqrcode',
+
                     table: 'school_activity',
                 }
             });
@@ -24,7 +29,8 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 pk: 'id',
                 sortName: 'weigh',
                 fixedColumns: true,
-                fixedRightNumber: 1,
+                fixedRightNumber: 2,
+                asyndownload: true,
                 columns: [
                     [
                         {checkbox: true},
@@ -80,6 +86,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'admin.nickname', title: __('Admin.nickname'), operate: 'LIKE'},
                         {field: 'admin.avatar', title: __('Admin.avatar'), operate: 'LIKE', events: Table.api.events.image, formatter: Table.api.formatter.image},
                         // {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
+                        {field: 'miniqrcode_link', title: __('微信小程序端展示'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.image},
 
                         {field: 'operate', title: __('Operate'), table: table , buttons: [
 
@@ -106,6 +113,22 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                                         return false;
                                     }},
 
+                                {
+                                    name: 'copy',
+                                    text: __('复制并创建活动'),
+                                    title: __('复制活动信息并创建成新活动'),
+                                    classname: 'btn btn-dialog',
+                                    icon: 'fa fa-files-o',
+                                    dropdown : '更多',
+                                    url: $.fn.bootstrapTable.defaults.extend.copy_url,
+                                    callback: function (data) {
+
+                                    },
+                                    // visible: function (row) {
+                                    //     return row.status == '2'||row.status == '3';
+                                    // }
+                                },
+
                             ], events: Table.api.events.operate, formatter: Table.api.formatter.operate},
 
 
@@ -185,6 +208,9 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
         edit: function () {
             Controller.api.bindevent();
         },
+        copy: function () {
+            Controller.api.bindevent();
+        },
         api: {
             bindevent: function () {
 
diff --git a/public/assets/js/backend/school/activity/order/order.js b/public/assets/js/backend/school/activity/order/order.js
index 86b1c03..7de4400 100644
--- a/public/assets/js/backend/school/activity/order/order.js
+++ b/public/assets/js/backend/school/activity/order/order.js
@@ -1,4 +1,4 @@
-define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefined, Backend, Table, Form) {
+define(['jquery', 'bootstrap', 'backend', 'csmtable', 'form'], function ($, undefined, Backend, Table, Form) {
 
     var Controller = {
         index: function () {
@@ -6,11 +6,15 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
             Table.api.init({
                 extend: {
                     index_url: 'school/activity/order/order/index' + location.search,
+                    freecancel_url: 'school/activity/order/order/freecancel',//免费和待支付取消订单
+                    paidcancel_url: 'school/activity/order/order/paidcancel',//付费取消订单
                     add_url: 'school/activity/order/order/add',
                     edit_url: 'school/activity/order/order/edit',
                     del_url: 'school/activity/order/order/del',
                     multi_url: 'school/activity/order/order/multi',
                     import_url: 'school/activity/order/order/import',
+                    verification_url: 'school/activity/order/order/verification',
+                    refund_url: 'school/activity/order/order/refund',
                     table: 'school_activity_order',
                 }
             });
@@ -24,49 +28,243 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 sortName: 'id',
                 fixedColumns: true,
                 fixedRightNumber: 1,
+                asyndownload: true,
                 columns: [
                     [
                         {checkbox: true},
                         {field: 'id', title: __('Id')},
                         {field: 'order_no', title: __('Order_no'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
-                        {field: 'pay_no', title: __('Pay_no'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
-                        {field: 'user_id', title: __('User_id')},
-                        {field: 'activity_id', title: __('Activity_id')},
-                        {field: 'activity_order_detail_id', title: __('Activity_order_detail_id')},
-                        {field: 'beforeprice', title: __('Beforeprice'), operate:'BETWEEN'},
-                        {field: 'totalprice', title: __('Totalprice'), operate:'BETWEEN'},
-                        {field: 'payprice', title: __('Payprice'), operate:'BETWEEN'},
-                        {field: 'pay_type', title: __('Pay_type'), searchList: {"yue":__('Pay_type yue'),"wechat":__('Pay_type wechat')}, formatter: Table.api.formatter.normal},
-                        {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'),"9":__('Status 9')}, formatter: Table.api.formatter.status},
-                        {field: 'before_status', title: __('Before_status'), searchList: {"-3":__('Before_status -3'),"0":__('Before_status 0'),"2":__('Before_status 2'),"3":__('Before_status 3'),"4":__('Before_status 4'),"6":__('Before_status 6'),"9":__('Before_status 9')}, formatter: Table.api.formatter.status},
-                        {field: 'server_status', title: __('Server_status'), searchList: {"0":__('Server_status 0'),"3":__('Server_status 3'),"6":__('Server_status 6')}, formatter: Table.api.formatter.status},
-                        {field: 'canceltime', title: __('Canceltime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
-                        {field: 'paytime', title: __('Paytime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
-                        {field: 'auth_time', title: __('Auth_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
-                        {field: 'reservation_time', title: __('Reservation_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
-                        {field: 'finishtime', title: __('Finishtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
-                        {field: 'refundtime', title: __('Refundtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
-                        {field: 'total_refundprice', title: __('Total_refundprice'), operate:'BETWEEN'},
-                        {field: 'real_refundprice', title: __('Real_refundprice'), operate:'BETWEEN'},
-                        {field: 'sub_refundprice', title: __('Sub_refundprice'), operate:'BETWEEN'},
-                        {field: 'platform', title: __('Platform'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
-                        {field: 'reason', title: __('Reason'), operate: 'LIKE'},
-                        {field: 'auth_status', title: __('Auth_status'), searchList: {"0":__('Auth_status 0'),"1":__('Auth_status 1'),"2":__('Auth_status 2')}, formatter: Table.api.formatter.status},
-                        {field: 'auth_user_id', title: __('Auth_user_id')},
-                        {field: 'auth_type', title: __('Auth_type'), operate: 'LIKE'},
-                        {field: 'refund_no', title: __('Refund_no'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
-                        {field: 'refund_error', title: __('Refund_error'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
-                        {field: 'refundsendtime', title: __('Refundsendtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
-                        {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: 'user.nickname', title: __('User.nickname'), operate: 'LIKE'},
-                        {field: 'user.realname', title: __('User.realname'), operate: 'LIKE'},
-                        {field: 'user.mobile', title: __('User.mobile'), operate: 'LIKE'},
-                        {field: 'user.avatar', title: __('User.avatar'), operate: 'LIKE', events: Table.api.events.image, formatter: Table.api.formatter.image},
                         {field: 'activity.title', title: __('Activity.title'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
                         {field: 'activity.images', title: __('Activity.images'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.images},
-                        {field: 'detail.title', title: __('Detail.title'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
-                        {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
+
+                        {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'),"9":__('Status 9')}, formatter: Table.api.formatter.status},
+
+
+                        {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'},
+                        {field: 'user.avatar', title: __('User.avatar'), operate: 'LIKE', events: Table.api.events.image, formatter: Table.api.formatter.image},
+
+
+
+                        {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'},
+                        {field: 'totalprice', title: __('Totalprice'), operate:'BETWEEN'},
+                        {field: 'num', title: __('购买人数'), operate:'BETWEEN'},
+                        {field: 'payprice', title: __('Payprice'), operate:'BETWEEN'},
+                        {field: 'pay_type', title: __('Pay_type'), searchList: {"yue":__('Pay_type yue'),"wechat":__('Pay_type wechat')}, formatter: Table.api.formatter.normal},
+                                                {field: 'before_status',visible:false, title: __('Before_status'), searchList: {"-3":__('Before_status -3'),"0":__('Before_status 0'),"2":__('Before_status 2'),"3":__('Before_status 3'),"4":__('Before_status 4'),"6":__('Before_status 6'),"9":__('Before_status 9')}, formatter: Table.api.formatter.status},
+                        {field: 'server_status', title: __('Server_status'), searchList: {"0":__('Server_status 0'),"3":__('Server_status 3'),"6":__('Server_status 6')}, formatter: Table.api.formatter.status},
+                        {field: 'canceltime',visible:false, title: __('Canceltime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
+                        {field: 'paytime',visible:false, title: __('Paytime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
+                        {field: 'auth_time',visible:false, title: __('Auth_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
+                        {field: 'reservation_time',visible:false, title: __('Reservation_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
+                        {field: 'finishtime',visible:false, title: __('Finishtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
+                        {field: 'refundtime',visible:false, title: __('Refundtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
+                        {field: 'total_refundprice',visible:false, title: __('Total_refundprice'), operate:'BETWEEN'},
+                        {field: 'real_refundprice',visible:false, title: __('Real_refundprice'), operate:'BETWEEN'},
+                        {field: 'sub_refundprice', title: __('Sub_refundprice'), operate:'BETWEEN'},
+                        {field: 'platform', title: __('Platform'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
+                        {field: 'reason',visible:false, title: __('Reason'), operate: 'LIKE'},
+                        {field: 'auth_status', title: __('Auth_status'), searchList: {"0":__('Auth_status 0'),"1":__('Auth_status 1'),"2":__('Auth_status 2')}, formatter: Table.api.formatter.status},
+                        {field: 'auth_user_id',visible:false, title: __('Auth_user_id')},
+                        {field: 'auth_type',visible:false, title: __('Auth_type'), operate: 'LIKE'},
+                        {field: 'refund_no',visible:false, title: __('Refund_no'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
+                        {field: 'refund_error', title: __('Refund_error'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
+                        {field: 'refundsendtime',visible:false, title: __('Refundsendtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
+                        {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: 'detail.title' ,visible:false , title: __('Detail.title'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
+                        // {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
+
+
+                        {field: 'operate', title: __('Operate'), table: table , buttons: [
+
+                                {name: 'freecancel',
+                                    text: '取消订单',
+                                    icon: 'fa fa-user-times',
+                                    classname: 'btn btn-xs btn-warning btn-magic btn-ajax',
+                                    url: $.fn.bootstrapTable.defaults.extend.freecancel_url,
+                                    confirm: '确认取消订单',
+                                    success: function (data, ret) {
+                                        Layer.alert(ret.msg );
+                                        $(".btn-refresh").trigger("click");
+                                    },
+                                    error: function (data, ret) {
+                                        Layer.alert(ret.msg);
+                                        return false;
+                                    },
+                                    visible: function (row) {
+                                        //非免费订单只有未支付可取消
+                                        if(row.status == '0' && row.detail.feel == '0'){
+                                            return true;
+                                        }
+                                        //免费订单未支付和进行中都可取消
+                                        if((row.status == '0' || row.status == '2'|| row.status == '3' )&& row.detail.feel == '1'){
+                                            return true;
+                                        }
+                                        return false;
+                                    }},
+
+
+                                {name: 'paidcancel',
+                                    text: '取消订单',
+                                    icon: 'fa fa-user-times',
+                                    classname: 'btn btn-xs btn-warning btn-magic btn-ajax',
+                                    url: $.fn.bootstrapTable.defaults.extend.paidcancel_url,
+                                    confirm: '确认取消订单',
+                                    success: function (data, ret) {
+                                        Layer.alert(ret.msg );
+                                        $(".btn-refresh").trigger("click");
+                                    },
+                                    error: function (data, ret) {
+                                        Layer.alert(ret.msg);
+                                        return false;
+                                    },
+                                    visible: function (row) {
+                                        //非免费订单只有未支付可取消
+                                        if((row.status == '2'|| row.status == '3' )&& row.detail.feel == '0'){
+                                            return true;
+                                        }
+
+                                        return false;
+                                    }},
+
+
+                                // {name: 'verification',
+                                //     text: '预约核销',
+                                //     icon: 'fa fa-sign-in',
+                                //     classname: 'btn btn-xs btn-warning btn-magic btn-ajax',
+                                //     url: $.fn.bootstrapTable.defaults.extend.verification_url,
+                                //     confirm: '预约核销',
+                                //     success: function (data, ret) {
+                                //         Layer.alert(ret.msg );
+                                //         $(".btn-refresh").trigger("click");
+                                //     },
+                                //     error: function (data, ret) {
+                                //         Layer.alert(ret.msg);
+                                //         return false;
+                                //     },
+                                //     visible: function (row) {
+                                //         //显示条件 只能待入住订单
+                                //         if(row.status == '3'){
+                                //             return true;
+                                //         }
+                                //         return false;
+                                //     }},
+
+                                {name: 'refund',
+                                    text: '退款重试(若失败双击本行查看原因)',
+                                    icon: 'fa fa-sign-in',
+                                    classname: 'btn btn-xs btn-danger  btn-magic btn-ajax',
+                                    url: $.fn.bootstrapTable.defaults.extend.refund_url,
+                                    confirm: '（本功能主要适用平台退款因账户原因失败需要重新操作的订单）重新发起退款，如果是第三方支付请等待回调！',
+                                    success: function (data, ret) {
+                                        Layer.alert(ret.msg );
+                                        $(".btn-refresh").trigger("click");
+                                    },
+                                    error: function (data, ret) {
+                                        Layer.alert(ret.msg);
+                                        return false;
+                                    },
+                                    visible: function (row) {
+                                        //显示条件 只能待入住订单
+                                        if(row.status == '5'){
+                                            return true;
+                                        }
+                                        return false;
+                                    }
+                                },
+
+
+                                {
+                                    name: 'order_detail',
+                                    text: __('下单锁定的活动信息'),
+                                    title: __('下单锁定的活动信息'),
+                                    classname: 'btn btn-dialog',
+                                    icon: 'fa fa-calendar',
+                                    dropdown : '更多',
+                                    url: order_detail_url,
+                                    callback: function (data) {
+
+                                    },
+                                    // visible: function (row) {
+                                    //     return row.paytime;
+                                    // }
+                                },
+                                {
+                                    name: 'order_code',
+                                    text: __('核销管理'),
+                                    title: __('核销管理'),
+                                        icon: 'fa fa-calendar',
+                                        classname: 'btn btn-xs btn-warning btn-magic btn-dialog',
+                                    // dropdown : '更多',
+                                    url: order_code_url,
+                                    callback: function (data) {
+
+                                    },
+                                    visible: function (row) {
+                                        return row.paytime || ( row.status > '0');
+                                    }
+                                },
+
+
+                                {
+                                    name: 'order_log',
+                                    text: __('订单日志'),
+                                    title: __('订单日志'),
+                                    classname: 'btn btn-dialog',
+                                    icon: 'fa fa-list',
+                                    dropdown : '更多',
+                                    url: order_log_url,
+                                    callback: function (data) {
+
+                                    },
+                                    // visible: function (row) {
+                                    //     return row.status == '2'||row.status == '3';
+                                    // }
+                                },
+
+                                {
+                                    name: 'activity',
+                                    text: __('线上活动查看'),
+                                    title: __('线上活动查看'),
+                                    classname: 'btn btn-dialog',
+                                    icon: 'fa fa-leanpub',
+                                    dropdown : '更多',
+                                    url: activity_url,
+                                    callback: function (data) {
+
+                                    },
+                                    // visible: function (row) {
+                                    //     return row.paytime;
+                                    // }
+                                },
+
+                                {
+                                    name: 'settle_log',
+                                    text: __('资金结算记录'),
+                                    title: __('资金结算记录'),
+                                    classname: 'btn btn-dialog',
+                                    icon: 'fa fa-calendar',
+                                    dropdown : '更多',
+                                    url: settle_log_url,
+                                    callback: function (data) {
+
+                                    },
+                                    visible: function (row) {
+                                        return row.sub_refundprice > 0;
+                                    }
+                                },
+
+
+
+                            ], events: Table.api.events.operate, formatter: Table.api.formatter.operate},
+
+
                     ]
                 ]
             });
@@ -146,5 +344,31 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
             }
         }
     };
+
+
+
+
+    var activity_url = function (row,dom) {
+        return 'school/activity/activity/index?id='+row.activity_id;
+    }
+
+    var order_log_url = function (row,dom) {
+        return 'school/activity/order/order_log/index?activity_order_id='+row.id;
+    }
+
+    var order_detail_url = function (row,dom) {
+        return 'school/activity/order/order_detail/index?activity_order_id='+row.id;
+    }
+    var order_code_url = function (row,dom) {
+        return 'school/activity/order/order_code/index?activity_order_id='+row.id;
+    }
+
+    var settle_log_url = function (row,dom) {
+        return 'school/activity/order/settle_log/index?activity_order_id='+row.id;
+    }
+
+
+
+
     return Controller;
 });
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 0849741..1c91d5b 100644
--- a/public/assets/js/backend/school/activity/order/order_code.js
+++ b/public/assets/js/backend/school/activity/order/order_code.js
@@ -10,6 +10,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     edit_url: 'school/activity/order/order_code/edit',
                     del_url: 'school/activity/order/order_code/del',
                     multi_url: 'school/activity/order/order_code/multi',
+                    verification_url: 'school/activity/order/order_code/verification',
                     import_url: 'school/activity/order/order_code/import',
                     table: 'school_activity_order_code',
                 }
@@ -30,20 +31,50 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'id', title: __('Id')},
                         {field: 'activity_order_id', title: __('Activity_order_id')},
                         {field: 'code', title: __('Code'), 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: 'codeoneimage', title: __('Codeoneimage'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.image},
+
+                        {field: 'miniurl', title: __('核销码内容'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
+
+                        {field: 'codeimage',visible:false, title: __('Codeimage'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.image},
+
+                        {field: 'codeoneimage',visible:false, title: __('Codeoneimage'), 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', title: __('Order.order_no'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
-                        {field: 'user.nickname', title: __('User.nickname'), operate: 'LIKE'},
-                        {field: 'user.realname', title: __('User.realname'), operate: 'LIKE'},
-                        {field: 'user.mobile', title: __('User.mobile'), operate: 'LIKE'},
-                        {field: 'user.avatar', title: __('User.avatar'), operate: 'LIKE', events: Table.api.events.image, formatter: Table.api.formatter.image},
-                        {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
+                        {field: 'order.order_no',visible:false, title: __('Order.order_no'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
+                        // {field: 'user.nickname', title: __('User.nickname'), operate: 'LIKE'},
+                        // {field: 'user.realname', title: __('User.realname'), operate: 'LIKE'},
+                        // {field: 'user.mobile', title: __('User.mobile'), operate: 'LIKE'},
+                        // {field: 'user.avatar', title: __('User.avatar'), operate: 'LIKE', events: Table.api.events.image, formatter: Table.api.formatter.image},
+                        // {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
+
+                        {field: 'operate', title: __('Operate'), table: table , buttons: [
+                                {name: 'verification',
+                                    text: '预约核销',
+                                    icon: 'fa fa-sign-in',
+                                    classname: 'btn btn-xs btn-warning btn-magic btn-ajax',
+                                    url: $.fn.bootstrapTable.defaults.extend.verification_url,
+                                    confirm: '预约核销',
+                                    success: function (data, ret) {
+                                        Layer.alert(ret.msg );
+                                        $(".btn-refresh").trigger("click");
+                                    },
+                                    error: function (data, ret) {
+                                        Layer.alert(ret.msg);
+                                        return false;
+                                    },
+                                    visible: function (row) {
+                                        //显示条件 只能待入住订单
+                                        if(row.status == '3'){
+                                            return true;
+                                        }
+                                        return false;
+                                    }},
+                            ], events: Table.api.events.operate, formatter: Table.api.formatter.operate},
+
+
                     ]
                 ]
             });
diff --git a/public/assets/js/backend/school/activity/order/order_detail.js b/public/assets/js/backend/school/activity/order/order_detail.js
index 6300ebb..36b531a 100644
--- a/public/assets/js/backend/school/activity/order/order_detail.js
+++ b/public/assets/js/backend/school/activity/order/order_detail.js
@@ -1,4 +1,4 @@
-define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefined, Backend, Table, Form) {
+define(['jquery', 'bootstrap', 'backend', 'csmtable', 'form'], function ($, undefined, Backend, Table, Form) {
 
     var Controller = {
         index: function () {
@@ -24,50 +24,58 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 sortName: 'weigh',
                 fixedColumns: true,
                 fixedRightNumber: 1,
+                asyndownload: true,
                 columns: [
                     [
                         {checkbox: true},
                         {field: 'id', title: __('Id')},
-                        {field: 'user_id', title: __('User_id')},
-                        {field: 'activity_order_id', title: __('Activity_order_id')},
-                        {field: 'activity_id', title: __('Activity_id')},
+                        {field: 'user_id', visible:false,title: __('User_id')},
+                        {field: 'activity_order_id', visible:false,title: __('Activity_order_id')},
+                        {field: 'activity_id',visible:false, title: __('Activity_id')},
                         {field: 'title', title: __('Title'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
                         {field: 'images', title: __('Images'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.images},
-                        {field: 'address_city', title: __('Address_city'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
-                        {field: 'cate_ids', title: __('Cate_ids'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
-                        {field: 'province', title: __('Province')},
-                        {field: 'city', title: __('City')},
-                        {field: 'district', title: __('District')},
+                        {field: 'price', title: __('Price'), operate:'BETWEEN'},
+                        {field: 'order.totalprice', title: __('Order.totalprice'), operate:'BETWEEN'},
+                        {field: 'order.order_no',visible:false, title: __('Order.order_no'), operate:'BETWEEN'},
+                        {field: 'order.num', title: __('购买人数'), operate:'BETWEEN'},
+
+                        {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'},
+                        {field: 'user.avatar', title: __('User.avatar'), operate: 'LIKE', events: Table.api.events.image, formatter: Table.api.formatter.image},
+                        {field: 'order.order_no',visible:false, title: __('Order.order_no'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
+                        // {field: 'activity.title',visible:false, title: __('Activity.title'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
+
+
+                        {field: 'address_city',visible:false, title: __('Address_city'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
+                        {field: 'cate_ids', title: __('Cate_ids'), searchList: cateListJson, formatter: Table.api.formatter.flag},
+                        {field: 'province',visible:false, title: __('Province')},
+                        {field: 'city',visible:false, title: __('City')},
+                        {field: 'district',visible:false, title: __('District')},
                         {field: 'address', title: __('Address'), operate: 'LIKE'},
                         {field: 'address_detail', title: __('Address_detail'), operate: 'LIKE'},
-                        {field: 'longitude', title: __('Longitude'), operate: 'LIKE'},
-                        {field: 'latitude', title: __('Latitude'), operate: 'LIKE'},
+                        {field: 'longitude',visible:false, title: __('Longitude'), operate: 'LIKE'},
+                        {field: 'latitude',visible:false, title: __('Latitude'), operate: 'LIKE'},
                         {field: 'start_time', title: __('Start_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
                         {field: 'end_time', title: __('End_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
                         {field: 'sign_start_time', title: __('Sign_start_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
                         {field: 'sign_end_time', title: __('Sign_end_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
-                        {field: 'price', title: __('Price'), operate:'BETWEEN'},
+
                         {field: 'stock', title: __('Stock')},
                         {field: 'weigh', title: __('Weigh'), operate: false},
-                        {field: 'recommend', title: __('Recommend'), searchList: {"0":__('Recommend 0'),"1":__('Recommend 1')}, formatter: Table.api.formatter.normal},
-                        {field: 'hot', title: __('Hot'), searchList: {"0":__('Hot 0'),"1":__('Hot 1')}, formatter: Table.api.formatter.normal},
-                        {field: 'new', title: __('New'), searchList: {"0":__('New 0'),"1":__('New 1')}, formatter: Table.api.formatter.normal},
-                        {field: 'sale', title: __('Sale')},
-                        {field: 'views', title: __('Views')},
-                        {field: 'add_type', title: __('Add_type'), searchList: {"1":__('Add_type 1'),"2":__('Add_type 2')}, formatter: Table.api.formatter.normal},
-                        {field: 'add_id', title: __('Add_id')},
+                        {field: 'recommend',visible:false, title: __('Recommend'), searchList: {"0":__('Recommend 0'),"1":__('Recommend 1')}, formatter: Table.api.formatter.normal},
+                        {field: 'hot',visible:false, title: __('Hot'), searchList: {"0":__('Hot 0'),"1":__('Hot 1')}, formatter: Table.api.formatter.normal},
+                        {field: 'new',visible:false, title: __('New'), searchList: {"0":__('New 0'),"1":__('New 1')}, formatter: Table.api.formatter.normal},
+                        {field: 'sale',visible:false, title: __('Sale')},
+                        {field: 'views',visible:false, title: __('Views')},
+                        {field: 'add_type',visible:false, title: __('Add_type'), searchList: {"1":__('Add_type 1'),"2":__('Add_type 2')}, formatter: Table.api.formatter.normal},
+                        {field: 'add_id',visible:false, title: __('Add_id')},
                         {field: 'feel', title: __('Feel'), searchList: {"0":__('Feel 0'),"1":__('Feel 1')}, formatter: Table.api.formatter.normal},
-                        {field: 'sign_num', title: __('Sign_num')},
-                        {field: 'verification_num', title: __('Verification_num')},
-                        {field: 'collect', title: __('Collect')},
+                        {field: 'sign_num',visible:false, title: __('Sign_num')},
+                        {field: 'verification_num',visible:false, title: __('Verification_num')},
+                        {field: 'collect',visible:false, title: __('Collect')},
                         {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: 'user.nickname', title: __('User.nickname'), operate: 'LIKE'},
-                        {field: 'user.realname', title: __('User.realname'), operate: 'LIKE'},
-                        {field: 'user.mobile', title: __('User.mobile'), operate: 'LIKE'},
-                        {field: 'user.avatar', title: __('User.avatar'), operate: 'LIKE', events: Table.api.events.image, formatter: Table.api.formatter.image},
-                        {field: 'order.order_no', title: __('Order.order_no'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
-                        {field: 'activity.title', title: __('Activity.title'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
                         {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
                     ]
                 ]
diff --git a/public/assets/js/backend/school/activity/order/order_log.js b/public/assets/js/backend/school/activity/order/order_log.js
index 5eb8392..d7ee263 100644
--- a/public/assets/js/backend/school/activity/order/order_log.js
+++ b/public/assets/js/backend/school/activity/order/order_log.js
@@ -1,4 +1,4 @@
-define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefined, Backend, Table, Form) {
+define(['jquery', 'bootstrap', 'backend', 'csmtable', 'form'], function ($, undefined, Backend, Table, Form) {
 
     var Controller = {
         index: function () {
@@ -22,6 +22,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 url: $.fn.bootstrapTable.defaults.extend.index_url,
                 pk: 'id',
                 sortName: 'id',
+                asyndownload: true,
                 columns: [
                     [
                         {checkbox: true},
@@ -36,7 +37,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'order.order_no', title: __('Order.order_no'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
                         {field: 'user.nickname', title: __('User.nickname'), operate: 'LIKE'},
                         {field: 'user.avatar', title: __('User.avatar'), operate: 'LIKE', events: Table.api.events.image, formatter: Table.api.formatter.image},
-                        {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
+                        // {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
                     ]
                 ]
             });
diff --git a/public/assets/js/backend/school/activity/order/settle_log.js b/public/assets/js/backend/school/activity/order/settle_log.js
index cfca19f..d8409bf 100644
--- a/public/assets/js/backend/school/activity/order/settle_log.js
+++ b/public/assets/js/backend/school/activity/order/settle_log.js
@@ -1,4 +1,4 @@
-define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefined, Backend, Table, Form) {
+define(['jquery', 'bootstrap', 'backend', 'csmtable', 'form'], function ($, undefined, Backend, Table, Form) {
 
     var Controller = {
         index: function () {
@@ -24,35 +24,72 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 sortName: 'id',
                 fixedColumns: true,
                 fixedRightNumber: 1,
+                asyndownload: true,
                 columns: [
                     [
                         {checkbox: true},
                         {field: 'id', title: __('Id')},
-                        {field: 'activity_order_id', title: __('Activity_order_id')},
-                        {field: 'withdrawal_log_id', title: __('Withdrawal_log_id')},
+                        {field: 'activity_order_id', title: __('Activity_order_id') ,visible:false},
+                        {field: 'withdrawal_log_id',visible:false, title: __('Withdrawal_log_id') },
                         {field: 'to_user_id', title: __('To_user_id')},
+                        {field: 'touser.nickname', title: __('Touser.nickname'), operate: 'LIKE'},
+                        {field: 'touser.realname',visible:false, title: __('Touser.realname'), operate: 'LIKE'},
+                        {field: 'touser.mobile', title: __('Touser.mobile'), operate: 'LIKE'},
+                        {field: 'touser.avatar',visible:false, title: __('Touser.avatar'), operate: 'LIKE', events: Table.api.events.image, formatter: Table.api.formatter.image},
+
                         {field: 'pay_user_id', title: __('Pay_user_id')},
+                        {field: 'payuser.nickname', title: __('Payuser.nickname'), operate: 'LIKE'},
+                        {field: 'payuser.realname',visible:false, title: __('Payuser.realname'), operate: 'LIKE'},
+                        {field: 'payuser.mobile', title: __('Payuser.mobile'), operate: 'LIKE'},
+                        {field: 'payuser.avatar', visible:false,title: __('Payuser.avatar'), operate: 'LIKE', events: Table.api.events.image, formatter: Table.api.formatter.image},
+
+
+
                         {field: 'status', title: __('Status'), searchList: {"1":__('Status 1'),"2":__('Status 2'),"3":__('Status 3'),"-1":__('Status -1')}, formatter: Table.api.formatter.status},
-                        {field: 'settletime', title: __('Settletime'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
-                        {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
-                        {field: 'canceltime', title: __('Canceltime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
-                        {field: 'unfreezetime', title: __('Unfreezetime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
+
+
                         {field: 'order_price', title: __('Order_price'), operate:'BETWEEN'},
                         {field: 'fee_price', title: __('Fee_price'), operate:'BETWEEN'},
                         {field: 'fee_scale', title: __('Fee_scale'), operate:'BETWEEN'},
                         {field: 'settle_price', title: __('Settle_price'), operate:'BETWEEN'},
+
+
                         {field: 'order.order_no', title: __('Order.order_no'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
-                        {field: 'log.id', title: __('Log.id')},
-                        {field: 'log.price', title: __('Log.price'), operate:'BETWEEN'},
-                        {field: 'touser.nickname', title: __('User.nickname'), operate: 'LIKE'},
-                        {field: 'touser.realname', title: __('User.realname'), operate: 'LIKE'},
-                        {field: 'touser.mobile', title: __('User.mobile'), operate: 'LIKE'},
-                        {field: 'touser.avatar', title: __('User.avatar'), operate: 'LIKE', events: Table.api.events.image, formatter: Table.api.formatter.image},
-                        {field: 'payuser.nickname', title: __('User.nickname'), operate: 'LIKE'},
-                        {field: 'payuser.realname', title: __('User.realname'), operate: 'LIKE'},
-                        {field: 'payuser.mobile', title: __('User.mobile'), operate: 'LIKE'},
-                        {field: 'payuser.avatar', title: __('User.avatar'), operate: 'LIKE', events: Table.api.events.image, formatter: Table.api.formatter.image},
-                        {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
+                        {field: 'log.id',visible:false, title: __('Log.id')},
+                        {field: 'log.price',visible:false, title: __('Log.price'), operate:'BETWEEN'},
+
+
+
+                        {field: 'settletime', title: __('Settletime'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
+                        {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
+                        {field: 'canceltime', title: __('Canceltime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
+                        {field: 'unfreezetime', title: __('Unfreezetime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
+
+
+                        {field: 'operate', title: __('Operate'), table: table , buttons: [
+
+                                {
+                                    name: 'order',
+                                    text: __('源头订单信息'),
+                                    title: __('源头订单信息'),
+                                    classname: 'btn btn-xs btn-warning btn-magic btn-dialog',
+                                    icon: 'fa fa-calendar',
+                                    // dropdown : '更多',
+                                    url: order_url,
+                                    callback: function (data) {
+
+                                    },
+                                    // visible: function (row) {
+                                    //     return row.paytime;
+                                    // }
+                                },
+
+
+                            ], events: Table.api.events.operate, formatter: Table.api.formatter.operate},
+
+
+
+                        // {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
                     ]
                 ]
             });
@@ -132,5 +169,12 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
             }
         }
     };
+
+
+    var order_url = function (row,dom) {
+        return 'school/activity/order/order/index?id='+row.activity_order_id;
+    }
+
+
     return Controller;
 });
diff --git a/public/assets/js/backend/user/user.js b/public/assets/js/backend/user/user.js
index 7788a9d..68a4984 100644
--- a/public/assets/js/backend/user/user.js
+++ b/public/assets/js/backend/user/user.js
@@ -51,73 +51,73 @@ define(['jquery', 'bootstrap', 'backend', 'csmtable', 'form'], function ($, unde
 
 
                         {field: 'operate', title: __('Operate'), table: table , buttons: [
-                                {
-                                    name: 'user_auth',
-                                    text: __('设置成机构认证'),
-                                    title: __('设置成机构认证'),
-                                    classname: 'btn   btn-dialog',
-                                    icon: 'fa fa-bank',
-                                    dropdown : '更多',
-                                    url: manystore_url,
-                                    callback: function (data) {
-
-                                    },
-                                    // visible: function (row) {
-                                    //     return row.status == '2'||row.status == '3';
-                                    // }
-                                },
-                                {
-                                    name: 'user_auth',
-                                    text: __('设置成机构授权'),
-                                    title: __('设置成机构授权'),
-                                    classname: 'btn   btn-dialog',
-                                    icon: 'fa fa-bitbucket',
-                                    dropdown : '更多',
-                                    url: user_auth_url,
-                                    callback: function (data) {
-
-                                    },
-                                    // visible: function (row) {
-                                    //     return row.status == '2'||row.status == '3';
-                                    // }
-                                },
-
-
-
-                                {
-                                    name: 'teacher',
-                                    text: __('设置成老师'),
-                                    title: __('设置成老师'),
-                                    classname: 'btn  btn-dialog',
-                                    icon: 'fa fa-user',
-                                    dropdown : '更多',
-                                    url: teacher_url,
-                                    callback: function (data) {
-
-                                    },
-                                    // visible: function (row) {
-                                    //     return row.status == '2'||row.status == '3';
-                                    // }
-                                },
-
-
-
-                                {
-                                    name: 'verification',
-                                    text: __('设置成核销员'),
-                                    title: __('设置成核销员'),
-                                    classname: 'btn  btn-dialog',
-                                    icon: 'fa fa-user',
-                                    dropdown : '更多',
-                                    url: verification_url,
-                                    callback: function (data) {
-
-                                    },
-                                    // visible: function (row) {
-                                    //     return row.status == '2'||row.status == '3';
-                                    // }
-                                },
-
+                                // {
+                                //     name: 'user_auth',
+                                //     text: __('设置成机构认证'),
+                                //     title: __('设置成机构认证'),
+                                //     classname: 'btn   btn-dialog',
+                                //     icon: 'fa fa-bank',
+                                //     dropdown : '更多',
+                                //     url: manystore_url,
+                                //     callback: function (data) {
+                                //
+                                //     },
+                                //     // visible: function (row) {
+                                //     //     return row.status == '2'||row.status == '3';
+                                //     // }
+                                // },
+                                // {
+                                //     name: 'user_auth',
+                                //     text: __('设置成机构授权'),
+                                //     title: __('设置成机构授权'),
+                                //     classname: 'btn   btn-dialog',
+                                //     icon: 'fa fa-bitbucket',
+                                //     dropdown : '更多',
+                                //     url: user_auth_url,
+                                //     callback: function (data) {
+                                //
+                                //     },
+                                //     // visible: function (row) {
+                                //     //     return row.status == '2'||row.status == '3';
+                                //     // }
+                                // },
+                                //
+                                //
+                                //
+                                // {
+                                //     name: 'teacher',
+                                //     text: __('设置成老师'),
+                                //     title: __('设置成老师'),
+                                //     classname: 'btn  btn-dialog',
+                                //     icon: 'fa fa-user',
+                                //     dropdown : '更多',
+                                //     url: teacher_url,
+                                //     callback: function (data) {
+                                //
+                                //     },
+                                //     // visible: function (row) {
+                                //     //     return row.status == '2'||row.status == '3';
+                                //     // }
+                                // },
+                                //
+                                //
+                                //
+                                // {
+                                //     name: 'verification',
+                                //     text: __('设置成核销员'),
+                                //     title: __('设置成核销员'),
+                                //     classname: 'btn  btn-dialog',
+                                //     icon: 'fa fa-user',
+                                //     dropdown : '更多',
+                                //     url: verification_url,
+                                //     callback: function (data) {
+                                //
+                                //     },
+                                //     // visible: function (row) {
+                                //     //     return row.status == '2'||row.status == '3';
+                                //     // }
+                                // },
+                                //
 
                                 {
                                     name: 'third',
@@ -136,41 +136,41 @@ define(['jquery', 'bootstrap', 'backend', 'csmtable', 'form'], function ($, unde
                                 },
 
 
-                                {
-                                    name: 'classes_order',
-                                    text: __('课程购买单'),
-                                    title: __('课程购买单'),
-                                    classname: 'btn btn-dialog',
-                                    icon: 'fa fa-cart-arrow-down',
-                                    dropdown : '更多',
-                                    url: classes_order_url,
-                                    callback: function (data) {
-
-                                    },
-                                    // visible: function (row) {
-                                    //     return row.status == '2'||row.status == '3';
-                                    // }
-                                },
-
-                                {
-                                    name: 'classes_hourorder',
-                                    text: __('课时预约单'),
-                                    title: __('课时预约单'),
-                                    classname: 'btn btn-dialog',
-                                    icon: 'fa fa-calendar',
-                                    dropdown : '更多',
-                                    url: classes_hourorder_url,
-                                    callback: function (data) {
-
-                                    },
-                                    // visible: function (row) {
-                                    //     return row.status == '2'||row.status == '3';
-                                    // }
-                                },
+                                // {
+                                //     name: 'classes_order',
+                                //     text: __('课程购买单'),
+                                //     title: __('课程购买单'),
+                                //     classname: 'btn btn-dialog',
+                                //     icon: 'fa fa-cart-arrow-down',
+                                //     dropdown : '更多',
+                                //     url: classes_order_url,
+                                //     callback: function (data) {
+                                //
+                                //     },
+                                //     // visible: function (row) {
+                                //     //     return row.status == '2'||row.status == '3';
+                                //     // }
+                                // },
+                                //
+                                // {
+                                //     name: 'classes_hourorder',
+                                //     text: __('课时预约单'),
+                                //     title: __('课时预约单'),
+                                //     classname: 'btn btn-dialog',
+                                //     icon: 'fa fa-calendar',
+                                //     dropdown : '更多',
+                                //     url: classes_hourorder_url,
+                                //     callback: function (data) {
+                                //
+                                //     },
+                                //     // visible: function (row) {
+                                //     //     return row.status == '2'||row.status == '3';
+                                //     // }
+                                // },
                                 {
                                     name: 'activity_order',
-                                    text: __('机构活动订单'),
-                                    title: __('机构活动订单'),
+                                    text: __('活动订单'),
+                                    title: __('活动订单'),
                                     classname: 'btn btn-dialog',
                                     icon: 'fa fa-cart-arrow-down',
                                     dropdown : '更多',
@@ -182,21 +182,21 @@ define(['jquery', 'bootstrap', 'backend', 'csmtable', 'form'], function ($, unde
                                     //     return row.status == '2'||row.status == '3';
                                     // }
                                 },
-                                {
-                                    name: 'evaluate',
-                                    text: __('查看用户评价'),
-                                    title: __('查看用户评价'),
-                                    classname: 'btn btn-dialog',
-                                    icon: 'fa fa-handshake-o',
-                                    dropdown : '更多',
-                                    url: evaluate_url,
-                                    callback: function (data) {
-
-                                    },
-                                    // visible: function (row) {
-                                    //     return row.classes_evaluate_id;
-                                    // }
-                                },
+                                // {
+                                //     name: 'evaluate',
+                                //     text: __('查看用户评价'),
+                                //     title: __('查看用户评价'),
+                                //     classname: 'btn btn-dialog',
+                                //     icon: 'fa fa-handshake-o',
+                                //     dropdown : '更多',
+                                //     url: evaluate_url,
+                                //     callback: function (data) {
+                                //
+                                //     },
+                                //     // visible: function (row) {
+                                //     //     return row.classes_evaluate_id;
+                                //     // }
+                                // },
                                 {
                                     name: 'attachment',
                                     text: __('查看用户上传图片'),
@@ -306,7 +306,7 @@ define(['jquery', 'bootstrap', 'backend', 'csmtable', 'form'], function ($, unde
     }
 
     var activity_order_url = function (row,dom) {
-        return 'school/classes/activity/order/order/index?user_id='+row.shop_id;
+        return 'school/activity/order/order/index?user_id='+row.id;
     }
 
 
diff --git a/public/assets/js/backend/user/withdrawal/userwithdrawal_log.js b/public/assets/js/backend/user/withdrawal/userwithdrawal_log.js
index b43c822..6d9b318 100644
--- a/public/assets/js/backend/user/withdrawal/userwithdrawal_log.js
+++ b/public/assets/js/backend/user/withdrawal/userwithdrawal_log.js
@@ -1,4 +1,4 @@
-define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefined, Backend, Table, Form) {
+define(['jquery', 'bootstrap', 'backend', 'csmtable', 'form'], function ($, undefined, Backend, Table, Form) {
 
     var Controller = {
         index: function () {
@@ -11,6 +11,10 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     del_url: 'user/withdrawal/userwithdrawal_log/del',
                     multi_url: 'user/withdrawal/userwithdrawal_log/multi',
                     import_url: 'user/withdrawal/userwithdrawal_log/import',
+
+                    auth_url: 'user/withdrawal/userwithdrawal_log/auths',
+                    paid_url: 'user/withdrawal/userwithdrawal_log/paid',
+
                     table: 'user_withdrawal_log',
                 }
             });
@@ -24,6 +28,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 sortName: 'id',
                 fixedColumns: true,
                 fixedRightNumber: 1,
+                asyndownload: true,
                 columns: [
                     [
                         {checkbox: true},
@@ -32,21 +37,83 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'fee_price', title: __('Fee_price'), operate:'BETWEEN'},
                         {field: 'real_price', title: __('Real_price'), operate:'BETWEEN'},
                         {field: 'status', title: __('Status'), searchList: {"1":__('Status 1'),"2":__('Status 2'),"3":__('Status 3')}, formatter: Table.api.formatter.status},
-                        {field: 'reason', title: __('Reason'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
+
                         {field: 'withdrawal_status', title: __('Withdrawal_status'), searchList: {"1":__('Withdrawal_status 1'),"2":__('Withdrawal_status 2'),"3":__('Withdrawal_status 3')}, formatter: Table.api.formatter.status},
+                        {field: 'remark', title: __('打款备注'), operate: 'LIKE', table: table, class: 'autocontent'},
+
+                        {field: 'reason', title: __('Reason'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
                         {field: 'user_id', title: __('User_id')},
                         {field: 'type', title: __('Type'), searchList: {"bank":__('Type bank'),"wechat":__('Type wechat'),"alipay":__('Type alipay')}, formatter: Table.api.formatter.normal},
-                        {field: 'name', title: __('Name'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
-                        {field: 'bank_name', title: __('Bank_name'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
-                        {field: 'bank_user_name', title: __('Bank_user_name'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
+                        {field: 'name',visible:false, title: __('Name'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
+                        {field: 'bank_name',visible:false, title: __('Bank_name'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
+                        {field: 'bank_user_name',visible:false, title: __('Bank_user_name'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
                         {field: 'paytime', title: __('Paytime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
-                        {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
+
                         {field: 'examinetime', title: __('Examinetime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
-                        {field: 'user.nickname', title: __('User.nickname'), operate: 'LIKE'},
-                        {field: 'user.realname', title: __('User.realname'), operate: 'LIKE'},
-                        {field: 'user.mobile', title: __('User.mobile'), operate: 'LIKE'},
-                        {field: 'user.avatar', title: __('User.avatar'), operate: 'LIKE', events: Table.api.events.image, formatter: Table.api.formatter.image},
-                        {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
+                        {field: 'user.nickname',visible:false, 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'},
+                        {field: 'user.avatar', visible:false,title: __('User.avatar'), operate: 'LIKE', events: Table.api.events.image, formatter: Table.api.formatter.image},
+
+                        {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
+
+
+
+
+                        {field: 'operate', title: __('Operate'), table: table , buttons: [
+                                {
+                                    name: 'auths',
+                                    text: __('提现审核'),
+                                    title: __('审核提现是否通过'),
+                                    classname: 'btn btn-xs btn-danger  btn-magic btn-dialog',
+                                    icon: 'fa fa-sign-in',
+                                    // dropdown : '更多',
+                                    url: $.fn.bootstrapTable.defaults.extend.auth_url,
+                                    callback: function (data) {
+
+                                    },
+                                    visible: function (row) {
+                                        return row.status == '1';
+                                    }
+                                },
+                                {
+                                    name: 'paid',
+                                    text: __('确认打款'),
+                                    title: __('确认打款并填写备注'),
+                                    classname: 'btn btn-xs btn-danger  btn-magic btn-dialog',
+                                    icon: 'fa fa-sign-in',
+                                    // dropdown : '更多',
+                                    url: $.fn.bootstrapTable.defaults.extend.paid_url,
+                                    callback: function (data) {
+
+                                    },
+                                    visible: function (row) {
+                                        return row.status == '2' && row.withdrawal_status == '2';
+                                    }
+                                },
+
+
+                                {
+                                    name: 'order_detail',
+                                    text: __('提现对应的结算记录'),
+                                    title: __('提现对应的结算记录'),
+                                    classname: 'btn btn-dialog',
+                                    icon: 'fa fa-calendar',
+                                    dropdown : '更多',
+                                    url: order_detail_url,
+                                    callback: function (data) {
+
+                                    },
+                                    // visible: function (row) {
+                                    //     return row.paytime;
+                                    // }
+                                },
+
+
+                            ], events: Table.api.events.operate, formatter: Table.api.formatter.operate},
+
+
+                        // {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
                     ]
                 ]
             });
@@ -60,11 +127,23 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
         edit: function () {
             Controller.api.bindevent();
         },
+        auths: function () {
+            Controller.api.bindevent();
+        },
+        paid: function () {
+            Controller.api.bindevent();
+        },
         api: {
             bindevent: function () {
                 Form.api.bindevent($("form[role=form]"));
             }
         }
     };
+
+
+    var order_detail_url = function (row,dom) {
+        return 'school/activity/order/settle_log/index?withdrawal_log_id='+row.id;
+    }
+
     return Controller;
 });