From bc4420f7a0ba1d243abcbea44b2203e2f6c6bc11 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Thu, 17 Feb 2022 22:35:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop
---
zq-erp/src/main/resources/templates/views/admin/shop/shopProduct-form.html | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/zq-erp/src/main/resources/templates/views/admin/shop/shopProduct-form.html b/zq-erp/src/main/resources/templates/views/admin/shop/shopProduct-form.html
index ff5c0b5..d3ad1c5 100644
--- a/zq-erp/src/main/resources/templates/views/admin/shop/shopProduct-form.html
+++ b/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);
--
Gitblit v1.9.1