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/appUser/TAppUser_edit.html | 28 ++++++++++++++++------------
1 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/appUser/TAppUser_edit.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/appUser/TAppUser_edit.html
index 1fa75eb..1292e28 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/appUser/TAppUser_edit.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/appUser/TAppUser_edit.html
@@ -58,7 +58,7 @@
<label class="col-sm-3 control-label">*所在市：</label>
<div class="col-sm-9">
<select style="width: 300px" class="form-control" id="cCode" name="cCode" >
- @for(obj in city){
+ @for(obj in city!){
<option style="width: 300px" value="${obj.code}"${obj.name == data.province ? 'selected=selected' : ''}>${obj.name}</option>
@}
</select>
@@ -76,7 +76,7 @@
<div class="form-group" >
<label class="col-sm-3 control-label">*生日：</label>
<div class="col-sm-9" style="display: flex;">
- <input style="width: 300px" class="form-control" value="${birthday}" id="birthday" placeholder="请选择" type="date">
+ <input style="width: 300px" class="form-control" value="${birthday!}" id="birthday" placeholder="请选择" type="date">
</div>
</div>
<div class="form-group" >
@@ -95,6 +95,14 @@
<input style="width: 300px" class="form-control" value="${data.phone}" id="phone" placeholder="请输入联系电话" type="text">
</div>
</div>
+ @if(type == 2){
+ <div class="form-group" >
+ <label class="col-sm-3 control-label">*剩余积分：</label>
+ <div class="col-sm-9" style="display: flex;">
+ <input style="width: 300px" class="form-control" value="${data.integral}" id="integral" type="text">
+ </div>
+ </div>
+ @}
<div class="form-group">
<label class="col-sm-3 control-label">*销售人员：</label>
<div class="col-sm-9">
@@ -116,22 +124,17 @@
</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="viplevelId" name = "gender">
- <option value="" style="color: #b6b6b6" disabled selected>请选择性别</option>
- <option value="1" ${data.viplevelId == 1 ? 'selected=selected' : ''}>青铜</option>
- <option value="2" ${data.viplevelId == 2 ? 'selected=selected' : ''}>白银</option>
- <option value="3" ${data.viplevelId == 3 ? 'selected=selected' : ''}>黄金</option>
- </select>
+ <label class="col-sm-3 control-label">*会员等级：</label>
+ <div class="col-sm-9" style="display: flex;">
+ <input style="width: 300px" class="form-control" value="${level}" id="level" type="text">
</div>
</div>
</div>
@}
<div class="form-horizontal" id="carInfoForm2">
<h2>学员信息</h2>
+ @for(obj in students){
<div class="form-group" style="display: flex">
- @for(obj in students){
<label class="col-sm-3 control-label">*姓名：</label>
<div class="col-sm-9">
<input style="width: 300px" class="form-control" value="${obj.name}" id="studentName" type="text">
@@ -141,8 +144,9 @@
<input style="width: 300px" class="form-control" value="${obj.phone}" id="studentPhone" type="text">
</div>
<#button btnCss="info" name="查看详情" id="ensure" icon="fa-check" clickFun="TQuestion.studentInfo(${obj.id})"/>
- @}
</div>
+ @}
+
</div>
<div class="row btn-group-m-t">
--
Gitblit v1.7.1