后台：答题，订单支付，订单退款

application/admin/controller/Payorder.php

@@ -0,0 +1,73 @@
+<?php
+
+namespace app\admin\controller;
+
+use app\common\controller\Backend;
+
+/**
+ * 支付订单管理
+ *
+ * @icon fa fa-circle-o
+ */
+class Payorder extends Backend
+{
+
+    /**
+     * Payorder模型对象
+     * @var \app\admin\model\Payorder
+     */
+    protected $model = null;
+
+    public function _initialize()
+    {
+        parent::_initialize();
+        $this->model = new \app\admin\model\Payorder;
+        $this->view->assign("orderStatusList", $this->model->getOrderStatusList());
+        $this->view->assign("isLianxuList", $this->model->getIsLianxuList());
+        $this->view->assign("plantaskStatusList", $this->model->getPlantaskStatusList());
+    }
+
+
+
+    /**
+     * 默认生成的控制器所继承的父类中有index/add/edit/del/multi五个基础方法、destroy/restore/recyclebin三个回收站方法
+     * 因此在当前控制器中可不用编写增删改查的代码,除非需要自己控制这部分逻辑
+     * 需要将application/admin/library/traits/Backend.php中对应的方法复制到当前控制器,然后进行修改
+     */
+
+
+    /**
+     * 查看
+     */
+    public function index()
+    {
+        //当前是否为关联查询
+        $this->relationSearch = true;
+        //设置过滤方法
+        $this->request->filter(['strip_tags', 'trim']);
+        if ($this->request->isAjax()) {
+            //如果发送的来源是Selectpage，则转发到Selectpage
+            if ($this->request->request('keyField')) {
+                return $this->selectpage();
+            }
+            list($where, $sort, $order, $offset, $limit) = $this->buildparams();
+
+            $list = $this->model
+                    ->with(['user'])
+                    ->where($where)
+                    ->order($sort, $order)
+                    ->paginate($limit);
+
+            foreach ($list as $row) {
+                
+                $row->getRelation('user')->visible(['nickname','mobile','avatar']);
+            }
+
+            $result = array("total" => $list->total(), "rows" => $list->items());
+
+            return json($result);
+        }
+        return $this->view->fetch();
+    }
+
+}

application/admin/controller/Payorderrefundlog.php

@@ -0,0 +1,37 @@
+<?php
+
+namespace app\admin\controller;
+
+use app\common\controller\Backend;
+
+/**
+ * 退款日志
+ *
+ * @icon fa fa-circle-o
+ */
+class Payorderrefundlog extends Backend
+{
+
+    /**
+     * Payorderrefundlog模型对象
+     * @var \app\admin\model\Payorderrefundlog
+     */
+    protected $model = null;
+
+    public function _initialize()
+    {
+        parent::_initialize();
+        $this->model = new \app\admin\model\Payorderrefundlog;
+        $this->view->assign("statusList", $this->model->getStatusList());
+    }
+
+
+
+    /**
+     * 默认生成的控制器所继承的父类中有index/add/edit/del/multi五个基础方法、destroy/restore/recyclebin三个回收站方法
+     * 因此在当前控制器中可不用编写增删改查的代码,除非需要自己控制这部分逻辑
+     * 需要将application/admin/library/traits/Backend.php中对应的方法复制到当前控制器,然后进行修改
+     */
+
+
+}

application/admin/lang/zh-cn/exam/grade.php

@@ -2,19 +2,19 @@
 
 return [
     'Cate_id'     => '所属分类',
-    'User_id'     => '考试用户',
-    'Paper_id'    => '所属试卷',
-    'Score'       => '考试分数',
+    'User_id'     => '答题用户ID',
+    'Paper_id'    => '所属科普ID',
+    'Score'       => '答题得分',
     'Is_pass'     => '是否及格',
     'Total_score' => '总分数',
     'Total_count' => '总题数',
     'Right_count' => '答对数',
     'Error_count' => '答错数',
-    'Grade_time'  => '考试用时',
+    'Grade_time'  => '答题用时',
     'Createtime'  => '创建时间',
     'Updatetime'  => '修改时间',
     'Cate.name'   => '名称',
-    'Paper.title' => '试卷名称',
+    'Paper.title' => '科普标题',
     'Start_time'  => '开考时间',
     'Finish_time'  => '交卷时间',
 ];

application/admin/lang/zh-cn/payorder.php

@@ -0,0 +1,31 @@
+<?php
+
+return [
+    'Id'                      => 'ID',
+    'User_id'                 => '下单用户id',
+    'Out_trade_no'            => '订单号',
+    'Order_amount'            => '订单金额',
+    'Createtime'              => '下单时间',
+    'Notifytime'              => '回调时间',
+    'Pay_type'                => '支付方式',
+    'Platform'                => '支付平台',
+    'Order_status'            => '状态',
+    'Order_status 0'          => '待支付',
+    'Order_status 1'          => '已支付 ',
+    'Table_name'              => '订单表名',
+    'Table_id'                => '订单表主键',
+    'Args'                    => '扩展参数',
+    'Bundle_id'               => '苹果支付产品id',
+    'Is_lianxu'               => '是否订阅',
+    'Is_lianxu 1'             => '是',
+    'Is_lianxu 0'             => '否',
+    'Original_transaction_id' => '原始苹果交易id',
+    'In_app_one'              => 'in_app其中一个',
+    'Transaction_info'        => 's2s',
+    'Plantask_status'         => '任务状态',
+    'Plantask_status 0'       => '未执行',
+    'Plantask_status 1'       => '已执行',
+    'User.nickname'           => '昵称',
+    'User.mobile'             => '手机号',
+    'User.avatar'             => '头像'
+];

application/admin/lang/zh-cn/payorderrefundlog.php

@@ -0,0 +1,20 @@
+<?php
+
+return [
+    'Order_id'      => '订单ID',
+    'Out_refund_no' => '退款单号',
+    'Pay_fee'       => '支付金额',
+    'Refund_price'  => '退款金额',
+    'Pay_type'      => '付款方式',
+    'Status'        => '退款状态',
+    'Status 0'      => '退款中',
+    'Set status to 0'=> '设为退款中',
+    'Status 1'      => '退款完成',
+    'Set status to 1'=> '设为退款完成',
+    'Status -1'     => '退款失败',
+    'Set status to -1'=> '设为退款失败',
+    'Createtime'    => '创建时间',
+    'Updatetime'    => '更新时间',
+    'Table'         => '来源表',
+    'Table_id'      => '来源表ID'
+];

application/admin/model/Payorder.php

@@ -0,0 +1,92 @@
+<?php
+
+namespace app\admin\model;
+
+use think\Model;
+
+
+class Payorder extends Model
+{
+
+    
+
+    
+
+    // 表名
+    protected $table = 'pay_order';
+    
+    // 自动写入时间戳字段
+    protected $autoWriteTimestamp = 'integer';
+
+    // 定义时间戳字段名
+    protected $createTime = 'createtime';
+    protected $updateTime = false;
+    protected $deleteTime = false;
+
+    // 追加属性
+    protected $append = [
+        'notifytime_text',
+        'order_status_text',
+        'is_lianxu_text',
+        'plantask_status_text'
+    ];
+    
+
+    
+    public function getOrderStatusList()
+    {
+        return ['0' => __('Order_status 0'), '1' => __('Order_status 1')];
+    }
+
+    public function getIsLianxuList()
+    {
+        return ['1' => __('Is_lianxu 1'), '0' => __('Is_lianxu 0')];
+    }
+
+    public function getPlantaskStatusList()
+    {
+        return ['0' => __('Plantask_status 0'), '1' => __('Plantask_status 1')];
+    }
+
+
+    public function getNotifytimeTextAttr($value, $data)
+    {
+        $value = $value ? $value : (isset($data['notifytime']) ? $data['notifytime'] : '');
+        return is_numeric($value) ? date("Y-m-d H:i:s", $value) : $value;
+    }
+
+
+    public function getOrderStatusTextAttr($value, $data)
+    {
+        $value = $value ? $value : (isset($data['order_status']) ? $data['order_status'] : '');
+        $list = $this->getOrderStatusList();
+        return isset($list[$value]) ? $list[$value] : '';
+    }
+
+
+    public function getIsLianxuTextAttr($value, $data)
+    {
+        $value = $value ? $value : (isset($data['is_lianxu']) ? $data['is_lianxu'] : '');
+        $list = $this->getIsLianxuList();
+        return isset($list[$value]) ? $list[$value] : '';
+    }
+
+
+    public function getPlantaskStatusTextAttr($value, $data)
+    {
+        $value = $value ? $value : (isset($data['plantask_status']) ? $data['plantask_status'] : '');
+        $list = $this->getPlantaskStatusList();
+        return isset($list[$value]) ? $list[$value] : '';
+    }
+
+    protected function setNotifytimeAttr($value)
+    {
+        return $value === '' ? null : ($value && !is_numeric($value) ? strtotime($value) : $value);
+    }
+
+
+    public function user()
+    {
+        return $this->belongsTo('User', 'user_id', 'id', [], 'LEFT')->setEagerlyType(0);
+    }
+}

application/admin/model/Payorderrefundlog.php

@@ -0,0 +1,49 @@
+<?php
+
+namespace app\admin\model;
+
+use think\Model;
+
+
+class Payorderrefundlog extends Model
+{
+
+    
+
+    
+
+    // 表名
+    protected $table = 'pay_order_refund_log';
+    
+    // 自动写入时间戳字段
+    protected $autoWriteTimestamp = 'integer';
+
+    // 定义时间戳字段名
+    protected $createTime = 'createtime';
+    protected $updateTime = 'updatetime';
+    protected $deleteTime = false;
+
+    // 追加属性
+    protected $append = [
+        'status_text'
+    ];
+    
+
+    
+    public function getStatusList()
+    {
+        return ['0' => __('Status 0'), '1' => __('Status 1'), '-1' => __('Status -1')];
+    }
+
+
+    public function getStatusTextAttr($value, $data)
+    {
+        $value = $value ? $value : (isset($data['status']) ? $data['status'] : '');
+        $list = $this->getStatusList();
+        return isset($list[$value]) ? $list[$value] : '';
+    }
+
+
+
+
+}

application/admin/validate/Payorder.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace app\admin\validate;
+
+use think\Validate;
+
+class Payorder extends Validate
+{
+    /**
+     * 验证规则
+     */
+    protected $rule = [
+    ];
+    /**
+     * 提示消息
+     */
+    protected $message = [
+    ];
+    /**
+     * 验证场景
+     */
+    protected $scene = [
+        'add'  => [],
+        'edit' => [],
+    ];
+    
+}

application/admin/validate/Payorderrefundlog.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace app\admin\validate;
+
+use think\Validate;
+
+class Payorderrefundlog extends Validate
+{
+    /**
+     * 验证规则
+     */
+    protected $rule = [
+    ];
+    /**
+     * 提示消息
+     */
+    protected $message = [
+    ];
+    /**
+     * 验证场景
+     */
+    protected $scene = [
+        'add'  => [],
+        'edit' => [],
+    ];
+    
+}

application/admin/view/exam/grade/index.html

@@ -7,7 +7,7 @@
                 <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-danger btn-del btn-disabled disabled {:$auth->check('exam/grade/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('exam/grade/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>-->
                         <!--<a href="javascript:;" class="btn btn-success btn-add {:$auth->check('exam/grade/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('exam/grade/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>
 

application/admin/view/payorder/add.html

@@ -0,0 +1,123 @@
+<form id="add-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="nickname" class="form-control selectpage" name="row[user_id]" type="text" value="">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Out_trade_no')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-out_trade_no" data-rule="required" class="form-control" name="row[out_trade_no]" type="text" value="">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Order_amount')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-order_amount" data-rule="required" class="form-control" step="0.01" name="row[order_amount]" type="number" value="0.00">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Notifytime')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-notifytime" data-rule="required" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[notifytime]" 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">{:__('Pay_type')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-pay_type" data-rule="required" class="form-control" name="row[pay_type]" type="text" value="">
+        </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" data-rule="required" class="form-control" name="row[platform]" type="text" value="">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Order_status')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            
+            <div class="radio">
+            {foreach name="orderStatusList" item="vo"}
+            <label for="row[order_status]-{$key}"><input id="row[order_status]-{$key}" name="row[order_status]" type="radio" value="{$key}" {in name="key" value="0"}checked{/in} /> {$vo}</label> 
+            {/foreach}
+            </div>
+
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Table_name')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-table_name" data-rule="required" class="form-control" name="row[table_name]" type="text" value="">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Table_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-table_id" data-rule="required" data-source="table/index" class="form-control selectpage" name="row[table_id]" type="text" value="">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Args')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-args" data-rule="required" class="form-control" name="row[args]" type="text" value="">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Bundle_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-bundle_id" data-rule="required" data-source="bundle/index" class="form-control selectpage" name="row[bundle_id]" type="text" value="">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Is_lianxu')}:</label>
+        <div class="col-xs-12 col-sm-8">
+                        
+            <select  id="c-is_lianxu" data-rule="required" class="form-control selectpicker" name="row[is_lianxu]">
+                {foreach name="isLianxuList" item="vo"}
+                    <option value="{$key}" {in name="key" value="0"}selected{/in}>{$vo}</option>
+                {/foreach}
+            </select>
+
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Original_transaction_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-original_transaction_id" data-rule="required" data-source="original/transaction/index" class="form-control selectpage" name="row[original_transaction_id]" type="text" value="">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('In_app_one')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <textarea id="c-in_app_one" class="form-control " rows="5" name="row[in_app_one]" cols="50"></textarea>
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Transaction_info')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <textarea id="c-transaction_info" class="form-control " rows="5" name="row[transaction_info]" cols="50"></textarea>
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Plantask_status')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            
+            <div class="radio">
+            {foreach name="plantaskStatusList" item="vo"}
+            <label for="row[plantask_status]-{$key}"><input id="row[plantask_status]-{$key}" name="row[plantask_status]" type="radio" value="{$key}" {in name="key" value="0"}checked{/in} /> {$vo}</label> 
+            {/foreach}
+            </div>
+
+        </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>

application/admin/view/payorder/edit.html

@@ -0,0 +1,123 @@
+<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="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">{:__('Out_trade_no')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-out_trade_no" data-rule="required" class="form-control" name="row[out_trade_no]" type="text" value="{$row.out_trade_no|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Order_amount')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-order_amount" data-rule="required" class="form-control" step="0.01" name="row[order_amount]" type="number" value="{$row.order_amount|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Notifytime')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-notifytime" data-rule="required" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[notifytime]" type="text" value="{:$row.notifytime?datetime($row.notifytime):''}">
+        </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">
+            <input id="c-pay_type" data-rule="required" class="form-control" name="row[pay_type]" type="text" value="{$row.pay_type|htmlentities}">
+        </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" data-rule="required" class="form-control" 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">{:__('Order_status')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            
+            <div class="radio">
+            {foreach name="orderStatusList" item="vo"}
+            <label for="row[order_status]-{$key}"><input id="row[order_status]-{$key}" name="row[order_status]" type="radio" value="{$key}" {in name="key" value="$row.order_status"}checked{/in} /> {$vo}</label> 
+            {/foreach}
+            </div>
+
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Table_name')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-table_name" data-rule="required" class="form-control" name="row[table_name]" type="text" value="{$row.table_name|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Table_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-table_id" data-rule="required" data-source="table/index" class="form-control selectpage" name="row[table_id]" type="text" value="{$row.table_id|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Args')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-args" data-rule="required" class="form-control" name="row[args]" type="text" value="{$row.args|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Bundle_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-bundle_id" data-rule="required" data-source="bundle/index" class="form-control selectpage" name="row[bundle_id]" type="text" value="{$row.bundle_id|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Is_lianxu')}:</label>
+        <div class="col-xs-12 col-sm-8">
+                        
+            <select  id="c-is_lianxu" data-rule="required" class="form-control selectpicker" name="row[is_lianxu]">
+                {foreach name="isLianxuList" item="vo"}
+                    <option value="{$key}" {in name="key" value="$row.is_lianxu"}selected{/in}>{$vo}</option>
+                {/foreach}
+            </select>
+
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Original_transaction_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-original_transaction_id" data-rule="required" data-source="original/transaction/index" class="form-control selectpage" name="row[original_transaction_id]" type="text" value="{$row.original_transaction_id|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('In_app_one')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <textarea id="c-in_app_one" class="form-control " rows="5" name="row[in_app_one]" cols="50">{$row.in_app_one|htmlentities}</textarea>
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Transaction_info')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <textarea id="c-transaction_info" class="form-control " rows="5" name="row[transaction_info]" cols="50">{$row.transaction_info|htmlentities}</textarea>
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Plantask_status')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            
+            <div class="radio">
+            {foreach name="plantaskStatusList" item="vo"}
+            <label for="row[plantask_status]-{$key}"><input id="row[plantask_status]-{$key}" name="row[plantask_status]" type="radio" value="{$key}" {in name="key" value="$row.plantask_status"}checked{/in} /> {$vo}</label> 
+            {/foreach}
+            </div>
+
+        </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>

application/admin/view/payorder/index.html

@@ -0,0 +1,29 @@
+<div class="panel panel-default panel-intro">
+    {:build_heading()}
+
+    <div class="panel-body">
+        <div id="myTabContent" class="tab-content">
+            <div class="tab-pane fade active in" id="one">
+                <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('payorder/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('payorder/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('payorder/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
+                        -->
+
+                        
+
+                        
+                    </div>
+                    <table id="table" class="table table-striped table-bordered table-hover table-nowrap"
+                           data-operate-edit="{:$auth->check('payorder/edit')}"
+                           data-operate-del="{:$auth->check('payorder/del')}"
+                           width="100%">
+                    </table>
+                </div>
+            </div>
+
+        </div>
+    </div>
+</div>

application/admin/view/payorderrefundlog/add.html

@@ -0,0 +1,63 @@
+<form id="add-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">{:__('Order_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-order_id" data-rule="required" data-source="order/index" class="form-control selectpage" name="row[order_id]" type="text" value="">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Out_refund_no')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-out_refund_no" class="form-control" name="row[out_refund_no]" type="text">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Pay_fee')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-pay_fee" class="form-control" step="0.01" name="row[pay_fee]" type="number">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Refund_price')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-refund_price" class="form-control" step="0.01" name="row[refund_price]" type="number">
+        </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">
+            <input id="c-pay_type" data-rule="required" class="form-control" name="row[pay_type]" type="text" value="">
+        </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="0"}checked{/in} /> {$vo}</label> 
+            {/foreach}
+            </div>
+
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Table')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-table" class="form-control" name="row[table]" type="text">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Table_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-table_id" data-rule="required" data-source="table/index" class="form-control selectpage" name="row[table_id]" type="text" value="">
+        </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>

application/admin/view/payorderrefundlog/edit.html

@@ -0,0 +1,63 @@
+<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">{:__('Order_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-order_id" data-rule="required" data-source="order/index" class="form-control selectpage" name="row[order_id]" type="text" value="{$row.order_id|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Out_refund_no')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-out_refund_no" class="form-control" name="row[out_refund_no]" type="text" value="{$row.out_refund_no|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Pay_fee')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-pay_fee" class="form-control" step="0.01" name="row[pay_fee]" type="number" value="{$row.pay_fee|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Refund_price')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-refund_price" class="form-control" step="0.01" name="row[refund_price]" type="number" value="{$row.refund_price|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">
+            <input id="c-pay_type" data-rule="required" class="form-control" name="row[pay_type]" type="text" value="{$row.pay_type|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">{:__('Table')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-table" class="form-control" name="row[table]" type="text" value="{$row.table|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Table_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-table_id" data-rule="required" data-source="table/index" class="form-control selectpage" name="row[table_id]" type="text" value="{$row.table_id|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>

application/admin/view/payorderrefundlog/index.html

@@ -0,0 +1,46 @@
+<div class="panel panel-default panel-intro">
+    
+    <div class="panel-heading">
+        {:build_heading(null,FALSE)}
+        <ul class="nav nav-tabs" data-field="status">
+            <li class="{:$Think.get.status === null ? 'active' : ''}"><a href="#t-all" data-value="" data-toggle="tab">{:__('All')}</a></li>
+            {foreach name="statusList" item="vo"}
+            <li class="{:$Think.get.status === (string)$key ? 'active' : ''}"><a href="#t-{$key}" data-value="{$key}" data-toggle="tab">{$vo}</a></li>
+            {/foreach}
+        </ul>
+    </div>
+
+
+    <div class="panel-body">
+        <div id="myTabContent" class="tab-content">
+            <div class="tab-pane fade active in" id="one">
+                <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('payorderrefundlog/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('payorderrefundlog/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('payorderrefundlog/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
+                        
+
+                        <div class="dropdown btn-group {:$auth->check('payorderrefundlog/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('payorderrefundlog/edit')}"
+                           data-operate-del="{:$auth->check('payorderrefundlog/del')}"
+                           width="100%">
+                    </table>
+                </div>
+            </div>
+
+        </div>
+    </div>
+</div>

application/admin/view/unishop/order/product.html

@@ -5,7 +5,7 @@
             订单金额：￥{$order.order_price}
         </li>
         <li class="list-group-item">
-            实付金额：￥{$order.total_price}元 (包含优惠￥{$order.discount_price})
+            实付金额：￥{$order.total_price}元
         </li>
     </ul>
 
@@ -31,7 +31,7 @@
             </a>
         </div>
         <div class="media-body">
-            <div>商品ID:{$item.product_id}</div>
+            <div>活动ID:{$item.product_id}</div>
             <h4 class="media-heading">{$item.title}</h4>
             <div>规格：{$item.spec}</div>
             <div>{$item.number} ✖ {$item.price}</div>

public/assets/js/backend/exam/grade.js

@@ -39,48 +39,49 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 sortName: 'id',
                 fixedColumns: true,
                 fixedRightNumber: 1,
+                search: false,
                 columns: [
                     [
                         {checkbox: true},
                         {field: 'id', title: __('Id')},
-                        {field: 'cate_id', title: __('Cate_id'), visible: false},
-                        {field: 'cate.name', title: __('Cate_id'), operate: false},
+                        // {field: 'cate_id', title: __('Cate_id'), visible: false},
+                        // {field: 'cate.name', title: __('Cate_id'), operate: false},
                         {field: 'user_id', title: __('User_id')},
-                        {field: 'user.nickname', title: __('交卷人昵称'), operate: 'LIKE'},
+                        {field: 'user.nickname', title: __('答题人昵称'), operate: 'LIKE'},
 //                        {field: 'user.mobile', title: __('交卷人手机'), operate: 'LIKE'},
                         {field: 'paper_id', title: __('Paper_id')},
                         {field: 'paper.title', title: __('Paper.title'), operate: false},
                         {field: 'score', title: __('Score'), operate: false,sortable:true },
-                        {
+                        /*{
                             field: 'is_pass', title: __('Is_pass'), searchList: {"1": __('及格'), "0": __('不及格')},
                             formatter: Table.api.formatter.normal
-                        },
+                        },*/
                         {field: 'total_score', title: __('Total_score'), operate: 'BETWEEN',},
                         {field: 'total_count', title: __('Total_count'), operate: false},
                         {field: 'right_count', title: __('Right_count'), operate: false},
                         {field: 'error_count', title: __('Error_count'), operate: false},
-                        {
-                            field: 'grade_time',
-                            title: __('Grade_time'),
-                            operate: false,
-                            formatter: Controller.formatter.formatSecond
-                        },
-                        {
-                            field: 'start_time',
-                            title: __('Start_time'),
-                            operate: 'RANGE',
-                            addclass: 'datetimerange',
-                            autocomplete: false,
-                            formatter: Table.api.formatter.datetime
-                        },
-                        {
-                            field: 'finish_time',
-                            title: __('Finish_time'),
-                            operate: 'RANGE',
-                            addclass: 'datetimerange',
-                            autocomplete: false,
-                            formatter: Table.api.formatter.datetime
-                        },
+                        /*   {
+                              field: 'grade_time',
+                              title: __('Grade_time'),
+                              operate: false,
+                              formatter: Controller.formatter.formatSecond
+                          },
+                         {
+                              field: 'start_time',
+                              title: __('Start_time'),
+                              operate: 'RANGE',
+                              addclass: 'datetimerange',
+                              autocomplete: false,
+                              formatter: Table.api.formatter.datetime
+                          },
+                          {
+                              field: 'finish_time',
+                              title: __('Finish_time'),
+                              operate: 'RANGE',
+                              addclass: 'datetimerange',
+                              autocomplete: false,
+                              formatter: Table.api.formatter.datetime
+                          },*/
                         {
                             field: 'operate', title: __('Operate'), table: table,
                             events: Table.api.events.operate,

public/assets/js/backend/exam/paper.js

@@ -30,6 +30,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'jstree'], function (
                     multi_url: 'exam/paper/multi',
                     import_url: 'exam/paper/import',
                     table: 'exam_paper',
+                    dragsort_url: false,
                 }
             });
 

public/assets/js/backend/payorder.js

@@ -0,0 +1,73 @@
+define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefined, Backend, Table, Form) {
+
+    var Controller = {
+        index: function () {
+            // 初始化表格参数配置
+            Table.api.init({
+                extend: {
+                    index_url: 'payorder/index' + location.search,
+                    add_url: 'payorder/add',
+                    edit_url: 'payorder/edit',
+                    del_url: 'payorder/del',
+                    multi_url: 'payorder/multi',
+                    import_url: 'payorder/import',
+                    table: 'pay_order',
+                }
+            });
+
+            var table = $("#table");
+
+            // 初始化表格
+            table.bootstrapTable({
+                url: $.fn.bootstrapTable.defaults.extend.index_url,
+                pk: 'id',
+                sortName: 'id',
+                fixedColumns: true,
+                fixedRightNumber: 1,
+                search: false,
+                columns: [
+                    [
+                        {checkbox: true},
+                        {field: 'id', title: __('Id')},
+                        {field: 'user_id', title: __('User_id')},
+                        {field: 'out_trade_no', title: __('Out_trade_no'), operate: 'LIKE'},
+                        {field: 'order_amount', title: __('Order_amount'), operate:'BETWEEN'},
+                        {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
+                        {field: 'notifytime', title: __('Notifytime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
+                        {field: 'pay_type', title: __('Pay_type'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
+                        {field: 'platform', title: __('Platform'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
+                        {field: 'order_status', title: __('Order_status'), searchList: {"0":__('Order_status 0'),"1":__('Order_status 1')}, formatter: Table.api.formatter.status},
+                        {field: 'table_name', title: __('Table_name'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
+                        {field: 'table_id', title: __('Table_id')},
+                        // {field: 'args', title: __('Args'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
+                        // {field: 'bundle_id', title: __('Bundle_id'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
+                        // {field: 'is_lianxu', title: __('Is_lianxu'), searchList: {"1":__('Is_lianxu 1'),"0":__('Is_lianxu 0')}, formatter: Table.api.formatter.normal},
+                        // {field: 'original_transaction_id', title: __('Original_transaction_id'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
+                        // {field: 'in_app_one', title: __('In_app_one')},
+                        // {field: 'transaction_info', title: __('Transaction_info')},
+                        // {field: 'plantask_status', title: __('Plantask_status'), searchList: {"0":__('Plantask_status 0'),"1":__('Plantask_status 1')}, formatter: Table.api.formatter.status},
+                        {field: 'user.nickname', title: __('User.nickname'), operate: 'LIKE'},
+                        {field: 'user.mobile', title: __('User.mobile'), operate: 'LIKE'},
+                        {field: 'user.avatar', title: __('User.avatar'), operate: 'LIKE', events: Table.api.events.image, formatter: Table.api.formatter.image},
+                        // {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
+                    ]
+                ]
+            });
+
+            // 为表格绑定事件
+            Table.api.bindevent(table);
+        },
+        add: function () {
+            Controller.api.bindevent();
+        },
+        edit: function () {
+            Controller.api.bindevent();
+        },
+        api: {
+            bindevent: function () {
+                Form.api.bindevent($("form[role=form]"));
+            }
+        }
+    };
+    return Controller;
+});

public/assets/js/backend/payorderrefundlog.js

@@ -0,0 +1,63 @@
+define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefined, Backend, Table, Form) {
+
+    var Controller = {
+        index: function () {
+            // 初始化表格参数配置
+            Table.api.init({
+                extend: {
+                    index_url: 'payorderrefundlog/index' + location.search,
+                    add_url: 'payorderrefundlog/add',
+                    edit_url: 'payorderrefundlog/edit',
+                    del_url: 'payorderrefundlog/del',
+                    multi_url: 'payorderrefundlog/multi',
+                    import_url: 'payorderrefundlog/import',
+                    table: 'pay_order_refund_log',
+                }
+            });
+
+            var table = $("#table");
+
+            // 初始化表格
+            table.bootstrapTable({
+                url: $.fn.bootstrapTable.defaults.extend.index_url,
+                pk: 'id',
+                sortName: 'id',
+                fixedColumns: true,
+                fixedRightNumber: 1,
+                search: false,
+                columns: [
+                    [
+                        {checkbox: true},
+                        {field: 'id', title: __('Id')},
+                        {field: 'order_id', title: __('Order_id')},
+                        {field: 'out_refund_no', title: __('Out_refund_no'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
+                        {field: 'pay_fee', title: __('Pay_fee'), operate:'BETWEEN'},
+                        {field: 'refund_price', title: __('Refund_price'), operate:'BETWEEN'},
+                        {field: 'pay_type', title: __('Pay_type'), operate: 'LIKE'},
+                        {field: 'status', title: __('Status'), searchList: {"0":__('Status 0'),"1":__('Status 1'),"-1":__('Status -1')}, formatter: Table.api.formatter.status},
+                        {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: 'table', title: __('Table'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
+                        {field: 'table_id', title: __('Table_id')},
+                        // {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
+                    ]
+                ]
+            });
+
+            // 为表格绑定事件
+            Table.api.bindevent(table);
+        },
+        add: function () {
+            Controller.api.bindevent();
+        },
+        edit: function () {
+            Controller.api.bindevent();
+        },
+        api: {
+            bindevent: function () {
+                Form.api.bindevent($("form[role=form]"));
+            }
+        }
+    };
+    return Controller;
+});

public/assets/js/backend/unishop/order.js

@@ -158,7 +158,8 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                                 },*/
                                 {
                                     name: 'product',
-                                    text: __('Product'),
+                                    text: '活动',
+                                    title: '活动',
                                     classname: 'btn btn-xs btn-info btn-product',
                                     extend: 'data-toggle="tooltip"',
                                     icon: 'fa fa-star-half'

public/assets/js/backend/unishop/product.js

@@ -553,6 +553,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'upload', 'vue'], fun
                     evaluate_url: 'unishop/evaluate/index',
                     copy_url: 'unishop/product/copy',
                     table: 'unishop_product',
+                    dragsort_url: false,
                 }
             });