From 951f90b82993acc835cdf58a9f1f39aeecd86674 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期三, 15 十一月 2023 16:10:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-management/src/main/webapp/static/modular/system/tShop/tShop_info.js | 37 ++++++++++++++++++++-----------------
1 files changed, 20 insertions(+), 17 deletions(-)
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tShop/tShop_info.js b/cloud-server-management/src/main/webapp/static/modular/system/tShop/tShop_info.js
index c5fa4e7..6a6779f 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/tShop/tShop_info.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/tShop/tShop_info.js
@@ -228,27 +228,30 @@
let name = $("#name").val()
let phone = $("#phone").val()
var elementById = document.getElementById("radio1");
- if (elementById.checked) {
- if (pCode == '' && $("#role").val() == "1") {
- Feng.info("请选择省")
- return;
+ if (elementById != null){
+ if (elementById.checked) {
+ if (pCode == '' && $("#role").val() == "1") {
+ Feng.info("请选择省")
+ return;
+ }
+ if (cCode == '' && $("#role").val() == "1") {
+ Feng.info("请选择市")
+ return;
+ }
}
- if (cCode == '' && $("#role").val() == "1") {
- Feng.info("请选择市")
- return;
+ if (!elementById.checked){
+ if(pCode1=='' && $("#role").val()=="1"){
+ Feng.info("请选择省")
+ return;
+ }
+ if(cCode1=='' && $("#role").val()=="1"){
+ Feng.info("请选择市")
+ return;
+ }
}
}
- if (!elementById.checked){
- if(pCode1=='' && $("#role").val()=="1"){
- Feng.info("请选择省")
- return;
- }
- if(cCode1=='' && $("#role").val()=="1"){
- Feng.info("请选择市")
- return;
- }
- }
+
if(name==''){
Feng.info("门店名称不能为空")
return;
--
Gitblit v1.7.1