Merge branch 'api' into score_shop

jyy

2021-03-10 df6a117d2923400fef1ed14cd60d14f56f4a6eec

 zq-erp/src/main/resources/templates/views/admin/shop/shopProduct-form.html

@@ -797,15 +797,7 @@
                    flag = true;
                    return false;
                }
                var path = tds.eq(length - 6).find("img").attr("src");
                if(path == null){
                    layer.msg("请填写规格图片",{
                        icon : 2,
                        time : 2000
                    });
                    flag = true;
                    return false;
                }

                var stock = tds.eq(length - 5).find("input").val();
                if(stock == ""){
                    layer.msg("请填写库存",{
@@ -832,15 +824,7 @@
                    flag = true;
                    return false;
                }
                var erpNo = tds.eq(length - 2).find("input").val();
                if(erpNo == ""){
                    layer.msg("请填写erp产品编号，否则订单无法和erp同步",{
                        icon : 2,
                        time : 2000
                    });
                    flag = true;
                    return false;
                }



            }