From 8f066612f76426b35228e9bac076b6d3e6fbf5de Mon Sep 17 00:00:00 2001
From: lccsw <1127794702@qq.com>
Date: Tue, 14 Dec 2021 13:52:40 +0800
Subject: [PATCH] edit-api-pay_list

---
 api/controllers/wxapp/liche/User.php | 2 ++
 api/libraries/liche/Progressopt.php  | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/api/controllers/wxapp/liche/User.php b/api/controllers/wxapp/liche/User.php
index 23db4516..3a6f7a1d 100644
--- a/api/controllers/wxapp/liche/User.php
+++ b/api/controllers/wxapp/liche/User.php
@@ -236,6 +236,7 @@ class User extends Wxapp{
 
         $page = $this->input_param('page');
         $size = $this->input_param('size');
+        $oid = $this->input_param('oid');
         !$page && $page = 1;
         !$size && $size = 10;
         $mobile = $this->session['mobile'];
@@ -244,6 +245,7 @@ class User extends Wxapp{
             "(mobile={$mobile} or (ifentrust=1 and json_extract(info_json,'$.entrust_mobile')='{$mobile}'))" => null,
             "status" => 6,
         ];
+        $oid && $where['o_id'] = $oid;
         $count = $this->orders_model->count($where);
         $lists = [];
         if($count){
diff --git a/api/libraries/liche/Progressopt.php b/api/libraries/liche/Progressopt.php
index c6e71083..932e565f 100644
--- a/api/libraries/liche/Progressopt.php
+++ b/api/libraries/liche/Progressopt.php
@@ -168,7 +168,7 @@ class Progressopt{
                                         }else{
                                             $state = 2; 
                                         }
-                                        $progressOpt = ['title'=> '交定金','url'=>'/pages/mine/carOrder/index'];
+                                        $progressOpt = ['title'=> '交定金','url'=>'/pages/mine/carOrder/index?oid='.$order['id']];
                                     }else{ //已交定金
                                         $state = 1;
                                     }
@@ -180,7 +180,7 @@ class Progressopt{
                                         $state = 2;
                                         if($ckcar_row['status']==2){ //未支付
                                             $title = $order['payway'] ? '去支付尾款' : '去支付首付';
-                                            $progressOpt = ['title'=> $title,'url'=>'/pages/mine/carOrder/index'];
+                                            $progressOpt = ['title'=> $title,'url'=>'/pages/mine/carOrder/index?oid='.$order['id']];
                                         }else{
                                             $progressOpt = ['title'=> '确认车辆','url'=>'/pages/mine/signContract/queRen?id='.$order['id']];
                                         }