Merge remote-tracking branch 'origin/score_shop' into score_shop

jyy

2021-04-07 2a4dc73c59eae1e14b0e0660bf04652fa3d322ad

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

@@ -221,6 +221,7 @@
                                    <th>消费可得积分</th>
                                    <th>关联ERP产品</th>
                                    <th>排序</th>
                                    <th>自购返佣</th>
                                    <th>推广提成</th>
                                    <th>邀请提成</th>
                                    <th>兑换所需金额</th>
@@ -353,6 +354,7 @@
        <input autocomplete="off"   type="hidden" class="form-control" name="erpGoodsCode">
    </div></td>
    <td><input autocomplete="off"   type="text" class="form-control" name=""></td>
        <td><input autocomplete="off"   type="text" class="form-control" name=""></td>
        <td><input autocomplete="off"   type="text" class="form-control" name=""></td>
        <td><input autocomplete="off"   type="text" class="form-control" name=""></td>
        <td><input autocomplete="off"   type="text" class="form-control" name=""></td>
@@ -528,7 +530,10 @@
            if (goodsName == null || typeof stockCode == 'undefined') {
                goodsName = "";
            }

            var selfPrice = shopSkus[c].selfPrice;
            if (selfPrice == null || typeof selfPrice == 'undefined') {
                selfPrice = "";
            }
            var sealesPrice = shopSkus[c].sealesPrice;
            if (sealesPrice == null || typeof sealesPrice == 'undefined') {
                sealesPrice = "";
@@ -559,6 +564,7 @@
                +'<td><div id="erpNoDiv"><button class="btn btn-info" onclick="selectProduct(\'shopIdValue\',\''+trId+'\')"><i class="fa fa-plus"></i></button>'
                +'<p class="form-control-static erpGoodsName">'+ goodsName +'</p><input autocomplete="off" class="form-control" type="hidden"  value="'+stockCode+'" name="erpGoodsCode"></div></td>'
                +'<td><input autocomplete="off"   type="text" class="form-control"  value="'+sort+'" name=""></td>'
                +'<td><input autocomplete="off"   type="text" class="form-control"  value="'+selfPrice+'" name=""></td>'
                +'<td><input autocomplete="off"   type="text" class="form-control"  value="'+sealesPrice+'" name=""></td>'
                +'<td><input autocomplete="off"   type="text" class="form-control"  value="'+invitationPrice+'" name=""></td>'
                +'<td><input autocomplete="off"   type="text" class="form-control"  value="'+scorePrice+'" name=""></td>'
@@ -745,61 +751,63 @@
            if (i != 0) {
                var tds = $(this).find("td");
                var length = tds.length - 1;
                var id = tds.eq(length - 12).find("input").val();
                var id = tds.eq(length - 13).find("input").val();
                if(id == null){
                    id ="";
                }
                sku.id = id;

                //规格名称
                var name = tds.eq(length - 11).find("input").val();
                var name = tds.eq(length - 12).find("input").val();
                if(name == null){
                    name = "";
                }
                sku.name = name;

                //图片地址
                var path = tds.eq(length - 10).find("img").attr("src");
                var path = tds.eq(length - 11).find("img").attr("src");
                if(path == null){
                    path = "";
                }
                sku.imgPath = path;

                //库存
                var stock = tds.eq(length - 9).find("input").val();
                var stock = tds.eq(length - 10).find("input").val();
                if(stock == ""){
                    stock = 0;
                }
                sku.stock = stock;

                //价格
                var price = tds.eq(length -8).find("input").val();
                var price = tds.eq(length -9).find("input").val();
                if(price == ""){
                    price =0;
                }
                sku.price = price;

                //积分
                var score = tds.eq(length - 7).find("input").val();
                var score = tds.eq(length - 8).find("input").val();
                if(score == ""){
                    score = 0;
                }
                sku.score = score;

                //品种编码
                var stockCode = tds.eq(length - 6).find("input").val();
                var stockCode = tds.eq(length - 7).find("input").val();
                if(stockCode == null || typeof stockCode == 'undefined'){
                    stockCode = '';
                }
                sku.stockCode = stockCode;

                //排序
                var sort = tds.eq(length - 5).find("input").val();
                var sort = tds.eq(length - 6).find("input").val();
                if(sort == ""){
                    sort = 0;
                }
                sku.sort = sort;

                //推广提成
                var selfPrice = tds.eq(length - 5).find("input").val();
                sku.selfPrice = selfPrice;
                //推广提成
                var sealesPrice = tds.eq(length - 4).find("input").val();
                sku.sealesPrice = sealesPrice;
@@ -838,20 +846,6 @@
                var tds = $(this).find("td");
                var length = tds.length - 1;

                if(ableSales==1){
                    //推广提成
                    var sealesPrice = tds.eq(length - 4).find("input").val();
                    //邀请提成
                    var invitationPrice = tds.eq(length - 3).find("input").val();
                    if(sealesPrice == ""||invitationPrice==""){
                        layer.msg("请填写推广提成和邀请提成",{
                            icon : 2,
                            time : 2000
                        });
                        flag = true;
                        return false;
                    }
                }

                if(ableScorePay==1){
                    //兑换所需金额
@@ -868,7 +862,7 @@
                    }
                }

                var name = tds.eq(length - 11).find("input").val();
                var name = tds.eq(length - 12).find("input").val();
                if(name == ""){
                    layer.msg("请填写规格名称",{
                        icon : 2,
@@ -886,7 +880,7 @@
                    return false;
                }

                var stock = tds.eq(length -9).find("input").val();
                var stock = tds.eq(length -10).find("input").val();
                if(stock == ""){
                    layer.msg("请填写库存",{
                        icon : 2,
@@ -895,7 +889,7 @@
                    flag = true;
                    return false;
                }
                var price = tds.eq(length - 8 ).find("input").val();
                var price = tds.eq(length - 9 ).find("input").val();
                if(price == ""){
                    layer.msg("请填写价格",{
                        icon : 2,