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

935090232@qq.com

2022-02-17 bc4420f7a0ba1d243abcbea44b2203e2f6c6bc11

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

@@ -196,6 +196,22 @@


                            </div>

                            <div class="form-group">
                                <label class="col-sm-2 control-label">是否虚拟产品
                                </label>
                                <div class="col-sm-4">
                                    <select th:field="${obj.isUnrealProduct}" class="form-control select2 " size="1"
                                            name="isUnrealProduct"
                                            style="width: 100%">
                                        <option value="2" th:selected="${obj.isUnrealProduct == '2'}">否</option>
                                        <option value="1" th:selected="${obj.isUnrealProduct == '1'}">是</option>
                                        </option>

                                    </select>
                                </div>

                            </div>
                        </div>
                    </div>
                </div>
@@ -807,13 +823,22 @@
                sku.sort = sort;
                //推广提成
                var selfPrice = tds.eq(length - 5).find("input").val();
                if(selfPrice == ""){
                    selfPrice = 0;
                }
                sku.selfPrice = selfPrice;
                //推广提成
                var sealesPrice = tds.eq(length - 4).find("input").val();
                if(sealesPrice == ""){
                    sealesPrice = 0;
                }
                sku.sealesPrice = sealesPrice;

                //邀请提成
                var invitationPrice = tds.eq(length - 3).find("input").val();
                if(invitationPrice == ""){
                    invitationPrice = 0;
                }
                sku.invitationPrice = invitationPrice;

                //兑换所需金额