From 818e8d1810bcdcbeae5a948ecd115ff0ce5a1f54 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 26 七月 2023 17:56:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompetition/TCompetition_add.html | 432 +++++++++++++----------------------------------------
1 files changed, 107 insertions(+), 325 deletions(-)
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompetition/TCompetition_add.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompetition/TCompetition_add.html
index 9f9e6a9..05014a6 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompetition/TCompetition_add.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompetition/TCompetition_add.html
@@ -1,110 +1,113 @@
@layout("/common/_container.html"){
<div class="ibox float-e-margins">
<div class="ibox-content">
- <div class="form-horizontal" id="carInfoForm">
- <input type="hidden" id="roleType" name="roleType" value="${roleType}">
- <input hidden id="language" value="${language}">
- @if(language==1){
- <div class="row">
- <div class="col-sm-11">
- <div class="form-group">
- <label class="col-sm-3 control-label">所属机构：</label>
- <div class="col-sm-9" style="display: flex;align-items: center;">
- @if(roleType == 1){
- <div class="radio radio-info radio-inline">
- <input type="radio" id="companyType1" value="1" name="companyType" checked="" onclick="TCarInfoDlg.companyTypeClick(1)">
- <label for="companyType1"> 平台车辆 </label>
- </div>
- <div class="radio radio-success radio-inline">
- <input type="radio" id="companyTyp2" value="2" name="companyType" onclick="TCarInfoDlg.companyTypeClick(2)">
- <label for="companyTyp2"> 加盟车辆 </label>
- </div>
- <select class="form-control companyDiv" id="oneId" onchange="TCarInfoDlg.oneChange(this)" style="width: 200px;display: none;">
- <option value="">选择所属分公司</option>
- @for(obj in companyList!){
- <option value="${obj.id}">${obj.name}</option>
- @}
- </select>
- <select class="form-control companyDiv" id="twoId" style="width: 200px;margin-left: 30px;display: none;">
- <option value="">选择所属加盟商</option>
- </select>
- @}else if(roleType == 2){
- <span class="control-label">${objectName!}</span>
- <select class="form-control" id="franchiseeId" style="width: 200px;margin-left: 30px;">
- <option value="">选择所属加盟商</option>
- @for(obj in franchiseeList!){
- <option value="${obj.id}">${obj.name}</option>
- @}
- </select>
- @}else if(roleType == 3){
- <span class="control-label">${objectName!}</span>
- @}
- </div>
- </div>
- <div class="form-group">
- <fieldset>
- <label class="col-sm-3 control-label">服务模式：</label>
- <div class="col-sm-9">
- <div class="checkbox checkbox-success checkbox-inline">
- <input type="checkbox" name="serverBox" id="serverBox1" value="1" onclick="TCarInfoDlg.zcServerClick()">
- <label for="serverBox1"> 摩托车 </label>
- </div>
- <div class="checkbox checkbox-success checkbox-inline">
- <input type="checkbox" name="serverBox" id="serverBox4" value="4">
- <label for="serverBox4"> 同城快送 </label>
- </div>
- </div>
- </fieldset>
- </div>
- <div class="form-group" style="display: none;" id="zcModelDiv">
- <label class="col-sm-3 control-label">摩托车车型：</label>
- <div class="col-sm-9">
- <select class="form-control" id="zcModel" name="zcModel">
- <option value="">选择车型</option>
- @for(obj in zcModelList){
- <option value="${obj.id}">${obj.name}</option>
- @}
- </select>
- </div>
- </div>
- <div class="form-group" style="display: none;" id="kcModelDiv">
- <label class="col-sm-3 control-label">同城快送车型：</label>
- <div class="col-sm-9">
- <select class="form-control" id="kcModel" name="kcModel">
- <option value="">选择车型</option>
- @for(obj in kcModelList){
- <option value="${obj.id}">${obj.name}</option>
- @}
- </select>
- </div>
- </div>
- <#select id="carBrandId" name="车辆品牌：" onchange="TCarInfoDlg.brandChange(this)">
- <option value="">选择车辆品牌</option>
- @for(obj in brandList){
- <option value="${obj.id}">${obj.name}</option>
- @}
- </#select>
- <#select id="carModelId" name="车辆类型：">
- <option value="">选择车辆类型</option>
- </#select>
- <#select id="carColor" name="车辆颜色：">
- <option value="">选择车辆颜色</option>
- <option value="1">黑色</option>
- <option value="2">银色</option>
- <option value="3">白色</option>
- <option value="4">红色</option>
- <option value="5">黄色</option>
- <option value="6">橙色</option>
- <option value="7">蓝色</option>
- </#select>
- <#input id="carLicensePlate" name="车牌号" />
- <#avatar id="carPhoto" name="车辆照片：" />
- <#input id="drivingLicenseNumber" name="行驶证编号" />
- <#avatar id="drivingLicensePhoto" name="行驶证照片：" />
- <#input id="annualInspectionTime" name="年检到期时间" type="text"/>
- <#input id="commercialInsuranceTime" name="商业保险到期时间" type="text"/>
- </div>
+
+ <div class="form-horizontal" id="carInfoForm">
+
+ <div class="form-group" id="provinceCode">
+ <label class="col-sm-3 control-label">举办省：</label>
+ <div class="col-sm-9">
+ <select class="form-control" id="pCode" name="pCode">
+ <option value="">选择省</option>
+ </select>
+ </div>
+ </div>
+ <div class="form-group" id="cityCode">
+ <label class="col-sm-3 control-label">举办市：</label>
+ <div class="col-sm-9">
+ <select class="form-control" id="cCode" name="cCode">
+ <option value="">选择市</option>
+ </select>
+ </div>
+ </div>
+ <div class="form-group" id="shop">
+ <label class="col-sm-3 control-label">举办门店：</label>
+ <div class="col-sm-9">
+ <select class="form-control" id="shopId" name="shopId">
+ <option value="">选择门店</option>
+ </select>
+ </div>
+ </div>
+ <#input id="name" name="赛事名称" type="text"/>
+ <#input id="startTime" name="开始时间" type="text"/>
+ <#input id="endTime" name="结束时间" type="text"/>
+ <#input id="registerEndTime" name="截止报名时间" type="text"/>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">报名条件：</label>
+ <div class="col-sm-9">
+ <input type="radio" name="registerCondition" value="1" checked> 全部用户
+ <input type="radio" name="registerCondition" value="2">仅限年度会员参与
+ <input type="radio" name="registerCondition" value="3">仅限学员参与
+ </div>
+ </div>
+
+ <div class="form-group">
+ <label class="col-sm-3 control-label">报名年龄：</label>
+ <div class="col-sm-9" style="display: flex">
+ <input class="form-control" style="width: 100px;" type="text" id="startAge"> ~ <input class="form-control" style="width: 100px;" type="text" id="endAge">
+ </div>
+ </div>
+
+ <div class="form-group">
+ <label class="col-sm-3 control-label">支付方式：</label>
+ <div class="col-sm-9">
+ <input type="checkbox"> 现金支付
+ <input type="checkbox"> 玩湃币支付
+ <input type="checkbox"> 课时支付
+ </div>
+ </div>
+
+ <div class="form-group">
+ <label class="col-sm-3 control-label">现金支付：</label>
+ <div class="col-sm-9">
+ <input class="form-control" style="width: 200px;" type="text" id="cashPrice">
+ </div>
+ </div>
+
+ <div class="form-group">
+ <label class="col-sm-3 control-label">玩湃币支付：</label>
+ <div class="col-sm-9">
+ <input class="form-control" style="width: 200px;" type="text" id="playPaiCoin">
+ </div>
+ </div>
+
+ <div class="form-group">
+ <label class="col-sm-3 control-label">课时支付：</label>
+ <div class="col-sm-9">
+ <input class="form-control" style="width: 200px;" type="text" id="classPrice">
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">参加地点：</label>
+ <div class="col-sm-9">
+ <input class="form-control" style="width: 500px;" type="text" id="address">
+ </div>
+ </div>
+
+ <#input id="applicantsNumber" name="报名人数" type="text"/>
+ <#input id="baseNumber" name="基础报名人数" type="text"/>
+
+ <div class="form-group">
+ <label class="col-sm-3 control-label">是否实名：</label>
+ <div class="col-sm-9">
+ <input type="radio" name="realName" value="1" checked> 是
+ <input type="radio" name="realName" value="0"> 否
+ </div>
+ </div>
+
+ <div class="form-group">
+ <label class="col-sm-3 control-label">赛事简介：</label>
+ <div class="col-sm-9">
+ <textarea id="introduction"></textarea>
+ </div>
+ </div>
+
+ <#avatar id="coverDrawing" name="赛事封面(推荐像素：210*280px)：" />
+ <#avatar id="imgs" name="赛事图片(推荐像素：780*440px)：" />
+ <#avatar id="registrationNotes" name="报名须知(推荐像素：宽780px)：" />
+
+ </div>
</div>
<div class="row btn-group-m-t">
@@ -113,233 +116,12 @@
<#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TCarInfoDlg.close()"/>
</div>
</div>
- @}
- @if(language==2){
-<div class="row">
- <div class="col-sm-11">
- <div class="form-group">
- <label class="col-sm-3 control-label">Affiliated organization：</label>
- <div class="col-sm-9" style="display: flex;align-items: center;">
- @if(roleType == 1){
- <div class="radio radio-info radio-inline">
- <input type="radio" id="companyType1" value="1" name="companyType" checked="" onclick="TCarInfoDlg.companyTypeClick(1)">
- <label for="companyType1"> Platform vehicle </label>
- </div>
- <div class="radio radio-success radio-inline">
- <input type="radio" id="companyTyp2" value="2" name="companyType" onclick="TCarInfoDlg.companyTypeClick(2)">
- <label for="companyTyp2"> Franchised vehicles </label>
- </div>
- <select class="form-control companyDiv" id="oneId" onchange="TCarInfoDlg.oneChange(this)" style="width: 200px;display: none;">
- <option value="">Select Branch</option>
- @for(obj in companyList!){
- <option value="${obj.id}">${obj.name}</option>
- @}
- </select>
- <select class="form-control companyDiv" id="twoId" style="width: 200px;margin-left: 30px;display: none;">
- <option value="">Select the franchisee</option>
- </select>
- @}else if(roleType == 2){
- <span class="control-label">${objectName!}</span>
- <select class="form-control" id="franchiseeId" style="width: 200px;margin-left: 30px;">
- <option value="">Select the franchisee</option>
- @for(obj in franchiseeList!){
- <option value="${obj.id}">${obj.name}</option>
- @}
- </select>
- @}else if(roleType == 3){
- <span class="control-label">${objectName!}</span>
- @}
- </div>
- </div>
- <div class="form-group">
- <fieldset>
- <label class="col-sm-3 control-label">Service mode：</label>
- <div class="col-sm-9">
- <div class="checkbox checkbox-success checkbox-inline">
- <input type="checkbox" name="serverBox" id="serverBox1" value="1" onclick="TCarInfoDlg.zcServerClick()">
- <label for="serverBox1"> motorcycle </label>
- </div>
- <div class="checkbox checkbox-success checkbox-inline">
- <input type="checkbox" name="serverBox" id="serverBox4" value="4">
- <label for="serverBox4"> Intra-city express delivery </label>
- </div>
- </div>
- </fieldset>
- </div>
- <div class="form-group" style="display: none;" id="zcModelDiv">
- <label class="col-sm-3 control-label">Motorcycle model：</label>
- <div class="col-sm-9">
- <select class="form-control" id="zcModel" name="zcModel">
- <option value="">Select vehicle type</option>
- @for(obj in zcModelList){
- <option value="${obj.id}">${obj.name}</option>
- @}
- </select>
- </div>
- </div>
- <div class="form-group" style="display: none;" id="kcModelDiv">
- <label class="col-sm-3 control-label">Local express delivery model：</label>
- <div class="col-sm-9">
- <select class="form-control" id="kcModel" name="kcModel">
- <option value="">Select vehicle type</option>
- @for(obj in kcModelList){
- <option value="${obj.id}">${obj.name}</option>
- @}
- </select>
- </div>
- </div>
-
- <#select id="carBrandId" name="Vehicle brand：" onchange="TCarInfoDlg.brandChange(this)">
- <option value="">Select vehicle brand</option>
- @for(obj in brandList){
- <option value="${obj.id}">${obj.name}</option>
- @}
- </#select>
- <#select id="carModelId" name="Vehicle type：">
- <option value="">Vehicle type</option>
-</#select>
-<#select id="carColor" name="Vehicle color：">
-<option value="">Select vehicle color</option>
-<option value="1">black</option>
-<option value="2">silvery</option>
-<option value="3">white</option>
-<option value="4">red</option>
-<option value="5">yellow</option>
-<option value="6">orange</option>
-<option value="7">blue</option>
-</#select>
-<#input id="carLicensePlate" name="License plate number" />
-<#avatar id="carPhoto" name="Vehicle photos：" />
-<#input id="drivingLicenseNumber" name="Driving license number" />
-<#avatar id="drivingLicensePhoto" name="Photo of driving license：" />
-<#input id="annualInspectionTime" name="Annual inspection expiration time" type="text"/>
-<#input id="commercialInsuranceTime" name="Expiration time of commercial insurance" type="text"/>
-</div>
-</div>
-
-<div class="row btn-group-m-t">
- <div class="col-sm-10 col-sm-offset-5">
- <#button btnCss="info" name="Submit" id="ensure" icon="fa-check" clickFun="TCarInfoDlg.addSubmit()"/>
- <#button btnCss="danger" name="Cancel" id="cancel" icon="fa-eraser" clickFun="TCarInfoDlg.close()"/>
- </div>
-</div>
- @}
- @if(language==3){
-<div class="row">
- <div class="col-sm-11">
- <div class="form-group">
- <label class="col-sm-3 control-label">Organisasi Afiliasi：</label>
- <div class="col-sm-9" style="display: flex;align-items: center;">
- @if(roleType == 1){
- <div class="radio radio-info radio-inline">
- <input type="radio" id="companyType1" value="1" name="companyType" checked="" onclick="TCarInfoDlg.companyTypeClick(1)">
- <label for="companyType1"> Kendaraan platform </label>
- </div>
- <div class="radio radio-success radio-inline">
- <input type="radio" id="companyTyp2" value="2" name="companyType" onclick="TCarInfoDlg.companyTypeClick(2)">
- <label for="companyTyp2"> Kendaraan waralaba </label>
- </div>
- <select class="form-control companyDiv" id="oneId" onchange="TCarInfoDlg.oneChange(this)" style="width: 200px;display: none;">
- <option value="">Pilih Branch</option>
- @for(obj in companyList!){
- <option value="${obj.id}">${obj.name}</option>
- @}
- </select>
- <select class="form-control companyDiv" id="twoId" style="width: 200px;margin-left: 30px;display: none;">
- <option value="">Pilih pemilik franchise</option>
- </select>
- @}else if(roleType == 2){
- <span class="control-label">${objectName!}</span>
- <select class="form-control" id="franchiseeId" style="width: 200px;margin-left: 30px;">
- <option value="">Pilih pemilik franchise</option>
- @for(obj in franchiseeList!){
- <option value="${obj.id}">${obj.name}</option>
- @}
- </select>
- @}else if(roleType == 3){
- <span class="control-label">${objectName!}</span>
- @}
- </div>
- </div>
- <div class="form-group">
- <fieldset>
- <label class="col-sm-3 control-label">Mode Layanan：</label>
- <div class="col-sm-9">
- <div class="checkbox checkbox-success checkbox-inline">
- <input type="checkbox" name="serverBox" id="serverBox1" value="1" onclick="TCarInfoDlg.zcServerClick()">
- <label for="serverBox1"> sepeda motor </label>
- </div>
- <div class="checkbox checkbox-success checkbox-inline">
- <input type="checkbox" name="serverBox" id="serverBox4" value="4">
- <label for="serverBox4"> Pengiriman Ekspres Dalam Kota </label>
- </div>
- </div>
- </fieldset>
- </div>
- <div class="form-group" style="display: none;" id="zcModelDiv">
- <label class="col-sm-3 control-label">Pengaturan model sepeda motor：</label>
- <div class="col-sm-9">
- <select class="form-control" id="zcModel" name="zcModel">
- <option value="">Pilih Jenis Kendaraan</option>
- @for(obj in zcModelList){
- <option value="${obj.id}">${obj.name}</option>
- @}
- </select>
- </div>
- </div>
- <div class="form-group" style="display: none;" id="kcModelDiv">
- <label class="col-sm-3 control-label">Model pengiriman ekspres lokal：</label>
- <div class="col-sm-9">
- <select class="form-control" id="kcModel" name="kcModel">
- <option value="">Pilih Jenis Kendaraan</option>
- @for(obj in kcModelList){
- <option value="${obj.id}">${obj.name}</option>
- @}
- </select>
- </div>
- </div>
-
- <#select id="carBrandId" name="Merek kendaraan：" onchange="TCarInfoDlg.brandChange(this)">
- <option value="">Pilih Merek Kendaraan</option>
- @for(obj in brandList){
- <option value="${obj.id}">${obj.name}</option>
- @}
- </#select>
- <#select id="carModelId" name="Jenis Kendaraan：">
- <option value="">Pilih Jenis Kendaraan</option>
-</#select>
-<#select id="carColor" name="Warna kendaraan：">
- <option value="">Pilih Warna Kendaraan</option>
- <option value="1">hitam</option>
- <option value="2">perak</option>
- <option value="3">putih</option>
- <option value="4">merah</option>
- <option value="5">kuning</option>
- <option value="6">oranye</option>
- <option value="7">biru</option>
-</#select>
-<#input id="carLicensePlate" name="车牌号" />
-<#avatar id="carPhoto" name="Nomor SIM Mengemudi：" />
-<#input id="drivingLicenseNumber" name="Nomor SIM Mengemudi" />
-<#avatar id="drivingLicensePhoto" name="Foto SIM：" />
-<#input id="annualInspectionTime" name="Waktu Kedaluwarsa Inspeksi Tahunan" type="text"/>
-<#input id="commercialInsuranceTime" name="Waktu kedaluwarsa asuransi komersial" type="text"/>
-</div>
-</div>
-
-<div class="row btn-group-m-t">
- <div class="col-sm-10 col-sm-offset-5">
- <#button btnCss="info" name="Kirim" id="ensure" icon="fa-check" clickFun="TCarInfoDlg.addSubmit()"/>
- <#button btnCss="danger" name="Batal" id="cancel" icon="fa-eraser" clickFun="TCarInfoDlg.close()"/>
- </div>
-</div>
- @}
</div>
</div>
</div>
-<script src="${ctxPath}/modular/system/tCar/tCar_info.js"></script>
+<script src="${ctxPath}/modular/system/tCompetition/tCompetition_info.js"></script>
<script>
laydate.render({
elem: '#annualInspectionTime'
--
Gitblit v1.7.1