1

app/common/model/Order.php

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

app/shopapi/lists/OrderLists.php

@@ -46,7 +46,7 @@ class OrderLists extends BaseShopDataLists
 //            $r_where[] = ['is_after_sale', '=', 1];
 //        }
         $c_type = $this->params['type'] ;
-        outFileLog($c_type,'getexpress','c_type');
+//        outFileLog($c_type,'getexpress','c_type');
         $lists = Order::withSearch(['order_type', 'user_id'], [
                 'order_type' => $this->params['type'],
                 'user_id' => $this->userId
@@ -87,10 +87,16 @@ class OrderLists extends BaseShopDataLists
             if($this->params['type'] == 'return'){
                 $afterOrder = AfterSale::where(['order_id'=>$list['id']])->find();
                 $list['after_order'] = $afterOrder;
+                $list['btn']['confirm_btn'] = 0 ;
+                $list['btn']['delivery_btn'] = 0 ;
+            }
 
+            if($this->params['type'] == 'take'){
+                $list['btn']['express_btn'] = 0 ;
+                $list['btn']['reapply_btn'] = 0 ;
+                $list['btn']['return_cancel_btn'] = 0 ;
             }
 
-            $list['cz_type'] = $c_type;
         }
 
         return $lists;

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 , $c_type = '')
+    public static function getOrderBtn(Order $order )
     {
         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,$c_type), //快递单号btn
+            'express_btn'   => self::getExpressBtn($order), //快递单号btn
             'reapply_btn'   => self::getReapplyBtn($order), //重新申请
             'return_cancel_btn'    => self::getReturnCancelBtn($order),  //撤销申请
         ];
@@ -262,14 +262,11 @@ class OrderBtnLogic extends BaseLogic
      * @author 段誉
      * @date 2021/8/2 20:25
      */
-    public static function getExpressBtn($order,$c_type)
+    public static function getExpressBtn($order)
     {
-        $btn = OrderEnum::BTN_HIDE;
-        outFileLog($order,'getexpress','$order');
         if($order['is_after_sale'] == 1 && $order['after_sale_status']  == 4 ){
             $btn = OrderEnum::BTN_SHOW;
         }
-
         return $btn;
     }
     /**