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/cpPayment/cpPayment_add.html | 47 +++++++++++++++++++++++++----------------------
1 files changed, 25 insertions(+), 22 deletions(-)
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/cpPayment/cpPayment_add.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/cpPayment/cpPayment_add.html
index 0b547b3..62d5951 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/cpPayment/cpPayment_add.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/cpPayment/cpPayment_add.html
@@ -56,7 +56,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="vipPhone" name="vipPhone" placeholder="请输入家长会员手机号" type="number">
- <#button btnCss="info" name="查询" id="ensure" icon="fa-check" clickFun="TCompetition.getStudent()"/>
+ <#button btnCss="info" name="查询" id="ensure" icon="fa-check" clickFun="TQuestion.getStudent()"/>
</div>
</div>
<div class="form-group" >
@@ -73,10 +73,11 @@
<div class="form-horizontal" id="carInfoForm">
<h2>选择课包信息</h2>
<input hidden id="roleType" value="${roleType}">
+ @if(roleType==1){
<div class="form-group" id="provinceCode">
<label class="col-sm-3 control-label">所在省：</label>
<div class="col-sm-9">
- <select style="width: 300px" class="form-control" id="pCode" name="pCode" onchange="TCompetition.oneChange(this)">
+ <select style="width: 300px" class="form-control" id="pCode" name="pCode" onchange="TQuestion.oneChange(this)">
<option value="">选择省</option>
@for(obj in list){
<option value="${obj.code}">${obj.name}</option>
@@ -87,25 +88,28 @@
<div class="form-group" id="cityCode">
<label class="col-sm-3 control-label">所在市：</label>
<div class="col-sm-9">
- <select style="width: 300px" class="form-control" id="cCode" name="cCode" onchange="TCompetition.threeChange(this)">
+ <select style="width: 300px" class="form-control" id="cCode" name="cCode" onchange="TQuestion.threeChange(this)">
<option value="">选择市</option>
- </select>
- </div>
- </div>
- @if(roleType !=3){
- <div class="form-group">
- <label class="col-sm-3 control-label">*所属门店：</label>
- <div class="col-sm-9">
- <select style="width: 300px" class="form-control" id="store" name="store" >
- <option value="">选择门店</option>
</select>
</div>
</div>
@}
<div class="form-group">
+ <label class="col-sm-3 control-label">*所属门店：</label>
+ <div class="col-sm-9">
+ <select style="width: 300px" class="form-control" id="store" name="store" >
+ <option value="">选择门店</option>
+ @for(obj in stores){
+ <option value="${obj.id}">${obj.name}</option>
+ @}
+ </select>
+ </div>
+ </div>
+ <div class="form-group">
<label class="col-sm-3 control-label">*课包类型：</label>
<div class="col-sm-9">
- <select style="width: 300px" class="form-control" id="coursePackageType" name="store" onchange="TCompetition.getCoursePackage(this)" >
+ <select style="width: 300px" class="form-control" id="coursePackageType" name="store" onchange="TQuestion.getCoursePackage(this)" >
+ <option value="">请选择</option>
@for(obj in coursePackageType){
<option value="${obj.id}">${obj.name}</option>
@}
@@ -116,29 +120,28 @@
<div class="form-group">
<label class="col-sm-3 control-label">*课包名称：</label>
<div class="col-sm-9">
- <select style="width: 300px" class="form-control" id="coursePackageName" name="store" onchange="TCompetition.getCoursePackageConfig(this)" >
+ <select style="width: 300px" class="form-control" id="coursePackageName" name="store" onchange="TQuestion.getCoursePackageConfig(this)" >
<option value="">选择课包</option>
</select>
</div>
</div>
- @if(roleType == 1){
- <div class="form-group">
+ <div class="form-group" id="toHidden">
<label class="col-sm-3 control-label">*课时规格：</label>
<div class="col-sm-9">
- <select style="width: 300px" class="form-control" id="courseTime" name="store">
+ <select style="width: 300px" class="form-control" id="courseTime" name="store" onchange="TQuestion.getCoursePackagePrice(this)">
<option value="">选择规格</option>
</select>
</div>
</div>
- @}
- <div class="form-group" >
+
+ <div class="form-group" id = "c1" hidden >
<label class="col-sm-3 control-label">*支付金额：</label>
<div class="col-sm-9" style="display: flex;">
<input style="width: 300px" class="form-control" id="cashPayment" name="cashPayment" placeholder="请输入金额" type="number">
<span style="margin-left: 5px;margin-top: 5px">￥</span>
</div>
</div>
- <div class="form-group" >
+ <div class="form-group" id = "c2" hidden >
<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="number">
@@ -150,8 +153,8 @@
<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="TCompetition.addSubmit()"/>
- <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TCompetition.close()"/>
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TQuestion.addSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TQuestion.close()"/>
</div>
</div>
--
Gitblit v1.7.1