edit

app/shop/database/sell_order.php

@@ -37,20 +37,19 @@ $status = array
     3 => '配送中',
     4 => '已完成',
     5 => '已取消',
-    6 => '退款申请中',
-    7 => '退货退款',
-    8 => '部分退款',
-    9 => '仅退款',
+    6 => '申请全部退款',
+    7 => '申请部分退款',
+    8 => '退货退款',
+    9 => '部分退款',
+    10 => '仅退款',
     11 => '已过期',
 );
 
 $tk_status = array
 (
-    1 => '未申请退款',
-    2 => '申请全部退款',
-    3 => '申请部分退款',
-    11 => '审核通过',
-    12 => '审核未通过',
+    1 => '待审核',
+    2 => '审核通过',
+    3 => '审核未通过',
 );
 
 return array
@@ -407,7 +406,8 @@ return array
             'name'      => '申请退款状态',
             'default'   => '1',
             'desc'      => '申请退款状态',
-            'match'     => 'is_numeric',
+            'match'     => 'option',
+            'update'    => 'radio',
             'option'    => $tk_status,
         ),
 
@@ -460,7 +460,7 @@ return array
         (
             'fast_list' => array('查看详情', '"sell_order_goods&project=shop&order_id={id}&page_type=1"'),
 
-            'edit' => array('退款', 'status,tk_time,tk_pic,tk_desc,tk_admin', '{status} == 2'),
+            'edit' => array('退款', 'status,tk_time,tk_pic,tk_desc,tk_admin,tk_status', '{status} == 6'),
             //'delete' => array('删除', '', '{status} == 1'),
         ),
     ),

app/shop/src/My.php

@@ -214,7 +214,7 @@ class My extends Core
             Dever::alert('订单不存在');
         }
         if ($this->data['status'] == 2 || $this->data['status'] == 3) {
-            Dever::db('shop/sell_order')->update(array('where_id' => $id, 'status' => 6, 'tk_status' => 2));
+            Dever::db('shop/sell_order')->update(array('where_id' => $id, 'status' => 6));
 
             # 退款到原支付账户
             return 'ok';
@@ -234,7 +234,7 @@ class My extends Core
             Dever::alert('订单不存在');
         }
         if ($this->data['status'] == 2 || $this->data['status'] == 3) {
-            Dever::db('shop/sell_order')->update(array('where_id' => $id, 'status' => 6, 'tk_status' => 3));
+            Dever::db('shop/sell_order')->update(array('where_id' => $id, 'status' => 7));
 
             $goods_id = explode(',', $user_goods_id);