Merge remote-tracking branch 'origin/master'

liujie

2023-08-16 5cb1979f05446792cc33a8cb6b7aaae906da5a70

 management/guns-admin/src/main/webapp/WEB-INF/view/system/tBranchOffice/tBranchOfficeDetail.html

@@ -95,14 +95,106 @@
                                <label>${driverCount}</label>人
                            </div>
                        </div>

                        <hr/>
                        <div class="initialLevel col-sm-12 control-label form-group"  >
                            <div style="background-color: gray;height: 35px;line-height: 35px">
                                <label style="color: #0C0C0C">价格规则</label>
                            </div>
                        </div>
                        <hr/>
                        <div class="initialLevel col-sm-12 control-label form-group" id="rules" style="text-align: left" >
                            @if(null != array){
                            @for(ChargeStandard in array){
                            <div name="rulesForm">
                                <div class="initialLevel col-sm-12 control-label form-group"  >
                                    <span class="control-label" >时间段</span>
                                    <span class="control-label" > ${ChargeStandard.num1} </span>
                                    <span class="control-label" >—</span>
                                    <span class="control-label" > ${ChargeStandard.num2} </span>
                                    <span class="control-label" >代驾里程</span>
                                    <span class="control-label" > ${ChargeStandard.num3} </span>
                                    <span class="control-label" >公里,起步价</span>
                                    <span class="control-label" > ${ChargeStandard.num4} </span>
                                    <span class="control-label" >元,超出里程每</span>
                                    <span class="control-label" > ${ChargeStandard.num5} </span>
                                    <span class="control-label" >公里,收费</span>
                                    <span class="control-label" > ${ChargeStandard.num6} </span>
                                    <span class="control-label" >元</span>
                                </div>
                                <div class="initialLevel col-sm-12 control-label form-group"  >
                                    <span class="control-label" >长途里程</span>
                                    <span class="control-label" > ${ChargeStandard.num7} </span>
                                    <span class="control-label" >—</span>
                                    <span class="control-label" > ${ChargeStandard.num8} </span>
                                    <span class="control-label" >公里,收费</span>
                                    <span class="control-label" > ${ChargeStandard.num9} </span>
                                    <span class="control-label" >元,超出里程每</span>
                                    <span class="control-label" > ${ChargeStandard.num10} </span>
                                    <span class="control-label" >公里,收费</span>
                                    <span class="control-label" > ${ChargeStandard.num11} </span>
                                    <span class="control-label" >元</span>
                                </div>
                            </div>
                            @}
                            @}
                        </div>
                        <hr/>
                        <div class="initialLevel col-sm-12 control-label form-group"  >
                            <div style="background-color: gray;height: 35px;line-height: 35px">
                                <label style="color: #0C0C0C">客服信息</label>
                            </div>
                        </div>
                        <hr/>
                        <div class="initialLevel col-sm-12 control-label form-group" style="text-align: left" >
                            <div class="initialLevel col-sm-12 control-label form-group"  >
                                <span class="control-label" >客服电话</span>
                                <span class="control-label" >${serviceTel}</span>
                            </div>
                        </div>
                        <hr/>
                        <div class="initialLevel col-sm-12 control-label form-group"  >
                            <div style="background-color: gray;height: 35px;line-height: 35px">
                                <label style="color: #0C0C0C">额外费用</label>
                            </div>
                        </div>
                        <hr/>
                        <div class="initialLevel col-sm-12 control-label form-group" style="text-align: left" >
                            <div class="initialLevel col-sm-12 control-label form-group"  >
                                <span class="control-label" >等待</span>
                                <span class="control-label" >${ExtraCost.num1}</span>
                                <span class="control-label" >分钟,收取</span>
                                <span class="control-label" >${ExtraCost.num2}</span>
                                <span class="control-label" >元,超出</span>
                                <span class="control-label" >${ExtraCost.num3}</span>
                                <span class="control-label" >分钟,收取</span>
                                <span class="control-label" >${ExtraCost.num4}</span>
                                <span class="control-label" >元/分钟</span>
                            </div>
                            <div class="initialLevel col-sm-12 control-label form-group" >
                                <span class="control-label" >恶劣天气</span>
                                <span class="control-label" >${ExtraCost.num5}</span>
                                <span class="control-label" >公里以内,加收</span>
                                <span class="control-label" >${ExtraCost.num6}</span>
                                <span class="control-label" >元,超出</span>
                                <span class="control-label" >${ExtraCost.num7}</span>
                                <span class="control-label" >公里,收取订单的</span>
                                <span class="control-label" >${ExtraCost.num8}</span>
                                <span class="control-label" >倍计费,最高收取</span>
                                <span class="control-label" >${ExtraCost.num9}</span>
                                <span class="control-label" >元</span>
                            </div>
                            <div class="initialLevel col-sm-12 control-label form-group" >
                                <span class="control-label" >节假日&nbsp;&nbsp;&nbsp;每单加收</span>
                                <span class="control-label" >${ExtraCost.num10}</span>
                                <span class="control-label" >元</span>
                            </div>
                        </div>
                    </div>
                </div>
            </div>
        </div>
    </div>
</div>
<script src="${ctxPath}/static/modular/system/tAgent/tAgent.js"></script>
<script type="text/javascript">
    laydate.render({
        elem: '#createTime',