Merge branch 'version1.5' of wugg/phpstock into master-online

app/admin/controller/After.php

@@ -277,20 +277,6 @@ class After extends \app\BaseController
             $info['updatetime']=date("Y-m-d H:i:s");
             $up =Db::name("order_return")->save($info);
             if($up){
-//                if($info['order_status']==1&&$info['order_type']==1 && $status==4){
-//                    $orderout= Db::name("order_out")->where($orde)->save(['status'=>3,"updatetime"=>date("Y-m-d H:i:s")]);
-//                    $order = ["order_code"=>$orde['outCode'],"status"=>$orde['status'],"action_remark"=>'',"action_type"=>"edit"];
-//                    ActionLog::logAdd($this->post['token'],$order,$orde['order_type']==1?'CKD':"ZXCKD", 3,['status'=>3,"updatetime"=>date("Y-m-d H:i:s")]);
-//                    $process=["order_code"=>$orde['outCode'],"order_id"=>$orde['id'],"order_status"=>3,"order_type"=>$orde['order_type']==1?'CKD':"ZXCKD"];
-//                    ProcessOrder::AddProcess($this->post['token'],$process);
-//                    if($orderout){
-//                        Db::commit();
-//                        return app_show(0,"更新成功");
-//                    }else{
-//                        Db::rollback();
-//                        return error_show(1004,"更新失败");
-//                    }
-//                }
                 $order = ["order_code"=>$info['returnCode'],"status"=>$var,"action_remark"=>'',"action_type"=>"edit"];
                 ActionLog::logAdd($this->post['token'],$order,$info['order_type']==1?'SHD':"ZXSHD", $info['status'],$this->post);
                 $process=["order_code"=>$info['returnCode'],"order_id"=>$info['id'],"order_status"=>$status,"order_type"=>$info['order_type']==1?'SHD':"ZXSHD"];
@@ -797,7 +783,7 @@ class After extends \app\BaseController
             if($post_code==""){
                 return error_show(1005,"参数post_code不能为空");
             }
-            if($post_fee==""){
+            if($post_fee===""){
                 return error_show(1005,"参数post_fee不能为空");
             }
         }

app/admin/controller/Project.php

@@ -681,7 +681,7 @@ class Project extends Base
                             if(isset($good['brand_id'])){
                                 $brand =Db::name("brand")->where(["id"=>$good['brand_id']])->find();
                             }
-                            $val['good_img']=isset($good['good_img'])&&$good['good_img']!=""?trim($good['good_img']):"";
+                            $val['good_img']=isset($good['good_thumb_img'])&&$good['good_thumb_img']!=""?trim($good['good_thumb_img']):"";
                             $val['brand_id']=isset($good['brand_id'])&&$good['brand_id']!=""?$good['brand_id']:"";
                             $val['brand_name']=isset($brand['brand_name'])&&$brand['brand_name']!=""?$brand['brand_name']:"";
                             $val['specinfo']=isset($good['specinfo'])&&$good['specinfo']!=""?$good['specinfo']:[];

app/admin/controller/Version.php

@@ -53,4 +53,43 @@ class Version extends BaseController
         }
     }
 
+    public function info(){
+        $projectNo = isset($this->post['projectNo'])&&$this->post['projectNo']!==""?trim($this->post['projectNo']):"";
+        if($projectNo==""){
+            return error_show(1004,"参数projectNo不能为空");
+        }
+
+        $type = isset($this->post['type'])&&$this->post['type']!=="" ? intval($this->post['type']) :0;
+
+        $info =Db::name("project")->where(["projectNo"=>$projectNo,"is_del"=>0])->find();
+        if($info==false){
+            return error_show(1004,"未找到项目信息");
+        }
+        $plat = Db::name("platform")->where(['id'=>$info['platform_id']])->find();
+        $info['platform_name']=isset($plat['platform_name'])?$plat['platform_name']:"";
+        $info['platform_code']=isset($plat['platform_code'])?$plat['platform_code']:"";
+
+        $khinfo = Db::name("customer_info")->where(["companyNo"=>$info['khNo']])->find();
+        $info['khName'] = isset($khinfo['companyName'])?$khinfo['companyName']:"";
+        $company = Db::name("business")->where(["companyNo"=>$info['companyNo']])->find();
+        $info['company'] = isset($company['company'])?$company['company']:"";
+
+        $ladder = Db::name("project_info")->where(['projectNo'=>$projectNo,"is_del"=>0])->select()->toArray();
+        $info['ladder']=[];
+        if(!empty($ladder)){
+            foreach ($ladder as $value){
+                $value["cat_info"]=isset($value['cat_id']) &&$value['cat_id']!=""? made($value['cat_id'],[]):[];
+                $condition  = $type==0?['pgNo'=>$value['pgNo'],"is_del"=>0] : ['pgNo'=>$value['pgNo'],"is_del"=>0,"status"=>1];
+                $feedback = Db::name("project_feedback")->where($condition)->select()->toArray();
+                array_walk($feedback,function (&$v){
+                    $v["cat_info"]=isset($v['cat_id'])&&$v['cat_id']!=""? made($v['cat_id'],[]):[];
+                });
+
+                $value['feedback']=$feedback;
+                $info['ladder'][]=$value;
+            }
+        }
+        return app_show(0,"获取成功",$info);
+    }
+
 }

app/admin/model/ActionLog.php

@@ -43,8 +43,5 @@ class ActionLog extends Model
         ];
         self::insert($data);
    }
-   public function  list(){}
 
-   public function info(){}
-   static function aad(){}
 }

app/admin/route/app.php

@@ -114,9 +114,6 @@ Route::rule('checkestatus','admin/Check/statu');
 Route::rule('checkexport','admin/Check/exportGood');
 Route::rule('checkimport','admin/Check/importGood');
 
-//Route::rule('veversioncreatersionlist','admin/Version/list');
-//Route::rule('','admin/Version/create');
-
 Route::rule('allotlist','admin/Allot/list');
 Route::rule('allotcreate','admin/Allot/create');
 Route::rule('allotedit','admin/Allot/edit');
@@ -199,7 +196,6 @@ Route::rule("cgddifflist","admin/Purch/difflist");
 Route::rule("cgddiffinfo","admin/Purch/diffinfo");
 Route::rule("cgddiffstatu","admin/Purch/diffstatu");
 
-
 Route::rule("orderinlist","admin/Purchin/list");
 Route::rule("orderinadd","admin/Purchin/add");
 Route::rule("orderininfo","admin/Purchin/info");
@@ -209,7 +205,6 @@ Route::rule("orderinreturn","admin/Purchin/ReturnAdd");
 Route::rule("returnsend","admin/Purchin/ReturnSend");
 Route::rule("returnstatus","admin/Purchin/ReturnStatus");
 
-
 Route::rule("processlist","admin/Process/list");
 Route::rule("processinfo","admin/Process/info");
 Route::rule("process","admin/Process/process");
@@ -230,7 +225,6 @@ Route::rule('cattlist','admin/Cat/tlist');
 Route::rule('catratedit','admin/Cat/ratedit');
 Route::rule('catwlist',"admin/Cat/wlist");
 
-
 Route::rule('backcreate','admin/Purchback/create');
 Route::rule('backlist','admin/Purchback/list');
 Route::rule('backstatus','admin/Purchback/status');
@@ -246,7 +240,6 @@ Route::rule('afterfeed','admin/After/postfeed');
 Route::rule('afterpost','admin/After/addpost');
 Route::rule('aftergys','admin/After/GysFeed');
 Route::rule('afterwsm','admin/After/GetWsm');
-//Route::rule('aftersetwsm','admin/After/setWsm');
 
 Route::rule('processolist','admin/Proorder/list');
 Route::rule('processowaitlist','admin/Proorder/waitlist');
@@ -294,7 +287,6 @@ Route::rule('attrstatus','admin/Attr/status');
 Route::rule('attredit','admin/Attr/edit');
 Route::rule('attrdelete','admin/Attr/del');
 
-
 Route::rule('specscreate','admin/Specs/create');
 Route::rule('specslist','admin/Specs/list');
 Route::rule('specsstatus','admin/Specs/status');
@@ -302,7 +294,6 @@ Route::rule('specstitle','admin/Specs/title');
 Route::rule('specsedit','admin/Specs/edit');
 Route::rule('specsdelete','admin/Specs/del');
 
-
 Route::rule('brandcreate','admin/Brand/create');
 Route::rule('brandlist','admin/Brand/list');
 Route::rule('brandedit','admin/Brand/edit');
@@ -378,7 +369,6 @@ Route::rule('platforminfo','admin/Platform/info');
 Route::rule('platformdelete','admin/Platform/del');
 Route::rule('platformstatus','admin/Platform/status');
 
-
 Route::rule('actcreate','admin/Activity/create');
 Route::rule('actcost','admin/Activity/cost');
 Route::rule('activity','admin/Activity/activity');
@@ -396,7 +386,6 @@ Route::rule('keepbdelete','admin/Keepbrand/del');
 Route::rule('valuecreate','admin/Specvalue/create');
 Route::rule('valueall','admin/Specvalue/all');
 
-
 Route::rule('titlecreate','admin/Title/create');
 Route::rule('titlelist','admin/Title/list');
 Route::rule('titleedit','admin/Title/edit');
@@ -404,11 +393,8 @@ Route::rule('titleinfo','admin/Title/info');
 Route::rule('titledelete','admin/Title/del');
 Route::rule('titlestatus','admin/Title/status');
 
-
 Route::rule('ocrquery','admin/Ocrlicense/query');
 
-
-//Route::rule('consultlist','admin/Consult/conlist');
 Route::rule('consultlists','admin/Consult/conlist');
 Route::rule('consultinfo','admin/Consult/info');
 Route::rule('consultdel','admin/Consult/del');
@@ -430,7 +416,6 @@ Route::rule('bidscheck','admin/Consult/bids_check');
 
 Route::rule('crontablist','admin/Consult/crontablist');
 
-
 Route::rule('supplercreate','admin/Suppler/create');
 Route::rule('supplerlist','admin/Suppler/list');
 Route::rule('suppleredit','admin/Suppler/edit');
@@ -438,7 +423,6 @@ Route::rule('supplerinfo','admin/Suppler/info');
 Route::rule('supplerstatus','admin/Suppler/status');
 Route::rule('supplerdelete','admin/Suppler/del');
 
-
 Route::rule("projectcreate","admin/Project/create");
 Route::rule("projectlist","admin/Project/list");
 Route::rule("projectinfo","admin/Project/info");
@@ -471,3 +455,6 @@ Route::rule("useedit","admin/Orderuse/edit");
 Route::rule("useinfo","admin/Orderuse/info");
 Route::rule("usestatus","admin/Orderuse/status");
 Route::rule("usedelete","admin/Orderuse/dele");
+
+Route::rule("projectshare","admin/Version/info");
+