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/WEB-INF/view/system/tSite/TSite_add.html | 65 ++++++++++++++++++++++++++------
1 files changed, 53 insertions(+), 12 deletions(-)
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tSite/TSite_add.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tSite/TSite_add.html
index 4423bc2..dcb9589 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tSite/TSite_add.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tSite/TSite_add.html
@@ -66,6 +66,9 @@
<label class="col-sm-3 control-label">*所属门店：</label>
<div class="col-sm-9">
<select style="width: 300px" class="form-control" id="store" name="store" >
+ @for(obj in stores){
+ <option style="width: 300px" value="${obj.id}">${obj.name}</option>
+ @}
</select>
</div>
</div>
@@ -88,16 +91,16 @@
@}
</select>
</div>
- </div>
+ </div>
<#input style="width: 300px" id="name" name="*场地名称" type="text"/>
<div class="form-group" >
<label class="col-sm-3 control-label">*可预约时间段：</label>
<!-- <input style="width: 300px" class="form-control" type="time">-->
<div class="col-sm-9" style="display: flex">
- <input style="width: 136px;" value="开始时间" id="start-time" class="form-control" type="time" onchange="updateTime(1)">
+ <input style="width: 136px;" value="开始时间" id="start-time" class="form-control" type="time" >
<span style="margin-top: 7px"> 至 </span>
- <input style="width: 136px;" value="结束时间" id="end-time" class="form-control" type="time" onchange="updateTime(2)">
+ <input style="width: 136px;" value="结束时间" id="end-time" class="form-control" type="time" >
</div>
</div>
@@ -105,7 +108,7 @@
<label class="col-sm-3 control-label">*现金价格：</label>
<div class="col-sm-9" style="display: flex;">
<input style="width: 300px" class="form-control" id="cashPrice" name="playPaiCoin" placeholder="请输入价格" type="text">
- <span style="margin-left: 5px;margin-top: 5px">元/半小时</span>
+ <span style="margin-left: 5px;margin-top: 5px" id="priceLabel3">元/半小时</span>
</div>
</div>
@@ -113,7 +116,7 @@
<label class="col-sm-3 control-label">*玩湃币价格：</label>
<div class="col-sm-9" style="display: flex;">
<input style="width: 300px" class="form-control" id="playPaiCoin" name="playPaiCoin" placeholder="请输入价格" type="text">
- <span style="margin-left: 5px;margin-top: 5px">币/半小时</span>
+ <span style="margin-left: 5px;margin-top: 5px" id="priceLabel4">币/半小时</span>
</div>
</div>
<div class="form-group" id="siteMore" style=" margin-left: 255px;">
@@ -131,7 +134,7 @@
<label class="col-sm-3 control-label">*现金价格：</label>
<div class="col-sm-9" style="display: flex;">
<input style="width: 300px" class="form-control" id="cashPriceOne" name="playPaiCoin" placeholder="请输入价格" type="text">
- <span style="margin-left: 5px;margin-top: 5px">元/半小时</span>
+ <span id="priceLabel" style="margin-left: 5px;margin-top: 5px">元/半小时</span>
</div>
</div>
@@ -139,7 +142,7 @@
<label class="col-sm-3 control-label">*玩湃币价格：</label>
<div class="col-sm-9" style="display: flex;">
<input style="width: 300px" class="form-control" id="playPaiCoinOne" name="playPaiCoin" placeholder="请输入价格" type="text">
- <span style="margin-left: 5px;margin-top: 5px">币/半小时</span>
+ <span id="priceLabel1" style="margin-left: 5px;margin-top: 5px">币/半小时</span>
</div>
</div>
@@ -169,7 +172,6 @@
<button class="btn btn-outline btn-success" type="file" onclick="UploadFileFn()"><i class="fa fa-upload"></i>上传文件</button>
</div>
</div>
- @if(objectType==1){
<div class="row" id="app1">
<div class="form-group">
<label class="col-sm-3 control-label head-scu-label">*实景图片(请上传不超过五张图片): </label>
@@ -190,17 +192,15 @@
</div>
</div>
</div>
- @}
- @if(objectType==1){
<#input style="width: 300px" id="ids" name="*添加闸机:" placeholder="请输入闸机ID" type="text"/>
- @}
+ @if(objectType==1){
<div class="form-group" style=" margin-left: 17%;" >
<label class="col-sm-1 control-label">场地说明：</label>
<div class="col-sm-5">
<textarea type="text/plain" id="editor" style="height: 300px;width: 800px;"></textarea>
</div>
</div>
-
+ @}
<div class="row btn-group-m-t">
<div class="col-sm-10 col-sm-offset-5" >
<#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TSite.addSubmit()"/>
@@ -219,7 +219,23 @@
<script src="${ctxPath}/js/vue/vue.js"></script>
<script src="${ctxPath}/js/elementui/index.js"></script>
<link rel="stylesheet" href="${ctxPath}/js/elementui/index.css">
+<link href="http://cdnjs.cloudflare.com/ajax/libs/select2/4.0.13/css/select2.min.css" rel="stylesheet" />
+<script src="http://cdnjs.cloudflare.com/ajax/libs/select2/4.0.13/js/select2.min.js"></script>
<script>
+
+
+ $(document).ready(function() {
+ $('#yys').select2({
+ width: '300px',
+ placeholder: '选择运营商',
+ allowClear: true,
+ minimumResultsForSearch: 1 // To disable the search box, set this value to Infinity
+ });
+ });
+
+
+
+
var vue2 = new Vue({
el: '#app1',
props: {
@@ -254,6 +270,10 @@
created() {
},
});
+
+
+
+
laydate.render({
elem: '#start-time', type: "time", format: "HH:mm", ready: formatminutes
});
@@ -352,6 +372,27 @@
}
});
function updateTime1() {
+ var selectedValue = document.getElementById("siteTypeOne").value;
+ var priceLabel = document.getElementById("priceLabel");
+ var priceLabel1 = document.getElementById("priceLabel1");
+ var priceLabel3 = document.getElementById("priceLabel3");
+ var priceLabel4 = document.getElementById("priceLabel4");
+
+ if (selectedValue === "智慧场地") {
+ console.log("=============智慧场地=")
+ priceLabel.innerText = "元/15分钟";
+ priceLabel1.innerText = "元/15分钟";
+ priceLabel3.innerText = "元/15分钟";
+ priceLabel4.innerText = "元/15分钟";
+ } else {
+ priceLabel.innerText = "元/半小时";
+ priceLabel1.innerText = "元/半小时";
+ priceLabel3.innerText = "元/半小时";
+ priceLabel4.innerText = "元/半小时";
+ }
+
+
+
$("#end-time").val('');
$("#start-time").val('');
}
--
Gitblit v1.7.1