Merge branch 'developer'

935090232@qq.com

2022-02-24 8c6026959d3006bbf9dce3f3c9311e70a02b80c1

 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>
@@ -827,15 +843,9 @@

                //兑换所需金额
                var scorePrice = tds.eq(length - 2).find("input").val();
                if(scorePrice == ""){
                    scorePrice = 0;
                }
                sku.scorePrice = scorePrice;
                //兑换所需积分
                var scoreCount = tds.eq(length - 1).find("input").val();
                if(scoreCount == ""){
                    scoreCount = 0;
                }
                sku.scoreCount = scoreCount;

                skus.push(sku);