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 | 34 ++++++++++++++++++++++++----------
1 files changed, 24 insertions(+), 10 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 9962460..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>
@@ -813,26 +829,24 @@
sku.selfPrice = selfPrice;
//推广提成
var sealesPrice = tds.eq(length - 4).find("input").val();
- if(sealesPrice != ""){
- sku.sealesPrice = sealesPrice;
+ if(sealesPrice == ""){
+ sealesPrice = 0;
}
+ sku.sealesPrice = sealesPrice;
//邀请提成
var invitationPrice = tds.eq(length - 3).find("input").val();
- if(invitationPrice != ""){
- sku.invitationPrice = invitationPrice;
+ if(invitationPrice == ""){
+ invitationPrice = 0;
}
+ sku.invitationPrice = invitationPrice;
//兑换所需金额
var scorePrice = tds.eq(length - 2).find("input").val();
- if(scorePrice != ""){
- sku.scorePrice = scorePrice;
- }
+ sku.scorePrice = scorePrice;
//兑换所需积分
var scoreCount = tds.eq(length - 1).find("input").val();
- if(scoreCount != ""){
- sku.scoreCount = scoreCount;
- }
+ sku.scoreCount = scoreCount;
skus.push(sku);
}
--
Gitblit v1.9.1