From 19c3da86d8c6adcb91baccac6981c63307e3dba1 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Fri, 20 Dec 2024 13:01:12 +0800
Subject: [PATCH] fix(mall): 修复会员提现状态更新逻辑
---
src/main/resources/templates/febs/views/modules/goods/carriageRuleAdd.html | 68 ++++++++++-----------------------
1 files changed, 21 insertions(+), 47 deletions(-)
diff --git a/src/main/resources/templates/febs/views/modules/goods/carriageRuleAdd.html b/src/main/resources/templates/febs/views/modules/goods/carriageRuleAdd.html
index 04413db..d79a111 100644
--- a/src/main/resources/templates/febs/views/modules/goods/carriageRuleAdd.html
+++ b/src/main/resources/templates/febs/views/modules/goods/carriageRuleAdd.html
@@ -23,7 +23,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>
@@ -120,63 +120,37 @@
list: [ 'ALL', 'CLEAR', 'REVERSE' ]
},
filterable: true,
- data: [
- {name: '北京市',value: 1,selected:false},
- {name: '天津市',value: 2,selected:false},
- {name: '河北省',value: 3,selected:false},
- {name: '山西省',value: 4,selected:false},
- {name: '辽宁省',value: 5,selected:false},
-
- {name: '吉林省',value: 6,selected:false},
- {name: '黑龙江省',value: 7,selected:false},
- {name: '上海市',value: 8,selected:false},
- {name: '江苏省',value: 9,selected:false},
- {name: '浙江省',value: 10,selected:false},
-
- {name: '安徽省',value: 11,selected:false},
- {name: '福建省',value: 12,selected:false},
- {name: '江西省',value: 13,selected:false},
- {name: '山东省',value: 14,selected:false},
- {name: '河南省',value: 15,selected:false},
-
- {name: '湖北省',value: 16,selected:false},
- {name: '湖南省',value: 17,selected:false},
- {name: '广东省',value: 18,selected:false},
- {name: '广西壮族自治区',value: 19,selected:false},
- {name: '海南省',value: 20,selected:false},
-
- {name: '重庆市',value: 21,selected:false},
- {name: '四川省',value: 22,selected:false},
- {name: '贵州省',value: 23,selected:false},
- {name: '云南省',value: 24,selected:false},
- {name: '西藏自治区',value: 25,selected:false},
-
- {name: '陕西省',value: 26,selected:false},
- {name: '甘肃省',value: 27,selected:false},
- {name: '青海省',value: 28,selected:false},
- {name: '宁夏回族自治区',value: 29,selected:false},
- {name: '内蒙古自治区',value: 30,selected:false},
-
- {name: '新疆维吾尔自治区',value: 31,selected:false},
- {name: '台湾省',value: 32,selected:false},
- {name: '香港特别行政区',value: 33,selected:false},
- {name: '澳门特别行政区',value: 34,selected:false},
- ],
+ data: [],
})
-
+ febs.get(ctx + 'admin/goodsCategory/addressMYXL', null, function(res) {
+ provinceSet.update({
+ // data : res.data,
+ data : res.data.map(province => ({
+ name: province.name,
+ value: province.id,
+ selected: false
+ })),
+ autoRow: true,
+ });
+ })
+ let provinceChoiceExist = "";
$('#test3').on('click', function (){
let provinceChoice = provinceSet.getValue('name');
+ console.log(provinceChoice);
if(provinceChoice == null || provinceChoice == ""){
febs.alert.warn('指定省份不能为空');
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;
--
Gitblit v1.9.1