moonsflyer hai 5 meses
pai
achega
0c92b76a4c

+ 5 - 3
app/common/model/Order.php

@@ -43,7 +43,8 @@ class Order extends BaseModel
     protected $deleteTime = 'delete_time';
 
     protected $json = ['address'];
-    
+
+    protected $c_type;
     /**
      * @notes 关联售后中
      * @return \think\model\relation\HasOne
@@ -168,6 +169,7 @@ class Order extends BaseModel
      */
     public function searchOrderTypeAttr($query, $value, $data)
     {
+        $c_type = $value;
         switch ($value ?? '') {
             //待支付
             case 'pay':
@@ -207,8 +209,8 @@ class Order extends BaseModel
      */
     public function getBtnAttr($value, $data)
     {
-
-        return OrderBtnLogic::getOrderBtn($this,$data);
+        $c_type = $this->c_type;
+        return OrderBtnLogic::getOrderBtn($this,$c_type);
     }
 
     /**

+ 2 - 2
app/shopapi/lists/OrderLists.php

@@ -29,7 +29,7 @@ use app\common\model\AfterSale;
 
 class OrderLists extends BaseShopDataLists
 {
-
+    public $c_type = '';
     /**
      * @notes 列表
      * @return array
@@ -45,7 +45,7 @@ class OrderLists extends BaseShopDataLists
 //        if($this->params['type'] == 'return'){
 //            $r_where[] = ['is_after_sale', '=', 1];
 //        }
-
+        $c_type = $this->params['type'] ;
         $lists = Order::withSearch(['order_type', 'user_id'], [
                 'order_type' => $this->params['type'],
                 'user_id' => $this->userId

+ 4 - 4
app/shopapi/logic/Order/OrderBtnLogic.php

@@ -43,7 +43,7 @@ class OrderBtnLogic extends BaseLogic
      * @author 段誉
      * @date 2021/8/2 20:07
      */
-    public static function getOrderBtn(Order $order , $data = [])
+    public static function getOrderBtn(Order $order , $c_type = '')
     {
         return [
             'pay_btn'       => self::getPayBtn($order),
@@ -55,7 +55,7 @@ class OrderBtnLogic extends BaseLogic
             'refund_btn'    => self::getRefundBtn($order),
             'delete_btn'    => self::getDeletedBtn($order),
             'content_btn'   => self::getContentBtn($order),
-            'express_btn'   => self::getExpressBtn($order,$data), //快递单号btn
+            'express_btn'   => self::getExpressBtn($order,$c_type), //快递单号btn
             'reapply_btn'   => self::getReapplyBtn($order), //重新申请
             'return_cancel_btn'    => self::getReturnCancelBtn($order),  //撤销申请
         ];
@@ -262,10 +262,10 @@ class OrderBtnLogic extends BaseLogic
      * @author 段誉
      * @date 2021/8/2 20:25
      */
-    public static function getExpressBtn($order,$data)
+    public static function getExpressBtn($order,$c_type)
     {
         $btn = OrderEnum::BTN_HIDE;
-        outFileLog($data,'getexpress','data');
+        outFileLog($c_type,'getexpress','$c_type');
         if($order['is_after_sale'] == 1 && $order['after_sale_status']  == 4 ){
             $btn = OrderEnum::BTN_SHOW;
         }