售后详情，显示寄回地址 和 综合状态

addons/shopro/controller/order/Aftersale.php

@@ -50,6 +50,14 @@ class Aftersale extends Common
             ->autopage()->select();
 //            ->paginate($this->request->param('list_rows', 10));
 
+        //综合状态
+        foreach($aftersales as $key => $aftersale){
+
+            $aftersale['status_show_text'] = $aftersale['aftersale_status_text'].','.$aftersale['refund_status_text'];
+
+            $aftersales[$key] = $aftersale;
+        }
+
         $this->success('获取成功', $aftersales);
     }
 
@@ -65,6 +73,13 @@ class Aftersale extends Common
             $this->error(__('No Results were found'));
         }
 
+        //寄回地址
+        $aftersale_address = Db::name('shopro_aftersale_address')->order('is_default','desc')->order('id desc')->find();
+        $aftersale['aftersale_address'] = $aftersale_address;
+
+        //综合状态
+        $aftersale['status_show_text'] = $aftersale['aftersale_status_text'].','.$aftersale['refund_status_text'];
+
         $this->success('获取成功', $aftersale);
     }
 

application/admin/model/shopro/order/Aftersale.php

@@ -87,8 +87,8 @@ class Aftersale extends Common
         return [
             self::AFTERSALE_STATUS_CANCEL => '已取消',
             self::AFTERSALE_STATUS_REFUSE => '拒绝',
-            self::AFTERSALE_STATUS_NOOPER => '未处理',
-            self::AFTERSALE_STATUS_ING => '申请售后', //售后处理中
+            self::AFTERSALE_STATUS_NOOPER => '已申请',
+            self::AFTERSALE_STATUS_ING    => '售后处理中', //售后处理中
             self::AFTERSALE_STATUS_COMPLETED => '售后完成'
         ];
     }
@@ -98,7 +98,7 @@ class Aftersale extends Common
         return [
             self::AFTERSALE_STATUS_CANCEL => '买家取消了售后申请',
             self::AFTERSALE_STATUS_REFUSE => '卖家拒绝了售后申请',
-            self::AFTERSALE_STATUS_NOOPER => '买家申请了售后，请及时处理',
+            self::AFTERSALE_STATUS_NOOPER => '买家申请了售后，等待同意',
             self::AFTERSALE_STATUS_ING => '售后正在处理中',
             self::AFTERSALE_STATUS_COMPLETED => '售后已完成'
         ];