From 5ba66988afe9d764c31ff21ec6786d09542e4625 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 05 十一月 2025 16:43:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java | 3 ++-
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TSiteController.java | 3 ++-
cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/yuyue_add.html | 4 ++++
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java | 1 +
cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/yuyue_info.html | 21 ++++++++++++++++++---
5 files changed, 27 insertions(+), 5 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java
index b037baa..73bfb53 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java
@@ -605,7 +605,8 @@
map1.put("remark",tStore.getIntroduce());
map1.put("lat",tStore.getLat());
map1.put("lng",tStore.getLon());
- String result = HttpRequestUtil.postRequest("https://port.daowepark.com/v7/user_api/general/addSpace", map1);
+ String result = HttpRequestUtil.postRequest("https://try.daowepark.com/v7/user_api/general/addSpace", map1);
+// String result = HttpRequestUtil.postRequest("https://port.daowepark.com/v7/user_api/general/addSpace", map1);
System.out.println(result);
JSONObject jsonObject = JSONObject.parseObject(result);
JSONObject data = jsonObject.getJSONObject("data");
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TSiteController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TSiteController.java
index 2ba8e6d..59bc153 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TSiteController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TSiteController.java
@@ -549,7 +549,8 @@
map.put("name",site.getName());
map.put("space_id",store.getId().toString());
String s = HttpRequestUtil.postRequest
- ("https://port.daowepark.com/v7/user_api/general/addSpaceArea", map);
+// ("https://port.daowepark.com/v7/user_api/general/addSpaceArea", map);
+ ("https://try.daowepark.com/v7/user_api/general/addSpaceArea", map);
JSONObject jsonObject = JSONObject.parseObject(s);
JSONObject data = jsonObject.getJSONObject("data");
String area_id = data.getString("area_id");
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java
index 5cfb963..77c7435 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java
@@ -972,6 +972,7 @@
yuyueTime = strings1.get(0);
}
model.addAttribute("yuyueTime", yuyueTime);
+ model.addAttribute("targetAudience", book.getTargetAudience());
model.addAttribute("city", book.getCity());
model.addAttribute("store", storeService.getById(book.getStoreId()).getName());
model.addAttribute("siteName", siteService.getById(book.getSiteId()).getName());
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/yuyue_add.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/yuyue_add.html
index fdf9793..be16ea3 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/yuyue_add.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/yuyue_add.html
@@ -253,6 +253,8 @@
// 选择半场 查询支持半场的场地
let ajax = new $ax(Feng.ctxPath + "/coursePackage/querySite1", function (data) {
let htmlStr = '';
+ htmlStr += '<option value="">' + "请选择" + '</option>'
+
for (let i = 0; i < data.length; i++) {
htmlStr += '<option value="' + data[i].id + '">' + data[i].name + '</option>'
}
@@ -295,6 +297,8 @@
// 选择半场 查询支持半场的场地
let ajax = new $ax(Feng.ctxPath + "/coursePackage/querySite1", function (data) {
let htmlStr = '';
+ htmlStr += '<option value="">' + "请选择" + '</option>'
+
for (let i = 0; i < data.length; i++) {
htmlStr += '<option value="' + data[i].id + '">' + data[i].name + '</option>'
}
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/yuyue_info.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/yuyue_info.html
index 05ec304..a949b1f 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/yuyue_info.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/yuyue_info.html
@@ -37,8 +37,8 @@
<div class="form-group">
<label class="col-sm-3 control-label">*预约场地类型：</label>
<div class="col-sm-4">
- <input type="radio" name="type" value="1" checked="" onclick="updateType(1)" disabled> 全场
- <input type="radio" name="type" value="2" onclick="updateType(2)" disabled> 半场
+ <input type="radio" name="type" value="1" ${item.isHalf ==1 ? '' :'checked'} onclick="updateType(1)" disabled> 全场
+ <input type="radio" name="type" value="2" ${item.isHalf ==2 ? '' :'checked'} onclick="updateType(2)" disabled> 半场
</div>
</div>
<div class="form-group">
@@ -55,6 +55,15 @@
<input class="form-control" id="siteName1" name="siteName" type="text" value="${siteName}" disabled >
</div>
</div>
+ @if(item.isHalf ==1){
+ <div class="form-group">
+ <label class="col-sm-3 control-label">*选择半场：</label>
+ <div class="col-sm-4">
+ <input class="form-control" id="halfName" name="halfName" type="text" value="${item.halfName}" disabled >
+ </div>
+ </div>
+ @}
+
<div class="form-group" id="half1" hidden="hidden">
<label class="col-sm-3 control-label">*选择半场：</label>
<div class="col-sm-4">
@@ -71,7 +80,13 @@
</div>
</div>
-
+ <div class="form-group">
+ <label class="col-sm-3 control-label">*入场方式：</label>
+ <div class="col-sm-4">
+ <input type="radio" name="type" value="1" ${item.targetAudience ==1 ? "checked" :""} onclick="updateType(1)" disabled> 订场
+ <input type="radio" name="type" value="2" ${item.targetAudience ==2 ? "checked" :""} onclick="updateType(2)" disabled> 散客
+ </div>
+ </div>
--
Gitblit v1.7.1