wupengfei 2 rokov pred
rodič
commit
c8e1a9ef2a

+ 2 - 1
.idea/workspace.xml

@@ -4,6 +4,7 @@
     <list default="true" id="1a36929e-c054-4875-a943-593a74e55fa4" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/application/api/controller/Supplier.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Supplier.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/operate/controller/SupplierGoods.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/operate/controller/SupplierGoods.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -293,7 +294,7 @@
       <workItem from="1681463431612" duration="3188000" />
       <workItem from="1681692707179" duration="23967000" />
       <workItem from="1681779545042" duration="19230000" />
-      <workItem from="1681866032563" duration="3239000" />
+      <workItem from="1681866032563" duration="3473000" />
     </task>
     <servers />
   </component>

+ 1 - 0
application/api/controller/Supplier.php

@@ -55,6 +55,7 @@ class Supplier extends Base
      * @header name:Authorization require:1 desc:Token
      * @return name:id type:int default:-- desc:分类id
      * @return name:title type:string default:0 desc:分类名称
+     * @return name:lev type:int default:0 desc:分类等级
      * @return name:children type:array default:0 desc:下级分类
      */
     public function getSupplierCate()

+ 2 - 0
application/operate/controller/SupplierGoods.php

@@ -163,6 +163,8 @@ class SupplierGoods extends Controller
                 if($third_classify) $data['second_classify'] = $third_info['pid'];
                 $data['first_classify'] = \app\common\model\SupplierCate::where('id',$data['second_classify'])->value('pid');
             }
+            $supplier_id = input('supplier_id');
+            if($supplier_id) $data['supplier_id'] = $supplier_id;
 
         }
         // 视频