From e8f01399a49bb718f184e31d0f6de27c3dc64cef Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期二, 19 八月 2025 08:58:34 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0 --- cloud-server-management/src/main/webapp/static/modular/system/tCompetition/tCompetition_info.js | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tCompetition/tCompetition_info.js b/cloud-server-management/src/main/webapp/static/modular/system/tCompetition/tCompetition_info.js index 3be94d2..4030ebb 100644 --- a/cloud-server-management/src/main/webapp/static/modular/system/tCompetition/tCompetition_info.js +++ b/cloud-server-management/src/main/webapp/static/modular/system/tCompetition/tCompetition_info.js @@ -249,7 +249,19 @@ } } } - + console.log("当前登陆人"+$("#type").val()) + if ($("#type").val()==2){ + pCode = $("#pCode1").val(); + if($("#pCode1").val()==""){ + Feng.info("请选择省"); + return; + } + cCode = $("#cCode1").val(); + if($("#cCode1").val()==""){ + Feng.info("请选择市"); + return; + } + } var shopId = $("#shopId").val(); if(shopId==""){ @@ -780,7 +792,7 @@ var marker; //搜索地图 TCarInfoDlg.searchByStationName = function(e,type){ - var keyword="成都"; + var keyword=""; if(type==2){ keyword = $(e).parent().prev().find("input").val(); }else { -- Gitblit v1.7.1