Merge remote-tracking branch 'origin/master'

liujie

2023-10-10 29bd4d946349eacd38442c07ebf15b470af92e82

 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"/>