Merge branch 'feature-sku' into feature-sku-2

src/pages/GoodsManage/SupplyPriceUpdate/staticdata.js

@@ -65,7 +65,7 @@ export function column(specArr = []) {
             initialValue={row.stock || 0}
             rules={[{ required: true, message: '请输入库存！' }, { validator: isIntegerNotMust }]}
           >
-            <InputNumber min={1} max={999999} />
+            <InputNumber min={0} max={999999} />
           </Form.Item>
         </div>
       ),

src/pages/GoodsManage/index.jsx

@@ -344,7 +344,7 @@ class goodsManage extends Component {
   serviceVisbleChange = async row => {
     const { state, spuId, productType, skuId } = row;
     this.setState({ createloading: true });
-    const { data, msg } = await spuDetail({ skuId }); // spuId
+    const { data, msg } = await spuDetail({ skuId, id: spuId }, state); // spuId
     if (data) {
       const SourceData = ProcessEditData(data, row);
       console.log('index.js=============>', SourceData);

src/pages/GoodsManage/service.js

@@ -59,8 +59,12 @@ export async function apiGetAttribute(categoryId) {
   return data;
 }
 // 编辑--获取详情
-export async function spuDetail(params) {
-  return request.post('/api/merchants/products/sku-detail', {
+export async function spuDetail(params, state) {
+  let url = '/api/merchants/products/sku-detail';
+  if (state === 4) {
+    url = '/api/merchants/products/detail';
+  }
+  return request.post(url, {
     prefix: goodsApi,
     params,
     headers,