Merge remote-tracking branch 'origin/2.0' into 2.0

luodangjia

2024-07-17 736ab0090700c75af37b8a3456b01609e4e2d329

 ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/subsidy/use.html

@@ -43,6 +43,19 @@
        margin-left: 40px; /* 设置矩形框之间的间距 */
        margin-top: 15px;
    }
    .rectangle4 {
        width: 250px; /* 设置框的宽度 */
        height: 170px; /* 自适应高度 */
        background-color: #cecece; /* 设置底色为灰色 */
        border-radius: 30px; /* 设置圆角半径为10px */
        display: flex; /* 使用 Flex 布局 */
        flex-direction: column; /* 设置主轴方向为垂直 */
        justify-content: center; /* 垂直居中 */
        align-items: center; /* 水平居中 */
        margin-right: 40px; /* 设置矩形框之间的间距 */
        margin-left: 40px; /* 设置矩形框之间的间距 */
        margin-top: 15px;
    }
    h1, h2 {
        margin: 0; /* 去除默认的外边距 */
    }
@@ -69,23 +82,15 @@
                            <div class="col-sm-3">
                                <#TimeCon id="insertTime" name="时间" isTime="false"/>
                            </div>
                            <div class="col-sm-3">
                                <#SelectCon id="type" name="流水项目" >
                                    <option value="">全部</option>
                                    <option value="1">用户订单消费</option>
                                    <option value="2">用户充值</option>
                                    <option value="3">司机结算</option>
                                    <option value="4">司机提现</option>
                                    <option value="5">用户提现</option>
                                </#SelectCon>
                            </div>
                            <div class="col-sm-3">
                                <#SelectCon id="payType" name="支付方式" >
                                    <option value="">全部</option>
                                    <option value="1">银行卡支付</option>
                                    <option value="2">手机支付</option>
                                </#SelectCon>
                            </div>
                        <div class="col-sm-3">
                            <#SelectCon id="type" name="补贴类型" >
                            <option value="">全部</option>
                            <option value="1">红包</option>
                            <option value="2">优惠券</option>
                            <option value="3">司机奖励</option>
                            <option value="4">折扣</option>
                        </#SelectCon>
                    </div>
                            <div class="col-sm-3">
                                <#button name="查询" icon="fa-search" clickFun="TUser.search()"/>
                                <#button name="重置" icon="fa-trash" clickFun="TUser.resetSearch()" space="true"/>
@@ -95,38 +100,40 @@
                    <div class="rectangle1">
                        <h1 id="num1">0</h1>
                        <br>
                        <h2 id="text1">第三方流水余额合计</h2>
                        <h2 id="text1">已使用补贴总额</h2>

                    </div>
                    <img style="margin-top: 70px" width="25px" height="25px" src="${ctxPath}/static/img/=.png.">
                    <div class="rectangle2">
                        <h1 id="num2">0</h1>
                        <br>
                        <h2 id="text2">用户订单消费</h2>
                        <h2 id="text2">已使用折扣总额(用户端)</h2>
                    </div>
                    <img style="margin-top: 70px" width="25px" height="25px" src="${ctxPath}/static/img/+.png.">
                    <div class="rectangle3">
                        <h1 id="num3">0</h1>
                        <br>
                        <h2 id="text3">用户充值总额</h2>
                        <h2 id="text3">已使用红包总额(用户端)</h2>
                    </div>
                    <img style="margin-top: 70px" width="25px" height="25px" src="${ctxPath}/static/img/+.png.">
                    <div class="rectangle3">
                        <h1 id="num4">0</h1>
                        <br>
                        <h2 id="text4">司机结算总额</h2>
                        <h2 id="text4">已使用优惠券总额(用户端)</h2>
                    </div>
                    <img style="margin-top: 70px" width="25px" height="25px" src="${ctxPath}/static/img/-.png.">
                    <div class="rectangle3">
                    <div class="rectangle4">
                        <h1 id="num5">0</h1>
                        <br>
                        <h2 id="text5">司机提现总额</h2>
                    </div>
                    <img style="margin-top: 70px" width="25px" height="25px" src="${ctxPath}/static/img/-.png.">
                    <div class="rectangle3">
                        <h1 id="num6">0</h1>
                        <h2 id="text5">已使用司机奖励合计</h2>
                        <br>
                        <h2 id="text6">用户提现总额</h2>
                        <div style="display: flex">
                        <span>已提现</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span id="num6">0</span>
                        </div>
                        <br>
                        <div style="display: flex">
                        <span>已消费</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span id="num7">0</span>
                        </div>
                    </div>
                </div>
                    <#table id="TUserTable"/>
@@ -136,7 +143,7 @@
        </div>
    </div>
</div>
<script src="${ctxPath}/static/modular/system/platform/water.js"></script>
<script src="${ctxPath}/static/modular/system/subsidy/use.js"></script>
<script>
    laydate.render({
        elem: '#insertTime'