From a1d261d6c92c38d9e496e11d1bc224ecc1d34798 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期二, 14 十一月 2023 09:14:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/yuyue.html | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 50 insertions(+), 3 deletions(-)
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/yuyue.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/yuyue.html
index 0aafb2c..83c6a9d 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/yuyue.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/yuyue.html
@@ -55,15 +55,62 @@
</div>
<div class="col-sm-3">
+ <div class="input-group">
+ <div class="input-group-btn open">
+ <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button" aria-expanded="true">
+ 支付方式
+ </button>
+ </div>
+ <select class="form-control" id="payMethod">
+ <option value="">全部</option>
+ <option value=1>微信</option>
+ <option value=2>支付宝</option>
+ <option value=3>玩湃币</option>
+ <option value=4>手动支付</option>
+ </select>
+ </div>
+ </div>
+
+ <div class="col-sm-3">
+ <div class="input-group">
+ <div class="input-group-btn open">
+ <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button" aria-expanded="true">
+ 状态
+ </button>
+ </div>
+ <select class="form-control" id="state">
+ <option value="">全部</option>
+
+ <option value="0">待支付</option>
+ <option value="1">待核销</option>
+ <option value="2">已到店</option>
+ <option value="3">已完成</option>
+ <option value="4">已过期</option>
+ <option value="5">已取消</option>
+ </select>
+ </div>
+ </div>
+
+
+
+ <div class="col-sm-3">
<#button name="搜索" icon="fa-search" clickFun="TStudent.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="TStudent.resetSearch()" space="true"/>
</div>
</div>
<div class="hidden-xs" id="TStudentTableToolbar" role="group">
- <#button name="添加" icon="fa-plus" clickFun="TStudent.openAddTStudent()"/>
- <#button name="修改" icon="fa-edit" clickFun="TStudent.openTStudentDetail()" space="true"/>
- <#button name="查看详情" icon="fa-edit" clickFun="TStudent.openTStudentDetail1()" space="true"/>
+ <#button name="添加" icon="fa-plus" clickFun="TStudent.openAddTStudent()"/>
+ @if(role == 1){
+ <#button name="修改" icon="fa-edit" clickFun="TStudent.openTStudentDetail()" space="true"/>
+ @}
+ <#button name="确认到店" icon="fa-edit" clickFun="TStudent.openTStudentDetail1()" space="true"/>
+ <#button name="取消预约" icon="fa-edit" clickFun="TStudent.openTStudentDetail4()" space="true"/>
+ <#button name="手动支付" icon="fa-edit" clickFun="TStudent.openTStudentDetail6()" space="true"/>
+ @if(role == 1){
+ <#button name="查看详情" icon="fa-edit" clickFun="TStudent.openTStudentDetail5()" space="true"/>
+ @}
@if(shiro.hasPermission("/tStudent/delete")){
<#button name="删除" icon="fa-remove" clickFun="TStudent.delete()" space="true"/>
@}
--
Gitblit v1.7.1