From df864d1d636751424fd642d3bdd33c53cf63500d Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Mon, 07 Jul 2025 17:51:09 +0800
Subject: [PATCH] feat(mall): 为活动订单项添加积分和成长值奖 - 在活动添加和编辑页面增加积分和成长值输入字段 - 更新活动实体类，添加 scoreCnt 和 growthCnt 字段 - 修改活动订单项处理逻辑，增加积分和成长值奖励的计算和发放 - 优化活动订单项状态检查逻辑，移除冗余代码
---
src/main/resources/templates/febs/views/modules/goods/carriageRuleUpdate.html | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/templates/febs/views/modules/goods/carriageRuleUpdate.html b/src/main/resources/templates/febs/views/modules/goods/carriageRuleUpdate.html
index 829a14f..abed2f4 100644
--- a/src/main/resources/templates/febs/views/modules/goods/carriageRuleUpdate.html
+++ b/src/main/resources/templates/febs/views/modules/goods/carriageRuleUpdate.html
@@ -25,7 +25,7 @@
<label class="layui-form-label febs-form-item-require">计价方式：</label>
<div class="layui-input-block">
<input type="radio" name="valuationType" value="1" title="按件算" checked />
- <input type="radio" name="valuationType" value="2" title="按重量算" />
+<!-- <input type="radio" name="valuationType" value="2" title="按重量算" />-->
</div>
</div>
@@ -167,6 +167,7 @@
],
})
+ let provinceChoiceExist = "";
$('#test3').on('click', function (){
let provinceChoice = provinceSet.getValue('name');
if(provinceChoice == null || provinceChoice == ""){
@@ -174,12 +175,16 @@
return false;
}
let provinceChoiceStr = "";
- console.log(provinceChoice);
for (let i = 0; i < provinceChoice.length; i++) {
+ //判断字符串是否出现过 =-1则没有出现
+ if(provinceChoiceExist.indexOf(provinceChoice[i]) != -1){
+ febs.alert.warn('['+provinceChoice[i]+'],指定省份不能重复');
+ return false;
+ }
provinceChoiceStr = provinceChoiceStr + provinceChoice[i]+",";
+ provinceChoiceExist = provinceChoiceExist + provinceChoiceStr;
}
- console.log(provinceChoiceStr);
let data = {};
data.areaAddress = provinceChoiceStr;
data.basicCnt = 1;
@@ -224,6 +229,7 @@
"moreCntDefault": carriageRule.moreCntDefault,
"morePriceDefault": carriageRule.morePriceDefault
});
+ provinceChoiceExist = carriageRule.areaAddressStr;
let carriageRuleInfos = carriageRule.adminCarriageRuleInfoVos;
if(Array.isArray(carriageRuleInfos) && carriageRuleInfos.length){
for (let i = 0; i < carriageRuleInfos.length; i++) {
--
Gitblit v1.9.1