From 19251fb5596415bfa83c51b8ed130ecbb31644ce Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期一, 09 十月 2023 18:31:30 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/yuyue.html | 44 +++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 43 insertions(+), 1 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..f4eef17 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,6 +55,45 @@
</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()"/>
</div>
</div>
@@ -62,7 +101,10 @@
<#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-edit" clickFun="TStudent.openTStudentDetail1()" space="true"/>
+ <#button name="取消凭证" icon="fa-edit" clickFun="TStudent.openTStudentDetail4()" space="true"/>
+
+ <#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