From 7e7f901b2172281dc294dfbc67e6ad00625f09f4 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 04 三月 2024 10:11:21 +0800
Subject: [PATCH] 合并代码
---
cloud-server-management/src/main/webapp/static/modular/system/tCoupon/TCouponInfo.js | 128 ++++++++++++++++++++++++++++++++++++++++--
1 files changed, 122 insertions(+), 6 deletions(-)
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tCoupon/TCouponInfo.js b/cloud-server-management/src/main/webapp/static/modular/system/tCoupon/TCouponInfo.js
index d4cab8a..5cb9b52 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/tCoupon/TCouponInfo.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/tCoupon/TCouponInfo.js
@@ -42,6 +42,9 @@
couponInfoDlg.close = function () {
parent.layer.close(window.parent.TCoupon.layerIndex);
}
+couponInfoDlg.close1 = function () {
+ parent.layer.close(window.parent.TCouponExamine.layerIndex);
+}
/**
@@ -316,7 +319,49 @@
couponInfoDlg.delete = function (o) {
$(o).parent("div").remove()
}
+couponInfoDlg.audit = function () {
+ var id = $("#id").val();
+ var state = $("#state").val();
+ console.log("让我看看state")
+ console.log(state)
+ if (state == "未通过"){
+ Feng.error("当前优惠券不可再次审核！");
+ return ;
+ }
+ let audit = document.querySelector('input[name="r1"]:checked').value;
+ let text = $("#text").val()
+ if(audit==3){
+ if(text==''){
+ Feng.info("请输入拒绝理由")
+ return false;
+ }
+ }
+ var ajax = new $ax(Feng.ctxPath + "/tCouponExamine/examine", function (data) {
+ if (data.code == 200) {
+ Feng.success("操作成功!");
+ window.parent.TCouponExamine.table.refresh();
+ couponInfoDlg.close1();
+ } else if(data=="repeat"){
+ window.location.reload();
+ window.parent.layer.closeAll();
+ Feng.error("请勿重复操作");
+ }else {
+ return Feng.error(data.msg);
+ }
+ }, function (data) {
+ Feng.error("操作失败!")
+ window.location.reload();
+ window.parent.layer.closeAll();
+ return Feng.error("操作失败!");
+ });
+
+ ajax.set("id", id);
+ ajax.set("state", audit);
+ ajax.set("remark", text);
+ ajax.start();
+ layer.closeAll();
+}
/**
* 提交
*/
@@ -395,15 +440,19 @@
if ($('#userType').val()==1){
// 兑换方式
let exchangeMethod = $(':radio[name="exchangeMethod"]:checked').val();
- if (exchangeMethod === '' || exchangeMethod === undefined || exchangeMethod === null){
- return Feng.error('兑换方式不能为空');
+ console.log("看看exchangeMethod")
+ console.log(exchangeMethod)
+ if (distributionMethod === '1') {
+ if (exchangeMethod === '' || exchangeMethod === undefined || exchangeMethod === null) {
+ return Feng.error('兑换方式不能为空');
+ }
}
- if (exchangeMethod === '1'){
+ if (exchangeMethod === '1' ){
if (requiredPoints === undefined || requiredPoints === '' || requiredPoints === null){
return Feng.error('所需积分不能为空');
}
}
- if (exchangeMethod === '2'){
+ if (exchangeMethod === '2' && distributionMethod === '1'){
if (requiredPoints === undefined || requiredPoints === '' || requiredPoints === null){
return Feng.error('所需积分不能为空');
}
@@ -411,7 +460,7 @@
return Feng.error('所需现金不能为空');
}
}
- if (exchangeMethod === '3'){
+ if (exchangeMethod === '3' && distributionMethod === '1'){
if (requiredCash === undefined || requiredCash === '' || requiredCash === null){
return Feng.error('所需现金不能为空');
}
@@ -435,9 +484,12 @@
cityIds.push(inData);
}
}
- cts = cityIds.join(',');
}
+ cts = cityIds.join(',');
+ console.log("============到达城市"+cts)
+
}
+
}
const commaSeparatedString = this.goodsPicArray.join(',');
@@ -450,12 +502,17 @@
stores = this.storeIds.join(',');
console.log('stores--===--',stores)
}
+
+ var ensure = document.getElementById("ensure");
+ ensure.disabled = true;
//提交信息
var ajax = new $ax(Feng.ctxPath + "/tCouponManage/commitData", function (data) {
+ ensure.disabled = false;
Feng.success("添加成功!");
window.parent.TCoupon.table.refresh();
couponInfoDlg.close();
}, function (data) {
+ ensure.disabled = false;
Feng.error("添加失败!" + data.responseJSON.message + "!");
});
ajax.set("userType",$('#userType').val());
@@ -520,6 +577,7 @@
$(function () {
+
getProvince(null);
radio1();
var OBJradio = document.getElementsByName("prescription")
@@ -604,4 +662,62 @@
$('#app1').show();
// 适用范围
}
+
+
+
+
+ const distributionMethodOptions = document.getElementsByName('distributionMethod');
+
+// 监听distributionMethod选项的变化
+ for (let i = 0; i < distributionMethodOptions.length; i++) {
+ distributionMethodOptions[i].addEventListener('change', function() {
+ // 获取选中的distributionMethod值
+ const selectedDistributionMethod = document.querySelector('input[name="distributionMethod"]:checked').value;
+ console.log("看看选择")
+ console.log(selectedDistributionMethod);
+ // 判断选中的值是否不等于1
+ if (selectedDistributionMethod !== '1') {
+ console.log("已经选择1")
+ // 隐藏exchangeType
+ document.getElementById('exchangeType').style.display = 'none';
+ document.getElementById('needAmount').style.display = 'none';
+ document.getElementById('needIntegral').style.display = 'none';
+ } else {
+ // 显示exchangeType
+ document.getElementById('exchangeType').style.display = 'block';
+ document.getElementById('needAmount').style.display = 'block';
+ document.getElementById('needIntegral').style.display = 'block';
+ }
+ // 如果选择发放方式为注册赠送
+ if (selectedDistributionMethod == "2"){
+ const userGroupRadios = document.querySelectorAll('input[name="userGroup"][value="1"], input[name="userGroup"][value="3"]');
+ console.log("看看要隐藏的")
+ console.log(userGroupRadios)
+ // 隐藏值为 1 或 2 的 radio 按钮，并显示值为 2 的 radio 按钮
+ userGroupRadios.forEach(userRadio => {
+ console.log("隐藏啊")
+ userRadio.style.display = 'none';
+ });
+ $('#u1').hide();
+ $('#u3').hide();
+ const userGroupTwo = document.querySelector('input[name="userGroup"][value="2"]');
+ userGroupTwo.style.display = 'inline-block';
+ userGroupTwo.checked = true;
+ }else{
+ // 如果选择的不是值为 2 的 radio 按钮，则显示所有的 userGroup radio 按钮
+ const userGroupRadios = document.querySelectorAll('input[name="userGroup"]');
+ userGroupRadios.forEach(userRadio => {
+ userRadio.style.display = 'inline-block';
+ });
+ const userGroupTwo = document.querySelector('input[name="userGroup"][value="1"]');
+ userGroupTwo.style.display = 'inline-block';
+ userGroupTwo.checked = true;
+ $('#u1').show();
+ $('#u3').show();
+ }
+ });
+ }
+
+
+
});
--
Gitblit v1.7.1