panlumeng 3 years ago
parent
commit
f1f845fdeb
2 changed files with 5 additions and 5 deletions
  1. 2 2
      app/admin/controller/Good.php
  2. 3 3
      app/admin/controller/Goodup.php

+ 2 - 2
app/admin/controller/Good.php

@@ -35,7 +35,7 @@ class Good extends \app\BaseController
 //            $token = isset($this->post['token']) ? trim($this->post['token']) : "";
 //            if($token==""){
 //                return error_show(101,'token不能为空');
-//            }
+//            }0
 //            $effetc = VerifyTokens($token);
 //            if(!empty($effetc) && $effetc['code']!=0){
 //                return error_show($effetc['code'],$effetc['message']);
@@ -126,7 +126,7 @@ class Good extends \app\BaseController
         $total = ceil($count / $size);
         $page = $page >= $total ? $total : $page;
         $list = Db::name('good')->alias("a")->leftJoin("good_platform b","a.spuCode=b.spuCode")->where($where)->page
-            ($page,$size)->field("b.skuCode,b.platform_code,b.plat_code,b.id as good_id,a.*,b.addtime,b.updatetime")
+            ($page,$size)->field("b.skuCode,b.platform_code,b.plat_code,b.id as good_id,a.*,b.addtime,b.updatetime,b.platform_code")
             ->order("b.addtime desc")
             ->select();
         $data=[];

+ 3 - 3
app/admin/controller/Goodup.php

@@ -687,9 +687,9 @@ class Goodup extends BaseController
             return error_show(1004,"商品已审核通过");
         }
         $status = isset($this->post['status'])&&$this->post['status']!=="" ? intval($this->post['status']):"";
-        if($status===""){
-            return error_show(1004,"参数status不能为空");
-        }
+//        if($status===""){
+//            return error_show(1004,"参数status不能为空");
+//        }
         $remark = isset($this->post['remark'])&&$this->post['remark']!=="" ? trim($this->post['remark']):"";
 //        if($remark===""){
 //            return error_show(1004,"参数remark不能为空");