edit-home-tool

admin/controllers/appdistribution/Distribution.php

@@ -231,8 +231,6 @@ class Distribution extends AppBase
             return $this->show_json(SYS_CODE_FAIL, '参数错误');
         }
         $this->load->model($this->mdApp->appConfig()[$this->app_id]['model'], 'mdAppUser');
-        //$this->load->model('apporder/order_purchase_model', 'mdOrderPurchase');
-        //$this->load->model('appitem/items_model', 'mdItems');
 
         $lists = array();
         $statusAry = array(0 => '进行中', 1 => '已完成', -1 => '已失效');
@@ -253,8 +251,6 @@ class Distribution extends AppBase
             $res = $this->mdDealLog->select($where, 'id DESC', $params['page'], $params['size'], 'cf_sid,type,status,money,c_time');
             foreach ($res as $key => $value) {
                 $setValue = array();
-                $reOp = $this->mdOrderPurchase->get(array('sid' => $value['cf_sid']), 'item_id,item_title,item_num
-                ,total_price,sku_id,app_uid');
                 $source = $item_title = '';
                 $item_num = 0;
                 $total_price = $expect_money = 0.00;

api/controllers/wxapp/licheb/Cusorder.php

@@ -303,10 +303,10 @@ class Cusorder extends Wxapp{
             $where["(name='{$keyword}' or mobile='{$keyword}')"] = null;
         }
         if($status == 11){ //已完成
-            $where['status'] = 6;
+            $where['status>='] = 6;
         }elseif($status == 10 ){ //进行中
             $where['status>='] = 0;
-            $where['status!='] = 6;
+            $where['status<'] = 6;
         }else{
             strlen($status) && $where['status'] = $status;
         }

home/controllers/h5/Toole.php

@@ -196,6 +196,10 @@ class Toole extends CI_Controller {
             $url.="agent?id=".$params['oid'];
         }elseif($params['type']==3){
             $url.="car_ck?id=".$params['oid'];
+        }elseif($params['type']==4){
+            $url.="car_sp?id=".$params['oid'];
+        }elseif($params['type']==5){
+            $url.="agent_sp?id=".$params['oid'];
         }else{
             $this->show_json(0,'参数错误,未知合同类型');
         }

home/views/h5/toole/pdf.php

@@ -32,6 +32,12 @@
                         </label>
                         <label class="checkbox-inline">
                             <input type="radio" value="3" v-model="info.type">车辆确认
+                        </label>
+                        <label class="checkbox-inline">
+                            <input type="radio" value="4" v-model="info.type">车辆补充协议
+                        </label>
+                        <label class="checkbox-inline">
+                            <input type="radio" value="5" v-model="info.type">服务补充协议
                         </label>
 				  	</div>
 				</div>