소스 검색

订单和预约单状态显示调整

zhangxiaobin 1 년 전
부모
커밋
5eac274675
3개의 변경된 파일4개의 추가작업 그리고 4개의 파일을 삭제
  1. 2 2
      application/api/controller/Order.php
  2. 1 1
      application/common/model/Order.php
  3. 1 1
      application/common/model/PreOrder.php

+ 2 - 2
application/api/controller/Order.php

@@ -41,7 +41,7 @@ class Order extends Api
                 ->join($p,$p.'.id = '.$o.'.package_id','LEFT')
                 ->where($where)->order($o.'.createtime desc')->autopage()->select();
             if (!empty($result)) {
-                $statusArr  = [2=>'待处理',3=>'已完成',4=>'已取消'];
+                $statusArr  = [2=>'已接单',3=>'已完成',4=>'已取消'];
                 $paytypeArr = [1=>'线下',2=>'余额',3=>'微信'];
                 $timeArr = ['createtime','cancel_time','finish_time','server_time'];
                 foreach ($result as $key => &$value) {
@@ -131,7 +131,7 @@ class Order extends Api
                 ->join($p,$p.'.id = '.$o.'.package_id','LEFT')
                 ->where($where)->find();
             if (!empty($result)) {
-                $statusArr  = [2=>'待处理',3=>'已完成',4=>'已取消'];
+                $statusArr  = [2=>'已接单',3=>'已完成',4=>'已取消'];
                 $paytypeArr = [1=>'线下',2=>'余额',3=>'微信'];
                 $timeArr = ['createtime','cancel_time','finish_time','server_time'];
                 foreach ($timeArr as $k => $v) {

+ 1 - 1
application/common/model/Order.php

@@ -45,7 +45,7 @@ class Order extends Model
 
     public function getStatusList()
     {
-        return ['2' => '待处理', '3' => '已完成', '4' => '已取消'];
+        return ['2' => '已接单', '3' => '已完成', '4' => '已取消'];
     }
 
     public function getPaytypeList()

+ 1 - 1
application/common/model/PreOrder.php

@@ -35,7 +35,7 @@ class PreOrder extends Model
     
     public function getPreOrderStatusList()
     {
-        return ['0' => '已取消', '1' => '待处理', '2' => '已开单'];
+        return ['0' => '已取消', '1' => '待处理', '2' => '待接单'];
     }