From 3b83ac724fcdc3af2b4763f11839d702909cb754 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 25 十二月 2024 13:43:02 +0800
Subject: [PATCH] 管理后台
---
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSysSensitiveWords/tSysSensitiveWords.html | 48
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tUser/tUser_userDetail.html | 99
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/user/user_add.html | 62
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_immediately.html | 41
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tComplaintDriver/tComplaint_edit.html | 34
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/role/role.html | 41
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponRecord/sysCouponRecord_edit.html | 34
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tVersionManagement/tVersionManagement.html | 49
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/user/user_chpwd.html | 34
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCar/tCar_edit.html | 190
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tServerCarmodel/charter.html | 49
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSysReformist/tSysReformist.html | 521 +
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_add.html | 309
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/menu/menu.html | 41
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tProblem/tProblem_add.html | 33
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tServerCarmodel/acrossCity_edit.html | 24
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity_detail.html | 132
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tComplaint/tComplaint_add.html | 34
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/report/couponStatistics.html | 184
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/sysCouponRecord1.html | 37
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemPrice/tSystemPrice_edit.html | 182
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysRedPacketRecord/sysRedPacketRecord_edit.html | 34
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCharter/tOrderCharter_add.html | 35
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderLogistics/tOrderLogistics_add.html | 82
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/punish.html | 62
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tUser/tUser_add.html | 54
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/code/code.html | 101
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/tReassign_reassignmentCross.html | 34
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tServerCarmodel/charter_edit.html | 47
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/common/tags/tag_tips | 22
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/notice/notice.html | 38
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tFeedback/tFeedback_immediately.html | 29
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tUser/tUser.html | 84
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderLogistics/tOrderLogistics.html | 94
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/cross.html | 87
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCharter/tOrderCharter.html | 61
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar_add.html | 89
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCharteredCar/tOrderCharteredCar_immediately.html | 28
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/tReassign.html | 87
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/dict/dict_add.html | 64
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity_add.html | 85
ManagementOKTravel/guns-admin/src/main/resources/logback-spring.xml | 132
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tFeedback/tFeedback_add.html | 36
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tServerCarmodel/tServerCarmodel.html | 49
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSmsrecord/tSmsrecord_edit.html | 31
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tVersionManagement/tVersionManagement_edit.html | 32
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponActivity/sysCouponRecord.html | 37
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSysSensitiveWords/tSysSensitiveWords_edit.html | 28
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCar/carInsuranceInfo.html | 35
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/web.xml | 12
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver.html | 70
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity.html | 68
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/sysCouponRecord.html | 37
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/code/code.html | 47
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementMe.html | 65
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/common/_right.html | 58
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/tReassign_reassignmentTaxi.html | 34
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/pricingRules.html | 65
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tVersionManagement/tVersionManagement_add.html | 72
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_detail.html | 496 +
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tProblem/tProblem_edit.html | 33
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSite/tSite.html | 67
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/404.html | 41
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCrossCity/tOrderCrossCity_track.html | 52
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tNotices/system_add.html | 58
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/common/tags/select.tag | 26
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tUserRedPacketRecord/tUserRedPacketRecord.html | 61
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_look.html | 43
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/common/tags/NameCon.tag | 14
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/common/tags/avatar.tag | 29
ManagementOKTravel/guns-admin/src/main/resources/application.yml | 117
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCar/tCar.html | 90
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemPrice/tSystemPrice_add.html | 182
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/receiveRecord.html | 296
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_detail.html | 180
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tPubWithdrawal/tPubWithdrawal.html | 49
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tComplaint/tComplaint_edit.html | 34
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar_trajectory.html | 52
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponActivity/sysCouponActivity_add.html | 65
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/index.html | 47
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSmsrecord/tSmsrecord.html | 48
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_addFranchisee.html | 71
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderEvaluate/tOrderEvaluate.html | 66
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCrossCity/tOrderCrossCity.html | 109
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDispatch/tDispatch_add.html | 47
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/user/user_roleassign.html | 79
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCar/carInsurance.html | 31
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemPrice/tSystemPrice.html | 52
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/corssHtml.html | 65
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDispatch/tDispatch_edit.html | 51
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderEvaluate/tOrderEvaluate_edit.html | 33
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tServerCarmodel/charter_add.html | 47
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderTaxi/tOrderTaxi_add.html | 79
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/taxi.html | 90
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar.html | 101
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tComplaintDriver/tComplaint_immediately.html | 36
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tFeedback/tFeedback.html | 52
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/addRegist.html | 78
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/smallPieceLogistics.html | 86
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/user/user.html | 80
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity.html | 57
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_optDriver.html | 29
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tUser/tUser_optUser.html | 29
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCarModel/tCarModel_add.html | 38
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tLine/tLine_addCompany.html | 65
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/common/tags/SelectCon.tag | 16
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAdvertisement/tAdvertisement_edit.html | 79
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderEvaluate/tOrderEvaluate_add.html | 33
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementOrder.html | 65
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tPubWithdrawal/tPubWithdrawal_immediately.html | 41
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tUserRedPacketRecord/tUserRedPacketRecord_add.html | 35
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/blackboardBlank.html | 59
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/training.html | 75
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivityHistory/driverActivityHistory.html | 25
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_edit.html | 509 +
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/log/log.html | 48
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tNotices/system.html | 51
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/home.html | 208
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCarBrand/tCarBrand.html | 48
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tIntegralOrder/tIntegralOrder_add.html | 35
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tInvoice/tInvoice_add.html | 39
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCarModel/tCarModel_edit.html | 39
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/dept/dept.html | 38
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tFeedback/tFeedback_edit.html | 36
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/sysRedPacketRecord.html | 36
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/sysCouponRecord2.html | 38
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity_immediately.html | 41
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCharter/tOrderCharter_immediately.html | 28
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAdvertisement/tAdvertisement.html | 61
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tInvoice/tInvoice_edit.html | 39
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementSmallPieceLogistics.html | 65
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCar/tCar_add.html | 171
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCharter/tOrderCharter_edit.html | 35
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/common/tags/table.tag | 12
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/yesDriver.html | 98
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tUser/tUser_updatePassword.html | 24
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderTaxi/tOrderTaxi.html | 100
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tPubWithdrawal/tPubWithdrawal_edit.html | 38
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCarBrand/tCarBrand_edit.html | 30
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tNotices/tNotices_add.html | 29
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tLine/tLine_edit.html | 257
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/tReassign_reassignmentSmall.html | 34
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/commonProblem.html | 65
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSite/tSite_add.html | 170
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/login.html | 193
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tServerCarmodel/tServerCarmodel_edit.html | 24
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany.html | 73
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/instructions.html | 65
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/common/_tab.html | 74
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tComplaint/tComplaint_immediately.html | 28
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tServerCarmodel/acrossCity_add.html | 24
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_add.html | 199
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOpenCity/tOpenCity_edit.html | 90
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCarModel/tCarModel.html | 48
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tComplaintDriver/lookDetail.html | 29
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tServerCarmodel/acrossCity.html | 49
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/log/login_log.html | 47
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/driverOnline.html | 33
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity_edit.html | 138
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/role/role_edit.html | 47
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tIntegralOrder/tIntegralOrder_immediately.html | 28
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tComplaintDriver/tComplaint.html | 58
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDispatch/tDispatch.html | 70
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/netCarInfo.html | 25
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tInvoice/tInvoice.html | 63
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tUser/tUser_edit.html | 54
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/menu/menu_edit.html | 42
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tIntegralOrder/tIntegralOrder_edit.html | 35
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/common/_theme.html | 84
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tComplaint/lookDetail.html | 29
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/user/user_view.html | 75
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/notice/notice_edit.html | 39
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponActivity/tUser.html | 63
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCharteredCar/tOrderCharteredCar_edit.html | 40
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tIntegralGoods/tIntegralGoods_add.html | 31
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysRedPacketRecord/sysRedPacketRecord.html | 45
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/driverRegister.html | 65
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userCouponRecord/userCouponRecord.html | 61
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tNotices/tNotices.html | 48
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponActivity/sysCouponActivity_immediately.html | 41
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_detailFranchisee.html | 52
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/menu/menu_add.html | 40
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/report/operationalData.html | 47
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tComplaint/tComplaint.html | 58
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementUser.html | 65
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_add.html | 237
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponRecord/sysCouponRecord_add.html | 57
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tLine/tLine.html | 70
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_edit.html | 171
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/common/tags/uploadFile.tag | 13
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_edit.html | 263
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCharteredCar/tOrderCharteredCar.html | 61
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tVerified/tVerified.html | 59
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_changeCar.html | 46
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/dept/dept_edit.html | 44
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tComplaintDriver/tComplaint_add.html | 34
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCrossCity/tOrderCrossCity_detail.html | 107
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/common/tags/button.tag | 30
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderTaxi/tOrderTaxi_trajectory.html | 52
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tVerified/tVerified_immediately.html | 35
ManagementOKTravel/guns-admin/src/main/resources/ehcache.xml | 57
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/tReassign_reassignment.html | 34
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemPrice/small.html | 397 +
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/role/role_assign.html | 78
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/role/role_add.html | 47
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/dict/dict_edit.html | 86
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCarBrand/tCarBrand_add.html | 30
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementRecharge.html | 65
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tUser/tUser_updateBalance.html | 28
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar_orderDetail.html | 115
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tVerified/tVerified_add.html | 33
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/common/tags/input.tag | 54
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOpenCity/tOpenCity.html | 48
ManagementOKTravel/guns-admin/src/main/resources/META-INF/spring-devtools.properties | 1
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponRecord/sysCouponRecord.html | 61
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAdvertisement/tAdvertisement_add.html | 58
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/common/tags/uploadImg.tag | 26
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/common/tags/TimeCon.tag | 15
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderLogistics/tOrderLogistics_detail.html | 63
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tUserRedPacketRecord/tUserRedPacketRecord_edit.html | 35
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSite/tSite_edit.html | 193
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tVerified/tVerified_edit.html | 33
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementLaw.html | 65
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCarAudit/tCarAudit.html | 89
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponActivity/sysCouponActivity_edit.html | 81
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOpenCity/tOpenCity_add.html | 74
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/common/tags/label.tag | 31
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysRedPacketRecord/sysRedPacketRecord_add.html | 82
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementDriver.html | 105
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tComplaintDriver/tComplaint_BlackList.html | 45
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tProblem/tProblem_immediately.html | 28
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCharteredCar/tOrderCharteredCar_add.html | 40
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_updateFranchisee.html | 77
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/dept/dept_add.html | 42
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tNotices/system_update.html | 44
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tNotices/tNotices_edit.html | 29
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/franchisee.html | 70
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tLine/tLine_add.html | 243
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementCharterCar.html | 65
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/platformEdit.html | 194
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tIntegralOrder/tIntegralOrder.html | 61
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tPubWithdrawal/tPubWithdrawal_add.html | 38
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderTaxi/tOrderTaxi_changeOrder.html | 35
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_immediately.html | 64
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderLogistics/tOrderLogistics_edit.html | 82
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/common/_container.html | 248
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderTaxi/tOrderTaxi_edit.html | 81
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/report/couponStatisticsInfo.html | 46
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tIntegralGoods/tIntegralGoods.html | 61
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tIntegralGoods/tIntegralGoods_edit.html | 31
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/common/tags/inputRequired.tag | 51
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreement.html | 105
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/user/user_edit.html | 58
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSmsrecord/tSmsrecord_add.html | 31
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSysSensitiveWords/tSysSensitiveWords_add.html | 22
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/receiveRecord.html | 226
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/notice/notice_add.html | 39
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tServerCarmodel/tServerCarmodel_add.html | 24
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponActivity/sysCouponActivity.html | 68
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/blackboard.html | 634 +
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tProblem/tProblem.html | 49
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/dict/dict.html | 38
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tFeedback/userFeedback.html | 52
263 files changed, 19,507 insertions(+), 0 deletions(-)
diff --git a/ManagementOKTravel/guns-admin/src/main/resources/META-INF/spring-devtools.properties b/ManagementOKTravel/guns-admin/src/main/resources/META-INF/spring-devtools.properties
new file mode 100644
index 0000000..3e72835
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/resources/META-INF/spring-devtools.properties
@@ -0,0 +1 @@
+restart.include.beetl=/beetl-2.8.5.jar
\ No newline at end of file
diff --git a/ManagementOKTravel/guns-admin/src/main/resources/application.yml b/ManagementOKTravel/guns-admin/src/main/resources/application.yml
new file mode 100644
index 0000000..dc43bd1
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/resources/application.yml
@@ -0,0 +1,117 @@
+server:
+ port: 10644
+
+guns:
+ swagger-open: true #是否开启swagger (true/false)
+ kaptcha-open: false #是否开启登录时验证码 (true/false)
+ spring-session-open: false #是否开启spring session,如果是多机环境需要开启(true/false)
+ session-invalidate-time: 1800 #session失效时间(只在单机环境下生效，多机环境在SpringSessionConfig类中配置) 单位：秒
+ session-validation-interval: 900 #多久检测一次失效的session(只在单机环境下生效) 单位：秒
+# file-upload-path: C:\Users\hi\Desktop\ #文件上传目录(不配置的话为java.io.tmpdir目录)
+# picture-server-address: http://192.168.0.43/resources/ #图片服务器地址
+ file-upload-path: D:\apache-tomcat-9.0.56-windows-x64\apache-tomcat-9.0.56\webapps\ROOT\upload\ #文件上传目录(不配置的话为java.io.tmpdir目录)
+ picture-server-address: http://127.0.0.1:8080/upload/ #图片服务器地址
+ rest-url: http://127.0.0.1:8080/rest/ #前端接口调用基础路径
+
+spring:
+ profiles:
+ active: local
+ mvc:
+ static-path-pattern: /static/**
+ view:
+ prefix: /WEB-INF/view
+ devtools:
+ restart:
+ enabled: false
+ additional-paths: src/main/java
+ exclude: static/**,WEB-INF/view/**
+ servlet:
+ multipart:
+ max-request-size: 100MB
+ max-file-size: 100MB
+
+mybatis-plus:
+ type-aliases-package: com.stylefeng.guns.modular.system.model
+ global-config:
+ id-type: 0 #0:数据库ID自增 1:用户输入id 2:全局唯一id(IdWorker) 3:全局唯一ID(uuid)
+ db-column-underline: false
+ configuration:
+ configuration.map-underscore-to-camel-case: true #是否开启自动驼峰命名规则（camel case）映射
+ log-impl: org.apache.ibatis.logging.slf4j.Slf4jImpl #输出Sql，如需打印Sql注释该配置
+
+logging:
+ level.root: error
+ level.com.stylefeng: debug
+ path: logs/
+ file: guns.log
+
+#eureka:
+# client:
+# service-url: #注册中心地址
+# defaultZone: http://sinata:sinata@139.9.249.67:8000/eureka #启用身份验证的方式连接
+# register-with-eureka: true #在注册中心进行注册
+# fetch-registry: true #从Eureka中获取注册信息。
+
+
+---
+
+spring:
+ profiles: local
+ datasource:
+# url: jdbc:mysql://116.169.59.170:3306/ziang?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
+# username: root
+# password: fVa%egqp_1du
+# url: jdbc:mysql://116.169.59.170:3306/ziang?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
+# username: root
+# password: fVa%egqp_1du
+# url: jdbc:mysql://127.0.0.1:3306/ziang?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
+# username: root
+# password: fVa%egqp_1du
+ url: jdbc:mysql://127.0.0.1:10633/xianning?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
+ username: root
+ password: XianNing@2024!
+ db-name: guns #用来搜集数据库的所有表
+ filters: wall,mergeStat
+
+
+#spring:
+# profiles: local
+# datasource:
+# url: jdbc:mysql://127.0.0.1:3306/oktravel?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
+# username: root
+# password: root
+# db-name: oktravel #用来搜集数据库的所有表
+# filters: wall,mergeStat
+
+
+
+#多数据源情况的配置
+guns:
+ muti-datasource:
+ open: false
+ url: jdbc:mysql://192.168.110.80:3306/ziang?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
+ username: root
+ password: 123456
+ dataSourceNames:
+ - dataSourceGuns
+ - dataSourceBiz
+
+---
+
+#spring:
+# profiles: produce
+# datasource:
+# url: jdbc:mysql://120.24.34.190:3306/mask?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
+# username: root
+# password: Root2020!
+# db-name: mask #用来搜集数据库的所有表
+# filters: wall,mergeStat
+
+---
+
+filePath: /usr/orderPostionFile/ #存储订单轨迹文件路径
+#filePath: C:/orderPostionFile/ #存储订单轨迹文件路径
+
+
+#交通部推送数据功能开关
+pushMinistryOfTransport: false
\ No newline at end of file
diff --git a/ManagementOKTravel/guns-admin/src/main/resources/ehcache.xml b/ManagementOKTravel/guns-admin/src/main/resources/ehcache.xml
new file mode 100644
index 0000000..1e47379
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/resources/ehcache.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ehcache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="ehcache.xsd"
+ updateCheck="false" monitoring="autodetect"
+ dynamicConfig="true" >
+
+ <diskStore path="java.io.tmpdir/ehcache"/>
+
+ <defaultCache
+ maxElementsInMemory="50000"
+ eternal="false"
+ timeToIdleSeconds="3600"
+ timeToLiveSeconds="3600"
+ overflowToDisk="true"
+ diskPersistent="false"
+ diskExpiryThreadIntervalSeconds="120"
+ />
+
+ <!-- 全局变量：永不过期-->
+ <cache name="CONSTANT"
+ maxElementsInMemory="50000"
+ eternal="true"
+ clearOnFlush="false"
+ overflowToDisk="true"
+ diskSpoolBufferSizeMB="1024"
+ maxElementsOnDisk="100000"
+ diskPersistent="false"
+ diskExpiryThreadIntervalSeconds="120"
+ memoryStoreEvictionPolicy="LFU"
+ transactionalMode="off">
+ </cache>
+
+</ehcache>
+
+ <!--
+ maxElementsInMemory="10000" //Cache中最多允许保存的数据对象的数量
+ external="false" //缓存中对象是否为永久的，如果是，超时设置将被忽略，对象从不过期
+ timeToLiveSeconds="3600" //缓存的存活时间，从开始创建的时间算起
+ timeToIdleSeconds="3600" //多长时间不访问该缓存，那么ehcache 就会清除该缓存
+
+ 这两个参数很容易误解，看文档根本没用，我仔细分析了ehcache的代码。结论如下：
+ 1、timeToLiveSeconds的定义是：以创建时间为基准开始计算的超时时长；
+ 2、timeToIdleSeconds的定义是：在创建时间和最近访问时间中取出离现在最近的时间作为基准计算的超时时长；
+ 3、如果仅设置了timeToLiveSeconds，则该对象的超时时间=创建时间+timeToLiveSeconds，假设为A；
+ 4、如果没设置timeToLiveSeconds，则该对象的超时时间=min(创建时间，最近访问时间)+timeToIdleSeconds，假设为B；
+ 5、如果两者都设置了，则取出A、B最少的值，即min(A,B)，表示只要有一个超时成立即算超时。
+
+ overflowToDisk="true" //内存不足时，是否启用磁盘缓存
+ diskSpoolBufferSizeMB //设置DiskStore（磁盘缓存）的缓存区大小。默认是30MB。每个Cache都应该有自己的一个缓冲区
+ maxElementsOnDisk //硬盘最大缓存个数
+ diskPersistent //是否缓存虚拟机重启期数据The default value is false
+ diskExpiryThreadIntervalSeconds //磁盘失效线程运行时间间隔，默认是120秒。
+ memoryStoreEvictionPolicy="LRU" //当达到maxElementsInMemory限制时，Ehcache将会根据指定的策略去清理内存。默认策略是LRU（最近最少使用）。你可以设置为FIFO（先进先出）或是LFU（较少使用）。
+ clearOnFlush //内存数量最大时是否清除
+ maxEntriesLocalHeap="0" //堆内存中最大缓存对象数,0没有限制
+ maxEntriesLocalDisk="1000" //硬盘最大缓存个数。
+ -->
diff --git a/ManagementOKTravel/guns-admin/src/main/resources/logback-spring.xml b/ManagementOKTravel/guns-admin/src/main/resources/logback-spring.xml
new file mode 100644
index 0000000..894a46b
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/resources/logback-spring.xml
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+
+ <!--定义日志存放的位置-->
+ <springProperty scope="context" name="gunsLogPath" source="log.path" defaultValue="guns-logs"/>
+
+ <!-- ****************************************************************************************** -->
+ <!-- ****************************** 本地开发只在控制台打印日志 ******************************** -->
+ <!-- ****************************************************************************************** -->
+ <springProfile name="local">
+
+ <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+ <!--encoder 默认配置为PatternLayoutEncoder-->
+ <encoder>
+ <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %highlight(%-5level) %logger Line:%-3L - %msg%n</pattern>
+ <charset>utf-8</charset>
+ </encoder>
+ </appender>
+
+ <!-- 日志记录器，日期滚动记录 -->
+ <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <!-- 正在记录的日志文件的路径及文件名 -->
+ <file>${gunsLogPath}/log_error.log</file>
+ <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
+ <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+ <!-- 归档的日志文件的路径，例如今天是2013-12-21日志，当前写的日志文件路径为file节点指定，可以将此文件与file指定文件路径设置为不同路径，从而将当前日志文件或归档日志文件置不同的目录。
+ 而2013-12-21的日志文件在由fileNamePattern指定。%d{yyyy-MM-dd}指定日期格式，%i指定索引 -->
+ <fileNamePattern>${gunsLogPath}/error/log-error-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+ <!-- 除按日志记录之外，还配置了日志文件不能超过2M，若超过2M，日志文件会以索引0开始，
+ 命名日志文件，例如log-error-2013-12-21.0.log -->
+ <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+ <maxFileSize>2MB</maxFileSize>
+ </timeBasedFileNamingAndTriggeringPolicy>
+ </rollingPolicy>
+ <!-- 追加方式记录日志 -->
+ <append>true</append>
+ <!-- 日志文件的格式 -->
+ <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+ <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger Line:%-3L - %msg%n</pattern>
+ <charset>utf-8</charset>
+ </encoder>
+ <!-- 日志文件记录级别配置。
+ 日志级别：ALL < TRACE < DEBUG < INFO < WARN < ERROR < FATAL < OFF
+ onMatch="ACCEPT" 表示匹配该级别及以上
+ onMatch="DENY" 表示不匹配该级别及以上
+ onMatch="NEUTRAL" 表示该级别及以上的，由下一个filter处理，如果当前是最后一个，则表示匹配该级别及以上
+ onMismatch="ACCEPT" 表示匹配该级别以下
+ onMismatch="NEUTRAL" 表示该级别及以下的，由下一个filter处理，如果当前是最后一个，则不匹配该级别以下的
+ onMismatch="DENY" 表示不匹配该级别以下的
+ -->
+ <filter class="ch.qos.logback.classic.filter.LevelFilter">
+ <level>ERROR</level>
+ <onMatch>ACCEPT</onMatch>
+ <onMismatch>DENY</onMismatch>
+ </filter>
+ </appender>
+
+ <root level="INFO">
+ <appender-ref ref="STDOUT"/>
+ <appender-ref ref="FILE"/>
+ </root>
+ </springProfile>
+
+ <!-- ****************************************************************************************** -->
+ <!-- ********************** 放到服务器上不管在什么环境都只在文件记录日志 ********************** -->
+ <!-- ****************************************************************************************** -->
+ <springProfile name="!local">
+
+ <!-- 日志记录器，日期滚动记录 -->
+ <appender name="FILE_ERROR" class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <!-- 正在记录的日志文件的路径及文件名 -->
+ <file>${gunsLogPath}/log_error.log</file>
+ <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
+ <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+ <!-- 归档的日志文件的路径，例如今天是2013-12-21日志，当前写的日志文件路径为file节点指定，可以将此文件与file指定文件路径设置为不同路径，从而将当前日志文件或归档日志文件置不同的目录。
+ 而2013-12-21的日志文件在由fileNamePattern指定。%d{yyyy-MM-dd}指定日期格式，%i指定索引 -->
+ <fileNamePattern>${gunsLogPath}/error/log-error-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+ <!-- 除按日志记录之外，还配置了日志文件不能超过2M，若超过2M，日志文件会以索引0开始，
+ 命名日志文件，例如log-error-2013-12-21.0.log -->
+ <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+ <maxFileSize>2MB</maxFileSize>
+ </timeBasedFileNamingAndTriggeringPolicy>
+ </rollingPolicy>
+ <!-- 追加方式记录日志 -->
+ <append>true</append>
+ <!-- 日志文件的格式 -->
+ <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+ <pattern>===%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger Line:%-3L - %msg%n</pattern>
+ <charset>utf-8</charset>
+ </encoder>
+ <!-- 此日志文件只记录error级别的 -->
+ <filter class="ch.qos.logback.classic.filter.LevelFilter">
+ <level>error</level>
+ <onMatch>ACCEPT</onMatch>
+ <onMismatch>DENY</onMismatch>
+ </filter>
+ </appender>
+
+ <!-- 日志记录器，日期滚动记录 -->
+ <appender name="FILE_ALL" class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <!-- 正在记录的日志文件的路径及文件名 -->
+ <file>${gunsLogPath}/log_total.log</file>
+ <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
+ <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+ <!-- 归档的日志文件的路径，例如今天是2013-12-21日志，当前写的日志文件路径为file节点指定，可以将此文件与file指定文件路径设置为不同路径，从而将当前日志文件或归档日志文件置不同的目录。
+ 而2013-12-21的日志文件在由fileNamePattern指定。%d{yyyy-MM-dd}指定日期格式，%i指定索引 -->
+ <fileNamePattern>${gunsLogPath}/total/log-total-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+ <!-- 除按日志记录之外，还配置了日志文件不能超过2M，若超过2M，日志文件会以索引0开始，
+ 命名日志文件，例如log-error-2013-12-21.0.log -->
+ <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+ <maxFileSize>2MB</maxFileSize>
+ </timeBasedFileNamingAndTriggeringPolicy>
+ </rollingPolicy>
+ <!-- 追加方式记录日志 -->
+ <append>true</append>
+ <!-- 日志文件的格式 -->
+ <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+ <pattern>===%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger Line:%-3L - %msg%n</pattern>
+ <charset>utf-8</charset>
+ </encoder>
+ </appender>
+
+ <root level="INFO">
+ <appender-ref ref="FILE_ERROR"/>
+ <appender-ref ref="FILE_ALL"/>
+ </root>
+
+ </springProfile>
+
+</configuration>
+
+
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/404.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/404.html
new file mode 100644
index 0000000..7c3e291
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/404.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+
+ <meta charset="utf-8">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+
+
+ <title>OK出行 - 404 页面</title>
+ <link rel="shortcut icon" href="${ctxPath}/static/favicon1.ico"> <link href="${ctxPath}/static/css/bootstrap.min.css?v=3.3.6" rel="stylesheet">
+ <link href="${ctxPath}/static/css/font-awesome.css?v=4.4.0" rel="stylesheet">
+ <link href="${ctxPath}/static/css/style.css?v=4.1.0" rel="stylesheet">
+
+</head>
+
+<body class="gray-bg">
+
+
+ <div class="middle-box text-center">
+ <h1>404</h1>
+ <h3 class="font-bold">页面未找到！</h3>
+
+ <div class="error-desc">
+ 抱歉，页面好像去火星了~
+ <!--<form class="form-inline m-t" role="form">
+ <div class="form-group">
+ <input type="email" class="form-control" placeholder="请输入您需要查找的内容 …">
+ </div>
+ <button type="submit" class="btn btn-primary">搜索</button>
+ </form>-->
+ </div>
+ </div>
+
+ <!-- 全局js -->
+ <script src="${ctxPath}/static/js/jquery.min.js?v=2.1.4"></script>
+ <script src="${ctxPath}/static/js/bootstrap.min.js?v=3.3.6"></script>
+
+</body>
+
+</html>
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/blackboard.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/blackboard.html
new file mode 100644
index 0000000..f3710fe
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/blackboard.html
@@ -0,0 +1,634 @@
+@layout("/common/_container.html"){
+<style type="text/css">
+ .ztree li span.button.add {margin-left:4px; margin-right: -1px; background-position:-144px 0; vertical-align:top; *vertical-align:middle}
+ .titleDiv{
+ overflow: hidden;
+ }
+ .titleItem{
+ float: left;text-align: center;width: 180px;
+ line-height: 40px;border-top:1px solid #E7EBEE;border-bottom: 1px solid #E7EBEE;
+ border-left:1px solid #E7EBEE;font-size: 16px;
+ }
+ .titleItemCk{
+ color: #fff !important;background: #1AB395 !important;
+ }
+ .titleItem:last-child{
+ border-right: 1px solid #E7EBEE;
+ }
+ .ibox-title{
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ }
+ .ibox-title div span{
+ cursor: pointer;
+ }
+ .ibox-title div span.active{
+ color:white;
+ background: #3d91d9;
+ border-radius: 4px;
+ }
+ .ibox-content{
+ min-height: 130px;
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ align-items: center;
+ }
+ .sp-item{
+ padding:2px 8px;
+
+ }
+ .sp-col{
+ font-size: 18px;
+ }
+ .sp-hidden{
+ visibility: hidden !important;
+ }
+ .flex-div{
+ display: flex;
+ align-items: center;
+ position: relative;
+ flex-wrap: nowrap;
+ }
+ \@media screen and (min-width: 1200px) {
+ .sp-width {
+ width:260px;
+ }
+ }
+ \@media screen and (max-width: 1200px) {
+ .sp-width {
+ width: 180px;
+ }
+ }
+
+</style>
+<div class="container-fluid" style="padding: 0 !important;">
+ <div class="row content">
+ <div class="col-sm-12">
+ <div class="col-sm-3">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h3>待处理</h3>
+ </div>
+ <a class="J_menuItem" href="javascript:void(0);" onclick="goddess()" name="tabMenuItem" data-index="27">
+ <div class="ibox-content">
+ <h1 class="no-margins">${goddessCount}</h1>
+ <small>待处理女神认证</small>
+ </div>
+ </a>
+ <a class="J_menuItem" href="javascript:void(0);" onclick="withdrawal()" name="tabMenuItem" data-index="27">
+ <div class="ibox-content">
+ <h1 class="no-margins">${withdrawalCount}</h1>
+ <small>待处理提现申请</small>
+ </div>
+ </a>
+ <a class="J_menuItem" href="javascript:void(0);" onclick="report()" name="tabMenuItem" data-index="27">
+ <div class="ibox-content">
+ <h1 class="no-margins">${reportCount}</h1>
+ <small>待处理用户举报</small>
+ </div>
+ </a>
+ <a class="J_menuItem" href="javascript:void(0);" onclick="feedback()" name="tabMenuItem" data-index="27">
+ <div class="ibox-content">
+ <h1 class="no-margins">${feedbackCount}</h1>
+ <small>待处理用户反馈</small>
+ </div>
+ </a>
+ </div>
+ </div>
+ <div class="col-sm-9">
+ <div class="col-sm-4 ">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h3>非会员付费解锁</h3>
+ <div id="noVipUnlockDiv" class="flex-div">
+ <div class="sp-hidden flex-div noVipUnlockTimess sp-width" style="position: absolute;right: 40px;top: 50%;transform: translateY(-50%);">
+ <input type="text" id="noVipUnlockTime" class="form-control layer-date " >
+ <#button style="margin: 0;" btnCs="info" name="搜索" id="ensure" icon="fa-check" clickFun="noVipUnlockSubmit()"/>
+ </div>
+ <div class="noVipUnlockTimes flex-div" style="position: absolute;right: 40px;top: 50%;transform: translateY(-50%);width: 180px;justify-content: flex-end;">
+ <span class="active sp-item">今日</span>
+ <span class="sp-item">本周</span>
+ <span class="sp-item">本月</span>
+ </div>
+ <div class="noVipUnlockSpan" onclick="noVipUnlockTime()" style="margin-left: 20px;"><i class="fa fa-calendar-plus-o"></i></div>
+ </div>
+ </div>
+ <div class="ibox-content">
+ <h1 class="sp-col" style="width: 100%;">订单数<span style="margin-left: 50px;font-size: 28px;" id="noVipUnlockNum">${noVipUnlockNumToDay}</span>单</h1>
+ <h1 class="sp-col" style="width: 100%;">成交额<span style="margin-left: 50px;font-size: 28px;" id="noVipUnlockMoney">${noVipUnlockMoneyToDay}</span>元</h1>
+ </div>
+ </div>
+ </div>
+ <div class="col-sm-4">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h3>会员付费解锁</h3>
+ <div id="vipUnlockDiv" class="flex-div">
+ <div class="sp-hidden flex-div vipUnlockTimess sp-width" style="position: absolute;right: 40px;top: 50%;transform: translateY(-50%);">
+ <input type="text" id="vipUnlockTime" class="form-control layer-date " >
+ <#button style="margin: 0;" btnCs="info" name="搜索" id="ensure" icon="fa-check" clickFun="vipUnlockSubmit()"/>
+ </div>
+ <div class="vipUnlockTimes flex-div" style="position: absolute;right: 40px;top: 50%;transform: translateY(-50%);width: 180px;justify-content: flex-end;">
+ <span class="active sp-item">今日</span>
+ <span class="sp-item">本周</span>
+ <span class="sp-item">本月</span>
+ </div>
+ <div class="vipUnlockSpan" onclick="vipUnlockTime()" style="margin-left: 20px;"><i class="fa fa-calendar-plus-o"></i></div>
+ </div>
+ </div>
+ <div class="ibox-content">
+ <h1 class="sp-col" style="width: 100%;">订单数<span style="margin-left: 50px;font-size: 28px;" id="vipUnlockNum">${vipUnlockNumToDay}</span>单</h1>
+ <h1 class="sp-col" style="width: 100%;">成交额<span style="margin-left: 50px;font-size: 28px;" id="vipUnlockMoney">${vipUnlockMoneyToDay}</span>元</h1>
+ </div>
+ </div>
+ </div>
+ <div class="col-sm-4">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h3>总营收</h3>
+ <div id="allIncomeDiv" class="flex-div">
+ <div class="sp-hidden flex-div allIncomeTimess sp-width" style="position: absolute;right: 40px;top: 50%;transform: translateY(-50%);">
+ <input type="text" id="allIncomeTime" class="form-control layer-date " >
+ <#button style="margin: 0;" btnCs="info" name="搜索" id="ensure" icon="fa-check" clickFun="allIncomeSubmit()"/>
+ </div>
+ <div class="allIncomeTimes flex-div" style="position: absolute;right: 40px;top: 50%;transform: translateY(-50%);width: 180px;justify-content: flex-end;">
+ <span class="active sp-item">今日</span>
+ <span class="sp-item">本周</span>
+ <span class="sp-item">本月</span>
+ </div>
+ <div class="allIncomeSpan" onclick="allIncomeTime()" style="margin-left: 20px;"><i class="fa fa-calendar-plus-o"></i></div>
+ </div>
+ </div>
+ <div class="ibox-content">
+ <h1 class="sp-col" style="width: 100%;">订单数<span style="margin-left: 50px;font-size: 28px;" id="allIncomeNum">${allIncomeNumToDay}</span>单</h1>
+ <h1 class="sp-col" style="width: 100%;">成交额<span style="margin-left: 50px;font-size: 28px;" id="allIncomeMoney">${allIncomeMoneyToDay}</span>元</h1>
+ </div>
+ </div>
+ </div>
+ <div class="col-sm-4">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h3>新增会员</h3>
+ <div id="addVipDiv" class="flex-div">
+ <div class="sp-hidden flex-div addVipTimess sp-width" style="position: absolute;right: 40px;top: 50%;transform: translateY(-50%);">
+ <input type="text" id="addVipTime" class="form-control layer-date " >
+ <#button style="margin: 0;" btnCs="info" name="搜索" id="ensure" icon="fa-check" clickFun="addVipSubmit()"/>
+ </div>
+ <div class="addVipTimes flex-div" style="position: absolute;right: 40px;top: 50%;transform: translateY(-50%);width: 180px;justify-content: flex-end;">
+ <span class="active sp-item">今日</span>
+ <span class="sp-item">本周</span>
+ <span class="sp-item">本月</span>
+ </div>
+ <div class="addVipSpan" onclick="addVipTime()" style="margin-left: 20px;"><i class="fa fa-calendar-plus-o"></i></div>
+ </div>
+ </div>
+ <div class="ibox-content">
+ <h1 class="sp-col" style="width: 100%;">新增数<span style="margin-left: 50px;font-size: 28px;" id="addVipNum">${addVipNumToDay}</span>位</h1>
+ <h1 class="sp-col" style="width: 100%;">新增收益<span style="margin-left: 50px;font-size: 28px;" id="addVipMoney">${addVipMoneyToDay}</span>元</h1>
+ </div>
+ </div>
+ </div>
+ <div class="col-sm-4">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h3>发布活动付费</h3>
+ <div id="sendActiveDiv" class="flex-div">
+ <div class="sp-hidden flex-div sendActiveTimess sp-width" style="position: absolute;right: 40px;top: 50%;transform: translateY(-50%);">
+ <input type="text" id="sendActiveTime" class="form-control layer-date " >
+ <#button style="margin: 0;" btnCs="info" name="搜索" id="ensure" icon="fa-check" clickFun="sendActiveSubmit()"/>
+ </div>
+ <div class="sendActiveTimes flex-div" style="position: absolute;right: 40px;top: 50%;transform: translateY(-50%);width: 180px;justify-content: flex-end;">
+ <span class="active sp-item">今日</span>
+ <span class="sp-item">本周</span>
+ <span class="sp-item">本月</span>
+ </div>
+ <div class="sendActiveSpan" onclick="sendActiveTime()" style="margin-left: 20px;"><i class="fa fa-calendar-plus-o"></i></div>
+ </div>
+ </div>
+ <div class="ibox-content">
+ <h1 class="sp-col" style="width: 100%;">订单数<span style="margin-left: 50px;font-size: 28px;" id="sendActiveNum">${sendActiveNumDay}</span>单</h1>
+ <h1 class="sp-col" style="width: 100%;">成交额<span style="margin-left: 50px;font-size: 28px;" id="sendActiveMoney">${sendActiveMoneyToDay}</span>元</h1>
+ </div>
+ </div>
+ </div>
+ <div class="col-sm-4">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h3>历史总营收</h3>
+ </div>
+ <div class="ibox-content">
+ <h1 class="sp-col" style="text-align: center;"><span style="font-size: 28px;">${historyIncomeMoney}</span>元</h1>
+ </div>
+ </div>
+ </div>
+ <div class="col-sm-4">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h4>新增用户</h4>
+ <div id="userDiv" class="flex-div">
+ <div class="sp-hidden flex-div userTimess sp-width" style="position: absolute;right: 40px;top: 50%;transform: translateY(-50%);">
+ <input type="text" id="userTime" class="form-control layer-date " >
+ <#button style="margin: 0;" btnCs="info" name="搜索" id="ensure" icon="fa-check" clickFun="userSubmit()"/>
+ </div>
+ <div class="userTimes flex-div" style="position: absolute;right: 40px;top: 50%;transform: translateY(-50%);width: 180px;justify-content: flex-end;">
+ <span class="active sp-item">今日</span>
+ <span class="sp-item">本周</span>
+ <span class="sp-item">本月</span>
+ </div>
+ <div class="userSpan" onclick="userTime()" style="margin-left: 20px;"><i class="fa fa-calendar-plus-o"></i></div>
+ </div>
+ </div>
+ <div class="ibox-content">
+ <h1 class="sp-col" style="text-align: center;"><span style="font-size: 28px;" id="userNum">${userNumToDay}</span>位</h1>
+ <div class="sp-col" style="display: flex;justify-content: space-between;width: 100%;">
+ <div style="text-align: center;display: inline-block;">男<span style="font-size: 28px;margin: 0 10px" id="maleUserNum">${maleUserNumToDay}</span>位</div>
+ <div style="text-align: center;display: inline-block;">女<span style="font-size: 28px;margin: 0 10px" id="femaleUserNum">${femaleUserNumToDay}</span>位</div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="col-sm-4">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h3>总用户数</h3>
+ </div>
+ <div class="ibox-content">
+ <h1 class="sp-col" style="text-align: center;"><span style="font-size: 28px;" >${userNum}</span>位</h1>
+ <div class="sp-col" style="display: flex;justify-content: space-between;width: 100%;">
+ <div style="text-align: center;display: inline-block;">男<span style="font-size: 28px;margin: 0 10px" >${maleUserNum}</span>位</div>
+ <div style="text-align: center;display: inline-block;">女<span style="font-size: 28px;margin: 0 10px" >${femaleUserNum}</span>位</div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="col-sm-4">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h3>总会员数</h3>
+ </div>
+ <div class="ibox-content">
+ <h1 class="sp-col" style="text-align: center;"><span style="font-size: 28px;">${allVipNum}</span>位</h1>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<link rel="icon" href="https://static.jianshukeji.com/highcharts/images/favicon1.ico">
+<script>
+ laydate.render({
+ elem: '#noVipUnlockTime'
+ ,range: true
+ });
+ laydate.render({
+ elem: '#vipUnlockTime'
+ ,range: true
+ });
+ laydate.render({
+ elem: '#allIncomeTime'
+ ,range: true
+ });
+ laydate.render({
+ elem: '#addVipTime'
+ ,range: true
+ });
+ laydate.render({
+ elem: '#sendActiveTime'
+ ,range: true
+ });
+ laydate.render({
+ elem: '#userTime'
+ ,range: true
+ });
+</script>
+<script type="text/javascript">
+ $(function () {
+ //非会员解锁
+ $("#noVipUnlockDiv span").click(function () {
+ $(this).addClass("active").siblings().removeClass("active");
+ var ajax = new $ax(Feng.ctxPath + "/blackboard/noVipUnlock", function (data) {
+ $("#noVipUnlockNum").html(data.noVipUnlockNum);
+ $("#noVipUnlockMoney").html(data.noVipUnlockMoney);
+ }, function (data) {
+ });
+ ajax.set("active",$(this).html());
+ ajax.start();
+ });
+ //会员解锁
+ $("#vipUnlockDiv span").click(function () {
+ $(this).addClass("active").siblings().removeClass("active");
+ var ajax = new $ax(Feng.ctxPath + "/blackboard/vipUnlock", function (data) {
+ $("#vipUnlockNum").html(data.vipUnlockNum);
+ $("#vipUnlockMoney").html(data.vipUnlockMoney);
+ }, function (data) {
+ });
+ ajax.set("active",$(this).html());
+ ajax.start();
+ });
+ //总营收
+ $("#allIncomeDiv span").click(function () {
+ $(this).addClass("active").siblings().removeClass("active");
+ var ajax = new $ax(Feng.ctxPath + "/blackboard/allIncome", function (data) {
+ $("#allIncomeNum").html(data.allIncomeNum);
+ $("#allIncomeMoney").html(data.allIncomeMoney);
+ }, function (data) {
+ });
+ ajax.set("active",$(this).html());
+ ajax.start();
+ });
+ //新增会员
+ $("#addVipDiv span").click(function () {
+ $(this).addClass("active").siblings().removeClass("active");
+ var ajax = new $ax(Feng.ctxPath + "/blackboard/addVip", function (data) {
+ $("#addVipNum").html(data.addVipNum);
+ $("#addVipMoney").html(data.addVipMoney);
+ }, function (data) {
+ });
+ ajax.set("active",$(this).html());
+ ajax.start();
+ });
+ //发布活动付费
+ $("#sendActiveDiv span").click(function () {
+ $(this).addClass("active").siblings().removeClass("active");
+ var ajax = new $ax(Feng.ctxPath + "/blackboard/sendActive", function (data) {
+ $("#sendActiveNum").html(data.sendActiveNum);
+ $("#sendActiveMoney").html(data.sendActiveMoney);
+ }, function (data) {
+ });
+ ajax.set("active",$(this).html());
+ ajax.start();
+ });
+ //新增用户
+ $("#userDiv span").click(function () {
+ $(this).addClass("active").siblings().removeClass("active");
+ var ajax = new $ax(Feng.ctxPath + "/blackboard/user", function (data) {
+ $("#userNum").html(data.userNum);
+ $("#maleUserNum").html(data.maleUserNum);
+ $("#femaleUserNum").html(data.femaleUserNum);
+ }, function (data) {
+ });
+ ajax.set("active",$(this).html());
+ ajax.start();
+ });
+ });
+
+ function goddess() {
+ var index = layer.open({
+ type: 2,
+ title: '待处理女神认证',
+ area: ['80%', '80%'], //宽高
+ fix: false, //不固定
+ maxmin: true,
+ content: Feng.ctxPath + '/appUserAuth'
+ });
+ this.layerIndex = index;
+ }
+ function withdrawal() {
+ var index = layer.open({
+ type: 2,
+ title: '待处理提现申请',
+ area: ['80%', '80%'], //宽高
+ fix: false, //不固定
+ maxmin: true,
+ content: Feng.ctxPath + '/appUserWithdrawal'
+ });
+ this.layerIndex = index;
+ }
+ function report() {
+ var index = layer.open({
+ type: 2,
+ title: '待处理用户举报',
+ area: ['80%', '80%'], //宽高
+ fix: false, //不固定
+ maxmin: true,
+ content: Feng.ctxPath + '/appUserReport'
+ });
+ this.layerIndex = index;
+ }
+ function feedback() {
+ var index = layer.open({
+ type: 2,
+ title: '待处理用户反馈',
+ area: ['80%', '80%'], //宽高
+ fix: false, //不固定
+ maxmin: true,
+ content: Feng.ctxPath + '/appUserFeedback'
+ });
+ this.layerIndex = index;
+ }
+
+ //非会员解锁日期选择切换
+ function noVipUnlockTime() {
+ $('.noVipUnlockSpan').toggleClass("active");
+ $('.noVipUnlockTimess').toggleClass("sp-hidden");
+ $('.noVipUnlockTimes').toggleClass('sp-hidden');
+ $("#noVipUnlockNum").html("0");
+ $("#noVipUnlockMoney").html("0");
+ $("#noVipUnlockTime").val("");
+ if ($(".noVipUnlockTimess").hasClass('sp-hidden')){
+ var ajax = new $ax(Feng.ctxPath + "/blackboard/noVipUnlock", function (data) {
+ $("#noVipUnlockNum").html(data.noVipUnlockNum);
+ $("#noVipUnlockMoney").html(data.noVipUnlockMoney);
+ }, function (data) {
+ });
+ ajax.set("active",$("#noVipUnlockDiv .active").html());
+ ajax.start();
+ }
+ }
+ //非会员解锁日期选择提交
+ function noVipUnlockSubmit(){
+ var time = $("#noVipUnlockTime").val();
+ if ("" == time) {
+ Feng.info("请选择查询时间");
+ return;
+ }
+ var ajax = new $ax(Feng.ctxPath + "/blackboard/noVipUnlockSubmit", function (data) {
+ $("#noVipUnlockNum").html(data.noVipUnlockNum);
+ $("#noVipUnlockMoney").html(data.noVipUnlockMoney);
+ }, function (data) {
+ });
+ ajax.set("time",time);
+ ajax.start();
+ }
+
+ // 会员解锁日期选择切换
+ function vipUnlockTime() {
+ $('.vipUnlockSpan').toggleClass("active");
+ $('.vipUnlockTimess').toggleClass("sp-hidden");
+ $('.vipUnlockTimes').toggleClass('sp-hidden');
+ $("#vipUnlockNum").html("0");
+ $("#vipUnlockMoney").html("0");
+ $("#vipUnlockTime").val("");
+ if ($(".vipUnlockTimess").hasClass('sp-hidden')){
+ var ajax = new $ax(Feng.ctxPath + "/blackboard/vipUnlock", function (data) {
+ $("#vipUnlockNum").html(data.vipUnlockNum);
+ $("#vipUnlockMoney").html(data.vipUnlockMoney);
+ }, function (data) {
+ });
+ ajax.set("active",$("#vipUnlockDiv .active").html());
+ ajax.start();
+ }
+ }
+ // 会员解锁日期选择提交
+ function vipUnlockSubmit(){
+ var time = $("#vipUnlockTime").val();
+ if ("" == time) {
+ Feng.info("请选择查询时间");
+ return;
+ }
+ var ajax = new $ax(Feng.ctxPath + "/blackboard/vipUnlockSubmit", function (data) {
+ $("#vipUnlockNum").html(data.vipUnlockNum);
+ $("#vipUnlockMoney").html(data.vipUnlockMoney);
+ }, function (data) {
+ });
+ ajax.set("time",time);
+ ajax.start();
+ }
+
+
+ // 总营收日期选择切换
+ function allIncomeTime() {
+ $('.allIncomeSpan').toggleClass("active");
+ $('.allIncomeTimess').toggleClass("sp-hidden");
+ $('.allIncomeTimes').toggleClass('sp-hidden');
+ $("#allIncomeNum").html("0");
+ $("#allIncomeMoney").html("0");
+ $("#allIncomeTime").val("");
+ if ($(".allIncomeTimess").hasClass('sp-hidden')){
+ var ajax = new $ax(Feng.ctxPath + "/blackboard/allIncome", function (data) {
+ $("#allIncomeNum").html(data.allIncomeNum);
+ $("#allIncomeMoney").html(data.allIncomeMoney);
+ }, function (data) {
+ });
+ ajax.set("active",$("#allIncomeDiv .active").html());
+ ajax.start();
+ }
+ }
+ // 总营收日期选择提交
+ function allIncomeSubmit(){
+ var time = $("#allIncomeTime").val();
+ if ("" == time) {
+ Feng.info("请选择查询时间");
+ return;
+ }
+ var ajax = new $ax(Feng.ctxPath + "/blackboard/allIncomeSubmit", function (data) {
+ $("#allIncomeNum").html(data.allIncomeNum);
+ $("#allIncomeMoney").html(data.allIncomeMoney);
+ }, function (data) {
+ });
+ ajax.set("time",time);
+ ajax.start();
+ }
+
+
+ // 新增会员日期选择切换
+ function addVipTime() {
+ $('.addVipSpan').toggleClass("active");
+ $('.addVipTimess').toggleClass("sp-hidden");
+ $('.addVipTimes').toggleClass('sp-hidden');
+ $("#addVipNum").html("0");
+ $("#addVipMoney").html("0");
+ $("#addVipTime").val("");
+ if ($(".addVipTimess").hasClass('sp-hidden')){
+ var ajax = new $ax(Feng.ctxPath + "/blackboard/addVip", function (data) {
+ $("#addVipNum").html(data.addVipNum);
+ $("#addVipMoney").html(data.addVipMoney);
+ }, function (data) {
+ });
+ ajax.set("active",$("#addVipDiv .active").html());
+ ajax.start();
+ }
+ }
+ // 新增会员日期选择提交
+ function addVipSubmit(){
+ var time = $("#addVipTime").val();
+ if ("" == time) {
+ Feng.info("请选择查询时间");
+ return;
+ }
+ var ajax = new $ax(Feng.ctxPath + "/blackboard/addVipSubmit", function (data) {
+ $("#addVipNum").html(data.addVipNum);
+ $("#addVipMoney").html(data.addVipMoney);
+ }, function (data) {
+ });
+ ajax.set("time",time);
+ ajax.start();
+ }
+
+
+ // 发布活动付费日期选择切换
+ function sendActiveTime() {
+ $('.sendActiveSpan').toggleClass("active");
+ $('.sendActiveTimess').toggleClass("sp-hidden");
+ $('.sendActiveTimes').toggleClass('sp-hidden');
+ $("#sendActiveNum").html("0");
+ $("#sendActiveMoney").html("0");
+ $("#sendActiveTime").val("");
+ if ($(".sendActiveTimess").hasClass('sp-hidden')){
+ var ajax = new $ax(Feng.ctxPath + "/blackboard/sendActive", function (data) {
+ $("#sendActiveNum").html(data.sendActiveNum);
+ $("#sendActiveMoney").html(data.sendActiveMoney);
+ }, function (data) {
+ });
+ ajax.set("active",$("#sendActiveDiv .active").html());
+ ajax.start();
+ }
+ }
+ // 发布活动付费日期选择提交
+ function sendActiveSubmit(){
+ var time = $("#sendActiveTime").val();
+ if ("" == time) {
+ Feng.info("请选择查询时间");
+ return;
+ }
+ var ajax = new $ax(Feng.ctxPath + "/blackboard/sendActiveSubmit", function (data) {
+ $("#sendActiveNum").html(data.sendActiveNum);
+ $("#sendActiveMoney").html(data.sendActiveMoney);
+ }, function (data) {
+ });
+ ajax.set("time",time);
+ ajax.start();
+ }
+
+ // 用户日期选择切换
+ function userTime() {
+ $('.userSpan').toggleClass("active");
+ $('.userTimess').toggleClass("sp-hidden");
+ $('.userTimes').toggleClass('sp-hidden');
+ $("#userNum").html("0");
+ $("#maleUserNum").html("0");
+ $("#femaleUserNum").html("0");
+ $("#userTime").val("");
+ if ($(".userTimess").hasClass('sp-hidden')){
+ var ajax = new $ax(Feng.ctxPath + "/blackboard/user", function (data) {
+ $("#userNum").html(data.userNum);
+ $("#maleUserNum").html(data.maleUserNum);
+ $("#femaleUserNum").html(data.femaleUserNum);
+ }, function (data) {
+ });
+ ajax.set("active",$("#userDiv .active").html());
+ ajax.start();
+ }
+ }
+ // 用户日期选择提交
+ function userSubmit(){
+ var time = $("#userTime").val();
+ if ("" == time) {
+ Feng.info("请选择查询时间");
+ return;
+ }
+ var ajax = new $ax(Feng.ctxPath + "/blackboard/userSubmit", function (data) {
+ $("#userNum").html(data.userNum);
+ $("#maleUserNum").html(data.maleUserNum);
+ $("#femaleUserNum").html(data.femaleUserNum);
+ }, function (data) {
+ });
+ ajax.set("time",time);
+ ajax.start();
+ }
+</script>
+@}
+
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/blackboardBlank.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/blackboardBlank.html
new file mode 100644
index 0000000..816af83
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/blackboardBlank.html
@@ -0,0 +1,59 @@
+@layout("/common/_container.html"){
+<style>
+ .contact-box {
+ background: unset;
+ border: unset;
+ }
+ strong{
+ line-height: 23px;
+ }
+</style>
+
+<div class="wrapper wrapper-content animated fadeInRight">
+ <div class="row">
+ <div class="col-sm-6">
+ <div class="contact-box">
+ <div class="col-sm-4">
+ <div class="text-center">
+ @if(user.avatar!=null){
+ <img alt="image" class="img-circle " src="${user.avatar}" style="width: 120px;height: 120px " >
+ @}
+ @if(user.avatar==null){
+ <img alt="image" class="img-circle " src="${ctxPath}/static/img/login-background.jpg" style="width: 120px;height: 120px" >
+ @}
+
+ <div class="m-t-xs font-bold">${deptName}</div>
+ </div>
+ </div>
+ <div class="col-sm-8">
+ <h3><strong>${user.name}</strong></h3>
+ <p><i class="fa fa-user-secret"></i> ${roleName}</p>
+ <address>
+ <strong>E-mail:${user.email}</strong><br>
+ <strong>Tel:${user.phone}</strong><br>
+ <strong>登录次数：${loginNum}次</strong><br>
+ <strong>登录时间：${date}</strong><br>
+ </address>
+ </div>
+ <div class="clearfix"></div>
+ </div>
+ </div>
+ </div>
+</div>
+<script>
+ $(document).ready(function () {
+ $('.contact-box').each(function () {
+ animationHover(this, 'pulse');
+ });
+ $(".row").css({
+ height: window.innerHeight+"px",
+ display:"flex",
+ alignItems: "center",
+ justifyContent: "center",
+ })
+ });
+</script>
+
+<script type="text/javascript" src="http://tajs.qq.com/stats?sId=9051096" charset="UTF-8"></script>
+@}
+
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/code/code.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/code/code.html
new file mode 100644
index 0000000..6cececb
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/code/code.html
@@ -0,0 +1,101 @@
+@layout("/common/_container.html"){
+<div class="row" xmlns="">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>代码生成</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="form-horizontal" id="generate">
+ <div class="row">
+ <div class="col-sm-4">
+ <#input id="projectPath" name="项目路径" value="${params.projectPath}"/>
+ </div>
+ <div class="col-sm-4">
+ <#input id="projectPackage" name="项目的包" value="${params.projectPackage}"/>
+ </div>
+ <div class="col-sm-4">
+ <#input id="corePackage" name="核心包" value="${params.corePackage}"/>
+ </div>
+ </div>
+
+ <div class="row">
+ <div class="col-sm-3">
+ <#input id="author" name="作者" value="${params.author!}"/>
+ </div>
+ <div class="col-sm-3">
+ <#input id="bizName" name="业务名称" />
+ </div>
+ <div class="col-sm-3">
+ <#input id="moduleName" name="模块名称" value="${params.moduleName}"/>
+ </div>
+ <div class="col-sm-3">
+ <#input id="parentMenuName" name="父级菜单名称" underline="false" value="${params.parentMenuName}"
+ hidden="pid" readonly="readonly"
+ clickFun="Code.showMenuSelectTree(); return false;"
+ style="background-color: #ffffff !important;"
+ selectFlag="true" selectId="pcodeTreeDiv" selectTreeId="pcodeTree" selectStyle=""/>
+ </div>
+ </div>
+
+ <div class="row">
+ <div class="col-sm-3">
+ <#input id="tableName" name="表名称" disabled="disabled"/>
+ </div>
+ <div class="col-sm-3">
+ <#input id="ignoreTabelPrefix" name="表前缀" value="${params.ignoreTabelPrefix}"/>
+ </div>
+ <div class="col-sm-3">
+ <#input id="className" name="类名" disabled="disabled"/>
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-sm-6">
+ <button id="genBtn" type="button" class="btn btn-primary mr10"
+ onclick="Code.generate()">
+ <span style="padding: 5px 20px;">生成</span>
+ </button>
+ </div>
+ </div>
+ </div>
+ <div style="padding-top: 10px; overflow: hidden"
+ class="container-fluid">
+ <div class="col-md-12">
+ <div class="row admin-form">
+ <div class="col-md-3 col-md-offset-3">
+ <h2>数据表</h2>
+ <div class="list-group" id="tableList"
+ data-bind="foreach: tables"
+ style="height: 500px; overflow-y: scroll">
+ @for(table in tables!){
+ <a href="javascript:void(0)" class="list-group-item" tableName="${table.tableName}" onclick="Code.selectTable('${table.tableName}')">${table.tableName}-${table.tableComment}</a>
+ @}
+ </div>
+ </div>
+ <div class="col-md-3">
+ <span><h2>模板</h2></span>
+ <div class="list-group" id="templateList"
+ style="height: 500px; overflow-y: scroll">
+ @for(template in templates!){
+ <a href="javascript:void(0)" class="list-group-item" key="${template.key}" onclick="Code.selectTemplate('${template.key}')">${template.desc}</a>
+ @}
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <ul class="nav nav-list">
+ <li class="divider"></li>
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/js/common/select-list-object.js"></script>
+<script src="${ctxPath}/static/modular/code/gen.js"></script>
+@}
+
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/common/_container.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/common/_container.html
new file mode 100644
index 0000000..b11088f
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/common/_container.html
@@ -0,0 +1,248 @@
+<!DOCTYPE html>
+<html>
+<head>
+ <meta charset="utf-8">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+ <meta name="renderer" content="webkit"/><!-- 让360浏览器默认选择webkit内核 -->
+
+ <!--地图-->
+ <script src="https://webapi.amap.com/maps?v=1.4.8&key=e17d799b2506d05faf7f88320a266803"></script>
+ <!--<script type="text/javascript" src="https://api.map.baidu.com/api?v=2.0&ak=IRKL4FLGKZUFr6T3gFk3t9X6kKarKu1K"></script>-->
+
+ <!-- 全局css -->
+ <link rel="shortcut icon" href="${ctxPath}/static/img/logo.jpg">
+ <link href="${ctxPath}/static/css/bootstrap.min.css?v=3.3.6" rel="stylesheet">
+ <link href="${ctxPath}/static/css/plugins/switchery/switchery.css" rel="stylesheet">
+ <link href="${ctxPath}/static/css/font-awesome.css?v=4.4.0" rel="stylesheet">
+ <link href="${ctxPath}/static/css/plugins/chosen/chosen.css" rel="stylesheet">
+ <link href="${ctxPath}/static/css/plugins/bootstrap-table/bootstrap-table.min.css" rel="stylesheet">
+ <link href="${ctxPath}/static/css/plugins/validate/bootstrapValidator.min.css" rel="stylesheet">
+ <link href="${ctxPath}/static/css/style.css?v=4.1.0" rel="stylesheet">
+ <link href="${ctxPath}/static/css/_fstyle.css" rel="stylesheet">
+ <link href="${ctxPath}/static/css/plugins/iCheck/custom.css" rel="stylesheet">
+ <link href="${ctxPath}/static/css/plugins/webuploader/webuploader.css" rel="stylesheet">
+ <link href="${ctxPath}/static/css/plugins/ztree/zTreeStyle.css" rel="stylesheet">
+ <link href="${ctxPath}/static/css/plugins/bootstrap-treetable/bootstrap-treetable.css" rel="stylesheet"/>
+ <!-- <link href="${ctxPath}/static/css/plugins/ztree/demo.css" rel="stylesheet"> -->
+ <link href="${ctxPath}/static/css/plugins/awesome-bootstrap-checkbox/awesome-bootstrap-checkbox.css" rel="stylesheet">
+ <link href="${ctxPath}/static/css/plugins/sweetalert/sweetalert.css" rel="stylesheet">
+ <link href="${ctxPath}/static/layui/css/layui.css" rel="stylesheet">
+
+ <!--富文本编辑器 css-->
+ <link type="text/css" rel="stylesheet" href="${ctxPath}/static/js/ueditor/jsp/themes/default/css/ueditor.css">
+
+ <!-- 全局js -->
+ <script src="${ctxPath}/static/js/jquery.min.js?v=2.1.4"></script>
+ <script src="${ctxPath}/static/js/bootstrap.min.js?v=3.3.6"></script>
+ <script src="${ctxPath}/static/js/plugins/ztree/jquery.ztree.all.min.js"></script>
+ <script src="${ctxPath}/static/js/plugins/bootstrap-table/bootstrap-table.min.js"></script>
+ <script src="${ctxPath}/static/js/plugins/validate/bootstrapValidator.min.js"></script>
+ <script src="${ctxPath}/static/js/plugins/validate/zh_CN.js"></script>
+ <script src="${ctxPath}/static/js/plugins/bootstrap-table/bootstrap-table-mobile.min.js"></script>
+ <script src="${ctxPath}/static/js/plugins/bootstrap-table/locale/bootstrap-table-zh-CN.min.js"></script>
+ <script src="${ctxPath}/static/js/plugins/bootstrap-treetable/bootstrap-treetable.js"></script>
+ <script src="${ctxPath}/static/js/plugins/layer/layer.js"></script>
+ <script src="${ctxPath}/static/js/plugins/switchery/switchery.js"></script>
+ <script src="${ctxPath}/static/js/plugins/chosen/chosen.jquery.js"></script>
+ <script src="${ctxPath}/static/js/plugins/iCheck/icheck.min.js"></script>
+ <script src="${ctxPath}/static/js/plugins/laydate/laydate.js"></script>
+ <script src="${ctxPath}/static/js/common/laydateChoose.js"></script>
+ <script src="${ctxPath}/static/js/plugins/webuploader/webuploader.min.js"></script>
+ <script src="${ctxPath}/static/js/common/ajax-object.js"></script>
+ <script src="${ctxPath}/static/js/common/bootstrap-table-object.js"></script>
+ <script src="${ctxPath}/static/js/common/tree-table-object.js"></script>
+ <script src="${ctxPath}/static/js/common/web-upload-object.js"></script>
+ <script src="${ctxPath}/static/js/common/web-upload-image.js"></script>
+ <script src="${ctxPath}/static/js/common/ztree-object.js"></script>
+ <script src="${ctxPath}/static/js/common/Feng.js"></script>
+ <script src="${ctxPath}/static/js/plugins/sweetalert/sweetalert.min.js"></script>
+ <script src="${ctxPath}/static/layui/layui.js"></script>
+
+ <!--富文本编辑器 js-->
+ <!-- <script type="text/javascript" charset="utf-8" src="${ctxPath}/static/js/plugins/umeditor/umeditor.config.js"></script>
+ <script type="text/javascript" charset="utf-8" src="${ctxPath}/static/js/plugins/umeditor/umeditor.js"></script>
+ <script type="text/javascript" charset="utf-8" src="${ctxPath}/static/js/plugins/umeditor/lang/zh-cn/zh-cn.js"></script>-->
+ <script type="text/javascript" charset="utf-8" src="${ctxPath}/static/js/ueditor/jsp/ueditor.config.js"></script>
+ <script type="text/javascript" charset="utf-8" src="${ctxPath}/static/js/ueditor/jsp/ueditor.all.js"></script>
+ <script type="text/javascript" charset="utf-8" src="${ctxPath}/static/js/ueditor/jsp/lang/zh-cn/zh-cn.js"></script>
+ <!--<style type="text/css">
+ table{
+ width:100px;
+ table-layout:fixed;/* 只有定义了表格的布局算法为fixed，下面td的定义才能起作用。 */
+ }
+ td{
+ width:100%;
+ word-break:keep-all;/* 不换行 */
+ white-space:nowrap;/* 不换行 */
+ overflow:hidden;/* 内容超出宽度时隐藏超出部分的内容 */
+ text-overflow:ellipsis;/* 当对象内文本溢出时显示省略标记(...) ；需与overflow:hidden;一起使用*/
+ }
+ </style>-->
+
+ <script type="text/javascript">
+ Feng.addCtx("${ctxPath}");
+ Feng.sessionTimeoutRegistry();
+ //验证电话号码
+ var phoneReg = /^1(3|4|5|7|8|9)\d{9}$/;
+ //验证是否输入正整数
+ var reg = /^[0-9]\d*$/;
+ //6-12位正整数
+ var regSix = /^[0-9]{6,12}$/;
+ //验证是否输入小数
+ var regDouble = /^(([1-9]{1}\d*)|(0{1}))(\.\d{0,2})?$/;
+ //保留一位小数
+ var regDoubleOne = /^(([1-9]{1}\d*)|(0{1}))(\.\d{0,1})?$/;
+ /**
+ * 图片弹出预览框（可选）
+ */
+ window.operateEvents = {
+ 'click .view': function (e, value, row) {
+ // 设置图片路径
+ var imgUrl = value;
+ if(imgUrl != "") {
+ imgUrl = imgUrl;// 设置图片路径
+ } else {
+ imgUrl = Feng.ctxPath + '/static/img/NoPIC.png';// 默认无图
+ }
+ layer.open({
+ type: 1,
+ title: false,
+ closeBtn: 0,
+ area: 'auto',
+ skin: 'layui-layer-nobg', //没有背景色
+ shadeClose: true,
+ content: '<img src="' + imgUrl + '" height="100%" width="100%" />'
+ });
+ },
+ };
+ /**
+ * 查看大图
+ */
+ function lookBigImg(obj){
+ console.log("进入")
+ console.log(obj)
+ // 设置图片路径
+ var imgUrl = obj;
+ if(imgUrl != "") {
+ imgUrl = imgUrl;// 设置图片路径
+ } else {
+ imgUrl = Feng.ctxPath + '/static/img/NoPIC.png';// 默认无图
+ }
+ layer.open({
+ type: 1,
+ title: false,
+ closeBtn: 0,
+ area: ['80%', '100%'],
+ skin: 'layui-layer-nobg', //没有背景色
+ shadeClose: true, //点击空白区域关闭弹出层
+ content: '<div id="zoomableImageContainer" style="height: 100%; width: 100%; overflow: hidden; display: flex; justify-content: center; align-items: center; position: relative;"><img id="zoomableImage" src="' + imgUrl + '" style="max-width: none; max-height: none; position: absolute;"></div>',
+ success: function(layero, index) {
+ // 获取图片容器和图片元素
+ var zoomableImageContainer = document.getElementById('zoomableImageContainer');
+ var zoomableImage = document.getElementById('zoomableImage');
+ var imageWidth = zoomableImage.naturalWidth;
+ var imageHeight = zoomableImage.naturalHeight;
+ var containerWidth = zoomableImageContainer.offsetWidth;
+ var containerHeight = zoomableImageContainer.offsetHeight;
+ var isDragging = false; // 标记是否正在拖动
+ var startX, startY; // 记录拖动起始位置
+ zoomableImageContainer.addEventListener('wheel', function(event) {
+ event.preventDefault();
+ var delta = Math.sign(-event.deltaY); // 获取滚动方向，1表示向上滚动，-1表示向下滚动
+ var currentWidth = zoomableImage.offsetWidth;
+ var currentHeight = zoomableImage.offsetHeight;
+ var step = 0.1; // 缩放步长
+ var newWidth = currentWidth + delta * step * currentWidth;
+ var aspectRatio = zoomableImage.naturalWidth / zoomableImage.naturalHeight;
+ var newHeight = newWidth / aspectRatio;
+ zoomableImage.style.width = newWidth + 'px';
+ zoomableImage.style.height = newHeight + 'px';});
+ zoomableImageContainer.addEventListener('mousedown', function(event) {
+ if(event.button === 0) { // 判断是否为鼠标左键点击
+ event.preventDefault();
+ isDragging = true;
+ startX = event.clientX - zoomableImage.offsetLeft;
+ startY = event.clientY - zoomableImage.offsetTop;}});
+ zoomableImageContainer.addEventListener('mousemove', function(event) {
+ if(isDragging) {
+ event.preventDefault();
+ var offsetX = event.clientX - startX;
+ var offsetY = event.clientY - startY;
+ var maxX = zoomableImage.offsetWidth - containerWidth;
+ var maxY = zoomableImage.offsetHeight - containerHeight;
+ offsetX = Math.min(Math.max(offsetX, -maxX), 0);
+ offsetY = Math.min(Math.max(offsetY, -maxY), 0);
+ zoomableImage.style.left = offsetX + 'px';
+ zoomableImage.style.top = offsetY + 'px';}});
+ zoomableImageContainer.addEventListener('mousemove', function(event) {
+ if(isDragging) {
+ var mouseX = event.clientX;
+ var mouseY = event.clientY;
+ var newLeft = mouseX - startX;
+ var newTop = mouseY - startY;
+ // 确保图片不会移出容器范围
+ if(newLeft >= 0 && newLeft + zoomableImage.offsetWidth <= containerWidth) {
+ zoomableImage.style.left = newLeft + 'px';}
+ if(newTop >= 0 && newTop + zoomableImage.offsetHeight <= containerHeight) {
+ zoomableImage.style.top = newTop + 'px';}}});
+ zoomableImageContainer.addEventListener('mouseup', function(event) {
+ if(event.button === 0) {
+ isDragging = false;}});}
+ });
+ }
+ /*表单验证错误点击叉叉可以清除文本框内容*/
+ $(function () {
+ $(".form-control:input").each(function () {
+ $(this).click(function () {
+ if($(this).next().hasClass("glyphicon-remove")){
+ $(this).val("");
+ }
+ })
+ })
+ })
+ /*验证输入字符*/
+ function checkField(value) {
+ var newvalue = value.replace(/[^\x00-\xff]/g, "**");
+ var length = newvalue.length;
+ return length;
+ }
+ //字符串操作函数 往指定位置插入字符 删除指定位置字符 替换指定位置字符
+ function insert_flg(str,flg,sn){
+ var newstr="";
+ for(var i=0;i<str.length;i+=sn){
+ var tmp=str.substring(i, i+sn);
+ if(sn==i){
+ newstr+=flg;
+ }
+ newstr+=tmp;
+ }
+ return newstr;
+ }
+
+ //获取当前时间，格式YYYY-MM-DD
+ function getNowFormatDate() {
+ var date = new Date();
+ var seperator1 = "-";
+ var year = date.getFullYear();
+ var month = date.getMonth() + 1;
+ var strDate = date.getDate();
+ if (month >= 1 && month <= 9) {
+ month = "0" + month;
+ }
+ if (strDate >= 0 && strDate <= 9) {
+ strDate = "0" + strDate;
+ }
+ var currentdate = year + seperator1 + month + seperator1 + strDate;
+ return currentdate;
+ }
+
+ </script>
+</head>
+
+<body class="gray-bg">
+<div class="wrapper wrapper-content">
+ ${layoutContent}
+</div>
+<script src="${ctxPath}/static/js/content.js?v=1.0.0"></script>
+</body>
+</html>
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/common/_right.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/common/_right.html
new file mode 100644
index 0000000..5c99b0e
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/common/_right.html
@@ -0,0 +1,58 @@
+<div id="page-wrapper" class="gray-bg dashbard-1">
+ <div class="row border-bottom">
+ <nav class="navbar navbar-static-top" role="navigation" style="margin-bottom: 0">
+ <div class="navbar-header"><a class="navbar-minimalize minimalize-styl-2 btn btn-primary " href="#"><i class="fa fa-bars"></i> </a>
+ <form role="search" class="navbar-form-custom" method="post" action="search_results.html">
+ <div class="form-group">
+ <input type="text" placeholder="咸宁95128后台管理系统 …" class="form-control" name="top-search" id="top-search" value="咸宁95128后台管理系统" disabled>
+ </div>
+ </form>
+ </div>
+ <ul class="nav navbar-top-links navbar-right">
+ <li class="dropdown hidden-xs">
+ <a class="right-sidebar-toggle" aria-expanded="false">
+ <i class="fa fa-tasks"></i> 主题
+ </a>
+ </li>
+ </ul>
+ </nav>
+ </div>
+ <div class="row content-tabs">
+ <button class="roll-nav roll-left J_tabLeft"><i class="fa fa-backward"></i>
+ </button>
+ <nav class="page-tabs J_menuTabs">
+ <div class="page-tabs-content">
+ <a href="javascript:;" class="active J_menuTab" data-id="${ctxPath}/blackboard">首页</a>
+ </div>
+ </nav>
+ <!--<nav class="page-tabs J_menuTabs">
+ <div class="page-tabs-content">
+ <a href="javascript:;" class="active J_menuTab" data-id="${ctxPath}/blackboard?type=0"></a>
+ </div>
+ </nav>-->
+ <button class="roll-nav roll-right J_tabRight"><i class="fa fa-forward"></i>
+ </button>
+ <div class="btn-group roll-nav roll-right">
+ <button class="dropdown J_tabClose" data-toggle="dropdown">关闭操作<span class="caret"></span>
+
+ </button>
+ <ul role="menu" class="dropdown-menu dropdown-menu-right">
+ <li class="J_tabShowActive"><a>定位当前选项卡</a>
+ </li>
+ <li class="divider"></li>
+ <li class="J_tabCloseAll"><a>关闭全部选项卡</a>
+ </li>
+ <li class="J_tabCloseOther"><a>关闭其他选项卡</a>
+ </li>
+ </ul>
+ </div>
+ <a href="logout" class="roll-nav roll-right J_tabExit"><i class="fa fa fa-sign-out"></i> 退出</a>
+ </div>
+ <div class="row J_mainContent" id="content-main">
+ <iframe class="J_iframe" name="iframe0" width="100%" height="100%" src="${ctxPath}/blackboard?type=${type}" frameborder="0" data-id="${ctxPath}/blackboard" seamless></iframe>
+ </div>
+ <div class="footer">
+ <div class="pull-right">
+ </div>
+ </div>
+</div>
\ No newline at end of file
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/common/_tab.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/common/_tab.html
new file mode 100644
index 0000000..79b3def
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/common/_tab.html
@@ -0,0 +1,74 @@
+<nav class="navbar-default navbar-static-side" role="navigation">
+ <div class="nav-close"><i class="fa fa-times-circle"></i>
+ </div>
+ <div class="sidebar-collapse">
+ <ul class="nav" id="side-menu">
+ <li class="nav-header">
+ <div class="dropdown profile-element">
+ <span><img alt="image" class="img-circle"
+ @if(isEmpty(avatar)){
+ src="${ctxPath}/static/img/NoPIC.png"
+ @}else{
+ src="${avatar}"
+ @}
+ width="64px" height="64px"/></span>
+ <a data-toggle="dropdown" class="dropdown-toggle" href="#">
+ <span class="clear">
+ <span class="block m-t-xs"><strong class="font-bold" id="userNameTab">${userName}</strong></span>
+ <span class="text-muted text-xs block">${shiro.getUser().roleNames[0]}<b class="caret"></b></span>
+ </span>
+ </a>
+ <ul class="dropdown-menu m-t-xs">
+ <li><a class="J_menuItem" href="${ctxPath}/mgr/user_info">个人资料</a></li>
+ <li><a class="J_menuItem" href="${ctxPath}/mgr/user_chpwd">修改密码</a></li>
+ <li class="divider"></li>
+ <li><a href="${ctxPath}/logout">安全退出</a>
+ </li>
+ </ul>
+ </div>
+ <div class="logo-element">MS
+ </div>
+ </li>
+
+ @for(title in titles){
+ @if(tool.isEmpty(title.children)){
+ <li>
+ <a class="J_menuItem" href="${ctxPath}${title.url}" name="tabMenuItem">
+ <i class="fa ${title.icon}"></i>
+ <span class="nav-label">${title.name}</span>
+ </a>
+ </li>
+ @}else{
+ <li>
+ <a href="#">
+ <i class="fa ${title.icon}"></i>
+ <span class="nav-label">${title.name}</span>
+ <span class="fa arrow"></span>
+ </a>
+ <ul class="nav nav-second-level">
+ @for(subTitle in title.children){
+ @if(tool.isEmpty(subTitle.children)){
+ <li>
+ <a class="J_menuItem" href="${ctxPath}${subTitle.url}" name="tabMenuItem">${subTitle.name}</a>
+ </li>
+ @}else{
+ <li>
+ <a href="#">${subTitle.name} <span class="fa arrow"></span></a>
+ <ul class="nav nav-third-level">
+ @for(thirdTitle in subTitle.children){
+ <li>
+ <a class="J_menuItem" href="${ctxPath}${thirdTitle.url}" name="tabMenuItem">${thirdTitle.name}</a>
+ </li>
+ @}
+ </ul>
+ </li>
+ @}
+ @}
+ </ul>
+ </li>
+ @}
+ @}
+
+ </ul>
+ </div>
+</nav>
\ No newline at end of file
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/common/_theme.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/common/_theme.html
new file mode 100644
index 0000000..4c093d8
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/common/_theme.html
@@ -0,0 +1,84 @@
+<div id="right-sidebar">
+ <div class="sidebar-container">
+
+ <ul class="nav nav-tabs navs-3">
+ <li class="active"><a data-toggle="tab" href="#tab-1"> <i
+ class="fa fa-gear"></i> 主题
+ </a></li>
+ </ul>
+
+ <div class="tab-content">
+ <div id="tab-1" class="tab-pane active">
+ <div class="sidebar-title">
+ <h3>
+ <i class="fa fa-comments-o"></i> 主题设置
+ </h3>
+ <small><i class="fa fa-tim"></i>
+ 你可以从这里选择和预览主题的布局和样式，这些设置会被保存在本地，下次打开的时候会直接应用这些设置。</small>
+ </div>
+ <div class="skin-setttings">
+ <div class="title">主题设置</div>
+ <div class="setings-item">
+ <span>收起左侧菜单</span>
+ <div class="switch">
+ <div class="onoffswitch">
+ <input type="checkbox" name="collapsemenu"
+ class="onoffswitch-checkbox" id="collapsemenu"> <label
+ class="onoffswitch-label" for="collapsemenu"> <span
+ class="onoffswitch-inner"></span> <span
+ class="onoffswitch-switch"></span>
+ </label>
+ </div>
+ </div>
+ </div>
+ <div class="setings-item">
+ <span>固定顶部</span>
+
+ <div class="switch">
+ <div class="onoffswitch">
+ <input type="checkbox" name="fixednavbar"
+ class="onoffswitch-checkbox" id="fixednavbar"> <label
+ class="onoffswitch-label" for="fixednavbar"> <span
+ class="onoffswitch-inner"></span> <span
+ class="onoffswitch-switch"></span>
+ </label>
+ </div>
+ </div>
+ </div>
+ <div class="setings-item">
+ <span> 固定宽度 </span>
+
+ <div class="switch">
+ <div class="onoffswitch">
+ <input type="checkbox" name="boxedlayout"
+ class="onoffswitch-checkbox" id="boxedlayout"> <label
+ class="onoffswitch-label" for="boxedlayout"> <span
+ class="onoffswitch-inner"></span> <span
+ class="onoffswitch-switch"></span>
+ </label>
+ </div>
+ </div>
+ </div>
+ <div class="title">皮肤选择</div>
+ <div class="setings-item default-skin nb">
+ <span class="skin-name "> <a href="#" class="s-skin-0">
+ 默认皮肤 </a>
+ </span>
+ </div>
+ <div class="setings-item blue-skin nb">
+ <span class="skin-name "> <a href="#" class="s-skin-1">
+ 蓝色主题 </a>
+ </span>
+ </div>
+ <div class="setings-item yellow-skin nb">
+ <span class="skin-name "> <a href="#" class="s-skin-3">
+ 黄色/紫色主题 </a>
+ </span>
+ </div>
+ </div>
+ </div>
+
+ </div>
+
+ </div>
+</div>
\ No newline at end of file
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/common/tags/NameCon.tag b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/common/tags/NameCon.tag
new file mode 100644
index 0000000..37cbe1d
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/common/tags/NameCon.tag
@@ -0,0 +1,14 @@
+@/*
+ 名称查询条件标签的参数说明:
+
+ name : 查询条件的名称
+ id : 查询内容的input框id
+@*/
+<div class="input-group">
+ <div class="input-group-btn">
+ <button data-toggle="dropdown" class="btn btn-white dropdown-toggle"
+ type="button">${name}
+ </button>
+ </div>
+ <input type="text" class="form-control" id="${id}" placeholder="${placeholder!}" />
+</div>
\ No newline at end of file
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/common/tags/SelectCon.tag b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/common/tags/SelectCon.tag
new file mode 100644
index 0000000..a350fc9
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/common/tags/SelectCon.tag
@@ -0,0 +1,16 @@
+@/*
+ 选择查询条件标签的参数说明:
+
+ name : 查询条件的名称
+ id : 查询内容的input框id
+@*/
+<div class="input-group">
+ <div class="input-group-btn">
+ <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+ ${name}
+ </button>
+ </div>
+ <select class="form-control" id="${id}">
+ ${tagBody!}
+ </select>
+</div>
\ No newline at end of file
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/common/tags/TimeCon.tag b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/common/tags/TimeCon.tag
new file mode 100644
index 0000000..a1fb8a3
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/common/tags/TimeCon.tag
@@ -0,0 +1,15 @@
+@/*
+ 时间查询条件标签的参数说明:
+
+ name : 查询条件的名称
+ id : 查询内容的input框id
+ isTime : 日期是否带有小时和分钟(true/false)
+@*/
+<div class="input-group">
+ <div class="input-group-btn">
+ <button data-toggle="dropdown" class="btn btn-white dropdown-toggle"
+ type="button">${name}
+ </button>
+ </div>
+ <input type="text" class="form-control layer-date" id="${id}"/>
+</div>
\ No newline at end of file
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/common/tags/avatar.tag b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/common/tags/avatar.tag
new file mode 100644
index 0000000..b7f7608
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/common/tags/avatar.tag
@@ -0,0 +1,29 @@
+@/*
+ 头像参数的说明:
+ name : 名称
+ id : 头像的id
+@*/
+<div class="form-group">
+ <label class="col-sm-3 control-label head-scu-label">${name}</label>
+ <div class="col-sm-4">
+ <div id="${id}PreId">
+ <div><img width="100px" height="100px"
+ @if(isEmpty(avatarImg)){
+ src="${ctxPath}/static/img/NoPIC.png"></div>
+ @}else{
+ src="${avatarImg}"></div>
+ @}
+ </div>
+ </div>
+ <div class="col-sm-2">
+ <div class="head-scu-btn upload-btn" id="${id}BtnId">
+ <i class="fa fa-upload"></i> 上传
+ </div>
+ </div>
+ <input type="hidden" id="${id}" value="${avatarImg!}"/>
+</div>
+@if(isNotEmpty(underline) && underline == 'true'){
+ <div class="hr-line-dashed"></div>
+@}
+
+
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/common/tags/button.tag b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/common/tags/button.tag
new file mode 100644
index 0000000..86def81
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/common/tags/button.tag
@@ -0,0 +1,30 @@
+@/*
+ 按钮标签中各个参数的说明:
+
+ btnType : 按钮的类型决定了颜色(default-灰色,primary-绿色,success-蓝色,info-淡蓝色,warning-黄色,danger-红色,white-白色)
+ space : 按钮左侧是否有间隔(true/false)
+ clickFun : 点击按钮所执行的方法
+ icon : 按钮上的图标的样式
+ name : 按钮名称
+@*/
+
+@var spaceCss = "";
+@var btnType = "";
+@if(isEmpty(space) || space == "false"){
+@ spaceCss = "";
+@}else{
+@ spaceCss = "button-margin";
+@}
+@if(isEmpty(btnCss)){
+@ btnType = "primary";
+@}else{
+@ btnType = btnCss;
+@}
+<button type="button" class="btn btn-${btnType} ${spaceCss}" onclick="${clickFun!}" id="${id!}"
+ @if(isNotEmpty(style)){
+ style="${style}"
+ @}
+>
+ <i class="fa ${icon}"></i> ${name}
+</button>
+
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/common/tags/input.tag b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/common/tags/input.tag
new file mode 100644
index 0000000..371ce9e
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/common/tags/input.tag
@@ -0,0 +1,54 @@
+@/*
+ 表单中input框标签中各个参数的说明:
+
+ hidden : input hidden框的id
+ id : input框id
+ name : input框名称
+ readonly : readonly属性
+ clickFun : 点击事件的方法名
+ style : 附加的css属性
+@*/
+<div class="form-group">
+ <label class="col-sm-3 control-label">${name}：</label>
+ <div class="col-sm-9">
+ <input class="form-control" id="${id}" name="${id}"
+ @if(isNotEmpty(value)){
+ value="${tool.dateType(value)}"
+ @}
+ @if(isNotEmpty(type)){
+ type="${type}"
+ @}else{
+ type="text"
+ @}
+ @if(isNotEmpty(readonly)){
+ readonly="${readonly}"
+ @}
+ @if(isNotEmpty(clickFun)){
+ onclick="${clickFun}"
+ @}
+ @if(isNotEmpty(style)){
+ style="${style}"
+ @}
+ @if(isNotEmpty(disabled)){
+ disabled="${disabled}"
+ @}
+ @if(isNotEmpty(placeholder)){
+ placeholder="${placeholder}"
+ @}
+ >
+ @if(isNotEmpty(hidden)){
+ <input class="form-control" type="hidden" id="${hidden}" value="${hiddenValue!}">
+ @}
+
+ @if(isNotEmpty(selectFlag)){
+ <div id="${selectId}" style="display: none; position: absolute; z-index: 200;">
+ <ul id="${selectTreeId}" class="ztree tree-box" style="${selectStyle!}"></ul>
+ </div>
+ @}
+ </div>
+</div>
+@if(isNotEmpty(underline) && underline == 'true'){
+ <div class="hr-line-dashed"></div>
+@}
+
+
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/common/tags/inputRequired.tag b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/common/tags/inputRequired.tag
new file mode 100644
index 0000000..6ff1d2a
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/common/tags/inputRequired.tag
@@ -0,0 +1,51 @@
+@/*
+ 表单中input框标签中各个参数的说明:
+
+ hidden : input hidden框的id
+ id : input框id
+ name : input框名称
+ readonly : readonly属性
+ clickFun : 点击事件的方法名
+ style : 附加的css属性
+@*/
+<div class="form-group">
+ <label class="col-sm-3 control-label"><span style="color:red">*</span> ${name}：</label>
+ <div class="col-sm-9">
+ <input class="form-control" id="${id}" name="${id}"
+ @if(isNotEmpty(value)){
+ value="${tool.dateType(value)}"
+ @}
+ @if(isNotEmpty(type)){
+ type="${type}"
+ @}else{
+ type="text"
+ @}
+ @if(isNotEmpty(readonly)){
+ readonly="${readonly}"
+ @}
+ @if(isNotEmpty(clickFun)){
+ onclick="${clickFun}"
+ @}
+ @if(isNotEmpty(style)){
+ style="${style}"
+ @}
+ @if(isNotEmpty(disabled)){
+ disabled="${disabled}"
+ @}
+ >
+ @if(isNotEmpty(hidden)){
+ <input class="form-control" type="hidden" id="${hidden}" value="${hiddenValue!}">
+ @}
+
+ @if(isNotEmpty(selectFlag)){
+ <div id="${selectId}" style="display: none; position: absolute; z-index: 200;">
+ <ul id="${selectTreeId}" class="ztree tree-box" style="${selectStyle!}"></ul>
+ </div>
+ @}
+ </div>
+</div>
+@if(isNotEmpty(underline) && underline == 'true'){
+ <div class="hr-line-dashed"></div>
+@}
+
+
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/common/tags/label.tag b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/common/tags/label.tag
new file mode 100644
index 0000000..2221b95
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/common/tags/label.tag
@@ -0,0 +1,31 @@
+@/*
+ 表单中input框标签中各个参数的说明:
+
+ hidden : input hidden框的id
+ id : input框id
+ name : input框名称
+ readonly : readonly属性
+ clickFun : 点击事件的方法名
+ style : 附加的css属性
+@*/
+<div class="form-group">
+ <label class="col-sm-3 control-label">${name}：</label>
+ <div class="col-sm-9">
+ <label class="control-label" id="${id}" name="${id}"
+ @if(isNotEmpty(style)){
+ style="${style};text-align: left;"
+ @}else{
+ style="text-align: left;"
+ @}
+ >
+ @if(isNotEmpty(value)){
+ ${tool.dateType(value)}
+ @}
+ </label>
+ </div>
+</div>
+@if(isNotEmpty(underline) && underline == 'true'){
+ <div class="hr-line-dashed"></div>
+@}
+
+
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/common/tags/select.tag b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/common/tags/select.tag
new file mode 100644
index 0000000..7072de1
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/common/tags/select.tag
@@ -0,0 +1,26 @@
+@/*
+ select标签中各个参数的说明:
+ name : select的名称
+ id : select的id
+ underline : 是否带分割线
+@*/
+<div class="form-group">
+ <label class="col-sm-3 control-label">${name}</label>
+ <div class="col-sm-9">
+ <select class="form-control" id="${id}" name="${id}"
+ @if(isNotEmpty(onchange)){
+ onchange="${onchange}"
+ @}
+ >
+ ${tagBody!}
+ </select>
+ @if(isNotEmpty(hidden)){
+ <input class="form-control" type="hidden" id="${hidden}" value="${hiddenValue!}">
+ @}
+ </div>
+</div>
+@if(isNotEmpty(underline) && underline == 'true'){
+ <div class="hr-line-dashed"></div>
+@}
+
+
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/common/tags/table.tag b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/common/tags/table.tag
new file mode 100644
index 0000000..3760417
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/common/tags/table.tag
@@ -0,0 +1,12 @@
+@/*
+ 表格标签的参数说明:
+
+ id : table表格的id
+@*/
+<table id="${id}" data-mobile-responsive="true" data-click-to-select="true">
+ <thead>
+ <tr>
+ <th data-field="selectItem" data-checkbox="true"></th>
+ </tr>
+ </thead>
+</table>
\ No newline at end of file
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/common/tags/tag_tips b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/common/tags/tag_tips
new file mode 100644
index 0000000..3a5d5d4
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/common/tags/tag_tips
@@ -0,0 +1,22 @@
+1 dictSelector(字典选择器)
+ 此标签是为了方便在前台form表单中使用系统中维护的字典而开发的，具体说明如下：
+1.1 标签样例
+ <#dictSelector id="sex" name ="sex" code="sys_sex" readonly="readonly" label="性别" underline="true" value="${user.sex}" />
+1.2 属性说明
+ id: (非必须) 控件的id
+ name: (非必须) 控件的name
+ code:(必须) 字典类型编码,根据code的值去后台查询该类型的字典。
+ type:(非必须) 控件类型，可选项为[select,radio,checkbox],标签会根据填写的类型，生成不同的控件。
+ searchnum：(非必须)下拉框达到多少个，开启搜索框，默认10个,type为select起效。
+ label：(非必须) 字典属性名称
+ width：(非必须) 控件的宽度单位为px，type为select起效。
+ value: (非必须) 控件默认值,多选时值要用,分隔。
+ placeholder：(非必须) 控件提示信息，type为select起效。
+ multiple：(非必须) 是否开启多选,可选值[true,false],默认为false,type为select起效。
+ underline:(非必须) 是否显示分割线,可选值[true,false],默认为false。
+ onchange：(非必须) onchange事件方法名称,会传入更改后的值作为参数,例：onchange="myOnChange" function myOnChange(newVal){}。
+ readonly：(非必须)只读控件,可选值[true,false],默认false
+ disabled：(非必须) 禁用控件,可选值[true,false],默认false
+
+
+
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/common/tags/uploadFile.tag b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/common/tags/uploadFile.tag
new file mode 100644
index 0000000..793cd19
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/common/tags/uploadFile.tag
@@ -0,0 +1,13 @@
+<div class="form-group">
+ <label class="col-sm-2 control-label">上传文件</label>
+ <div class="col-sm-6">
+ <input type="file" class="form-control" id="upFile" name="upFile">
+ <input type="hidden" id="${id}" name="${id}"/>
+ </div>
+ <div class="col-sm-2">
+ <button class="btn btn-outline btn-success" type="button" onclick="UploadFileFn()"><i class="fa fa-upload"></i>上传文件</button>
+ </div>
+</div>
+<div class="col-sm-12 progress progress-striped" style="margin-top: 10px;">
+ <div id="progressBarFile" style="width: 0%" aria-valuemax="100" aria-valuemin="0" aria-valuenow="0" role="progressbar" class="progress-bar progress-bar-info"></div>
+</div>
\ No newline at end of file
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/common/tags/uploadImg.tag b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/common/tags/uploadImg.tag
new file mode 100644
index 0000000..8a0c521
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/common/tags/uploadImg.tag
@@ -0,0 +1,26 @@
+@/*
+ 上传文件参数的说明:
+ id : 文件的id
+@*/
+<div class="form-group">
+ <div class="col-sm-4">
+ <div id="${id}PreId">
+ <div><img width="100px" height="100px"
+ @if(isEmpty(fileImg)){
+ src="${ctxPath}/static/img/NoPIC.png">
+ @}else{
+ src="${fileImg}">
+ @}
+ </div>
+ </div>
+ </div>
+ <div class="col-sm-2">
+ <div class="head-scu-btn upload-btn" id="${id}BtnId">
+ <i class="fa fa-upload"></i> 上传
+ </div>
+ </div>
+ <input type="hidden" id="${id}" value="${fileImg!}"/>
+</div>
+@if(isNotEmpty(underline) && underline == 'true'){
+ <div class="hr-line-dashed"></div>
+@}
\ No newline at end of file
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/driverOnline.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/driverOnline.html
new file mode 100644
index 0000000..9299d76
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/driverOnline.html
@@ -0,0 +1,33 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>在线司机</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#NameCon id="name" name="司机姓名" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="phone" name="手机号" />
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="Home.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="Home.resetSearch()" space="true"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="HomeTableToolbar" role="group">
+ </div>
+ <#table id="HomeTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/home.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/home.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/home.html
new file mode 100644
index 0000000..65415ad
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/home.html
@@ -0,0 +1,208 @@
+@layout("/common/_container.html"){
+<div class="container-fluid" style="padding: 0 !important;">
+ <div class="row">
+ <div class="col-sm-12">
+ <div class="row" style="border-style: none none solid; border-color: #e7eaec; border-width: 1px 0px;">
+ <ul class="breadcrumb" style="height: 45px; line-height: 45px; padding-left: 20px;">
+ <li><a href="#" class="statistics">运营数据总览</a></li>
+ <li><a href="#" class="map">车辆地图总览</a></li>
+ <li><a href="#" class="order">订单热点图</a></li>
+ </ul>
+ </div>
+
+ <div class="row content" id="statisticsDiv">
+ <div class="form-group" style="height: 80px; padding-top: 20px; background-color: #FFFFFF;margin-bottom: 8px;">
+ <div class="col-sm-3">
+ <div class="input-group">
+ <div class="input-group-btn">
+ <button data-toggle="dropdown" class="btn btn-white dropdown-toggle"
+ type="button">选择查看范围
+ </button>
+ </div>
+ <div style="padding-left: 0px;">
+ <select class="form-control" id="branchOffice">
+ <option value="">----请选择----</option>
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="col-sm-2">
+ <#button name="搜索" icon="fa-search" clickFun="getData()"/>
+ </div>
+ </div>
+ <div class="col-sm-3">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <div class="pull-right" style="margin-top: -10px;">
+ <input type="text" class="layui-input form-control" id="addDate">
+ </div>
+ <h5>今日运行情况</h5>
+ </div>
+ <div class="ibox-content">
+ <h1 class="no-margins" id="newPassengerInfo">0</h1>
+ <small>新增用户</small>
+ </div>
+ <div class="ibox-content" onclick="Home.onlineDriver()">
+ <h1 class="no-margins" id="newNetcardriver">0</h1>
+ <small>在线司机</small>
+ </div>
+ <div class="ibox-content">
+ <h1 class="no-margins" id="orderDetail2">0</h1>
+ <small>出租车订单</small>
+ </div>
+ </div>
+ </div>
+ <div class="col-sm-3">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <span class="label label-info pull-right">全部</span>
+ <h5>运营总数据</h5>
+ </div>
+ <div class="ibox-content">
+ <h1 class="no-margins" id="passengerInfoSum">0</h1>
+ <small>总用户</small>
+ </div>
+ <div class="ibox-content">
+ <h1 class="no-margins" id="netcarDriverSum">0</h1>
+ <small>总司机</small>
+ </div>
+ <div class="ibox-content">
+ <h1 class="no-margins" id="netCarSum">0</h1>
+ <small>总车辆</small>
+ </div>
+ <div class="ibox-content">
+ <h1 class="no-margins" id="orderDetailSum">0</h1>
+ <small>总订单</small>
+ </div>
+ <div class="ibox-content">
+ <h1 class="no-margins" id="paiceSum">0</h1>
+ <small>交易总金额</small>
+ </div>
+ <div class="ibox-content">
+ <h1 class="no-margins" id="paySum">0</h1>
+ <small>总收益</small>
+ </div>
+ </div>
+ </div>
+ <div class="col-sm-3">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <div class="pull-right" style="margin-top: -10px;">
+ <input type="text" class="layui-input form-control" id="rangeDate">
+ </div>
+ <h5>运营数据增长查询</h5>
+ </div>
+ <div class="ibox-content">
+ <h1 class="no-margins" id="passengerInfoSum1">0</h1>
+ <small>用户增长数</small>
+ </div>
+ <div class="ibox-content">
+ <h1 class="no-margins" id="netcarDriverSum1">0</h1>
+ <small>新增司机</small>
+ </div>
+ <div class="ibox-content">
+ <h1 class="no-margins" id="orderDetail21">0</h1>
+ <small>出租车订单数</small>
+ </div>
+ <div class="ibox-content">
+ <h1 class="no-margins" id="paiceSum1">0</h1>
+ <small>交易总金额</small>
+ </div>
+ <div class="ibox-content">
+ <h1 class="no-margins" id="paySum1">0</h1>
+ <small>总收益</small>
+ </div>
+ </div>
+ </div>
+ <div class="col-sm-3">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <span class="label label-danger pull-right">最近30天</span>
+ <h5>运营总趋势</h5>
+ </div>
+ <div class="ibox-content">
+ <h1 class="no-margins">
+ <span class="dynamicsparkline" id="orderDetailSum1">Loading..</span>
+ </h1>
+ <small>订单数趋势图</small>
+ </div>
+ <div class="ibox-content">
+ <h1 class="no-margins">
+ <span class="dynamicsparkline" id="passengerInfoSum2">Loading..</span>
+ </h1>
+ <small>用户注册趋势图</small>
+ </div>
+ <div class="ibox-content">
+ <h1 class="no-margins">
+ <span class="dynamicsparkline" id="orderDetail22">Loading..</span>
+ </h1>
+ <small>出租车订单趋势图</small>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row content" id="mapDiv">
+ <div class="form-group" style="height: 80px; padding-top: 20px; background-color: #FFFFFF;margin-bottom: 8px;">
+ <div class="col-sm-8">
+ <div class="input-group">
+ <div class="input-group-btn">
+ <button data-toggle="dropdown" class="btn btn-white dropdown-toggle"
+ type="button">选择查看范围
+ </button>
+ </div>
+ <div class="col-sm-4" style="padding-left: 0px;">
+ <select class="form-control" id="branchOffice1">
+ <option value="">----请选择----</option>
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="col-sm-2">
+ <#button name="搜索" icon="fa-search" clickFun="getData1()"/>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-sm-2" style="padding: 0px; height: 47em; overflow: auto">
+ <div class="form-group" style="padding: 0px 5px;">
+ <div class="col-sm-12">
+ <ul class="list-group" id="netcardriver">
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ <div class="col-sm-8" style="padding: 0px;">
+ <div class="form-group" style="padding: 0px 5px;">
+ <div id="container" style="height: 47em;"></div>
+ </div>
+ </div>
+ <div class="col-sm-2" style="padding: 0px; height: 47em; overflow: auto">
+ <div class="form-group">
+ <div class="col-sm-12" style="padding: 0px 5px;">
+ <ul class="list-group" id="order">
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row content" id="orderDiv">
+ <div class="form-group" style="height: 80px; padding-top: 20px; background-color: #FFFFFF;margin-bottom: 8px;">
+ <div class="col-sm-12">
+ <div id="container_" style="height: 47em;"></div>
+ </div>
+ </div>
+ </div>
+
+ </div>
+ </div>
+</div>
+<script type="text/javascript" src="https://webapi.amap.com/maps?v=1.4.15&key=c59c0ec8058a8305009eb315584e07d1"></script>
+<script src="https://webapi.amap.com/maps?v=1.4.15&key=c59c0ec8058a8305009eb315584e07d1&plugin=AMap.MouseTool"></script>
+<script type="text/javascript" src='https://a.amap.com/jsapi_demos/static/citys.js'></script>
+<script src="${ctxPath}/static/home.js"></script>
+<script src="${ctxPath}/static/js/jquery.sparkline 2.1.2.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/index.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/index.html
new file mode 100644
index 0000000..23aa5c0
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/index.html
@@ -0,0 +1,47 @@
+<!DOCTYPE html>
+<html>
+<head>
+ <meta charset="utf-8">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+ <meta name="renderer" content="webkit">
+ <title>咸宁95128 - 主页</title>
+ <link rel="shortcut icon" href="${ctxPath}/static/img/logo.jpg">
+ <link href="${ctxPath}/static/css/bootstrap.min.css?v=3.3.6" rel="stylesheet">
+ <link href="${ctxPath}/static/css/font-awesome.min.css?v=4.4.0" rel="stylesheet">
+ <link href="${ctxPath}/static/css/style.css?v=4.1.0" rel="stylesheet">
+</head>
+
+<body class="fixed-sidebar full-height-layout gray-bg" style="overflow:hidden">
+ <div id="wrapper">
+
+ <!--左侧导航开始-->
+ @include("/common/_tab.html"){}
+ <!--左侧导航结束-->
+
+ <!--右侧部分开始-->
+ @include("/common/_right.html"){}
+ <!--右侧部分结束-->
+
+ <!--右侧边栏开始-->
+ @include("/common/_theme.html"){}
+ <!--右侧边栏结束-->
+
+ </div>
+
+ <!-- 全局js -->
+ <script src="${ctxPath}/static/js/jquery.min.js?v=2.1.4"></script>
+ <script src="${ctxPath}/static/js/bootstrap.min.js?v=3.3.6"></script>
+ <script src="${ctxPath}/static/js/plugins/metisMenu/jquery.metisMenu.js"></script>
+ <script src="${ctxPath}/static/js/plugins/slimscroll/jquery.slimscroll.min.js"></script>
+ <script src="${ctxPath}/static/js/plugins/layer/layer.js"></script>
+
+ <!-- 自定义js -->
+ <script src="${ctxPath}/static/js/hplus.js?v=4.1.0"></script>
+ <script type="text/javascript" src="${ctxPath}/static/js/contabs.js"></script>
+
+ <!-- 第三方插件 -->
+ <script src="${ctxPath}/static/js/plugins/pace/pace.min.js"></script>
+
+</body>
+
+</html>
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/login.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/login.html
new file mode 100644
index 0000000..483d4ed
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/login.html
@@ -0,0 +1,193 @@
+<!DOCTYPE html>
+<html>
+<head>
+ <meta charset="utf-8">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+
+ <title>咸宁95128 - 登录</title>
+
+ <link rel="shortcut icon" href="${ctxPath}/static/img/logo.jpg">
+ <link href="${ctxPath}/static/css/bootstrap.min.css?v=3.3.6" rel="stylesheet">
+ <link href="${ctxPath}/static/css/font-awesome.css?v=4.4.0" rel="stylesheet">
+ <link href="${ctxPath}/static/css/style.css?v=4.1.0" rel="stylesheet">
+ <script>if (window.top !== window.self) {
+ window.top.location = window.location;
+ }</script>
+ <script src="${ctxPath}/static/js/jquery.min.js?v=2.1.4"></script>
+ <script src="${ctxPath}/static/js/bootstrap.min.js?v=3.3.6"></script>
+ <style>
+ .item{
+ display: flex;
+ align-items: center;
+ /*border: 1px solid red !important;*/
+ margin: 24px 0;
+ position: relative;
+ }
+ .item>img{
+ position: absolute;
+ left: 8px;
+ /*bottom: 50%;*/
+ }
+ .itemInput{
+ background:none;
+ outline:none;
+ border:0px;
+ border-bottom:1px solid grey ;
+ padding-left: 30px;
+ height: 34px;
+ width: 100%;
+ }
+ .itemInput[type="text"]{
+
+ background: #fff;
+ outline: none;
+ }
+
+ .itemInput:-webkit-autofill {
+ -webkit-box-shadow: 0 0 0 1000px white inset; // 背景设为白色
+ -webkit-text-fill-color: #fff; // 字体颜色
+ }
+ </style>
+</head>
+
+<body class="gray-bg" style="background:url(${ctxPath}/static/img/index1.png) no-repeat; background-size:cover;">
+
+<div style="display: flex;align-items: center;justify-content: center;height: 100%">
+
+
+<img src="${ctxPath}/static/img/logo.jpg" style="width: 300px;height: 400px;z-index: 1000">
+<div style="position: relative;left: -20px; max-width: 300px;min-height: 300px;background: white;border-radius: 8px;box-sizing: border-box;padding: 0 30px 0 50px;display: flex;align-items: center;justify-content: center;">
+ <div style="max-height: 100%">
+ <h3 style="color: black;"><img src="${ctxPath}/static/img/logo.jpg" width="30px" height="30px"/> 咸宁95128管理后台</h3>
+ <br/>
+ <h4 style="color: red;">${tips!}</h4>
+ <form class="m-t" role="form" action="${ctxPath}/login" method="post">
+ <div class="item">
+ <img src="${ctxPath}/static/img/account.png" />
+ <input class="itemInput" type="text" name="username" placeholder="请输入您的账号" required="" value="">
+ </div>
+ <div class="item">
+ <img src="${ctxPath}/static/img/password.png" />
+ <input class="itemInput" type="password" name="password" placeholder="请输入您的密码" required="" value="">
+ </div>
+ @if(kaptcha.getKaptchaOnOff() == true){
+ <div class="form-group" style="float: left;">
+ <div class="col-sm-8" style="padding-left: 0px; padding-right: 0px;">
+ <input class="form-control" type="text" name="kaptcha" placeholder="验证码" required="">
+ </div>
+ <div class="col-sm-4" style="padding-left: 0px; padding-right: 0px;">
+ <img src="${ctxPath}/kaptcha" id="kaptcha" width="100%" height="100%"/>
+ </div>
+ </div>
+ @}
+ <div class="form-group" style="float: left;">
+ <div class="checkbox" style="text-align: left">
+ <!--<label>
+ <input type="checkbox" name="remember" style="margin-top: 2px;">记住我
+ </label>-->
+ </div>
+ </div>
+ <button type="submit" class="btn full-width m-b" style="background-color: #d56b29;color: black;">登 录</button>
+ </p>
+ </form>
+ </div>
+</div></div>
+
+<script>
+ $(function () {
+ $("#kaptcha").on('click', function () {
+ $("#kaptcha").attr('src', '${ctxPath}/kaptcha?' + Math.floor(Math.random() * 100)).fadeIn();
+ });
+ });
+
+ window.addEventListener(
+ "mousewheel",
+ function(event) {
+ if (event.ctrlKey === true || event.metaKey) {
+ event.preventDefault();
+ }
+ },
+ { passive: false }
+ );
+
+ //firefox
+ window.addEventListener(
+ "DOMMouseScroll",
+ function(event) {
+ if (event.ctrlKey === true || event.metaKey) {
+ event.preventDefault();
+ }
+ },
+ { passive: false }
+ );
+
+
+ function fontSize(designWidth, maxWidth, minWidth) {
+ var doc = document,
+ win = window,
+ docEl = doc.documentElement,
+ remStyle = document.createElement("style"),
+ tid;
+
+ function refreshRem() {
+ var width = docEl.getBoundingClientRect().width;
+ maxWidth = maxWidth || 540;
+ width > maxWidth && (width = maxWidth);
+ var rem = (width * 100) / designWidth;
+ remStyle.innerHTML = "html{font-size:" + rem + "px;}";
+ }
+
+ if (docEl.firstElementChild) {
+ docEl.firstElementChild.appendChild(remStyle);
+ } else {
+ var wrap = doc.createElement("div");
+ wrap.appendChild(remStyle);
+ doc.write(wrap.innerHTML);
+ wrap = null;
+ }
+ // 要等 wiewport 设置好后才能执行 refreshRem，不然 refreshRem 会执行2次；
+ refreshRem();
+
+ win.addEventListener(
+ "resize",
+ function(res) {
+ // console.log(res);
+ if (minWidth < res.currentTarget.innerWidth) {
+ clearTimeout(tid); //防止执行两次
+ return;
+ }
+
+ tid = setTimeout(refreshRem, 10);
+ },
+ false
+ );
+
+ win.addEventListener(
+ "pageshow",
+ function(e) {
+ if (e.persisted) {
+ // 浏览器后退的时候重新计算
+ clearTimeout(tid);
+ tid = setTimeout(refreshRem, 300);
+ }
+ },
+ false
+ );
+
+ if (doc.readyState === "complete") {
+ doc.body.style.fontSize = "16px";
+ } else {
+ doc.addEventListener(
+ "DOMContentLoaded",
+ function(e) {
+ doc.body.style.fontSize = "16px";
+ },
+ false
+ );
+ }
+ }
+ fontSize(768, 1920);
+</script>
+</body>
+
+</html>
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/netCarInfo.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/netCarInfo.html
new file mode 100644
index 0000000..76a4e05
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/netCarInfo.html
@@ -0,0 +1,25 @@
+@layout("/common/_container.html"){
+<style type="text/css">
+ tr{
+ height: 40px;
+ }
+ td{
+ width: 200px;
+ }
+ h4{
+ color: #1AB394;
+ }
+ img{
+ height: 80px;
+ }
+</style>
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <input type="hidden" id="driverId" value="${id}">
+ <div class="form-horizontal" id="content">
+
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/netCarInfo.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/code/code.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/code/code.html
new file mode 100644
index 0000000..cacd239
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/code/code.html
@@ -0,0 +1,47 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-6 col-sm-offset-3">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>代码生成</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="form-horizontal">
+ <div class="form-group">
+ <label class="col-sm-2 control-label">模块英文名称</label>
+ <div class="col-sm-10">
+ <input type="text" class="form-control" id="moduleName"> <span class="help-block m-b-none">例如:system</span>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">业务名称</label>
+ <div class="col-sm-10">
+ <input type="text" class="form-control" id="bizChName"> <span class="help-block m-b-none">例如:测试</span>
+ </div>
+ </div>
+ <div class="hr-line-dashed"></div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">业务英文名称</label>
+ <div class="col-sm-10">
+ <input type="text" class="form-control" id="bizEnName"> <span class="help-block m-b-none">例如:test</span>
+ </div>
+ </div>
+ <div class="hr-line-dashed"></div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">输出路径</label>
+ <div class="col-sm-10">
+ <input type="text" class="form-control" id="path"> <span class="help-block m-b-none">默认路径为D:\ideaSpace\guns,可修改为您的项目的路径</span>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-sm-4 col-sm-offset-2">
+ <button class="btn btn-primary" onclick="Code.generate()">代码生成</button>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/code/code.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/dept/dept.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/dept/dept.html
new file mode 100644
index 0000000..a0570a2
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/dept/dept.html
@@ -0,0 +1,38 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>部门管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#NameCon id="condition" name="名称" />
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="Dept.search()"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="DeptTableToolbar" role="group">
+ @if(shiro.hasPermission("/dept/add")){
+ <#button name="添加" icon="fa-plus" clickFun="Dept.openAddDept()"/>
+ @}
+ @if(shiro.hasPermission("/dept/update")){
+ <#button name="修改" icon="fa-plus" clickFun="Dept.openDeptDetail()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/dept/delete")){
+ <#button name="删除" icon="fa-plus" clickFun="Dept.delete()" space="true"/>
+ @}
+ </div>
+ <#table id="DeptTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/dept/dept.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/dept/dept_add.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/dept/dept_add.html
new file mode 100644
index 0000000..2be4b89
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/dept/dept_add.html
@@ -0,0 +1,42 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="deptInfoForm">
+
+ <input type="hidden" id="id" value="">
+
+ <div class="row">
+ <div class="col-sm-6 b-r">
+ <#input id="simplename" name="部门名称" underline="true"/>
+
+ <#input id="fullname" name="部门全称" underline="true"/>
+
+ <#input id="tips" name="备注" underline="true"/>
+ </div>
+ <div class="col-sm-6">
+ <#input id="num" name="排序" underline="true"/>
+
+ <#input id="pName" name="上级部门" readonly="readonly" hidden="pid"
+ clickFun="DeptInfoDlg.showDeptSelectTree(); return false;"
+ style="background-color: #ffffff !important;"/>
+ </div>
+ </div>
+
+ <!-- 父级部门的选择框 -->
+ <div id="parentDeptMenu" class="menuContent"
+ style="display: none; position: absolute; z-index: 200;">
+ <ul id="parentDeptMenuTree" class="ztree tree-box" style="width: 245px !important;"></ul>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="DeptInfoDlg.addSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="DeptInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/dept/dept_info.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/dept/dept_edit.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/dept/dept_edit.html
new file mode 100644
index 0000000..c805552
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/dept/dept_edit.html
@@ -0,0 +1,44 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="deptInfoForm">
+
+ <input type="hidden" id="id" value="${dept.id}">
+ <input type="hidden" id="pid" value="${dept.pid}">
+
+ <div class="row">
+ <div class="col-sm-6 b-r">
+ <#input id="simplename" name="部门名称" underline="true" value="${dept.simplename}"/>
+
+ <#input id="fullname" name="部门全称" underline="true" value="${dept.fullname}"/>
+
+ <#input id="tips" name="备注" underline="true" value="${dept.tips}"/>
+ </div>
+ <div class="col-sm-6">
+ <#input id="num" name="排序" underline="true" value="${dept.num}"/>
+
+ <#input id="pName" name="上级部门" readonly="readonly" hidden="pid"
+ hiddenValue="${dept.pid}" value="${pName}"
+ clickFun="DeptInfoDlg.showDeptSelectTree(); return false;"
+ style="background-color: #ffffff !important;"/>
+ </div>
+ </div>
+
+ <!-- 父级部门的选择框 -->
+ <div id="parentDeptMenu" class="menuContent"
+ style="display: none; position: absolute; z-index: 200;">
+ <ul id="parentDeptMenuTree" class="ztree tree-box" style="width: 245px !important;"></ul>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="DeptInfoDlg.editSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="DeptInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/dept/dept_info.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/dict/dict.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/dict/dict.html
new file mode 100644
index 0000000..2bf81ee
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/dict/dict.html
@@ -0,0 +1,38 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>字典管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#NameCon id="condition" name="名称" />
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="Dict.search()"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="DictTableToolbar" role="group">
+ @if(shiro.hasPermission("/dict/add")){
+ <#button name="添加" icon="fa-plus" clickFun="Dict.openAddDict()"/>
+ @}
+ @if(shiro.hasPermission("/dict/update")){
+ <#button name="修改" icon="fa-plus" clickFun="Dict.openDictDetail()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/dict/delete")){
+ <#button name="删除" icon="fa-plus" clickFun="Dict.delete()" space="true"/>
+ @}
+ </div>
+ <#table id="DictTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/dict/dict.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/dict/dict_add.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/dict/dict_add.html
new file mode 100644
index 0000000..f3d51f3
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/dict/dict_add.html
@@ -0,0 +1,64 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+
+ <input type="hidden" id="id" value="">
+
+ <div class="row">
+ <div class="col-sm-12" id="itemsArea">
+ <div class="form-group">
+ <label class="col-sm-2 control-label">类型编码</label>
+ <div class="col-sm-2">
+ <input class="form-control" id="dictCode" type="text">
+ </div>
+ <label class="col-sm-2 control-label">类型名称</label>
+ <div class="col-sm-2">
+ <input class="form-control" id="dictName" type="text">
+ </div>
+
+ <div class="col-sm-2">
+ <#button btnCss="info" name="增加" icon="fa-plus" clickFun="DictInfoDlg.addItem()"/>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">备注</label>
+ <div class="col-sm-8">
+ <input class="form-control" id="dictTips" type="text">
+ </div>
+ </div>
+ <div class="hr-line-dashed"></div>
+
+ </div>
+ </div>
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="DictInfoDlg.addSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="DictInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <script type="text/template" id="itemTemplate">
+ <div class="form-group" name="dictItem" id="dictItem">
+ <label class="col-sm-1 control-label">值</label>
+ <div class="col-sm-2">
+ <input class="form-control" type="text" name="itemCode">
+ </div>
+ <label class="col-sm-1 control-label" >名称</label>
+ <div class="col-sm-2">
+ <input class="form-control" type="text" name="itemName">
+ </div>
+ <label class="col-sm-1 control-label" >序号</label>
+ <div class="col-sm-2">
+ <input class="form-control" type="text" name="itemNum">
+ </div>
+ <div class="col-sm-2">
+ <#button btnCss="danger" name="删除" id="cancel" icon="fa-remove" clickFun="DictInfoDlg.deleteItem(event)"/>
+ </div>
+ </div>
+ </script>
+
+ <script src="${ctxPath}/static/modular/system/dict/dict_info.js"></script>
+ @}
\ No newline at end of file
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/dict/dict_edit.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/dict/dict_edit.html
new file mode 100644
index 0000000..84027c5
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/dict/dict_edit.html
@@ -0,0 +1,86 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+
+ <input type="hidden" id="id" value="">
+
+ <div class="row">
+ <div class="col-sm-12" id="itemsArea">
+ <input type="hidden" id="itemSize" value="${subDicts.~size!0}" />
+ <div class="form-group">
+
+ <label class="col-sm-2 control-label">类型编码</label>
+ <div class="col-sm-2">
+ <input class="form-control" id="dictCode" type="text" value="${dict.code}">
+ </div>
+
+ <label class="col-sm-2 control-label">类型名称</label>
+ <div class="col-sm-2">
+ <input class="form-control" id="dictName" type="text" value="${dict.name}">
+ <input type="hidden" id="dictId" value="${dict.id}">
+ </div>
+
+ <div class="col-sm-2">
+ <#button btnCss="info" name="增加" icon="fa-plus" clickFun="DictInfoDlg.addItem()"/>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">备注</label>
+ <div class="col-sm-8">
+ <input class="form-control" id="dictTips" type="text" value="${dict.tips}">
+ </div>
+ </div>
+ <div class="hr-line-dashed"></div>
+ @for(item in subDicts){
+ <div class="form-group" name="dictItem" id="dictItem${itemLP.index}">
+ <label class="col-sm-1 control-label">值</label>
+ <div class="col-sm-2">
+ <input class="form-control" type="text" name="itemCode" value="${item.code}">
+ </div>
+ <label class="col-sm-1 control-label" >名称</label>
+ <div class="col-sm-2">
+ <input class="form-control" type="text" name="itemName" value="${item.name}">
+ </div>
+ <label class="col-sm-1 control-label" >序号</label>
+ <div class="col-sm-2">
+ <input class="form-control" type="text" name="itemNum" value="${item.num}">
+ </div>
+ <div class="col-sm-2">
+ <#button btnCss="danger" name="删除" id="cancel" icon="fa-remove" clickFun="DictInfoDlg.deleteItem(event)"/>
+ </div>
+ </div>
+ @}
+ </input>
+ </div>
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="DictInfoDlg.editSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="DictInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <script type="text/template" id="itemTemplate">
+ <div class="form-group" name="dictItem" id="dictItem">
+ <label class="col-sm-1 control-label">值</label>
+ <div class="col-sm-2">
+ <input class="form-control" type="text" name="itemCode">
+ </div>
+ <label class="col-sm-1 control-label" >名称</label>
+ <div class="col-sm-2">
+ <input class="form-control" type="text" name="itemName">
+ </div>
+ <label class="col-sm-1 control-label" >序号</label>
+ <div class="col-sm-2">
+ <input class="form-control" type="text" name="itemNum">
+ </div>
+ <div class="col-sm-2">
+ <#button btnCss="danger" name="删除" id="cancel" icon="fa-remove" clickFun="DictInfoDlg.deleteItem(event)"/>
+ </div>
+ </div>
+ </script>
+
+ <script src="${ctxPath}/static/modular/system/dict/dict_info.js"></script>
+ @}
\ No newline at end of file
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity.html
new file mode 100644
index 0000000..5707610
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity.html
@@ -0,0 +1,57 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#TimeCon id="createTime" name="添加时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="name" name="名称" />
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="DriverActivity.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="DriverActivity.resetSearch()" space="true"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="DriverActivityTableToolbar" role="group">
+ @if(shiro.hasPermission("/driverActivity/add")){
+ <#button name="添加" icon="fa-plus" clickFun="DriverActivity.openAddDriverActivity()"/>
+ @}
+ @if(shiro.hasPermission("/driverActivity/update")){
+ <#button name="编辑" icon="fa-edit" clickFun="DriverActivity.openUpdateDriverActivity()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/driverActivity/updateStatus")){
+ <#button name="启动/暂停" icon="" clickFun="DriverActivity.updateStatus()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/driverActivity/detail")){
+ <#button name="详情" icon="" clickFun="DriverActivity.openDriverActivityDetail()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/driverActivity/receiveRecord")){
+ <#button name="领取记录" icon="" clickFun="DriverActivity.receiveRecord()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/driverActivity/immediately")){
+ <#button name="审核" icon="" clickFun="DriverActivity.immediately()" space="true"/>
+ @}
+ </div>
+ <#table id="DriverActivityTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/driverActivity/driverActivity.js"></script>
+<script>
+ laydate.render({
+ elem: '#createTime'
+ ,range: true
+ });
+</script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity_add.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity_add.html
new file mode 100644
index 0000000..0350c90
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity_add.html
@@ -0,0 +1,85 @@
+@layout("/common/_container.html"){
+<style>
+ .newWidth, .single-line{
+ max-width:150px !important;display: initial !important;
+ }
+</style>
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+
+ <div class="row">
+ <div class="col-sm-11">
+ <div class="form-group">
+ <div class="col-sm-10">
+ 活动名称： <input type="text" name="zc1" id="num1" class="form-control newWidth" />
+ <br/>
+ <br/>
+ 司机邀请司机注册
+ <br/>
+ <br/>
+
+ 司机注册既赠送 <input type="text" id="num2" class="form-control newWidth" /> 元
+ <br/>
+ <br/>
+ 司机邀请用户注册
+ <br/>
+ <br/>
+ 用户注册既赠送 <input type="text" id="num3" class="form-control newWidth" /> 元
+ <br/>
+ <br/>
+ 司机APP每天累计在线奖励
+ <br/>
+ <br/>
+ 专车累计在线 <input type="text" id="num4" class="form-control newWidth" /> 小时奖励
+ <input type="text" id="num5" class="form-control newWidth" /> 元
+ <br/>
+ <br/>
+ 出租车累计在线 <input type="text" id="num6" class="form-control newWidth" /> 小时奖励
+ <input type="text" id="num7" class="form-control newWidth" /> 元
+ <br/>
+ <br/>
+ 跨城出行累计在线 <input type="text" id="num8" class="form-control newWidth" /> 小时奖励
+ <input type="text" id="num9" class="form-control newWidth" /> 元
+ <br/>
+ <br/>
+ 司机累计达到规定订单数奖励
+ <br/>
+ <br/>
+ 每天 <input type="text" id="staTime" class="form-control newWidth" /> 司机接单达到
+ <input type="text" id="num10" class="form-control newWidth" /> 单既奖励
+ <input type="text" id="num11" class="form-control newWidth" /> 元
+ <br/>
+ <br/>
+ 有效期为 <input type="text" id="startTime" name="zc7" class="form-control" style="max-width:300px !important;display: initial !important;" />
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="DriverActivityInfoDlg.addSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="DriverActivityInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/driverActivity/driverActivity_info.js"></script>
+<script>
+ laydate.render({
+ elem: '#startTime'
+ ,type: 'datetime'
+ ,range: true
+ ,min: 'new Date()' //最小值今天
+ });
+ laydate.render({
+ elem: '#staTime',
+ range: true,
+ type:'time',
+ format: 'HH:mm'
+ });
+</script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity_detail.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity_detail.html
new file mode 100644
index 0000000..d23f29f
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity_detail.html
@@ -0,0 +1,132 @@
+@layout("/common/_container.html"){
+<style>
+ .newWidth, .single-line{
+ max-width:150px !important;display: initial !important;
+ }
+</style>
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+
+ <div class="row">
+ <div class="col-sm-11">
+ <div class="form-group">
+ <div class="col-sm-10">
+ 活动名称： <input type="text" value="${item.name}" name="zc1" id="zc1" class="form-control newWidth" readonly />
+ <br/>
+ <br/>
+ 司机邀请司机注册
+ <br/>
+ <br/>
+
+ 司机注册既赠送 <input type="text" @if(isNotEmpty(regist1)){
+ value="${regist1.money}"
+ @}else{
+ value=""
+ @}
+ name="zc7" class="form-control newWidth" readonly/> 元
+ <br/>
+ <br/>
+ 司机邀请用户注册
+ <br/>
+ <br/>
+ 用户注册既赠送 <input type="text" @if(isNotEmpty(regist2)){
+ value="${regist2.money}"
+ @}else{
+ value=""
+ @}
+ name="zc7" class="form-control newWidth" readonly/> 元
+ <br/>
+ <br/>
+ 司机APP每天累计在线奖励
+ <br/>
+ <br/>
+ 专车累计在线 <input type="text" @if(isNotEmpty(online1)){
+ value="${online1.online}"
+ @}else{
+ value=""
+ @}
+ name="zc7" class="form-control newWidth" readonly/> 小时奖励
+ <input type="text" @if(isNotEmpty(online1)){
+ value="${online1.money}"
+ @}else{
+ value=""
+ @}
+ name="zc7" class="form-control newWidth" readonly/> 元
+ <br/>
+ <br/>
+ 出租车累计在线 <input type="text" @if(isNotEmpty(online2)){
+ value="${online2.online}"
+ @}else{
+ value=""
+ @}
+ name="zc7" class="form-control newWidth" readonly/> 小时奖励
+ <input type="text" @if(isNotEmpty(online2)){
+ value="${online2.money}"
+ @}else{
+ value=""
+ @}
+ name="zc7" class="form-control newWidth" readonly/> 元
+ <br/>
+ <br/>
+ 跨城出行累计在线 <input type="text" @if(isNotEmpty(online3)){
+ value="${online3.online}"
+ @}else{
+ value=""
+ @}
+ name="zc7" class="form-control newWidth" readonly/> 小时奖励
+ <input type="text" @if(isNotEmpty(online3)){
+ value="${online3.money}"
+ @}else{
+ value=""
+ @}
+ name="zc7" class="form-control newWidth" readonly/> 元
+ <br/>
+ <br/>
+ 司机累计达到规定订单数奖励
+ <br/>
+ <br/>
+ 每天 <input type="text" @if(isNotEmpty(order)){
+ value="${order.start}"
+ @}else{
+ value=""
+ @}
+ name="zc7" class="form-control newWidth" readonly/>-
+ <input type="text" @if(isNotEmpty(order)){
+ value="${order.end}"
+ @}else{
+ value=""
+ @}
+ name="zc7" class="form-control newWidth" readonly/> 司机接单达到
+ <input type="text" @if(isNotEmpty(order)){
+ value="${order.orderNum}"
+ @}else{
+ value=""
+ @}
+ name="zc7" class="form-control newWidth" readonly/> 单既奖励
+ <input type="text" @if(isNotEmpty(order)){
+ value="${order.money}"
+ @}else{
+ value=""
+ @}
+ name="zc7" class="form-control newWidth" readonly/> 元
+ <br/>
+ <br/>
+ 有效期为 <input type="text" value="${startTime}" name="zc7" class="form-control newWidth" readonly/>-
+ <input type="text" value="${endTime}" name="zc7" class="form-control newWidth" readonly/>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10">
+ <#button btnCss="danger" name="关闭" id="cancel" icon="fa-eraser" clickFun="DriverActivityInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/driverActivity/driverActivity_info.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity_edit.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity_edit.html
new file mode 100644
index 0000000..eaad672
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity_edit.html
@@ -0,0 +1,138 @@
+@layout("/common/_container.html"){
+<style>
+ .newWidth, .single-line{
+ max-width:150px !important;display: initial !important;
+ }
+</style>
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+
+ <div class="row">
+ <div class="col-sm-11">
+ <div class="form-group">
+ <input type="hidden" id="id" value="${item.id}">
+ <div class="col-sm-10">
+ 活动名称： <input type="text" value="${item.name}" name="zc1" id="num1" class="form-control newWidth" />
+ <br/>
+ <br/>
+ 司机邀请司机注册
+ <br/>
+ <br/>
+
+ 司机注册既赠送 <input type="text" @if(isNotEmpty(regist1)){
+ value="${regist1.money}"
+ @}else{
+ value=""
+ @}
+ name="zc7" id="num2" class="form-control newWidth"/> 元
+ <br/>
+ <br/>
+ 司机邀请用户注册
+ <br/>
+ <br/>
+ 用户注册既赠送 <input type="text" @if(isNotEmpty(regist2)){
+ value="${regist2.money}"
+ @}else{
+ value=""
+ @}
+ name="zc7" id="num3" class="form-control newWidth"/> 元
+ <br/>
+ <br/>
+ 司机APP每天累计在线奖励
+ <br/>
+ <br/>
+ 专车累计在线 <input type="text" @if(isNotEmpty(online1)){
+ value="${online1.online}"
+ @}else{
+ value=""
+ @}
+ name="zc7" id="num4" class="form-control newWidth"/> 小时奖励
+ <input type="text" @if(isNotEmpty(online1)){
+ value="${online1.money}"
+ @}else{
+ value=""
+ @}
+ name="zc7" id="num5" class="form-control newWidth"/> 元
+ <br/>
+ <br/>
+ 出租车累计在线 <input type="text" @if(isNotEmpty(online2)){
+ value="${online2.online}"
+ @}else{
+ value=""
+ @}
+ name="zc7" id="num6" class="form-control newWidth"/> 小时奖励
+ <input type="text" @if(isNotEmpty(online2)){
+ value="${online2.money}"
+ @}else{
+ value=""
+ @}
+ name="zc7" id="num7" class="form-control newWidth"/> 元
+ <br/>
+ <br/>
+ 跨城出行累计在线 <input type="text" @if(isNotEmpty(online3)){
+ value="${online3.online}"
+ @}else{
+ value=""
+ @}
+ name="zc7" id="num8" class="form-control newWidth"/> 小时奖励
+ <input type="text" @if(isNotEmpty(online3)){
+ value="${online3.money}"
+ @}else{
+ value=""
+ @}
+ name="zc7" id="num9" class="form-control newWidth"/> 元
+ <br/>
+ <br/>
+ 司机累计达到规定订单数奖励
+ <br/>
+ <br/>
+ 每天 <input type="text" id="staTime" class="form-control newWidth" /> 司机接单达到
+ <input type="text" @if(isNotEmpty(order)){
+ value="${order.orderNum}"
+ @}else{
+ value=""
+ @}
+ name="zc7" id="num10" class="form-control newWidth"/> 单既奖励
+ <input type="text" @if(isNotEmpty(order)){
+ value="${order.money}"
+ @}else{
+ value=""
+ @}
+ name="zc7" id="num11" class="form-control newWidth"/> 元
+ <br/>
+ <br/>
+ 有效期为 <input type="text" id="startTime" name="zc7" class="form-control" style="max-width:300px !important;display: initial !important;" />
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="DriverActivityInfoDlg.editSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="DriverActivityInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/driverActivity/driverActivity_info.js"></script>
+<script>
+ laydate.render({
+ elem: '#startTime'
+ ,type: 'datetime'
+ ,range: true
+ ,min: 'new Date()' //最小值今天
+ });
+ laydate.render({
+ elem: '#staTime'
+ ,range: true,
+ type:'time',
+ format: 'HH:mm'
+ });
+ $("#startTime").val("${startTime} - ${endTime}")
+ $("#staTime").val("${startTime1}")
+</script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity_immediately.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity_immediately.html
new file mode 100644
index 0000000..80af27d
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity_immediately.html
@@ -0,0 +1,41 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="sysCouponActivityInfoForm">
+ <input type="hidden" id="id" name="id" value="${id}">
+ <div class="row">
+ <div class="col-sm-10">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">处理意见：</label>
+ <div class="col-sm-9" style="display: flex;align-items: center;">
+ <div class="radio radio-info radio-inline">
+ <input type="radio" id="state2" value="3" name="state" checked="" >
+ <label for="state2"> 同意 </label>
+ </div>
+ <div class="radio radio-success radio-inline">
+ <input type="radio" id="state3" value="2" name="state" >
+ <label for="state3"> 拒绝 </label>
+ </div>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">填写备注：</label>
+ <div class="col-sm-9">
+ <textarea type="text/plain" class="form-control" name="remark" id="remark" style="width:100%;height:150px;"></textarea>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="DriverActivityInfoDlg.immediately()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="DriverActivityInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/driverActivity/driverActivity_info.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/receiveRecord.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/receiveRecord.html
new file mode 100644
index 0000000..823247d
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/receiveRecord.html
@@ -0,0 +1,226 @@
+@layout("/common/_container.html"){
+<style type="text/css">
+
+ ztree li span. {
+ margin-left: 4px;
+ margin-right: -1px;
+ background-position: -144px 0;
+ vertical-align: top;
+ *vertical-align: middle
+ }
+
+ .titleDiv {
+ overflow: hidden;
+ }
+
+ .titleItem {
+ float: left;
+ text-align: center;
+ width: 180px;
+ line-height: 40px;
+ border-top: 1px solid #E7EBEE;
+ border-bottom: 1px solid #E7EBEE;
+ border-left: 1px solid #E7EBEE;
+ font-size: 16px;
+ }
+
+ .titleItem1 {
+ float: left;
+ text-align: center;
+ width: 180px;
+ line-height: 40px;
+ border-bottom: 1px solid #E7EBEE;
+ border-left: 1px solid #E7EBEE;
+ font-size: 16px;
+ }
+
+ .titleItemCk {
+ color: #fff !important;
+ background: #1AB395 !important;
+ }
+
+ .titleItem:last-child {
+ border-right: 1px solid #E7EBEE;
+ }
+
+ /* 订单分析 */
+ ul {
+ list-style-type: none;
+ }
+
+ .orderFenxiBox {
+ width: 100%;
+ display: flex;
+ align-items: center;
+ background-color: white;
+ }
+
+ .orderFenxiItem {
+ flex: 1;
+ padding: 20px 0;
+ }
+
+ .orderFenxiItem:last-child .orderFenxiItem_number {
+ border-right: 0 none;
+ }
+
+ .orderFenxiItem_number {
+ width: 80%;
+ height: 80%;
+ line-height: 90px;
+ padding: 20px 0;
+ font-size: 32px;
+ color: #1AB394;
+ text-align: center;
+ border-right: 1px solid #eaeaea;
+ }
+
+ .orderFenxiItem_title, .orderFenxiItem_last {
+ line-height: 40px;
+ font-size: 14px;
+ }
+</style>
+
+<div class="row" style="margin-left: 2%;">
+ <div class="col-sm-3">
+ <input id="activityId" value="${activityId}" type="hidden">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h3>活动时间：<input type="text" id="startTime" name="zc7" class="form-control" style="max-width:250px !important;display: initial !important;" onchange="receiveRecordDetail()"/></h3>
+ </div>
+ <div class="ibox-title">
+ <h3>领取总金额<span id="totalMOney"></span></h3>
+ </div>
+ </div>
+ </div>
+</div>
+
+
+<div class="row" style="margin-left: 2%;">
+ <div class="col-sm-3">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h3>邀请司机注册</h3>
+ </div>
+ <div class="ibox-content">
+ <h1 class="no-margins text-navy">领取人数：<span id="number1"></span></h1>
+ <h1 class="no-margins text-navy">领取金额：<span id="money1"></span></h1>
+ </div>
+ <h4><a href="#" onclick="driverActivityHistory(1,${id1})">领取列表</a></h4>
+ </div>
+ </div>
+ <div class="col-sm-3">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h3>邀请用户注册</h3>
+ </div>
+ <div class="ibox-content">
+ <h1 class="no-margins text-navy">领取人数：<span id="number2"></span></h1>
+ <h1 class="no-margins text-navy">领取金额：<span id="money2"></span></h1>
+ </div>
+ <h4><a href="#" onclick="driverActivityHistory(2,${id2})">领取列表</a></h4>
+ </div>
+ </div>
+ <div class="col-sm-3">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h3>专车累计在线</h3>
+ </div>
+ <div class="ibox-content">
+ <h1 class="no-margins text-navy">领取人数：<span id="number3"></span></h1>
+ <h1 class="no-margins text-navy">领取金额：<span id="money3"></span></h1>
+ </div>
+ <h4><a href="#" onclick="driverActivityHistory(3,${id3})">领取列表</a></h4>
+ </div>
+ </div>
+ <div class="col-sm-3">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h3>出租车累计在线</h3>
+ </div>
+ <div class="ibox-content">
+ <h1 class="no-margins text-navy">领取人数：<span id="number4"></span></h1>
+ <h1 class="no-margins text-navy">领取金额：<span id="money4"></span></h1>
+ </div>
+ <h4><a href="#" onclick="driverActivityHistory(3,${id4})">领取列表</a></h4>
+ </div>
+ </div>
+ <div class="col-sm-3">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h3>跨城累计在线</h3>
+ </div>
+ <div class="ibox-content">
+ <h1 class="no-margins text-navy">领取人数：<span id="number5"></span></h1>
+ <h1 class="no-margins text-navy">领取金额：<span id="money5"></span></h1>
+ </div>
+ <h4><a href="#" onclick="driverActivityHistory(3,${id5})">领取列表</a></h4>
+ </div>
+ </div>
+ <div class="col-sm-3">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h3>订单数奖励</h3>
+ </div>
+ <div class="ibox-content">
+ <h1 class="no-margins text-navy">领取人数：<span id="number6"></span></h1>
+ <h1 class="no-margins text-navy">领取金额：<span id="money6"></span></h1>
+ </div>
+ <h4><a href="#" onclick="driverActivityHistory(4,${id6})">领取列表</a></h4>
+ </div>
+ </div>
+</div>
+
+
+<!-- ChartJS-->
+<script type="text/javascript">
+ $(function () {
+ $("#startTime").val("${startTime} - ${endTime}")
+ receiveRecordDetail("${startTime} - ${endTime}");
+ })
+ laydate.render({
+ elem: '#startTime'
+ ,range: true
+ ,done: function(value, date, endDate){
+ // 回调函数
+ receiveRecordDetail(value);
+ }
+ });
+
+ function receiveRecordDetail(times){
+ var ajax = new $ax(Feng.ctxPath + "/driverActivity/receiveRecordDetail", function (data) {
+ $("#totalMOney").html(data.totalMOney);
+ $("#money1").html(data.money1);
+ $("#number1").html(data.number1);
+ $("#money2").html(data.money2);
+ $("#number2").html(data.number2);
+ $("#money3").html(data.money3);
+ $("#number3").html(data.number3);
+ $("#money4").html(data.money4);
+ $("#number4").html(data.number4);
+ $("#money5").html(data.money5);
+ $("#number5").html(data.number5);
+ $("#money6").html(data.money6);
+ $("#number6").html(data.number6);
+ }, function (data) {
+ Feng.error("操作失败!" + data.responseJSON.message + "!");
+ });
+ ajax.set("createTime",times);
+ ajax.set("activityId",$("#activityId").val());
+ ajax.start();
+ }
+ /**
+ * 领取记录
+ */
+ function driverActivityHistory(type,id) {
+ layer.open({
+ type: 2,
+ title: '领取记录',
+ area: ['100%', '100%'], //宽高
+ fix: false, //不固定
+ maxmin: true,
+ content: Feng.ctxPath + '/driverActivityHistory?activityId='+ id+"&type="+type
+ });
+ };
+</script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivityHistory/driverActivityHistory.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivityHistory/driverActivityHistory.html
new file mode 100644
index 0000000..1dda419
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivityHistory/driverActivityHistory.html
@@ -0,0 +1,25 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>领取记录</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <input type="hidden" id="type" value="${type}">
+ <input type="hidden" id="activityId" value="${activityId}">
+ <div class="col-sm-12">
+
+ <div class="hidden-xs" id="DriverActivityHistoryTableToolbar" role="group">
+
+ </div>
+ <#table id="DriverActivityHistoryTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/driverActivityHistory/driverActivityHistory.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/log/log.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/log/log.html
new file mode 100644
index 0000000..a9b7f48
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/log/log.html
@@ -0,0 +1,48 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>业务日志</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-2">
+ <#NameCon id="beginTime" name="开始时间" isTime="false" pattern="YYYY-MM-DD" />
+ </div>
+ <div class="col-sm-2">
+ <#NameCon id="endTime" name="结束时间" isTime="false" pattern="YYYY-MM-DD" />
+ </div>
+ <div class="col-sm-2">
+ <#NameCon id="logName" name="用户名称" />
+ </div>
+ <div class="col-sm-2">
+ <#button name="搜索" icon="fa-search" clickFun="OptLog.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="OptLog.resetSearch()" space="true"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="OptLogTableToolbar" role="group">
+ <#button name="查看详情" icon="fa-plus" clickFun="OptLog.detail()"/>
+ @if(shiro.hasPermission("/log/delLog")){
+ <#button name="清空日志" icon="fa-plus" clickFun="OptLog.delLog()" space="true"/>
+ @}
+ </div>
+ <#table id="OptLogTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/log/log.js"></script>
+<script>
+ laydate.render({
+ elem: '#beginTime',
+ });
+ laydate.render({
+ elem: '#endTime',
+ });
+</script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/log/login_log.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/log/login_log.html
new file mode 100644
index 0000000..8d38ac9
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/log/login_log.html
@@ -0,0 +1,47 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>登录日志</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#NameCon id="beginTime" name="开始时间" isTime="false" pattern="YYYY-MM-DD" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="endTime" name="结束时间" isTime="false" pattern="YYYY-MM-DD" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="logName" name="用户名称" />
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="LoginLog.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="LoginLog.resetSearch()" space="true"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="LoginLogTableToolbar" role="group">
+ @if(shiro.hasPermission("/loginLog/delLoginLog")){
+ <#button name="清空日志" icon="fa-plus" clickFun="LoginLog.delLog()"/>
+ @}
+ </div>
+ <#table id="LoginLogTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/log/login_log.js"></script>
+<script>
+ laydate.render({
+ elem: '#beginTime',
+ });
+ laydate.render({
+ elem: '#endTime',
+ });
+</script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/menu/menu.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/menu/menu.html
new file mode 100644
index 0000000..b0e89a7
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/menu/menu.html
@@ -0,0 +1,41 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>菜单管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#NameCon id="menuName" name="菜单名称" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="level" name="层级" />
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="Menu.search()"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="menuTableToolbar" role="group">
+ @if(shiro.hasPermission("/menu/add")){
+ <#button name="添加" icon="fa-plus" clickFun="Menu.openAddMenu()"/>
+ @}
+ @if(shiro.hasPermission("/menu/edit")){
+ <#button name="修改" icon="fa-edit" clickFun="Menu.openChangeMenu()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/menu/remove")){
+ <#button name="删除" icon="fa-remove" clickFun="Menu.delMenu()" space="true"/>
+ @}
+ </div>
+ <#table id="menuTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/menu/menu.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/menu/menu_add.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/menu/menu_add.html
new file mode 100644
index 0000000..aef8ae7
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/menu/menu_add.html
@@ -0,0 +1,40 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="menuInfoForm">
+
+ <input type="hidden" id="id" value="">
+
+ <div class="row">
+ <div class="col-sm-6 b-r">
+ <#input id="name" name="名称" underline="true" />
+ <#input id="code" name="菜单编号" underline="true" />
+ <#input id="pcodeName" name="父级编号" underline="true"
+ hidden="pcode" readonly="readonly"
+ clickFun="MenuInfoDlg.showMenuSelectTree(); return false;"
+ style="background-color: #ffffff !important;"
+ selectFlag="true" selectId="pcodeTreeDiv" selectTreeId="pcodeTree" selectStyle="width:244px !important;"/>
+ <#select id="ismenu" name="是否是菜单">
+ <option value="1">是</option>
+ <option value="0">不是</option>
+ </#select>
+ </div>
+ <div class="col-sm-6">
+ <#input id="url" name="请求地址" underline="true" />
+ <#input id="num" name="排序" underline="true" />
+ <#input id="icon" name="图标" underline="false" value="fa-bars" />
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="MenuInfoDlg.addSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="MenuInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/menu/menu_info.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/menu/menu_edit.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/menu/menu_edit.html
new file mode 100644
index 0000000..608a280
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/menu/menu_edit.html
@@ -0,0 +1,42 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="menuInfoForm">
+
+ <input type="hidden" id="id" value="${menu.id}">
+ <input type="hidden" id="ismenuValue" value="${menu.ismenu}">
+
+ <div class="row">
+ <div class="col-sm-6 b-r">
+ <#input id="name" name="名称" value="${menu.name}" underline="true" />
+ <#input id="code" name="菜单编号" value="${menu.code}" underline="true" />
+ <#input id="pcodeName" name="父级编号" value="${menu.pcodeName}" underline="true"
+ hidden="pcode" readonly="readonly" hiddenValue="${menu.pcode}"
+ clickFun="MenuInfoDlg.showMenuSelectTree(); return false;"
+ style="background-color: #ffffff !important;"
+ selectFlag="true" selectId="pcodeTreeDiv" selectTreeId="pcodeTree" selectStyle="width:244px !important;"/>
+ <#select id="ismenu" name="是否是菜单">
+ <option value="1">是</option>
+ <option value="0">不是</option>
+ </#select>
+
+ </div>
+ <div class="col-sm-6">
+ <#input id="url" name="请求地址" value="${menu.url}" underline="true" />
+ <#input id="num" name="排序" value="${menu.num}" underline="true" />
+ <#input id="icon" name="图标" underline="false" value="${menu.icon}"/>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="MenuInfoDlg.editSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="MenuInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/menu/menu_info.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/notice/notice.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/notice/notice.html
new file mode 100644
index 0000000..f373984
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/notice/notice.html
@@ -0,0 +1,38 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>通知管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#NameCon id="condition" name="名称" />
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="Notice.search()"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="NoticeTableToolbar" role="group">
+ @if(shiro.hasPermission("/notice/add")){
+ <#button name="添加" icon="fa-plus" clickFun="Notice.openAddNotice()"/>
+ @}
+ @if(shiro.hasPermission("/notice/update")){
+ <#button name="修改" icon="fa-plus" clickFun="Notice.openNoticeDetail()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/notice/delete")){
+ <#button name="删除" icon="fa-plus" clickFun="Notice.delete()" space="true"/>
+ @}
+ </div>
+ <#table id="NoticeTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/notice/notice.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/notice/notice_add.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/notice/notice_add.html
new file mode 100644
index 0000000..037ebdc
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/notice/notice_add.html
@@ -0,0 +1,39 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="noticeInfoForm">
+
+ <input type="hidden" id="id" value="">
+
+ <div class="row">
+ <div class="col-sm-12">
+ <div class="form-group">
+ <label class="col-sm-1 control-label">标题</label>
+ <div class="col-sm-11">
+ <input class="form-control" id="title" name="title" type="text">
+
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-1 control-label">内容</label>
+ <div class="col-sm-11">
+ <div id="editor" class="editorHeight">
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="NoticeInfoDlg.addSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="NoticeInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script type="text/javascript" src="//unpkg.com/wangeditor/release/wangEditor.min.js"></script>
+<script src="${ctxPath}/static/modular/system/notice/notice_info.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/notice/notice_edit.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/notice/notice_edit.html
new file mode 100644
index 0000000..1d5de30
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/notice/notice_edit.html
@@ -0,0 +1,39 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="noticeInfoForm">
+
+ <input type="hidden" id="id" value="${notice.id}">
+ <input type="hidden" id="contentVal" value='${notice.content}'>
+
+ <div class="row">
+ <div class="col-sm-12">
+ <div class="form-group">
+ <label class="col-sm-1 control-label">标题</label>
+ <div class="col-sm-11">
+ <input class="form-control" id="title" name="title" type="text" value="${notice.title}">
+
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-1 control-label">内容</label>
+ <div class="col-sm-11">
+ <div id="editor" class="editorHeight">
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="NoticeInfoDlg.editSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="NoticeInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script type="text/javascript" src="${ctxPath}/static/js/plugins/wangEditor/wangEditor.js"></script>
+<script src="${ctxPath}/static/modular/system/notice/notice_info.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/report/couponStatistics.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/report/couponStatistics.html
new file mode 100644
index 0000000..1742b48
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/report/couponStatistics.html
@@ -0,0 +1,184 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>优惠券管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row" style="margin-bottom: 20px;">
+ <ul class="nav nav-tabs">
+ <li class="active" onclick="CouponStatistics.cutover(1, this)"><a href="#">注册奖励</a></li>
+ <li onclick="CouponStatistics.cutover(2, this)"><a href="#">邀请奖励</a></li>
+ <li onclick="CouponStatistics.cutover(3, this)"><a href="#">充值奖励</a></li>
+ <li onclick="CouponStatistics.cutover(4, this)"><a href="#">打折活动</a></li>
+ <li onclick="CouponStatistics.cutover(5, this)"><a href="#">红包活动</a></li>
+ </ul>
+ </div>
+ <div id="panel1">
+ <div class="row">
+ <div class="col-sm-3">
+ <#NameCon id="name1" name="活动名称" />
+ </div>
+ <div class="col-sm-3">
+ <#TimeCon id="time1" name="起止时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="company1" name="运营商" >
+ <option value="">全部</option>
+ @for(c in company!){
+ <option value="${c.id}">${c.name}</option>
+ @}
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="CouponStatistics.search1()"/>
+ <#button name="重置" icon="fa-search" clickFun="CouponStatistics.resetSearch1()"/>
+ <#button name="下载" icon="fa-download" clickFun="CouponStatistics.downloadExcel1()"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="TCarBrandTable1Toolbar" role="group">
+ <#button name="注册奖励详情" icon="fa-plus" clickFun="CouponStatistics.openCouponStatisticsInfo1(1)"/>
+ </div>
+ <#table id="TCarBrandTable1"/>
+ </div>
+ <div id="panel2" style="display: none;">
+ <div class="row">
+ <div class="col-sm-3">
+ <#NameCon id="name2" name="活动名称" />
+ </div>
+ <div class="col-sm-3">
+ <#TimeCon id="time2" name="起止时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="company2" name="运营商" >
+ <option value="">全部</option>
+ @for(c in company!){
+ <option value="${c.id}">${c.name}</option>
+ @}
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="CouponStatistics.search2()"/>
+ <#button name="重置" icon="fa-search" clickFun="CouponStatistics.resetSearch2()"/>
+ <#button name="下载" icon="fa-download" clickFun="CouponStatistics.downloadExcel2()"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="TCarBrandTable2Toolbar" role="group">
+ <#button name="邀请奖励详情" icon="fa-plus" clickFun="CouponStatistics.openCouponStatisticsInfo2(2)"/>
+ </div>
+ <#table id="TCarBrandTable2"/>
+ </div>
+ <div id="panel3" style="display: none;">
+ <div class="row">
+ <div class="col-sm-3">
+ <#NameCon id="name3" name="活动名称" />
+ </div>
+ <div class="col-sm-3">
+ <#TimeCon id="time3" name="起止时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="company3" name="运营商" >
+ <option value="">全部</option>
+ @for(c in company!){
+ <option value="${c.id}">${c.name}</option>
+ @}
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="CouponStatistics.search3()"/>
+ <#button name="重置" icon="fa-search" clickFun="CouponStatistics.resetSearch3()"/>
+ <#button name="下载" icon="fa-download" clickFun="CouponStatistics.downloadExcel3()"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="TCarBrandTable3Toolbar" role="group">
+ <#button name="充值奖励详情" icon="fa-plus" clickFun="CouponStatistics.openCouponStatisticsInfo3(3)"/>
+ </div>
+ <#table id="TCarBrandTable3"/>
+ </div>
+ <div id="panel4" style="display: none;">
+ <div class="row">
+ <div class="col-sm-3">
+ <#NameCon id="name4" name="活动名称" />
+ </div>
+ <div class="col-sm-3">
+ <#TimeCon id="time4" name="起止时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="company4" name="运营商" >
+ <option value="">全部</option>
+ @for(c in company!){
+ <option value="${c.id}">${c.name}</option>
+ @}
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="CouponStatistics.search4()"/>
+ <#button name="重置" icon="fa-search" clickFun="CouponStatistics.resetSearch4()"/>
+ <#button name="下载" icon="fa-download" clickFun="CouponStatistics.downloadExcel4()"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="TCarBrandTable4Toolbar" role="group">
+ <#button name="折扣优惠详情" icon="fa-plus" clickFun="CouponStatistics.openCouponStatisticsInfo4(4)"/>
+ </div>
+ <#table id="TCarBrandTable4"/>
+ </div>
+ <div id="panel5" style="display: none;">
+ <div class="row">
+ <div class="col-sm-3">
+ <#NameCon id="name5" name="活动名称" />
+ </div>
+ <div class="col-sm-3">
+ <#TimeCon id="time5" name="起止时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="company5" name="运营商" >
+ <option value="">全部</option>
+ @for(c in company!){
+ <option value="${c.id}">${c.name}</option>
+ @}
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="CouponStatistics.search5()"/>
+ <#button name="重置" icon="fa-search" clickFun="CouponStatistics.resetSearch5()"/>
+ <#button name="下载" icon="fa-download" clickFun="CouponStatistics.downloadExcel5()"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="TCarBrandTable5Toolbar" role="group">
+ <#button name="红包奖励详情" icon="fa-plus" clickFun="CouponStatistics.openCouponStatisticsInfo5(5)"/>
+ </div>
+ <#table id="TCarBrandTable5"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/report/couponStatistics.js"></script>
+<script>
+ laydate.render({
+ elem: '#time1'
+ ,range: true
+ });
+ laydate.render({
+ elem: '#time2'
+ ,range: true
+ });
+ laydate.render({
+ elem: '#time3'
+ ,range: true
+ });
+ laydate.render({
+ elem: '#time4'
+ ,range: true
+ });
+ laydate.render({
+ elem: '#time5'
+ ,range: true
+ });
+</script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/report/couponStatisticsInfo.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/report/couponStatisticsInfo.html
new file mode 100644
index 0000000..f98ec0f
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/report/couponStatisticsInfo.html
@@ -0,0 +1,46 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <input type="hidden" id="type" value="${type}">
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#NameCon id="name" name="活动名称" />
+ </div>
+ <div class="col-sm-3">
+ <#TimeCon id="time" name="起止时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="company" name="运营商" >
+ <option value="">全部</option>
+ @for(c in company!){
+ <option value="${c.id}">${c.name}</option>
+ @}
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="CouponStatisticsInfo.search()"/>
+ <#button name="重置" icon="fa-search" clickFun="CouponStatisticsInfo.resetSearch()"/>
+ <#button name="下载" icon="fa-download" clickFun="CouponStatisticsInfo.downloadExcel()"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="TCarBrandTableToolbar" role="group">
+ </div>
+ <#table id="TCarBrandTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/report/couponStatisticsInfo.js"></script>
+<script>
+ laydate.render({
+ elem: '#time'
+ ,range: true
+ });
+</script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/report/operationalData.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/report/operationalData.html
new file mode 100644
index 0000000..69f26c6
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/report/operationalData.html
@@ -0,0 +1,47 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#SelectCon id="type" name="类别" >
+ <option value="2">出租车</option>
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#TimeCon id="time" name="起止时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="company" name="运营商" >
+ <option value="">全部</option>
+ @for(c in company!){
+ <option value="${c.id}">${c.name}</option>
+ @}
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="OperationalData.search()"/>
+ <#button name="重置" icon="fa-search" clickFun="OperationalData.resetSearch()"/>
+ <#button name="下载" icon="fa-download" clickFun="OperationalData.downloadExcel()"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="TCarBrandTableToolbar" role="group">
+ </div>
+ <#table id="TCarBrandTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/report/operationalData.js"></script>
+<script>
+ laydate.render({
+ elem: '#time'
+ ,range: true
+ });
+</script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/role/role.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/role/role.html
new file mode 100644
index 0000000..316cf85
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/role/role.html
@@ -0,0 +1,41 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>角色管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#NameCon id="roleName" name="角色名称" />
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="Role.search()"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="roleTableToolbar" role="group">
+ @if(shiro.hasPermission("/role/add")){
+ <#button name="添加" icon="fa-plus" clickFun="Role.openAddRole()" />
+ @}
+ @if(shiro.hasPermission("/role/edit")){
+ <#button name="修改" icon="fa-edit" clickFun="Role.openChangeRole()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/role/remove")){
+ <#button name="删除" icon="fa-remove" clickFun="Role.delRole()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/role/setAuthority")){
+ <#button name="权限配置" icon="fa-user-secret" clickFun="Role.assign()" space="true"/>
+ @}
+ </div>
+ <#table id="roleTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/role/role.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/role/role_add.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/role/role_add.html
new file mode 100644
index 0000000..1d576cc
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/role/role_add.html
@@ -0,0 +1,47 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="roleInfoForm">
+
+ <input type="hidden" id="id" value="">
+
+ <div class="row">
+ <div class="col-sm-6 b-r">
+ <#input id="name" name="角色名称" underline="true"/>
+ <#input id="pName" name="上级名称" underline="true" hidden="pid" readonly="readonly"
+ clickFun="RolInfoDlg.showPNameSelectTree(); return false;"
+ style="background-color: #ffffff !important;"/>
+ <#input id="deptName" name="部门名称" hidden="deptid" readonly="readonly"
+ clickFun="RolInfoDlg.showDeptSelectTree(); return false;"
+ style="background-color: #ffffff !important;"/>
+ </div>
+ <div class="col-sm-6">
+ <#input id="tips" name="别名" underline="true"/>
+ <#input id="num" name="排序"/>
+ </div>
+ </div>
+
+ <!-- 这是部门下拉框 -->
+ <div id="deptContent" class="menuContent"
+ style="display: none; position: absolute; z-index: 200;">
+ <ul id="deptTree" class="ztree tree-box" style="width: 250px !important;"></ul>
+ </div>
+
+ <!-- 这是父级菜单下拉框 -->
+ <div id="pNameContent" class="menuContent"
+ style="display: none; position: absolute; z-index: 200;">
+ <ul id="pNameTree" class="ztree tree-box" style="width: 250px !important;"></ul>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="RolInfoDlg.addSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="RolInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/role/role_info.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/role/role_assign.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/role/role_assign.html
new file mode 100644
index 0000000..6eee434
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/role/role_assign.html
@@ -0,0 +1,78 @@
+@layout("/common/_container.html"){
+
+
+<script type="text/javascript">
+ $(function () {
+ var index = parent.layer.getFrameIndex(window.name); //获取窗口索引
+
+ $("#btn_close").bind("click", function () {
+ parent.layer.close(index);
+ });
+
+ $("#btn_save").bind("click", function () {
+ var ids = Feng.zTreeCheckedNodes("zTree");
+ var index = parent.layer.load(0, {shade: false});// 加载动画层，0代表加载的风格，支持0-2
+ var ajax = new $ax(Feng.ctxPath + "/role/setAuthority", function (data) {
+ parent.layer.close(index);// 关闭加载动画层
+ Feng.success("分配角色成功!");
+ window.parent.Role.table.refresh();
+ parent.layer.close(index);
+ parent.layer.close(window.parent.Role.layerIndex);
+ }, function (data) {
+ Feng.error("分配角色失败!"
+ + data.responseJSON.message + "!");
+ });
+ ajax.set("roleId", "${roleId}");
+ ajax.set("ids", ids);
+ ajax.start();
+ });
+
+ initZtree();
+ });
+
+ function initZtree() {
+ var setting = {
+ check: {
+ enable: true,
+ chkboxType: { "Y": "ps", "N": "ps" }
+ },
+ data: {
+ simpleData: {
+ enable: true
+ }
+ }
+ };
+
+ var ztree = new $ZTree("zTree", "/menu/menuTreeListByRoleId/"
+ + "${roleId}");
+ ztree.setSettings(setting);
+ ztree.init();
+ }
+</script>
+
+
+<!-- 配置grid -->
+<div class="container" style="padding: 0px 10px !important;margin-top: -10px;text-align: center !important;">
+ <div class="row">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>${roleName!}</h5>
+ </div>
+ <div class="ibox-content">
+ <ul id="zTree" class="ztree"></ul>
+ </div>
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-md-12">
+ <button class="btn btn-sm btn-info" type="button" id="btn_save">
+ <i class="ace-icon fa fa-check bigger-110"></i>保存
+ </button>
+
+ <button class="btn btn-sm btn-danger" type="button" id="btn_close">
+ <i class="ace-icon fa fa-close bigger-110"></i>关闭
+ </button>
+ </div>
+ </div>
+</div>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/role/role_edit.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/role/role_edit.html
new file mode 100644
index 0000000..ae538ac
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/role/role_edit.html
@@ -0,0 +1,47 @@
+ @layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="roleInfoForm">
+
+ <input type="hidden" id="id" value="${role.id}">
+
+ <div class="row">
+ <div class="col-sm-6 b-r">
+ <#input id="name" name="角色名称" underline="true" value="${role.name}"/>
+ <#input id="pName" name="上级名称" underline="true" hidden="pid" hiddenValue="${role.pid}" readonly="readonly" value="${pName}"
+ clickFun="RolInfoDlg.showPNameSelectTree(); return false;"
+ style="background-color: #ffffff !important;"/>
+ <#input id="deptName" name="部门名称" hidden="deptid" hiddenValue="${role.deptid}" readonly="readonly" value="${deptName}"
+ clickFun="RolInfoDlg.showDeptSelectTree(); return false;"
+ style="background-color: #ffffff !important;"/>
+ </div>
+ <div class="col-sm-6">
+ <#input id="tips" name="别名" underline="true" value="${role.tips}"/>
+ <#input id="num" name="排序" value="${role.num}"/>
+ </div>
+ </div>
+
+ <!-- 这是部门下拉框 -->
+ <div id="deptContent" class="menuContent"
+ style="display: none; position: absolute; z-index: 200;">
+ <ul id="deptTree" class="ztree tree-box" style="width: 250px !important;"></ul>
+ </div>
+
+ <!-- 这是父级菜单下拉框 -->
+ <div id="pNameContent" class="menuContent"
+ style="display: none; position: absolute; z-index: 200;">
+ <ul id="pNameTree" class="ztree tree-box" style="width: 250px !important;"></ul>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="RolInfoDlg.editSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="RolInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/role/role_info.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponActivity/sysCouponActivity.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponActivity/sysCouponActivity.html
new file mode 100644
index 0000000..7cdc6ff
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponActivity/sysCouponActivity.html
@@ -0,0 +1,68 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>赠送活动管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#TimeCon id="createTime" name="添加时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="couponUseType" name="优惠券类型" >
+ <option value="">全部</option>
+ <option value="0">通用券</option>
+ <option value="1">专车券</option>
+ <option value="2">出租车券</option>
+ <option value="3">跨城出行券</option>
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="status" name="状态" >
+ <option value="">全部</option>
+ <option value="1">待审核</option>
+ <option value="2">已驳回</option>
+ <option value="3">已发送</option>
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="SysCouponActivity.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="SysCouponActivity.resetSearch()" space="true"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="SysCouponActivityTableToolbar" role="group">
+ @if(shiro.hasPermission("/sysCouponActivity/add")){
+ <#button name="添加" icon="fa-plus" clickFun="SysCouponActivity.openAddSysCouponActivity()"/>
+ @}
+ @if(shiro.hasPermission("/sysCouponActivity/update")){
+ <#button name="编辑" icon="fa-edit" clickFun="SysCouponActivity.openSysCouponActivityDetail()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/sysCouponActivity/delete")){
+ <#button name="删除记录" icon="fa-remove" clickFun="SysCouponActivity.delete()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/sysCouponActivity/userCouponRecord")){
+ <#button name="领取记录" icon="fa-remove" clickFun="SysCouponActivity.userCouponRecord()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/sysCouponActivity/immediately")){
+ <#button name="审核" icon="fa-edit" clickFun="SysCouponActivity.immediately()" space="true"/>
+ @}
+ </div>
+ <#table id="SysCouponActivityTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/sysCouponActivity/sysCouponActivity.js"></script>
+<script>
+ laydate.render({
+ elem: '#createTime'
+ ,range: true
+ });
+</script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponActivity/sysCouponActivity_add.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponActivity/sysCouponActivity_add.html
new file mode 100644
index 0000000..fcc93ae
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponActivity/sysCouponActivity_add.html
@@ -0,0 +1,65 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="sysCouponActivityInfoForm">
+ <input type="hidden" id="activityId">
+ <div class="row">
+ <div class="col-sm-6">
+ <#input id="name" name="活动标题" underline="true"/>
+ <#button name="选择优惠券" icon="fa-plus" clickFun="SysCouponActivityInfoDlg.toSelectCouponOpt()" style="margin-left: 12%;"/>
+ <#input id="couponType" name="优惠券类型" readonly="true" />
+ <#input id="couponUseType" name="服务类型" underline="true" readonly="true" />
+ <#input id="money" name="金额" underline="true" readonly="true" />
+ <#input id="effective" name="有效天数" underline="true"/>
+ <#input id="number" name="张数" underline="true"/>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">赠送用户：</label>
+ <div class="col-sm-9" style="display: flex;align-items: center;">
+ <div class="radio radio-info radio-inline">
+ <input type="radio" id="sendType1" value="1" name="sendType" checked="" >
+ <label for="sendType1"> 全部用户 </label>
+ </div>
+ <div class="radio radio-success radio-inline">
+ <input type="radio" id="sendType2" value="2" name="sendType" >
+ <label for="sendType2"> 选择用户 </label>
+ </div>
+ <#button name="选择" icon="fa-plus" clickFun="SysCouponActivityInfoDlg.toSelectUserOpt()"/>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">已添加用户</label>
+ <div class="col-sm-9">
+ <div style="height: 200px; border: 1px solid #e5e6e7;overflow-y: auto;">
+ <table class="table table-striped table-bordered table-hover table-condensed">
+ <thead>
+ <tr>
+ <th style="width: 300px;">用户昵称</th>
+ <th style="width: 300px;">手机号</th>
+ <th style="width: 300px;">注册地所属分公司</th>
+ <th style="width: 100px;">操作</th>
+ </tr>
+ </thead>
+ <tbody id="coun">
+
+ </tbody>
+ </table>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="SysCouponActivityInfoDlg.addSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="SysCouponActivityInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/sysCouponActivity/sysCouponActivity_info.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponActivity/sysCouponActivity_edit.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponActivity/sysCouponActivity_edit.html
new file mode 100644
index 0000000..5c4d49c
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponActivity/sysCouponActivity_edit.html
@@ -0,0 +1,81 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="sysCouponActivityInfoForm">
+
+ <input type="hidden" id="id" value="${item.id}"/>
+ <input type="hidden" id="activityId" value="${item.couponId}">
+ <div class="row">
+ <div class="col-sm-6">
+ <#input id="name" name="活动标题" underline="true" value="${item.name}"/>
+ <#button name="选择优惠券" icon="fa-plus" clickFun="SysCouponActivityInfoDlg.toSelectCouponOpt()" style="margin-left: 12%;"/>
+ <#input id="couponType" name="优惠券类型" readonly="true" value="${item.couponType==1?'抵扣':'满减'}"/>
+ <#input id="couponUseType" name="服务类型" underline="true" readonly="true" value="${item.couponUseType==0?'通用券':item.couponUseType==1?'专车券':item.couponUseType==2?'出租券':'跨城出行券'}"/>
+ <#input id="money" name="金额" underline="true" readonly="true" value="${item.money}"/>
+ <#input id="effective" name="有效天数" underline="true" value="${item.effective}"/>
+ <#input id="number" name="张数" underline="true" value="${item.number}"/>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">赠送用户：</label>
+ <div class="col-sm-9" style="display: flex;align-items: center;">
+ <div class="radio radio-info radio-inline">
+ <input type="radio" id="sendType1" value="1" name="sendType" checked="${item.sendType==1?'checked':''}" >
+ <label for="sendType1"> 全部用户 </label>
+ </div>
+ <div class="radio radio-success radio-inline">
+ <input type="radio" id="sendType2" value="2" name="sendType" checked="${item.sendType==2?'checked':''}">
+ <label for="sendType2"> 选择用户 </label>
+ </div>
+ <#button name="选择" icon="fa-plus" clickFun="SysCouponActivityInfoDlg.toSelectUserOpt()"/>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">已添加用户</label>
+ <div class="col-sm-9">
+ <div style="height: 200px; border: 1px solid #e5e6e7;overflow-y: auto;">
+ <table class="table table-striped table-bordered table-hover table-condensed">
+ <thead>
+ <tr>
+ <th style="width: 300px;">用户昵称</th>
+ <th style="width: 300px;">手机号</th>
+ <th style="width: 300px;">注册地所属分公司</th>
+ <th style="width: 100px;">操作</th>
+ </tr>
+ </thead>
+ <tbody id="coun">
+ @for(obj in sendUserInfoList){
+ <tr class="timeClass">
+ <td>
+ <input type="hidden" id="userId" name="userId" value="${obj.userId}">
+ <input type="hidden" id="nickName" name="nickName" value="${obj.nickName}">${obj.nickName}
+ </td>
+ <td>
+ <input type="hidden" id="phone" name="phone" value="${obj.phone}">${obj.nickName}
+ </td>
+ <td>
+ <input type="hidden" id="companyName" name="companyName" value="${obj.companyName}">${obj.nickName}
+ </td>
+ <td>
+ <button onclick="deleteSub(this)">移除</button>
+ </td>
+ </tr>
+ @}
+ </tbody>
+ </table>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="SysCouponActivityInfoDlg.editSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="SysCouponActivityInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/sysCouponActivity/sysCouponActivity_info.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponActivity/sysCouponActivity_immediately.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponActivity/sysCouponActivity_immediately.html
new file mode 100644
index 0000000..3079469
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponActivity/sysCouponActivity_immediately.html
@@ -0,0 +1,41 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="sysCouponActivityInfoForm">
+ <input type="hidden" id="id" name="id" value="${id}">
+ <div class="row">
+ <div class="col-sm-10">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">处理意见：</label>
+ <div class="col-sm-9" style="display: flex;align-items: center;">
+ <div class="radio radio-info radio-inline">
+ <input type="radio" id="state2" value="3" name="state" checked="" >
+ <label for="state2"> 同意 </label>
+ </div>
+ <div class="radio radio-success radio-inline">
+ <input type="radio" id="state3" value="2" name="state" >
+ <label for="state3"> 拒绝 </label>
+ </div>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">填写备注：</label>
+ <div class="col-sm-9">
+ <textarea type="text/plain" class="form-control" name="remark" id="remark" style="width:100%;height:150px;"></textarea>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="SysCouponActivityInfoDlg.immediately()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="SysCouponActivityInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/sysCouponActivity/sysCouponActivity_info.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponActivity/sysCouponRecord.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponActivity/sysCouponRecord.html
new file mode 100644
index 0000000..196d277
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponActivity/sysCouponRecord.html
@@ -0,0 +1,37 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>优惠券管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#TimeCon id="createTime" name="添加时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="SysCouponRecord.search()"/>
+ <#button name="重置" icon="fa-search" clickFun="SysCouponRecord.resetSearch()"/>
+ <#button btnCss="info" name="确定" id="ensure" icon="fa-check" clickFun="SysCouponRecord.selectCouponOpt()" space="true"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="SysCouponRecord.close()" space="true"/>
+
+ </div>
+ </div>
+ <#table id="SysCouponRecordTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/sysCouponActivity/sysCouponRecord.js"></script>
+<script>
+ laydate.render({
+ elem: '#createTime'
+ ,range: true
+ });
+</script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponActivity/tUser.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponActivity/tUser.html
new file mode 100644
index 0000000..2027607
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponActivity/tUser.html
@@ -0,0 +1,63 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>用户管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#TimeCon id="insertTime" name="注册时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="id" name="用户ID" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="nickName" name="昵称" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="phone" name="手机号" />
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="isAuth" name="是否实名认证" >
+ <option value="">全部</option>
+ <option value="1">否</option>
+ <option value="2">是</option>
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="state" name="状态" >
+ <option value="">全部</option>
+ <option value="1">正常</option>
+ <option value="2">冻结</option>
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="companyName" name="注册地所在分公司" />
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="TUser.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="TUser.resetSearch()" space="true"/>
+ <#button btnCss="info" name="确定" id="ensure" icon="fa-check" clickFun="TUser.selectUserOpt()" space="true"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TUser.close()" space="true"/>
+
+ </div>
+ </div>
+ <#table id="TUserTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/sysCouponActivity/tUser.js"></script>
+<script>
+ laydate.render({
+ elem: '#insertTime'
+ ,range: true
+ });
+</script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponRecord/sysCouponRecord.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponRecord/sysCouponRecord.html
new file mode 100644
index 0000000..64de3fe
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponRecord/sysCouponRecord.html
@@ -0,0 +1,61 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>优惠券管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#TimeCon id="createTime" name="添加时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="couponUseType" name="优惠券类型" >
+ <option value="">全部</option>
+ <option value="0">通用券</option>
+ <option value="1">专车券</option>
+ <option value="2">出租车券</option>
+ <option value="3">跨城出行券</option>
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="couponType" name="服务类型" >
+ <option value="">全部</option>
+ <option value="1">抵扣</option>
+ <option value="2">满减</option>
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="SysCouponRecord.search()"/>
+ <#button name="重置" icon="fa-search" clickFun="SysCouponRecord.resetSearch()"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="SysCouponRecordTableToolbar" role="group">
+ @if(shiro.hasPermission("/sysCouponRecord/add")){
+ <#button name="添加" icon="fa-plus" clickFun="SysCouponRecord.openAddSysCouponRecord()"/>
+ @}
+ @if(shiro.hasPermission("/sysCouponRecord/update")){
+ <#button name="修改" icon="fa-edit" clickFun="SysCouponRecord.openSysCouponRecordDetail()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/sysCouponRecord/delete")){
+ <#button name="删除" icon="fa-remove" clickFun="SysCouponRecord.delete()" space="true"/>
+ @}
+ </div>
+ <#table id="SysCouponRecordTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/sysCouponRecord/sysCouponRecord.js"></script>
+<script>
+ laydate.render({
+ elem: '#createTime'
+ ,range: true
+ });
+</script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponRecord/sysCouponRecord_add.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponRecord/sysCouponRecord_add.html
new file mode 100644
index 0000000..aae3c66
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponRecord/sysCouponRecord_add.html
@@ -0,0 +1,57 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal"id="sysCouponRecordInfoForm">
+
+ <div class="row">
+ <div class="col-sm-6">
+ <#input id="name" name="名称" underline="true" placeholder="最多20个字"/>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">优惠券类型</label>
+ <div class="col-sm-9">
+ <select class="form-control" id="couponType" name="couponType"
+ onchange="changeType()"
+ >
+ <option value="1">抵扣券</option>
+ <option value="2">满减券</option>
+ </select>
+ </div>
+ </div>
+ <#select id="couponUseType" name="服务类型" underline="true">
+ <option value="1">专车券</option>
+ <option value="2">出租车券</option>
+ <option value="3">跨城出行券</option>
+ <option value="0">通用券</option>
+ </#select>
+ <#input id="money" name="金额" underline="true" placeholder="最多4位数字"/>
+ <div class="form-group" id="fullMoneys" style="display: none">
+ <label class="col-sm-3 control-label">条件金额：</label>
+ <div class="col-sm-9">
+ <input class="form-control" id="fullMoney" name="fullMoney" >
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="SysCouponRecordInfoDlg.addSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="SysCouponRecordInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/sysCouponRecord/sysCouponRecord_info.js"></script>
+<script>
+ function changeType(){
+ if($("#couponType").val()==2){
+ $("#fullMoneys").show();
+ }else{
+ $("#fullMoneys").hide();
+ }
+
+ }
+</script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponRecord/sysCouponRecord_edit.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponRecord/sysCouponRecord_edit.html
new file mode 100644
index 0000000..3dc5f02
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponRecord/sysCouponRecord_edit.html
@@ -0,0 +1,34 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+
+ <div class="row">
+ <div class="col-sm-6 b-r">
+ <#input id="id" name="" value="${item.id}" underline="true"/>
+ <#input id="money" name="金额" value="${item.money}" underline="true"/>
+ <#input id="fullMoney" name="满减金额" value="${item.fullMoney}" underline="true"/>
+ <#input id="insertTime" name="添加时间" value="${item.insertTime}" underline="true"/>
+ <#input id="companyId" name="公司id" value="${item.companyId}" />
+ </div>
+
+ <div class="col-sm-6">
+ <#input id="couponUseType" name="优惠券使用类型(0=通用，1=专车，2=出租车，3=城际，4=小件物流)" value="${item.couponUseType}" underline="true"/>
+ <#input id="couponType" name="优惠券类型(1=抵扣，2=满减)" value="${item.couponType}" underline="true"/>
+ <#input id="name" name="优惠券名称" value="${item.name}" underline="true"/>
+ <#input id="effective" name="有效天数" value="${item.effective}" />
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="SysCouponRecordInfoDlg.editSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="SysCouponRecordInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/sysCouponRecord/sysCouponRecord_info.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysRedPacketRecord/sysRedPacketRecord.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysRedPacketRecord/sysRedPacketRecord.html
new file mode 100644
index 0000000..4752c82
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysRedPacketRecord/sysRedPacketRecord.html
@@ -0,0 +1,45 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>红包管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#TimeCon id="createTime" name="添加时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="SysRedPacketRecord.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="SysRedPacketRecord.resetSearch()" space="true"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="SysRedPacketRecordTableToolbar" role="group">
+ @if(shiro.hasPermission("/sysRedPacketRecord/add")){
+ <#button name="添加" icon="fa-plus" clickFun="SysRedPacketRecord.openAddSysRedPacketRecord()"/>
+ @}
+ @if(shiro.hasPermission("/sysRedPacketRecord/update")){
+ <#button name="修改" icon="fa-edit" clickFun="SysRedPacketRecord.openSysRedPacketRecordDetail()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/sysRedPacketRecord/delete")){
+ <#button name="删除" icon="fa-remove" clickFun="SysRedPacketRecord.delete()" space="true"/>
+ @}
+ </div>
+ <#table id="SysRedPacketRecordTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/sysRedPacketRecord/sysRedPacketRecord.js"></script>
+<script>
+ laydate.render({
+ elem: '#createTime'
+ ,range: true
+ });
+</script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysRedPacketRecord/sysRedPacketRecord_add.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysRedPacketRecord/sysRedPacketRecord_add.html
new file mode 100644
index 0000000..44f02c6
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysRedPacketRecord/sysRedPacketRecord_add.html
@@ -0,0 +1,82 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="sysRedPacketRecordInfoForm">
+
+ <div class="row">
+ <div class="col-sm-12">
+ <div class="form-group">
+ <label class="col-sm-2 control-label">红包名称</label>
+ <div class="col-sm-5">
+ <input id="name" style="width: 170px;height: 35px;" placeholder="最多15个字">
+ </div>
+ </div>
+ </div>
+ <div class="col-sm-12">
+ <div class="form-group">
+ <label class="col-sm-2 control-label">红包金额类型</label>
+ <div class="col-sm-5">
+ <label style="margin: 0 10px"><input type="radio" checked="checked" name="type" value="1" onclick="changeDiv(1)">固定金额</label>
+ <label style="margin: 0 10px"><input type="radio" name="type" value="2" onclick="changeDiv(2)" >随机金额</label>
+ </div>
+ </div>
+ </div>
+ <div class="col-sm-12">
+ <div class="form-group">
+ <label class="col-sm-2 control-label">总金额</label>
+ <div class="col-sm-5">
+ <input id="totalMoney" style="width: 170px;height: 35px;" placeholder="最多8位数"> 元
+ </div>
+ </div>
+ </div>
+ <div class="col-sm-12" id="moneyDiv">
+ <div class="form-group">
+ <label class="col-sm-2 control-label">每个红包金额</label>
+ <div class="col-sm-5">
+ <input id="money" style="width: 170px;height: 35px;" placeholder="最多3位数"> 元
+ </div>
+ </div>
+ </div>
+ <div class="col-sm-12" id="moneySectionDiv" style="display: none;">
+ <div class="form-group">
+ <label class="col-sm-2 control-label">每个红包金额范围</label>
+ <div class="col-sm-5">
+ <input id="startMoney" style="width: 80px;height: 35px;"> -
+ <input id="endMoney" style="width: 80px;height: 35px;"> 元
+ </div>
+ </div>
+ </div>
+ <div class="col-sm-12">
+ <div class="form-group">
+ <label class="col-sm-2 control-label">有效天数</label>
+ <div class="col-sm-5">
+ <input id="effective" style="width: 170px;height: 35px;"> 天
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="SysRedPacketRecordInfoDlg.addSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="SysRedPacketRecordInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/sysRedPacketRecord/sysRedPacketRecord_info.js"></script>
+<script>
+ function changeDiv(type){
+ if(type==1){
+ $("#moneySectionDiv").hide();
+ $("#moneyDiv").show();
+ }else{
+ $("#moneySectionDiv").show();
+ $("#moneyDiv").hide();
+ }
+ }
+
+</script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysRedPacketRecord/sysRedPacketRecord_edit.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysRedPacketRecord/sysRedPacketRecord_edit.html
new file mode 100644
index 0000000..e66baa3
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysRedPacketRecord/sysRedPacketRecord_edit.html
@@ -0,0 +1,34 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+
+ <div class="row">
+ <div class="col-sm-6 b-r">
+ <#input id="id" name="" value="${item.id}" underline="true"/>
+ <#input id="money" name="金额" value="${item.money}" underline="true"/>
+ <#input id="name" name="红包名称" value="${item.name}" underline="true"/>
+ <#input id="type" name="类型(1=固定金额，2=随机金额)" value="${item.type}" />
+ </div>
+
+ <div class="col-sm-6">
+ <#input id="totalMoney" name="总金额" value="${item.totalMoney}" underline="true"/>
+ <#input id="laveMoney" name="剩余金额" value="${item.laveMoney}" underline="true"/>
+ <#input id="startMoney" name="开始金额" value="${item.startMoney}" underline="true"/>
+ <#input id="endMoney" name="结束金额" value="${item.endMoney}" underline="true"/>
+ <#input id="effective" name="有效天数" value="${item.effective}" underline="true"/>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="SysRedPacketRecordInfoDlg.editSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="SysRedPacketRecordInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/sysRedPacketRecord/sysRedPacketRecord_info.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAdvertisement/tAdvertisement.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAdvertisement/tAdvertisement.html
new file mode 100644
index 0000000..5547e7f
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAdvertisement/tAdvertisement.html
@@ -0,0 +1,61 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>广告设置管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#TimeCon id="insertTime" name="添加时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="name" name="广告名称" />
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="type" name="广告类型" >
+ <option value="">全部</option>
+ <option value="1">弹窗广告</option>
+ <option value="2">首页底部广告</option>
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="TAdvertisement.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="TAdvertisement.resetSearch()" space="true"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="TAdvertisementTableToolbar" role="group">
+ @if(shiro.hasPermission("/tAdvertisement/add")){
+ <#button name="添加" icon="fa-plus" clickFun="TAdvertisement.openAddTAdvertisement()"/>
+ @}
+ @if(shiro.hasPermission("/tAdvertisement/update")){
+ <#button name="编辑" icon="fa-edit" clickFun="TAdvertisement.openTAdvertisementDetail()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tAdvertisement/delete")){
+ <#button name="删除" icon="fa-remove" clickFun="TAdvertisement.delete()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tAdvertisement/up")){
+ <#button name="上线" icon="fa-remove" clickFun="TAdvertisement.up()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tAdvertisement/down")){
+ <#button name="下线" icon="fa-remove" clickFun="TAdvertisement.down()" space="true"/>
+ @}
+ </div>
+ <#table id="TAdvertisementTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tAdvertisement/tAdvertisement.js"></script>
+<script>
+ laydate.render({
+ elem: '#insertTime'
+ ,range: true
+ });
+</script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAdvertisement/tAdvertisement_add.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAdvertisement/tAdvertisement_add.html
new file mode 100644
index 0000000..34f542d
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAdvertisement/tAdvertisement_add.html
@@ -0,0 +1,58 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="advertisementInfoForm">
+
+ <div class="row">
+ <div class="col-sm-10">
+ <#input id="name" name="广告图名称"/>
+ <#avatar id="imgUrl" name="广告图图片：" />
+ <#select id="type" name="广告类型：">
+ <option value="">选择广告类型</option>
+ <option value="1">弹窗广告</option>
+ <option value="2">首页底部广告</option>
+ </#select>
+ <#select id="provinceId" name="所属省：">
+ <option value="">选择所属省</option>
+ @for(province in list){
+ <option value="${province.id}"> ${province.name} </option>
+ @}
+ </#select>
+ <#select id="isJump" name="是否跳转：" onchange="TAdvertisementInfoDlg.isJump()">
+ <option value="">选择是否跳转</option>
+ <option value="1">是</option>
+ <option value="2">否</option>
+ </#select>
+ <div id="yesDiv" style="display: none;">
+ <#select id="jumpType" name="跳转类型：" onchange="TAdvertisementInfoDlg.jumpType()">
+ <option value="">选择跳转类型</option>
+ <option value="1">外部</option>
+ <option value="2">内部</option>
+ </#select>
+ <div id="internalDiv" style="display: none;">
+ <#input id="jumpUrl" name="跳转路径"/>
+ </div>
+ <div id="externalDiv" style="display: none;">
+ <div class="form-group" id="contentDiv">
+ <label class="col-sm-3 control-label">跳转内容：</label>
+ <div class="col-sm-9">
+ <textarea type="text/plain" id="editor" style="width:100%;height:350px;"></textarea>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TAdvertisementInfoDlg.addSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TAdvertisementInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tAdvertisement/tAdvertisement_info.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAdvertisement/tAdvertisement_edit.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAdvertisement/tAdvertisement_edit.html
new file mode 100644
index 0000000..70b2fa1
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAdvertisement/tAdvertisement_edit.html
@@ -0,0 +1,79 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="advertisementInfoForm">
+ <input type="hidden" id="id" name="id" value="${item.id}">
+ <div class="row">
+ <div class="col-sm-10">
+ <#input id="name" name="广告图名称" value="${item.name}"/>
+ <#avatar id="imgUrl" name="广告图图片：" avatarImg="${item.imgUrl}"/>
+ <#select id="type" name="广告类型：">
+ <option value="">选择广告类型</option>
+ <option value="1" ${1 == item.type ? 'selected=selected' : ''}>弹窗广告</option>
+ <option value="2" ${2 == item.type ? 'selected=selected' : ''}>首页底部广告</option>
+ </#select>
+ <#select id="provinceId" name="所属省：">
+ <option value="">选择所属省</option>
+ @for(province in list){
+ <option value="${province.id}" ${province.id == item.provinceId ? 'selected=selected' : ''}> ${province.name} </option>
+ @}
+ </#select>
+ <#select id="isJump" name="是否跳转：" onchange="TAdvertisementInfoDlg.isJump()">
+ <option value="">选择是否跳转</option>
+ <option value="1" ${1 == item.isJump ? 'selected=selected' : ''}>是</option>
+ <option value="2" ${2 == item.isJump ? 'selected=selected' : ''}>否</option>
+ </#select>
+ <div id="yesDiv" style="display: none;">
+ <#select id="jumpType" name="跳转类型：" onchange="TAdvertisementInfoDlg.jumpType()">
+ <option value="">选择跳转类型</option>
+ <option value="1" ${1 == item.jumpType ? 'selected=selected' : ''}>外部</option>
+ <option value="2" ${2 == item.jumpType ? 'selected=selected' : ''}>内部</option>
+ </#select>
+ <div id="internalDiv" style="display: none;">
+ <#input id="jumpUrl" name="跳转路径" value="${item.jumpUrl}"/>
+ </div>
+ <div id="externalDiv" style="display: none;">
+ <div class="form-group" id="contentDiv">
+ <label class="col-sm-3 control-label">跳转内容：</label>
+ <div class="col-sm-9">
+ <textarea type="text/plain" id="editor" style="width:100%;height:350px;">${item.content}</textarea>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TAdvertisementInfoDlg.editSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TAdvertisementInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tAdvertisement/tAdvertisement_info.js"></script>
+<script type="text/javascript">
+ $(function() {
+ var isJump = $("#isJump").val();
+ if (1 == isJump){
+ $("#yesDiv").show();
+ }else{
+ $("#yesDiv").hide();
+ }
+ var jumpType = $("#jumpType").val();
+ if (1 == jumpType){
+ $("#internalDiv").show();
+ $("#externalDiv").hide();
+ } else if (2 == jumpType) {
+ $("#internalDiv").hide();
+ $("#externalDiv").show();
+ } else {
+ $("#internalDiv").hide();
+ $("#externalDiv").hide();
+ }
+ });
+</script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/commonProblem.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/commonProblem.html
new file mode 100644
index 0000000..0b4a77a
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/commonProblem.html
@@ -0,0 +1,65 @@
+@layout("/common/_container.html"){
+<style>
+ .newWidth, .single-line{
+ max-width:350px !important;display: initial !important;
+ }
+</style>
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="tabs-container">
+ <ul class="nav nav-tabs">
+ <li class="active"><a data-toggle="tab" href="#tab-1" aria-expanded="true">常见问题设置</a></li>
+ </ul>
+ <div class="tab-content">
+ <div id="tab-1" class="tab-pane active">
+ <div class="panel-body">
+ <textarea id="editor_1" type="text/plain" style="width:1200px;height:400px;">${one.content}</textarea>
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="保存" id="ensure" icon="fa-check" clickFun="update_1(${one.id});"/>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+
+<script type="text/javascript">
+ var editor_1 = null;
+ $(function () {
+ //初始化编辑器
+ editor_1 = UE.getEditor('editor_1');
+ });
+
+ function update_1(id){
+ if (editor_1.getContentTxt() == ""){
+ Feng.error("内容不能为空!");
+ return;
+ }
+ submitData(editor_1.getContent(),id);
+ }
+
+ function submitData(content,id) {
+ //提交信息
+ var ajax = new $ax(Feng.ctxPath + "/tAgreement/updateAppParam", function(data){
+ Feng.success("编辑成功!");
+ },function(data){
+ Feng.error("编辑失败!" + data.responseJSON.message + "!");
+ });
+ ajax.set("context", content);
+ ajax.set("id", id);
+ ajax.start();
+ }
+</script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/corssHtml.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/corssHtml.html
new file mode 100644
index 0000000..263e853
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/corssHtml.html
@@ -0,0 +1,65 @@
+@layout("/common/_container.html"){
+<style>
+ .newWidth, .single-line{
+ max-width:350px !important;display: initial !important;
+ }
+</style>
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="tabs-container">
+ <ul class="nav nav-tabs">
+ <li class="active"><a data-toggle="tab" href="#tab-1" aria-expanded="true">跨城出行乘车须知</a></li>
+ </ul>
+ <div class="tab-content">
+ <div id="tab-1" class="tab-pane active">
+ <div class="panel-body">
+ <textarea id="editor_1" type="text/plain" style="width:1200px;height:400px;">${one.content}</textarea>
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="保存" id="ensure" icon="fa-check" clickFun="update_1(${one.id});"/>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+
+<script type="text/javascript">
+ var editor_1 = null;
+ $(function () {
+ //初始化编辑器
+ editor_1 = UE.getEditor('editor_1');
+ });
+
+ function update_1(id){
+ if (editor_1.getContentTxt() == ""){
+ Feng.error("内容不能为空!");
+ return;
+ }
+ submitData(editor_1.getContent(),id);
+ }
+
+ function submitData(content,id) {
+ //提交信息
+ var ajax = new $ax(Feng.ctxPath + "/tAgreement/updateAppParam", function(data){
+ Feng.success("编辑成功!");
+ },function(data){
+ Feng.error("编辑失败!" + data.responseJSON.message + "!");
+ });
+ ajax.set("context", content);
+ ajax.set("id", id);
+ ajax.start();
+ }
+</script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/driverRegister.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/driverRegister.html
new file mode 100644
index 0000000..daa009c
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/driverRegister.html
@@ -0,0 +1,65 @@
+@layout("/common/_container.html"){
+<style>
+ .newWidth, .single-line{
+ max-width:350px !important;display: initial !important;
+ }
+</style>
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="tabs-container">
+ <ul class="nav nav-tabs">
+ <li class="active"><a data-toggle="tab" href="#tab-1" aria-expanded="true">司机注册协议设置</a></li>
+ </ul>
+ <div class="tab-content">
+ <div id="tab-1" class="tab-pane active">
+ <div class="panel-body">
+ <textarea id="editor_1" type="text/plain" style="width:1200px;height:400px;">${one.content}</textarea>
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="保存" id="ensure" icon="fa-check" clickFun="update_1(${one.id});"/>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+
+<script type="text/javascript">
+ var editor_1 = null;
+ $(function () {
+ //初始化编辑器
+ editor_1 = UE.getEditor('editor_1');
+ });
+
+ function update_1(id){
+ if (editor_1.getContentTxt() == ""){
+ Feng.error("内容不能为空!");
+ return;
+ }
+ submitData(editor_1.getContentTxt(),id);
+ }
+
+ function submitData(content,id) {
+ //提交信息
+ var ajax = new $ax(Feng.ctxPath + "/tAgreement/updateAppParam", function(data){
+ Feng.success("编辑成功!");
+ },function(data){
+ Feng.error("编辑失败!" + data.responseJSON.message + "!");
+ });
+ ajax.set("context", content);
+ ajax.set("id", id);
+ ajax.start();
+ }
+</script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/instructions.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/instructions.html
new file mode 100644
index 0000000..10c0580
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/instructions.html
@@ -0,0 +1,65 @@
+@layout("/common/_container.html"){
+<style>
+ .newWidth, .single-line{
+ max-width:350px !important;display: initial !important;
+ }
+</style>
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="tabs-container">
+ <ul class="nav nav-tabs">
+ <li class="active"><a data-toggle="tab" href="#tab-1" aria-expanded="true">改派说明设置</a></li>
+ </ul>
+ <div class="tab-content">
+ <div id="tab-1" class="tab-pane active">
+ <div class="panel-body">
+ <textarea id="editor_1" type="text/plain" style="width:1200px;height:400px;">${one.content}</textarea>
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="保存" id="ensure" icon="fa-check" clickFun="update_1(${one.id});"/>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+
+<script type="text/javascript">
+ var editor_1 = null;
+ $(function () {
+ //初始化编辑器
+ editor_1 = UE.getEditor('editor_1');
+ });
+
+ function update_1(id){
+ if (editor_1.getContentTxt() == ""){
+ Feng.error("内容不能为空!");
+ return;
+ }
+ submitData(editor_1.getContent(),id);
+ }
+
+ function submitData(content,id) {
+ //提交信息
+ var ajax = new $ax(Feng.ctxPath + "/tAgreement/updateAppParam", function(data){
+ Feng.success("编辑成功!");
+ },function(data){
+ Feng.error("编辑失败!" + data.responseJSON.message + "!");
+ });
+ ajax.set("context", content);
+ ajax.set("id", id);
+ ajax.start();
+ }
+</script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/pricingRules.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/pricingRules.html
new file mode 100644
index 0000000..939359b
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/pricingRules.html
@@ -0,0 +1,65 @@
+@layout("/common/_container.html"){
+<style>
+ .newWidth, .single-line{
+ max-width:350px !important;display: initial !important;
+ }
+</style>
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="tabs-container">
+ <ul class="nav nav-tabs">
+ <li class="active"><a data-toggle="tab" href="#tab-1" aria-expanded="true">计价规则设置</a></li>
+ </ul>
+ <div class="tab-content">
+ <div id="tab-1" class="tab-pane active">
+ <div class="panel-body">
+ <textarea id="editor_1" type="text/plain" style="width:1200px;height:400px;">${one.content}</textarea>
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="保存" id="ensure" icon="fa-check" clickFun="update_1(${one.id});"/>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+
+<script type="text/javascript">
+ var editor_1 = null;
+ $(function () {
+ //初始化编辑器
+ editor_1 = UE.getEditor('editor_1');
+ });
+
+ function update_1(id){
+ if (editor_1.getContentTxt() == ""){
+ Feng.error("内容不能为空!");
+ return;
+ }
+ submitData(editor_1.getContent(),id);
+ }
+
+ function submitData(content,id) {
+ //提交信息
+ var ajax = new $ax(Feng.ctxPath + "/tAgreement/updateAppParam", function(data){
+ Feng.success("编辑成功!");
+ },function(data){
+ Feng.error("编辑失败!" + data.responseJSON.message + "!");
+ });
+ ajax.set("context", content);
+ ajax.set("id", id);
+ ajax.start();
+ }
+</script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreement.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreement.html
new file mode 100644
index 0000000..78fc7fb
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreement.html
@@ -0,0 +1,105 @@
+@layout("/common/_container.html"){
+<style>
+ .newWidth, .single-line{
+ max-width:350px !important;display: initial !important;
+ }
+</style>
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="tabs-container">
+ <ul class="nav nav-tabs">
+ <li class="active"><a data-toggle="tab" href="#tab-1" aria-expanded="true">注册协议</a></li>
+ <li class=""><a data-toggle="tab" href="#tab-2" aria-expanded="false">用户协议</a></li>
+ <li class=""><a data-toggle="tab" href="#tab-3" aria-expanded="false">隐私协议</a></li>
+ </ul>
+ <div class="tab-content">
+ <div id="tab-1" class="tab-pane active">
+ <div class="panel-body">
+ <textarea id="editor_1" type="text/plain" style="width:1200px;height:400px;">${one.content}</textarea>
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="保存" id="ensure" icon="fa-check" clickFun="update_1(${one.id});"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div id="tab-2" class="tab-pane">
+ <div class="panel-body">
+ <textarea type="text/plain" id="editor_2" style="width:1200px;height:400px;">${two.content}</textarea>
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="保存" id="ensure" icon="fa-check" clickFun="update_2(${two.id});"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div id="tab-3" class="tab-pane">
+ <div class="panel-body">
+ <textarea type="text/plain" id="three" style="width:1200px;height:400px;">${three.content}</textarea>
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="保存" id="ensure" icon="fa-check" clickFun="update_3(${three.id});"/>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+
+<script type="text/javascript">
+ var editor_1 = null;
+ var editor_2 = null;
+ var editor_3 = null;
+ $(function () {
+ //初始化编辑器
+ editor_1 = UE.getEditor('editor_1');
+ editor_2 = UE.getEditor('editor_2');
+ editor_3 = UE.getEditor('editor_3');
+ });
+
+ function update_1(id){
+ if (editor_1.getContentTxt() == ""){
+ Feng.error("内容不能为空!");
+ return;
+ }
+ submitData(editor_1.getContent(),id);
+ }
+ function update_2(id){
+ if (editor_2.getContentTxt() == ""){
+ Feng.error("内容不能为空!");
+ return;
+ }
+ submitData(editor_2.getContent(),id);
+ }
+ function update_3(id){
+ if ($("#three").val() == ""){
+ Feng.error("内容不能为空!");
+ return;
+ }
+ submitData($("#three").val(),id);
+ }
+
+ function submitData(content,id) {
+ //提交信息
+ var ajax = new $ax(Feng.ctxPath + "/tAgreement/updateAppParam", function(data){
+ Feng.success("编辑成功!");
+ },function(data){
+ Feng.error("编辑失败!" + data.responseJSON.message + "!");
+ });
+ ajax.set("context", content);
+ ajax.set("id", id);
+ ajax.start();
+ }
+</script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementCharterCar.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementCharterCar.html
new file mode 100644
index 0000000..1cdbaa0
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementCharterCar.html
@@ -0,0 +1,65 @@
+@layout("/common/_container.html"){
+<style>
+ .newWidth, .single-line{
+ max-width:350px !important;display: initial !important;
+ }
+</style>
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="tabs-container">
+ <ul class="nav nav-tabs">
+ <li class="active"><a data-toggle="tab" href="#tab-1" aria-expanded="true">包车协议设置</a></li>
+ </ul>
+ <div class="tab-content">
+ <div id="tab-1" class="tab-pane active">
+ <div class="panel-body">
+ <textarea id="editor_1" type="text/plain" style="width:1200px;height:400px;">${one.content}</textarea>
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="保存" id="ensure" icon="fa-check" clickFun="update_1(${one.id});"/>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+
+<script type="text/javascript">
+ var editor_1 = null;
+ $(function () {
+ //初始化编辑器
+ editor_1 = UE.getEditor('editor_1');
+ });
+
+ function update_1(id){
+ if (editor_1.getContentTxt() == ""){
+ Feng.error("内容不能为空!");
+ return;
+ }
+ submitData(editor_1.getContent(),id);
+ }
+
+ function submitData(content,id) {
+ //提交信息
+ var ajax = new $ax(Feng.ctxPath + "/tAgreement/updateAppParam", function(data){
+ Feng.success("编辑成功!");
+ },function(data){
+ Feng.error("编辑失败!" + data.responseJSON.message + "!");
+ });
+ ajax.set("context", content);
+ ajax.set("id", id);
+ ajax.start();
+ }
+</script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementDriver.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementDriver.html
new file mode 100644
index 0000000..4a47ce4
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementDriver.html
@@ -0,0 +1,105 @@
+@layout("/common/_container.html"){
+<style>
+ .newWidth, .single-line{
+ max-width:350px !important;display: initial !important;
+ }
+</style>
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="tabs-container">
+ <ul class="nav nav-tabs">
+ <li class="active"><a data-toggle="tab" href="#tab-1" aria-expanded="true">注册协议</a></li>
+ <li class=""><a data-toggle="tab" href="#tab-2" aria-expanded="false">用户协议</a></li>
+ <li class=""><a data-toggle="tab" href="#tab-3" aria-expanded="false">隐私协议</a></li>
+ </ul>
+ <div class="tab-content">
+ <div id="tab-1" class="tab-pane active">
+ <div class="panel-body">
+ <textarea id="editor_1" type="text/plain" style="width:1200px;height:400px;">${one.content}</textarea>
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="保存" id="ensure" icon="fa-check" clickFun="update_1(${one.id});"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div id="tab-2" class="tab-pane">
+ <div class="panel-body">
+ <textarea type="text/plain" id="editor_2" style="width:1200px;height:400px;">${two.content}</textarea>
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="保存" id="ensure" icon="fa-check" clickFun="update_2(${two.id});"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div id="tab-3" class="tab-pane">
+ <div class="panel-body">
+ <textarea type="text/plain" id="editor_3" style="width:1200px;height:400px;">${three.content}</textarea>
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="保存" id="ensure" icon="fa-check" clickFun="update_3(${three.id});"/>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+
+<script type="text/javascript">
+ var editor_1 = null;
+ var editor_2 = null;
+ var editor_3 = null;
+ $(function () {
+ //初始化编辑器
+ editor_1 = UE.getEditor('editor_1');
+ editor_2 = UE.getEditor('editor_2');
+ editor_3 = UE.getEditor('editor_3');
+ });
+
+ function update_1(id){
+ if (editor_1.getContentTxt() == ""){
+ Feng.error("内容不能为空!");
+ return;
+ }
+ submitData(editor_1.getContent(),id);
+ }
+ function update_2(id){
+ if (editor_2.getContentTxt() == ""){
+ Feng.error("内容不能为空!");
+ return;
+ }
+ submitData(editor_2.getContent(),id);
+ }
+ function update_3(id){
+ if (editor_3.getContentTxt() == ""){
+ Feng.error("内容不能为空!");
+ return;
+ }
+ submitData(editor_3.getContent(),id);
+ }
+
+ function submitData(content,id) {
+ //提交信息
+ var ajax = new $ax(Feng.ctxPath + "/tAgreement/updateAppParam", function(data){
+ Feng.success("编辑成功!");
+ },function(data){
+ Feng.error("编辑失败!" + data.responseJSON.message + "!");
+ });
+ ajax.set("context", content);
+ ajax.set("id", id);
+ ajax.start();
+ }
+</script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementLaw.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementLaw.html
new file mode 100644
index 0000000..0a28fd1
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementLaw.html
@@ -0,0 +1,65 @@
+@layout("/common/_container.html"){
+<style>
+ .newWidth, .single-line{
+ max-width:350px !important;display: initial !important;
+ }
+</style>
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="tabs-container">
+ <ul class="nav nav-tabs">
+ <li class="active"><a data-toggle="tab" href="#tab-1" aria-expanded="true">法律法规设置</a></li>
+ </ul>
+ <div class="tab-content">
+ <div id="tab-1" class="tab-pane active">
+ <div class="panel-body">
+ <textarea id="editor_1" type="text/plain" style="width:1200px;height:400px;">${one.content}</textarea>
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="保存" id="ensure" icon="fa-check" clickFun="update_1(${one.id});"/>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+
+<script type="text/javascript">
+ var editor_1 = null;
+ $(function () {
+ //初始化编辑器
+ editor_1 = UE.getEditor('editor_1');
+ });
+
+ function update_1(id){
+ if (editor_1.getContentTxt() == ""){
+ Feng.error("内容不能为空!");
+ return;
+ }
+ submitData(editor_1.getContent(),id);
+ }
+
+ function submitData(content,id) {
+ //提交信息
+ var ajax = new $ax(Feng.ctxPath + "/tAgreement/updateAppParam", function(data){
+ Feng.success("编辑成功!");
+ },function(data){
+ Feng.error("编辑失败!" + data.responseJSON.message + "!");
+ });
+ ajax.set("context", content);
+ ajax.set("id", id);
+ ajax.start();
+ }
+</script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementMe.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementMe.html
new file mode 100644
index 0000000..afc7dbc
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementMe.html
@@ -0,0 +1,65 @@
+@layout("/common/_container.html"){
+<style>
+ .newWidth, .single-line{
+ max-width:350px !important;display: initial !important;
+ }
+</style>
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="tabs-container">
+ <ul class="nav nav-tabs">
+ <li class="active"><a data-toggle="tab" href="#tab-1" aria-expanded="true">关于我们设置</a></li>
+ </ul>
+ <div class="tab-content">
+ <div id="tab-1" class="tab-pane active">
+ <div class="panel-body">
+ <textarea id="editor_1" type="text/plain" style="width:1200px;height:400px;">${one.content}</textarea>
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="保存" id="ensure" icon="fa-check" clickFun="update_1(${one.id});"/>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+
+<script type="text/javascript">
+ var editor_1 = null;
+ $(function () {
+ //初始化编辑器
+ editor_1 = UE.getEditor('editor_1');
+ });
+
+ function update_1(id){
+ if (editor_1.getContentTxt() == ""){
+ Feng.error("内容不能为空!");
+ return;
+ }
+ submitData(editor_1.getContent(),id);
+ }
+
+ function submitData(content,id) {
+ //提交信息
+ var ajax = new $ax(Feng.ctxPath + "/tAgreement/updateAppParam", function(data){
+ Feng.success("编辑成功!");
+ },function(data){
+ Feng.error("编辑失败!" + data.responseJSON.message + "!");
+ });
+ ajax.set("context", content);
+ ajax.set("id", id);
+ ajax.start();
+ }
+</script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementOrder.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementOrder.html
new file mode 100644
index 0000000..2177676
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementOrder.html
@@ -0,0 +1,65 @@
+@layout("/common/_container.html"){
+<style>
+ .newWidth, .single-line{
+ max-width:350px !important;display: initial !important;
+ }
+</style>
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="tabs-container">
+ <ul class="nav nav-tabs">
+ <li class="active"><a data-toggle="tab" href="#tab-1" aria-expanded="true">取消订单说明</a></li>
+ </ul>
+ <div class="tab-content">
+ <div id="tab-1" class="tab-pane active">
+ <div class="panel-body">
+ <textarea id="editor_1" type="text/plain" style="width:1200px;height:400px;">${one.content}</textarea>
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="保存" id="ensure" icon="fa-check" clickFun="update_1(${one.id});"/>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+
+<script type="text/javascript">
+ var editor_1 = null;
+ $(function () {
+ //初始化编辑器
+ editor_1 = UE.getEditor('editor_1');
+ });
+
+ function update_1(id){
+ if (editor_1.getContentTxt() == ""){
+ Feng.error("内容不能为空!");
+ return;
+ }
+ submitData(editor_1.getContent(),id);
+ }
+
+ function submitData(content,id) {
+ //提交信息
+ var ajax = new $ax(Feng.ctxPath + "/tAgreement/updateAppParam", function(data){
+ Feng.success("编辑成功!");
+ },function(data){
+ Feng.error("编辑失败!" + data.responseJSON.message + "!");
+ });
+ ajax.set("context", content);
+ ajax.set("id", id);
+ ajax.start();
+ }
+</script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementRecharge.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementRecharge.html
new file mode 100644
index 0000000..88ee69d
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementRecharge.html
@@ -0,0 +1,65 @@
+@layout("/common/_container.html"){
+<style>
+ .newWidth, .single-line{
+ max-width:350px !important;display: initial !important;
+ }
+</style>
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="tabs-container">
+ <ul class="nav nav-tabs">
+ <li class="active"><a data-toggle="tab" href="#tab-1" aria-expanded="true">充值领券规则设置</a></li>
+ </ul>
+ <div class="tab-content">
+ <div id="tab-1" class="tab-pane active">
+ <div class="panel-body">
+ <textarea id="editor_1" type="text/plain" style="width:1200px;height:400px;">${one.content}</textarea>
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="保存" id="ensure" icon="fa-check" clickFun="update_1(${one.id});"/>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+
+<script type="text/javascript">
+ var editor_1 = null;
+ $(function () {
+ //初始化编辑器
+ editor_1 = UE.getEditor('editor_1');
+ });
+
+ function update_1(id){
+ if (editor_1.getContentTxt() == ""){
+ Feng.error("内容不能为空!");
+ return;
+ }
+ submitData(editor_1.getContent(),id);
+ }
+
+ function submitData(content,id) {
+ //提交信息
+ var ajax = new $ax(Feng.ctxPath + "/tAgreement/updateAppParam", function(data){
+ Feng.success("编辑成功!");
+ },function(data){
+ Feng.error("编辑失败!" + data.responseJSON.message + "!");
+ });
+ ajax.set("context", content);
+ ajax.set("id", id);
+ ajax.start();
+ }
+</script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementSmallPieceLogistics.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementSmallPieceLogistics.html
new file mode 100644
index 0000000..da1ab70
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementSmallPieceLogistics.html
@@ -0,0 +1,65 @@
+@layout("/common/_container.html"){
+<style>
+ .newWidth, .single-line{
+ max-width:350px !important;display: initial !important;
+ }
+</style>
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="tabs-container">
+ <ul class="nav nav-tabs">
+ <li class="active"><a data-toggle="tab" href="#tab-1" aria-expanded="true">小件物流协议设置</a></li>
+ </ul>
+ <div class="tab-content">
+ <div id="tab-1" class="tab-pane active">
+ <div class="panel-body">
+ <textarea id="editor_1" type="text/plain" style="width:1200px;height:400px;">${one.content}</textarea>
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="保存" id="ensure" icon="fa-check" clickFun="update_1(${one.id});"/>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+
+<script type="text/javascript">
+ var editor_1 = null;
+ $(function () {
+ //初始化编辑器
+ editor_1 = UE.getEditor('editor_1');
+ });
+
+ function update_1(id){
+ if (editor_1.getContentTxt() == ""){
+ Feng.error("内容不能为空!");
+ return;
+ }
+ submitData(editor_1.getContent(),id);
+ }
+
+ function submitData(content,id) {
+ //提交信息
+ var ajax = new $ax(Feng.ctxPath + "/tAgreement/updateAppParam", function(data){
+ Feng.success("编辑成功!");
+ },function(data){
+ Feng.error("编辑失败!" + data.responseJSON.message + "!");
+ });
+ ajax.set("context", content);
+ ajax.set("id", id);
+ ajax.start();
+ }
+</script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementUser.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementUser.html
new file mode 100644
index 0000000..d7625bf
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementUser.html
@@ -0,0 +1,65 @@
+@layout("/common/_container.html"){
+<style>
+ .newWidth, .single-line{
+ max-width:350px !important;display: initial !important;
+ }
+</style>
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="tabs-container">
+ <ul class="nav nav-tabs">
+ <li class="active"><a data-toggle="tab" href="#tab-1" aria-expanded="true">用户指南设置</a></li>
+ </ul>
+ <div class="tab-content">
+ <div id="tab-1" class="tab-pane active">
+ <div class="panel-body">
+ <textarea id="editor_1" type="text/plain" style="width:1200px;height:400px;">${one.content}</textarea>
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="保存" id="ensure" icon="fa-check" clickFun="update_1(${one.id});"/>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+
+<script type="text/javascript">
+ var editor_1 = null;
+ $(function () {
+ //初始化编辑器
+ editor_1 = UE.getEditor('editor_1');
+ });
+
+ function update_1(id){
+ if (editor_1.getContentTxt() == ""){
+ Feng.error("内容不能为空!");
+ return;
+ }
+ submitData(editor_1.getContent(),id);
+ }
+
+ function submitData(content,id) {
+ //提交信息
+ var ajax = new $ax(Feng.ctxPath + "/tAgreement/updateAppParam", function(data){
+ Feng.success("编辑成功!");
+ },function(data){
+ Feng.error("编辑失败!" + data.responseJSON.message + "!");
+ });
+ ajax.set("context", content);
+ ajax.set("id", id);
+ ajax.start();
+ }
+</script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCar/carInsurance.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCar/carInsurance.html
new file mode 100644
index 0000000..aa23eeb
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCar/carInsurance.html
@@ -0,0 +1,31 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>车辆保险管理</h5>
+ </div>
+ <div class="ibox-content">
+ <input type="hidden" id="carId" value="${carId}">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="hidden-xs" id="TCarTableToolbar" role="group">
+ @if(shiro.hasPermission("/CarInsurance/openAddCarInsurance")){
+ <#button name="添加" icon="fa-plus" clickFun="CarInsurance.openAddCarInsurance()"/>
+ @}
+ @if(shiro.hasPermission("/CarInsurance/openCarInsuranceDetail")){
+ <#button name="修改" icon="fa-edit" clickFun="CarInsurance.openCarInsuranceDetail()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/CarInsurance/delete")){
+ <#button name="删除" icon="fa-remove" clickFun="CarInsurance.delete()" space="true"/>
+ @}
+ </div>
+ <#table id="TCarTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tCar/carInsurance.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCar/carInsuranceInfo.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCar/carInsuranceInfo.html
new file mode 100644
index 0000000..c34faf8
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCar/carInsuranceInfo.html
@@ -0,0 +1,35 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="carInfoForm">
+ <input type="hidden" id="carId" value="${carId}">
+ <input type="hidden" id="id" value="${id}">
+ <div class="row">
+ <div class="col-sm-11">
+ <#input id="insurCom" name="保险公司名称"/>
+ <#input id="insurNum" name="保险号" />
+ <#input id="insurType" name="保险类型"/>
+ <#input id="insurCount" name="保险金额" type="number"/>
+ <#input id="insurEff" name="保险生效日期" type="text" />
+ <#input id="insurExp" name="保险到期日期" type="text" />
+ </div>
+ </div>
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="CarInsuranceInfo.addSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="CarInsuranceInfo.close()"/>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tCar/carInsuranceInfo.js"></script>
+<script>
+ laydate.render({
+ elem: '#insurEff'
+ });
+ laydate.render({
+ elem: '#insurExp'
+ });
+</script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCar/tCar.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCar/tCar.html
new file mode 100644
index 0000000..bdcfe5a
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCar/tCar.html
@@ -0,0 +1,90 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>车辆管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#TimeCon id="createTime" name="添加时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="id" name="车辆ID" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="brandName" name="车辆品牌" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="modelName" name="车辆类型" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="carColor" name="车辆颜色" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="serverStr" name="服务模式" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="carLicensePlate" name="车牌号" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="driverName" name="关联司机" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="companyName" name="所属分公司" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="franchiseeName" name="所属加盟商" />
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="TCar.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="TCar.resetSearch()" space="true"/>
+ </div>
+ <div class="col-sm-3">
+ <input type="file" name="file" style="width:0px;height:0px;" id="uploadEventFile" onchange="TCar.exportCar()">
+ </div>
+ </div>
+ <div class="hidden-xs" id="TCarTableToolbar" role="group">
+ @if(shiro.hasPermission("/tCar/add")){
+ <#button name="添加" icon="fa-plus" clickFun="TCar.openAddTCar()"/>
+ @}
+ @if(shiro.hasPermission("/tCar/update")){
+ <#button name="修改" icon="fa-edit" clickFun="TCar.openTCarDetail()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tCar/delete")){
+ <#button name="删除" icon="fa-remove" clickFun="TCar.delete()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tCar/inCar")){
+ <#button btnCss="info" name="下载模板" id="uploadModel" icon="fa fa-level-down" clickFun="TCar.uploadCarModel()" space="true"/>
+ <#button btnCss="danger" name="导入" id="uploadEventBtn" icon="fa fa-level-up" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tCar/outCar")){
+ <#button name="导出" icon="fa-remove" clickFun="TCar.outCar()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tCar/carInsurance")){
+ <#button name="车辆保险" icon="fa-remove" clickFun="TCar.carInsurance()" space="true"/>
+ @}
+ </div>
+ <!--<div style="width: 100%;overflow-y: auto">
+ <div style="width:1920px">
+ <#table id="TCarTable"/>
+ </div>
+ </div>-->
+ <#table id="TCarTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tCar/tCar.js"></script>
+<script>
+ laydate.render({
+ elem: '#createTime'
+ ,range: true
+ });
+</script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCar/tCar_add.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCar/tCar_add.html
new file mode 100644
index 0000000..04cedcf
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCar/tCar_add.html
@@ -0,0 +1,171 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="carInfoForm">
+ <input type="hidden" id="roleType" name="roleType" value="${roleType}">
+ <div class="row">
+ <div class="col-sm-11">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">所属机构：</label>
+ <div class="col-sm-9" style="display: flex;align-items: center;">
+ @if(roleType == 1){
+ <div class="radio radio-info radio-inline">
+ <input type="radio" id="companyType1" value="1" name="companyType" checked="" onclick="TCarInfoDlg.companyTypeClick(1)">
+ <label for="companyType1"> 平台车辆 </label>
+ </div>
+ <div class="radio radio-success radio-inline">
+ <input type="radio" id="companyTyp2" value="2" name="companyType" onclick="TCarInfoDlg.companyTypeClick(2)">
+ <label for="companyTyp2"> 加盟车辆 </label>
+ </div>
+ <!--<div id="companyDiv">-->
+ <select class="form-control companyDiv" id="oneId" onchange="TCarInfoDlg.oneChange(this)" style="width: 200px;display: none;">
+ <option value="">选择所属分公司</option>
+ @for(obj in companyList!){
+ <option value="${obj.id}">${obj.name}</option>
+ @}
+ </select>
+ <select class="form-control companyDiv" id="twoId" style="width: 200px;margin-left: 30px;display: none;">
+ <option value="">选择所属加盟商</option>
+ </select>
+ <!--</div>-->
+ @}else if(roleType == 2){
+ <span class="control-label">${objectName!}</span>
+ <select class="form-control" id="franchiseeId" style="width: 200px;margin-left: 30px;">
+ <option value="">选择所属加盟商</option>
+ @for(obj in franchiseeList!){
+ <option value="${obj.id}">${obj.name}</option>
+ @}
+ </select>
+ @}else if(roleType == 3){
+ <span class="control-label">${objectName!}</span>
+ @}
+ </div>
+ </div>
+ <div class="form-group">
+ <fieldset>
+ <label class="col-sm-3 control-label">服务模式：</label>
+ <div class="col-sm-9">
+ <div class="checkbox checkbox-success checkbox-inline">
+ <input type="checkbox" checked name="serverBox" id="serverBox2" value="2">
+ <label for="serverBox2"> 出租车 </label>
+ </div>
+ </div>
+ </fieldset>
+ </div>
+ <div class="form-group" style="display: none;" id="zcModelDiv">
+ <label class="col-sm-3 control-label">专车车型：</label>
+ <div class="col-sm-9">
+ <select class="form-control" id="zcModel" name="zcModel">
+ <option value="">选择车型</option>
+ @for(obj in zcModelList){
+ <option value="${obj.id}">${obj.name}</option>
+ @}
+ </select>
+ </div>
+ </div>
+ <div class="form-group" style="display: none;" id="kcModelDiv">
+ <label class="col-sm-3 control-label">跨城出行车型：</label>
+ <div class="col-sm-9">
+ <select class="form-control" id="kcModel" name="kcModel">
+ <option value="">选择车型</option>
+ @for(obj in kcModelList){
+ <option value="${obj.id}">${obj.name}</option>
+ @}
+ </select>
+ </div>
+ </div>
+
+ <#select id="carBrandId" name="车辆品牌：" onchange="TCarInfoDlg.brandChange(this)">
+ <option value="">选择车辆品牌</option>
+ @for(obj in brandList){
+ <option value="${obj.id}">${obj.name}</option>
+ @}
+ </#select>
+ <#select id="carModelId" name="车辆类型：">
+ <option value="">选择车辆类型</option>
+ </#select>
+ <#select id="carColor" name="车辆颜色：">
+ <option value="">选择车辆颜色</option>
+ <option value="蓝白色">蓝白色</option>
+ <option value="绿色">绿色</option>
+ </#select>
+ <#input id="carLicensePlate" name="车牌号" />
+ <#avatar id="carPhoto" name="车辆照片：" />
+ <#input id="drivingLicenseNumber" name="行驶证编号" />
+ <#avatar id="drivingLicensePhoto" name="行驶证照片：" />
+ <#input id="annualInspectionTime" name="年检到期时间" type="text"/>
+ <#input id="commercialInsuranceTime" name="商业保险到期时间" type="text"/>
+ <#input id="ownerName" name="车辆所有人" />
+ <#input id="engineId" name="发动机号" />
+ <#input id="VIN" name="车辆VIN码" />
+ <#input id="certifyDateA" name="车辆注册日期" type="text"/>
+ <#input id="fuelType" name="车辆燃料类型" />
+ <#input id="engineDisplace" name="发动机排量" />
+ <#input id="certificate" name="运输证字号" />
+ <#input id="transAgency" name="车辆运输证发证机构" />
+ <#input id="transArea" name="车辆经营区域" />
+ <#input id="transDateStart" name="车辆运输证有效期起" type="text"/>
+ <#input id="transDateStop" name="车辆运输证有效期止" type="text"/>
+ <#input id="certifyDateB" name="车辆初次登记日期" type="text"/>
+ <#select id="fixState" name="车辆维修状态：">
+ <option value="0">未检修</option>
+ <option value="1">已检修</option>
+ <option value="2">未知</option>
+ </#select>
+ <#input id="nextFixDate" name="车辆下次年检时间" type="text"/>
+ <#input id="checkState" name="车辆年度审核状态" />
+ <#input id="feePrintId" name="发票打印设备序列号" />
+ <#input id="GPSBrand" name="卫星定位装置品牌" />
+ <#input id="GPSModel" name="卫星定位装置型号" />
+ <#input id="GPSIMEI" name="卫星定位装置IMEI号" />
+ <#input id="GPSInstallDate" name="卫星定位装置安装时间" type="text"/>
+ <#input id="registerDate" name="车辆报备日期" type="text"/>
+ <#select id="commercialType" name="服务类型：">
+ <option value="1">网络预约出租车</option>
+ <option value="2">巡游出租汽车</option>
+ <option value="3">私人小客车合乘</option>
+ </#select>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TCarInfoDlg.addSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TCarInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tCar/tCar_info.js"></script>
+<script>
+ laydate.render({
+ elem: '#annualInspectionTime'
+ });
+ laydate.render({
+ elem: '#commercialInsuranceTime'
+ });
+ laydate.render({
+ elem: '#certifyDateA'
+ });
+ laydate.render({
+ elem: '#transDateStart'
+ });
+ laydate.render({
+ elem: '#transDateStop'
+ });
+ laydate.render({
+ elem: '#certifyDateB'
+ });
+ laydate.render({
+ elem: '#nextFixDate'
+ });
+ laydate.render({
+ elem: '#GPSInstallDate'
+ });
+ laydate.render({
+ elem: '#registerDate'
+ });
+</script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCar/tCar_edit.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCar/tCar_edit.html
new file mode 100644
index 0000000..ca41b48
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCar/tCar_edit.html
@@ -0,0 +1,190 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="carInfoForm">
+ <input type="hidden" id="id" name="id" value="${item.id}">
+ <input type="hidden" id="roleType" name="roleType" value="${roleType}">
+ <div class="row">
+ <div class="col-sm-11">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">所属机构：</label>
+ <div class="col-sm-9" style="display: flex;align-items: center;">
+ @if(roleType == 1){
+ <div class="radio radio-info radio-inline">
+ <input type="radio" id="companyType1" value="1" name="companyType" ${1 == companyType ? 'checked=checked' : ''} onclick="TCarInfoDlg.companyTypeClick(1)">
+ <label for="companyType1"> 平台车辆 </label>
+ </div>
+ <div class="radio radio-success radio-inline">
+ <input type="radio" id="companyTyp2" value="2" name="companyType" ${2 == companyType ? 'checked=checked' : ''} onclick="TCarInfoDlg.companyTypeClick(2)">
+ <label for="companyTyp2"> 加盟车辆 </label>
+ </div>
+ <select class="form-control companyDiv" id="oneId" onchange="TCarInfoDlg.oneChange(this)" style="width: 200px">
+ <option value="">选择所属分公司</option>
+ @for(obj in companyList!){
+ <option value="${obj.id}" ${obj.id == item.companyId ? 'selected=selected' : ''}>${obj.name}</option>
+ @}
+ </select>
+ <select class="form-control companyDiv" id="twoId" style="width: 200px;margin-left: 30px;">
+ <option value="">选择所属加盟商</option>
+ @for(obj in franchiseeList!){
+ <option value="${obj.id}" ${obj.id == item.franchiseeId ? 'selected=selected' : ''}>${obj.name}</option>
+ @}
+ </select>
+ @}else if(roleType == 2){
+ <span class="control-label">${objectName!}</span>
+ <select class="form-control" id="franchiseeId" style="width: 200px;margin-left: 30px;">
+ <option value="">选择所属加盟商</option>
+ @for(obj in franchiseeList!){
+ <option value="${obj.id}" ${obj.id == item.franchiseeId ? 'selected=selected' : ''}>${obj.name}</option>
+ @}
+ </select>
+ @}else if(roleType == 3){
+ <span class="control-label">${objectName!}</span>
+ @}
+ </div>
+ </div>
+ <div class="form-group">
+ <fieldset>
+ <label class="col-sm-3 control-label">服务模式：</label>
+ <div class="col-sm-9">
+ <div class="checkbox checkbox-success checkbox-inline">
+ <input type="checkbox" name="serverBox" id="serverBox2" value="2" ${2 == two ? 'checked=checked' : ''}>
+ <label for="serverBox2"> 出租车 </label>
+ </div>
+ </div>
+ </fieldset>
+ </div>
+ <div class="form-group" id="zcModelDiv">
+ <label class="col-sm-3 control-label">专车车型：</label>
+ <div class="col-sm-9">
+ <select class="form-control" id="zcModel" name="zcModel">
+ <option value="">选择车型</option>
+ @for(obj in zcModelList){
+ <option value="${obj.id}" ${obj.id == zcModel ? 'selected=selected' : ''}>${obj.name}</option>
+ @}
+ </select>
+ </div>
+ </div>
+ <div class="form-group" id="kcModelDiv">
+ <label class="col-sm-3 control-label">跨城出行车型：</label>
+ <div class="col-sm-9">
+ <select class="form-control" id="kcModel" name="kcModel">
+ <option value="">选择车型</option>
+ @for(obj in kcModelList){
+ <option value="${obj.id}" ${obj.id == kcModel ? 'selected=selected' : ''}>${obj.name}</option>
+ @}
+ </select>
+ </div>
+ </div>
+ <#select id="carBrandId" name="车辆品牌：" onchange="TCarInfoDlg.brandChange(this)">
+ <option value="">选择车辆品牌</option>
+ @for(obj in brandList){
+ <option value="${obj.id}" ${obj.id == item.carBrandId ? 'selected=selected' : ''}>${obj.name}</option>
+ @}
+ </#select>
+ <#select id="carModelId" name="车辆类型：">
+ <option value="">选择车辆类型</option>
+ @for(obj in modelList){
+ <option value="${obj.id}" ${obj.id == item.carModelId ? 'selected=selected' : ''}>${obj.name}</option>
+ @}
+ </#select>
+ <#select id="carColor" name="车辆颜色：">
+ <option value="">选择车辆颜色</option>
+
+ <option value="蓝白色" ${'蓝白色' == item.carColor ? 'selected=selected' : ''}>蓝白色</option>
+ <option value="绿色" ${'绿色' == item.carColor ? 'selected=selected' : ''}>绿色</option>
+ </#select>
+ <#input id="carLicensePlate" name="车牌号" value="${item.carLicensePlate}"/>
+ <#avatar id="carPhoto" name="车辆照片：" avatarImg="${item.carPhoto}"/>
+ <#input id="drivingLicenseNumber" name="行驶证编号" value="${item.drivingLicenseNumber}"/>
+ <#avatar id="drivingLicensePhoto" name="行驶证照片：" avatarImg="${item.drivingLicensePhoto}"/>
+ <#input id="annualInspectionTime" name="年检到期时间" type="text" value="${item.annualInspectionTime}"/>
+ <#input id="commercialInsuranceTime" name="商业保险到期时间" type="text" value="${item.commercialInsuranceTime}"/>
+ <#input id="ownerName" name="车辆所有人" value="${item.ownerName}"/>
+ <#input id="engineId" name="发动机号" value="${item.engineId}"/>
+ <#input id="VIN" name="车辆VIN码" value="${item.VIN}"/>
+ <#input id="certifyDateA" name="车辆注册日期" type="text" value="${item.certifyDateA}"/>
+ <#input id="fuelType" name="车辆燃料类型" value="${item.fuelType}"/>
+ <#input id="engineDisplace" name="发动机排量" value="${item.engineDisplace}"/>
+ <#input id="certificate" name="运输证字号" value="${item.certificate}"/>
+ <#input id="transAgency" name="车辆运输证发证机构" value="${item.transAgency}"/>
+ <#input id="transArea" name="车辆经营区域" value="${item.transArea}"/>
+ <#input id="transDateStart" name="车辆运输证有效期起" type="text" value="${item.transDateStart}"/>
+ <#input id="transDateStop" name="车辆运输证有效期止" type="text" value="${item.transDateStop}"/>
+ <#input id="certifyDateB" name="车辆初次登记日期" type="text" value="${item.certifyDateB}"/>
+ <#select id="fixState" name="车辆维修状态：">
+ <option value="0" ${'0' == item.fixState ? 'selected=selected' : ''}>未检修</option>
+ <option value="1" ${'1' == item.fixState ? 'selected=selected' : ''}>已检修</option>
+ <option value="2" ${'2' == item.fixState ? 'selected=selected' : ''}>未知</option>
+ </#select>
+ <#input id="nextFixDate" name="车辆下次年检时间" type="text" value="${item.nextFixDate}"/>
+ <#input id="checkState" name="车辆年度审核状态" value="${item.checkState}"/>
+ <#input id="feePrintId" name="发票打印设备序列号" value="${item.feePrintId}"/>
+ <#input id="GPSBrand" name="卫星定位装置品牌" value="${item.GPSBrand}"/>
+ <#input id="GPSModel" name="卫星定位装置型号" value="${item.GPSModel}"/>
+ <#input id="GPSIMEI" name="卫星定位装置IMEI号" value="${item.GPSIMEI}"/>
+ <#input id="GPSInstallDate" name="卫星定位装置安装时间" type="text" value="${item.GPSInstallDate}"/>
+ <#input id="registerDate" name="车辆报备日期" type="text" value="${item.registerDate}"/>
+ <#select id="commercialType" name="服务类型：">
+ <option value="1" ${'1' == item.commercialType ? 'selected=selected' : ''}>网络预约出租车</option>
+ <option value="2" ${'2' == item.commercialType ? 'selected=selected' : ''}>巡游出租汽车</option>
+ <option value="3" ${'3' == item.commercialType ? 'selected=selected' : ''}>私人小客车合乘</option>
+ </#select>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TCarInfoDlg.editSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TCarInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tCar/tCar_info.js"></script>
+<script>
+ laydate.render({
+ elem: '#annualInspectionTime'
+ });
+ laydate.render({
+ elem: '#commercialInsuranceTime'
+ });
+ laydate.render({
+ elem: '#certifyDateA'
+ });
+ laydate.render({
+ elem: '#transDateStart'
+ });
+ laydate.render({
+ elem: '#transDateStop'
+ });
+ laydate.render({
+ elem: '#certifyDateB'
+ });
+ laydate.render({
+ elem: '#nextFixDate'
+ });
+ laydate.render({
+ elem: '#GPSInstallDate'
+ });
+ laydate.render({
+ elem: '#registerDate'
+ });
+</script>
+<script type="application/javascript">
+ $(function() {
+ var companyType = $("input[name='companyType']:checked").val();
+ if (1 == companyType){
+ $(".companyDiv").hide();
+ } else if (2 == companyType){
+ $(".companyDiv").show();
+ }
+
+ TCarInfoDlg.zcServerClick();
+ TCarInfoDlg.kcServerClick();
+
+ });
+</script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCarAudit/tCarAudit.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCarAudit/tCarAudit.html
new file mode 100644
index 0000000..77d8003
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCarAudit/tCarAudit.html
@@ -0,0 +1,89 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>车辆管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#TimeCon id="createTime" name="添加时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="id" name="车辆ID" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="brandName" name="车辆品牌" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="modelName" name="车辆类型" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="carColor" name="车辆颜色" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="serverStr" name="服务模式" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="carLicensePlate" name="车牌号" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="driverName" name="关联司机" />
+ </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="audit">
+ <option value="">全部</option>
+ <option value="0">待审核</option>
+ <option value="1">审核通过</option>
+ <option value="2">审核拒绝</option>
+ </select>
+ </div>
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="companyName" name="所属分公司" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="franchiseeName" name="所属加盟商" />
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="TCar.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="TCar.resetSearch()" space="true"/>
+ </div>
+ <div class="col-sm-3">
+ <input type="file" name="file" style="width:0px;height:0px;" id="uploadEventFile" onchange="TCar.exportCar()">
+ </div>
+ </div>
+ <div class="hidden-xs" id="TCarTableToolbar" role="group">
+ @if(shiro.hasPermission("/tCarAudit/audit")){
+ <#button name="审核" icon="fa-edit" clickFun="TCar.audit()" space="true"/>
+ @}
+ </div>
+ <!--<div style="width: 100%;overflow-y: auto">
+ <div style="width:1920px">
+ <#table id="TCarTable"/>
+ </div>
+ </div>-->
+ <#table id="TCarTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tCarAudit/tCarAudit.js"></script>
+<script>
+ laydate.render({
+ elem: '#createTime'
+ ,range: true
+ });
+</script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCarBrand/tCarBrand.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCarBrand/tCarBrand.html
new file mode 100644
index 0000000..9355e97
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCarBrand/tCarBrand.html
@@ -0,0 +1,48 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>车辆品牌管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#TimeCon id="createTime" name="添加时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="name" name="名称" />
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="TCarBrand.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="TCarBrand.resetSearch()" space="true"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="TCarBrandTableToolbar" role="group">
+ @if(shiro.hasPermission("/tCarBrand/add")){
+ <#button name="添加" icon="fa-plus" clickFun="TCarBrand.openAddTCarBrand()"/>
+ @}
+ @if(shiro.hasPermission("/tCarBrand/update")){
+ <#button name="编辑" icon="fa-edit" clickFun="TCarBrand.openTCarBrandDetail()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tCarBrand/delete")){
+ <#button name="删除" icon="fa-remove" clickFun="TCarBrand.delete()" space="true"/>
+ @}
+ </div>
+ <#table id="TCarBrandTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tCarBrand/tCarBrand.js"></script>
+<script>
+ laydate.render({
+ elem: '#createTime'
+ ,range: true
+ });
+</script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCarBrand/tCarBrand_add.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCarBrand/tCarBrand_add.html
new file mode 100644
index 0000000..308916e
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCarBrand/tCarBrand_add.html
@@ -0,0 +1,30 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="carBrandInfoForm">
+
+ <div class="row">
+ <div class="col-sm-11">
+ <#input id="name" name="品牌名称"/>
+ <#avatar id="imgUrl" name="品牌图标：" />
+ <div class="form-group">
+ <label class="col-sm-3 control-label">备注：</label>
+ <div class="col-sm-9">
+ <textarea type="text/plain" class="form-control" name="remark" id="remark" style="width:100%;height:150px;"></textarea>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TCarBrandInfoDlg.addSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TCarBrandInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tCarBrand/tCarBrand_info.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCarBrand/tCarBrand_edit.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCarBrand/tCarBrand_edit.html
new file mode 100644
index 0000000..7904907
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCarBrand/tCarBrand_edit.html
@@ -0,0 +1,30 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="carBrandInfoForm">
+ <input type="hidden" id="id" name="id" value="${item.id}">
+ <div class="row">
+ <div class="col-sm-11">
+ <#input id="name" name="名称" value="${item.name}"/>
+ <#avatar id="imgUrl" name="品牌图标：" avatarImg="${item.imgUrl}"/>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">备注：</label>
+ <div class="col-sm-9">
+ <textarea type="text/plain" class="form-control" name="remark" id="remark" style="width:100%;height:150px;">${item.remark}</textarea>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TCarBrandInfoDlg.editSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TCarBrandInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tCarBrand/tCarBrand_info.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCarModel/tCarModel.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCarModel/tCarModel.html
new file mode 100644
index 0000000..4158d58
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCarModel/tCarModel.html
@@ -0,0 +1,48 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>车辆类型管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#TimeCon id="createTime" name="添加时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="name" name="名称" />
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="TCarModel.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="TCarModel.resetSearch()" space="true"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="TCarModelTableToolbar" role="group">
+ @if(shiro.hasPermission("/tCarModel/add")){
+ <#button name="添加" icon="fa-plus" clickFun="TCarModel.openAddTCarModel()"/>
+ @}
+ @if(shiro.hasPermission("/tCarModel/update")){
+ <#button name="编辑" icon="fa-edit" clickFun="TCarModel.openTCarModelDetail()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tCarModel/delete")){
+ <#button name="删除" icon="fa-remove" clickFun="TCarModel.delete()" space="true"/>
+ @}
+ </div>
+ <#table id="TCarModelTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tCarModel/tCarModel.js"></script>
+<script>
+ laydate.render({
+ elem: '#createTime'
+ ,range: true
+ });
+</script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCarModel/tCarModel_add.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCarModel/tCarModel_add.html
new file mode 100644
index 0000000..57105bc
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCarModel/tCarModel_add.html
@@ -0,0 +1,38 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="carModelInfoForm">
+ <div class="row">
+ <div class="col-sm-11">
+ <#input id="name" name="类型名称" />
+ <#select id="seat" name="座位数：">
+ <option value="5">5座</option>
+ <option value="7">7座</option>
+ </#select>
+ <#select id="brandId" name="所属车辆品牌：" >
+ <option value="">选择所属车辆品牌</option>
+ @for(obj in brandList){
+ <option value="${obj.id}">${obj.name}</option>
+ @}
+ </#select>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">备注：</label>
+ <div class="col-sm-9">
+ <textarea type="text/plain" class="form-control" name="remark" id="remark" style="width:100%;height:150px;"></textarea>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TCarModelInfoDlg.addSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TCarModelInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tCarModel/tCarModel_info.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCarModel/tCarModel_edit.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCarModel/tCarModel_edit.html
new file mode 100644
index 0000000..d6c7db8
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCarModel/tCarModel_edit.html
@@ -0,0 +1,39 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="carModelInfoForm">
+ <input type="hidden" id="id" name="id" value="${item.id}">
+ <div class="row">
+ <div class="col-sm-11">
+ <#input id="name" name="类型名称" value="${item.name}"/>
+ <#select id="seat" name="座位数：">
+ <option value="5" ${5 == item.seat ? 'selected=selected' : ''}>5座</option>
+ <option value="7" ${7 == item.seat ? 'selected=selected' : ''}>7座</option>
+ </#select>
+ <#select id="brandId" name="所属车辆品牌：" >
+ <option value="">选择所属车辆品牌</option>
+ @for(obj in brandList){
+ <option value="${obj.id}" ${obj.id == item.brandId ? 'selected=selected' : ''}>${obj.name}</option>
+ @}
+ </#select>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">备注：</label>
+ <div class="col-sm-9">
+ <textarea type="text/plain" class="form-control" name="remark" id="remark" style="width:100%;height:150px;">${item.remark}</textarea>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TCarModelInfoDlg.editSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TCarModelInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tCarModel/tCarModel_info.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/franchisee.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/franchisee.html
new file mode 100644
index 0000000..ccfe69f
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/franchisee.html
@@ -0,0 +1,70 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>加盟商管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#TimeCon id="insertTime" name="添加时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="name" name="加盟商名称" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="account" name="账号" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="principalName" name="联系人" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="principalPhone" name="联系电话" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="serviceStr" name="经营业务" />
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="state" name="状态" >
+ <option value="">全部</option>
+ <option value="2">正常</option>
+ <option value="1">禁用</option>
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="Franchisee.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="Franchisee.resetSearch()" space="true"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="FranchiseeTableToolbar" role="group">
+ @if(shiro.hasPermission("/tCompany/addFranchisee")){
+ <#button name="添加" icon="fa-plus" clickFun="Franchisee.addFranchisee()"/>
+ @}
+ @if(shiro.hasPermission("/tCompany/updateFranchisee")){
+ <#button name="修改" icon="fa-edit" clickFun="Franchisee.updateFranchisee()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tCompany/deleteFranchisee")){
+ <#button name="删除" icon="fa-remove" clickFun="Franchisee.deleteFranchisee()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tCompany/detailFranchisee")){
+ <#button name="查看详情" icon="fa-remove" clickFun="Franchisee.detailFranchisee()" space="true"/>
+ @}
+ </div>
+ <#table id="FranchiseeTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tCompany/franchisee.js"></script>
+<script>
+ laydate.render({
+ elem: '#insertTime'
+ ,range: true
+ });
+</script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/platformEdit.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/platformEdit.html
new file mode 100644
index 0000000..9ecd84b
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/platformEdit.html
@@ -0,0 +1,194 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="companyInfoForm">
+ <input type="hidden" id="id" name="id" value="${item.id}">
+ <input type="hidden" id="userId" name="userId" value="${user.id}">
+ <div class="row">
+ <div class="col-sm-6 b-r">
+ <#input id="name" name="分公司名称" value="${item.name}" />
+ <#input id="code" name="分公司代码" value="${item.code}" />
+ <#input id="principalName" name="分公司负责人" value="${item.principalName}" />
+ <#input id="adminName" name="分公司管理人" value="${item.adminName}" />
+ <#input id="documentAddress" name="行政文书送达地址" value="${item.documentAddress}" />
+ <#input id="setupTime" name="服务机构设立日期" value="${item.setupTime}" />
+ <#input id="licenseNumber" name="网络预约出租汽<br>车经营许可证号" value="${item.licenseNumber}" />
+ <#input id="addressCode" name="注册地行政区域划<br>分代码" value="${item.addressCode}" />
+ <#input id="licenseTime" name="经营许可证初次发证日期" value="${item.licenseTime}" />
+ <#input id="licenseEndTime" name="经营许可证有效期止" value="${item.licenseEndTime}" />
+ <#input id="regCapital" name="注册资本" value="${item.regCapital}" />
+ <#input id="driverNum" name="注册网络预约车驾驶员数量" value="${item.driverNum}" />
+ <#input id="legalId" name="法人代表身份证号" value="${item.legalId}" />
+ <#avatar id="idCardPositive" name="法定代表人身份<br>证照片(正面)：" avatarImg="${item.idCardPositive}"/>
+ <#input id="contactAddress" name="通信地址" value="${item.contactAddress}"/>
+ </div>
+
+ <div class="col-sm-6">
+ <#input id="scopeCode" name="分公司区划代码" value="${item.scopeCode}"/>
+ <#input id="detailAddress" name="分公司具体地址" value="${item.detailAddress}"/>
+ <#input id="principalPhone" name="负责人电话" value="${item.principalPhone}"/>
+ <#input id="adminPhone" name="管理员电话" value="${item.adminPhone}"/>
+ <#input id="urgentPhoen" name="紧急联系电话" value="${item.urgentPhoen}"/>
+ <#input id="identifier" name="统一社会信用代码" value="${item.identifier}"/>
+ <#input id="serviceScope" name="经营区域" value="${item.serviceScope}"/>
+ <#input id="licensingAgency" name="经营许可证发证机构" value="${item.licensingAgency}"/>
+ <#input id="licenseStartTime" name="经营许可证有效期起" value="${item.licenseStartTime}"/>
+ <#input id="economicType" name="经营业户经济类型" value="${item.economicType}"/>
+ <#input id="carNum" name="注册网络预约出租车<br>车辆数" value="${item.carNum}"/>
+ <#input id="legalName" name="法人代表姓名" value="${item.legalName}"/>
+ <#input id="legalPhone" name="法人代表电话" value="${item.legalPhone}"/>
+ <#avatar id="idCardReverse" name="法定代表人身份<br>证照片(反面)：" avatarImg="${item.idCardReverse}"/>
+ <#input id="businessScope" name="经营范围" value="${item.businessScope}"/>
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-sm-12">
+ <div class="form-group">
+ <label class="col-sm-2 control-label">经营业务：</label>
+ <div class="col-sm-10">
+ <fieldset>
+ <div class="checkbox checkbox-primary">
+ <input name="checkbox" id="checkbox2" type="checkbox" value="2" ${1 == item.isTaxi ? 'checked=checked' : ''} onclick="TCompanyInfoDlg.checkbox2()">
+ <label for="checkbox2">
+ 出租车
+ </label>
+
+ </div>
+ </fieldset>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row">
+ <div class="col-sm-12">
+ <div class="form-group">
+ <label class="col-sm-2 control-label">经营区域：</label>
+ <div class="col-sm-2">
+ <select class="form-control" id="province" onchange="TCompanyInfoDlg.provinceChange(this)">
+ <option value="">选择省</option>
+ @for(obj in provinceList){
+ <option value="${obj.code}">${obj.name}</option>
+ @}
+ </select>
+ </div>
+ <div class="col-sm-2">
+ <select class="form-control" id="city" onchange="TCompanyInfoDlg.cityChage(this)">
+ <option value="">选择市</option>
+ </select>
+ </div>
+ <div class="col-sm-2">
+ <select class="form-control" id="area">
+ <option value="">选择区</option>
+ </select>
+ </div>
+ <div class="col-sm-1">
+ <#button btnCss="info" name="添加" id="ensure" icon="fa-check" clickFun="TCompanyInfoDlg.addScope()"/>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">添加区域</label>
+ <div class="col-sm-9">
+ <div style="height: 200px; border: 1px solid #e5e6e7;overflow-y: auto;">
+ <table class="table table-striped table-bordered table-hover table-condensed">
+ <thead>
+ <tr>
+ <th style="width: 300px;">区域</th>
+ <th style="width: 200px;">操作</th>
+ </tr>
+ </thead>
+ <tbody id="conn">
+ @for(obj in scopeList){
+ <tr class="timeClass">
+ <td><input type="hidden" id="recordId" name="recordId" value="${obj.id}">
+ <input type="hidden" id="provinceCode" name="provinceCode" value="${obj.provinceCode}">
+ <input type="hidden" id="cityCode" name="cityCode" value="${obj.cityCode}">
+ <input type="hidden" id="areaCode" name="areaCode" value="${obj.areaCode}">${obj.value}</td>
+ <td><button onclick="deleteSub(this)">移除</button></td>
+ </tr>
+ @}
+ </tbody>
+ </table>
+ </div>
+ </div>
+ </div>
+
+
+ <!-- <div class="form-group">
+ <label class="col-sm-2 control-label">限登录MAC地址：</label>
+ <div class="col-sm-9">
+ <input type="text" class="form-control" id="mac" name="mac" value="${item.mac}">
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">登录账号：</label>
+ <div class="col-sm-9">
+ <input type="text" class="form-control" id="account" name="account" value="${user.account}">
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">登录密码：</label>
+ <div class="col-sm-9">
+ <input type="password" class="form-control" id="password" name="password" >
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">确认密码：</label>
+ <div class="col-sm-9">
+ <input type="password" class="form-control" id="rePassword" name="rePassword" >
+ </div>
+ </div>-->
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TCompanyInfoDlg.editSubmit()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tCompany/tCompany_info.js"></script>
+<script type="application/javascript">
+ laydate.render({
+ elem: '#setupTime'
+ });
+ laydate.render({
+ elem: '#licenseTime'
+ });
+ laydate.render({
+ elem: '#licenseStartTime'
+ });
+ laydate.render({
+ elem: '#licenseEndTime'
+ });
+
+ $(function() {
+ TCompanyInfoDlg.checkbox1();
+ TCompanyInfoDlg.checkbox2();
+ TCompanyInfoDlg.checkbox3();
+ TCompanyInfoDlg.checkbox4();
+ TCompanyInfoDlg.checkbox5();
+ TCompanyInfoDlg.checkbox6();
+
+ var zc = $("input[name='zc']:checked").val();
+ var cz = $("input[name='cz']:checked").val();
+ var tcx = $("input[name='tcx']:checked").val();
+ var kcx = $("input[name='kcx']:checked").val();
+ if (zc == "" || zc == null || zc == undefined){
+ $("#zc1").attr("checked","checked")
+ }
+ if (cz == "" || cz == null || cz == undefined){
+ $("#cz1").attr("checked","checked")
+ }
+ if (tcx == "" || tcx == null || tcx == undefined){
+ $("#tcx1").attr("checked","checked")
+ }
+ if (kcx == "" || kcx == null || kcx == undefined){
+ $("#kcx1").attr("checked","checked")
+ }
+ });
+</script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany.html
new file mode 100644
index 0000000..677cd52
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany.html
@@ -0,0 +1,73 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>分公司管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#TimeCon id="insertTime" name="添加时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="name" name="分公司名称" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="principalName" name="负责人名称" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="principalPhone" name="负责人电话" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="adminName" name="管理人名称" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="adminPhone" name="管理人电话" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="serviceStr" name="经营业务" />
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="state" name="状态" >
+ <option value="">全部</option>
+ <option value="2">正常</option>
+ <option value="1">禁用</option>
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="TCompany.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="TCompany.resetSearch()" space="true"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="TCompanyTableToolbar" role="group">
+ @if(shiro.hasPermission("/tCompany/add")){
+ <#button name="添加" icon="fa-plus" clickFun="TCompany.openAddTCompany()"/>
+ @}
+ @if(shiro.hasPermission("/tCompany/update")){
+ <#button name="修改" icon="fa-edit" clickFun="TCompany.openTCompanyDetail()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tCompany/delete")){
+ <#button name="删除" icon="fa-remove" clickFun="TCompany.delete()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tCompany/detail")){
+ <#button name="查看详情" icon="fa-remove" clickFun="TCompany.detail()" space="true"/>
+ @}
+ </div>
+ <#table id="TCompanyTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tCompany/tCompany.js"></script>
+<script>
+ laydate.render({
+ elem: '#insertTime'
+ ,range: true
+ });
+</script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_add.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_add.html
new file mode 100644
index 0000000..13418ef
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_add.html
@@ -0,0 +1,199 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="companyInfoForm">
+
+ <div class="row">
+ <div class="col-sm-6 b-r">
+ <#input id="name" name="分公司名称"/>
+ <#input id="code" name="分公司代码"/>
+ <#input id="principalName" name="分公司负责人" />
+ <#input id="adminName" name="分公司管理人"/>
+ <#input id="documentAddress" name="行政文书送达地址"/>
+ <#input id="setupTime" name="服务机构设立日期"/>
+ <#input id="licenseNumber" name="网络预约出租汽<br>车经营许可证号"/>
+ <#input id="addressCode" name="注册地行政区域划<br>分代码"/>
+ <#input id="licenseTime" name="经营许可证初次发证日期" />
+ <#input id="licenseEndTime" name="经营许可证有效期止" />
+ <#input id="regCapital" name="注册资本"/>
+ <#input id="driverNum" name="注册网络预约车驾驶员数量" />
+ <#input id="legalId" name="法人代表身份证号"/>
+ <#avatar id="idCardPositive" name="法定代表人身份<br>证照片(正面)：" />
+ <#input id="contactAddress" name="通信地址"/>
+ </div>
+
+ <div class="col-sm-6">
+ <#input id="scopeCode" name="分公司区划代码"/>
+ <#input id="detailAddress" name="分公司具体地址" />
+ <#input id="principalPhone" name="负责人电话" />
+ <#input id="adminPhone" name="管理员电话" />
+ <#input id="urgentPhoen" name="紧急联系电话" />
+ <#input id="identifier" name="统一社会信用代码" />
+ <#input id="serviceScope" name="经营区域" />
+ <#input id="licensingAgency" name="经营许可证发证机构"/>
+ <#input id="licenseStartTime" name="经营许可证有效期起"/>
+ <#input id="economicType" name="经营业户经济类型"/>
+ <#input id="carNum" name="注册网络预约出租车<br>车辆数"/>
+ <#input id="legalName" name="法人代表姓名" />
+ <#input id="legalPhone" name="法人代表电话" />
+ <#avatar id="idCardReverse" name="法定代表人身份<br>证照片(反面)：" />
+ <#input id="businessScope" name="经营范围" />
+
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-sm-12">
+ <div class="form-group">
+ <label class="col-sm-2 control-label">经营业务：</label>
+ <div class="col-sm-10">
+ <fieldset>
+ <div class="checkbox checkbox-primary">
+ <input name="checkbox" id="checkbox2" type="checkbox" value="2" >
+ <label for="checkbox2">
+ 出租车
+ </label>
+<!-- <fieldset>-->
+<!-- <div class="row" style="display: none;" id="czDiv">-->
+<!-- <div class="col-sm-6">-->
+<!-- <div class="checkbox checkbox-circle">-->
+<!-- <input type="radio" name="cz" id="cz1" value="1" checked="">-->
+<!-- <label for="cz1">-->
+<!-- <div style="position: relative;top: -8px;">-->
+<!-- <span>按比例抽成,每笔订单抽取</span>-->
+<!-- <input style="width: 50%;display: inline-block;" type="text" class="form-control" id="czPercent" name="czPercent">-->
+<!-- <span>%</span>-->
+<!-- </div>-->
+<!-- </label>-->
+<!-- </div>-->
+<!-- <div class="checkbox checkbox-circle">-->
+<!-- <input type="radio" name="cz" id="cz2" value="2">-->
+<!-- <label for="cz2">-->
+<!-- <div style="position: relative;top: -8px;">-->
+<!-- <span>按固定金额抽成,每笔订单抽取</span>-->
+<!-- <input style="width: 50%;display: inline-block;" type="text" class="form-control" id="czMoney" name="czMoney">-->
+<!-- <span>元</span>-->
+<!-- </div>-->
+<!-- </label>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- </fieldset>-->
+ </div>
+ </fieldset>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row">
+ <div class="col-sm-12">
+ <div class="form-group">
+ <label class="col-sm-2 control-label">经营区域：</label>
+ <div class="col-sm-2">
+ <select class="form-control" id="province" onchange="TCompanyInfoDlg.provinceChange(this)">
+ <option value="">选择省</option>
+ @for(obj in provinceList){
+ <option value="${obj.code}">${obj.name}</option>
+ @}
+ </select>
+ </div>
+ <div class="col-sm-2">
+ <select class="form-control" id="city" onchange="TCompanyInfoDlg.cityChage(this)">
+ <option value="">选择市</option>
+ </select>
+ </div>
+ <div class="col-sm-2">
+ <select class="form-control" id="area">
+ <option value="">选择区</option>
+ </select>
+ </div>
+ <div class="col-sm-1">
+ <#button btnCss="info" name="添加" id="ensure" icon="fa-check" clickFun="TCompanyInfoDlg.addScope()"/>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">添加区域</label>
+ <div class="col-sm-9">
+ <div style="height: 200px; border: 1px solid #e5e6e7;overflow-y: auto;">
+ <table class="table table-striped table-bordered table-hover table-condensed">
+ <thead>
+ <tr>
+ <th style="width: 300px;">区域</th>
+ <th style="width: 200px;">操作</th>
+ </tr>
+ </thead>
+ <tbody id="conn">
+
+ </tbody>
+ </table>
+ </div>
+ </div>
+ </div>
+
+<!-- <div class="form-group">-->
+<!-- <label class="col-sm-2 control-label">是否需要摆渡车：</label>-->
+<!-- <div class="col-sm-9" style="display: flex;align-items: center;">-->
+<!-- <div class="radio radio-info radio-inline">-->
+<!-- <input type="radio" id="isNeedFerry1" value="1" name="isNeedFerry" checked="" >-->
+<!-- <label for="isNeedFerry1"> 是 </label>-->
+<!-- </div>-->
+<!-- <div class="radio radio-success radio-inline">-->
+<!-- <input type="radio" id="isNeedFerry2" value="2" name="isNeedFerry" >-->
+<!-- <label for="isNeedFerry2"> 否 </label>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- </div>-->
+ <div class="form-group">
+ <label class="col-sm-2 control-label">限登录MAC地址：</label>
+ <div class="col-sm-9">
+ <input type="text" class="form-control" id="mac" name="mac" >
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">登录账号：</label>
+ <div class="col-sm-9">
+ <input type="text" class="form-control" id="account" name="account" >
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">登录密码：</label>
+ <div class="col-sm-9">
+ <input type="password" class="form-control" id="password" name="password" >
+ </div>
+ </div>
+<!-- <div class="form-group">-->
+<!-- <label class="col-sm-2 control-label">确认密码：</label>-->
+<!-- <div class="col-sm-9">-->
+<!-- <input type="password" class="form-control" id="rePassword" name="rePassword" >-->
+<!-- </div>-->
+<!-- </div>-->
+ </div>
+ </div>
+
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TCompanyInfoDlg.addSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TCompanyInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tCompany/tCompany_info.js"></script>
+<script>
+ laydate.render({
+ elem: '#setupTime'
+ });
+ laydate.render({
+ elem: '#licenseTime'
+ });
+ laydate.render({
+ elem: '#licenseStartTime'
+ });
+ laydate.render({
+ elem: '#licenseEndTime'
+ });
+</script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_addFranchisee.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_addFranchisee.html
new file mode 100644
index 0000000..1390edc
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_addFranchisee.html
@@ -0,0 +1,71 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="franchiseeInfoForm">
+
+ <div class="row">
+ <div class="col-sm-10">
+ @if(roleType == 1){
+ <#select id="superiorId" name="所属分公司：" onchange="TOpenCityInfoDlg.provinceChange()">
+ <option value="">选择所属分公司</option>
+ @for(obj in companyList){
+ <option value="${obj.id}">${obj.name}</option>
+ @}
+ </#select>
+ @}else if(roleType == 2){
+ <#label id="companyName" name="所属分公司" value="${company.name}"/>
+ @}
+ <#input id="name" name="加盟商名称"/>
+ <#input id="detailAddress" name="加盟商地址"/>
+
+ <#input id="principalName" name="联系人" />
+ <#input id="principalPhone" name="联系电话" />
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-sm-10">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">经营业务：</label>
+ <div class="col-sm-9">
+ <fieldset>
+ <div class="checkbox checkbox-primary">
+ <input name="checkbox" id="checkbox2" type="checkbox" value="2">
+ <label for="checkbox2">
+ 出租车
+ </label>
+
+ </div>
+ </fieldset>
+ </div>
+ </div>
+
+ <div class="form-group">
+ <label class="col-sm-3 control-label">登录账号：</label>
+ <div class="col-sm-9">
+ <input type="text" class="form-control" id="account" name="account" >
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">登录密码：</label>
+ <div class="col-sm-9">
+ <input type="password" class="form-control" id="password" name="password" >
+ </div>
+ </div>
+
+ </div>
+ </div>
+
+
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="FranchiseeInfoDlg.addFranchisee()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="FranchiseeInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tCompany/franchisee_info.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_detail.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_detail.html
new file mode 100644
index 0000000..420d0a8
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_detail.html
@@ -0,0 +1,180 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="companyInfoForm">
+ <input type="hidden" id="id" name="id" value="${item.id}">
+ <input type="hidden" id="userId" name="userId" value="${user.id}">
+ <div class="row">
+ <div class="col-sm-6 b-r">
+ <#label id="account" name="登录账号" value="${user.account}"/>
+ <#label id="name" name="分公司名称" value="${item.name}"/>
+ <#label id="code" name="分公司代码" value="${item.code}"/>
+ <#label id="principalName" name="分公司负责人" value="${item.principalName}"/>
+ <#label id="adminName" name="分公司管理人" value="${item.adminName}"/>
+ <#label id="documentAddress" name="行政文书送达地址" value="${item.documentAddress}"/>
+ <#label id="setupTime" name="服务机构设立日期" value="${item.setupTime}"/>
+ <#label id="licenseNumber" name="网络预约出租汽<br>车经营许可证号" value="${item.licenseNumber}"/>
+ <#label id="addressCode" name="注册地行政区域划<br>分代码" value="${item.addressCode}"/>
+ <#label id="licenseTime" name="经营许可证初次发证日期" value="${item.licenseTime}"/>
+ <#label id="licenseEndTime" name="经营许可证有效期止" value="${item.licenseEndTime}"/>
+ <#label id="regCapital" name="注册资本" value="${item.regCapital}"/>
+ <#label id="driverNum" name="注册网络预约车驾驶员数量" value="${item.driverNum}"/>
+ <#label id="legalId" name="法人代表身份证号" value="${item.legalId}"/>
+ <#label id="contactAddress" name="通信地址" value="${item.contactAddress}"/>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">法定代表人身份<br>证照片(正面)：</label>
+ <div class="col-sm-9">
+ <div class="form-group">
+ <div class="col-sm-6">
+ <div id="idCardPositivePreId">
+ <div>
+ @if(isEmpty(item.idCardPositive)){
+ <img onclick="lookBigImg('${ctxPath}/static/img/NoPIC.png')" src="${ctxPath}/static/img/NoPIC.png" style="max-width:150px;">
+ @}else{
+ <img onclick="lookBigImg('${item.idCardPositive}')" src="${item.idCardPositive}" style="max-width:250px;">
+ @}
+ </div>
+ </div>
+ </div>
+ <input type="hidden" id="idCardPositive" name="idCardPositive" value="${item.idCardPositive}"/>
+ </div>
+ </div>
+ </div>
+
+
+ </div>
+
+ <div class="col-sm-6">
+ <#label id="mac" name="限登录MAC地址" value="${item.mac}"/>
+ <#label id="scopeCode" name="分公司区划代码" value="${item.scopeCode}"/>
+ <#label id="detailAddress" name="分公司具体地址" value="${item.detailAddress}"/>
+ <#label id="principalPhone" name="负责人电话" value="${item.principalPhone}"/>
+ <#label id="adminPhone" name="管理员电话" value="${item.adminPhone}"/>
+ <#label id="urgentPhoen" name="紧急联系电话" value="${item.urgentPhoen}"/>
+ <#label id="identifier" name="统一社会信用代码" value="${item.identifier}"/>
+ <#label id="serviceScope" name="经营区域" value="${item.serviceScope}"/>
+ <#label id="licensingAgency" name="经营许可证发证机构" value="${item.licensingAgency}"/>
+ <#label id="licenseStartTime" name="经营许可证有效期起" value="${item.licenseStartTime}"/>
+ <#label id="economicType" name="经营业户经济类型" value="${item.economicType}"/>
+ <#label id="carNum" name="注册网络预约出租车<br>车辆数" value="${item.carNum}"/>
+ <#label id="legalName" name="法人代表姓名" value="${item.legalName}"/>
+ <#label id="legalPhone" name="法人代表电话" value="${item.legalPhone}"/>
+ <#label id="businessScope" name="经营范围" value="${item.businessScope}"/>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">法定代表人身份<br>证照片(反面)：</label>
+ <div class="col-sm-9">
+ <div class="form-group">
+ <div class="col-sm-6">
+ <div id="idCardReversePreId">
+ <div>
+ @if(isEmpty(item.idCardReverse)){
+ <img onclick="lookBigImg('${ctxPath}/static/img/NoPIC.png')" src="${ctxPath}/static/img/NoPIC.png" style="max-width:150px;">
+ @}else{
+ <img onclick="lookBigImg('${item.idCardReverse}')" src="${item.idCardReverse}" style="max-width:250px;">
+ @}
+ </div>
+ </div>
+ </div>
+ <input type="hidden" id="idCardReverse" name="idCardReverse" value="${item.idCardReverse}"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-sm-12">
+ <div class="form-group">
+ <label class="col-sm-2 control-label">经营业务：</label>
+ <div class="col-sm-10">
+ <fieldset>
+ <div class="checkbox checkbox-primary">
+ <input name="checkbox" id="checkbox2" type="checkbox" disabled value="2" ${1 == item.isTaxi ? 'checked=checked' : ''} >
+ <label for="checkbox2">
+ 出租车
+ </label>
+ </div>
+ </fieldset>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row">
+ <div class="col-sm-12">
+ <div class="form-group">
+ <label class="col-sm-2 control-label">添加区域</label>
+ <div class="col-sm-9">
+ <div style="height: 200px; border: 1px solid #e5e6e7;overflow-y: auto;">
+ <table class="table table-striped table-bordered table-hover table-condensed">
+ <thead>
+ <tr>
+ <th style="width: 300px;text-align: center;">区域</th>
+ <!--<th style="width: 200px;">操作</th>-->
+ </tr>
+ </thead>
+ <tbody id="conn">
+ @for(obj in scopeList){
+ <tr class="timeClass" style="text-align: center;">
+ <td><input type="hidden" id="recordId" name="recordId" value="${obj.id}">
+ <input type="hidden" id="provinceCode" name="provinceCode" value="${obj.provinceCode}">
+ <input type="hidden" id="cityCode" name="cityCode" value="${obj.cityCode}">
+ <input type="hidden" id="areaCode" name="areaCode" value="${obj.areaCode}">${obj.value}</td>
+ <!--<td><button onclick="deleteSub(this)">移除</button></td>-->
+ </tr>
+ @}
+ </tbody>
+ </table>
+ </div>
+ </div>
+ </div>
+
+ <div class="form-group">
+ <label class="col-sm-2 control-label">是否需要摆渡车：</label>
+ <div class="col-sm-9" style="display: flex;align-items: center;">
+ <div class="radio radio-info radio-inline">
+ <input type="radio" id="isNeedFerry1" value="1" disabled name="isNeedFerry" ${1 == item.isNeedFerry ? 'checked=checked' : ''} >
+ <label for="isNeedFerry1"> 是 </label>
+ </div>
+ <div class="radio radio-success radio-inline">
+ <input type="radio" id="isNeedFerry2" value="2" disabled name="isNeedFerry" ${2 == item.isNeedFerry ? 'checked=checked' : ''}>
+ <label for="isNeedFerry2"> 否 </label>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tCompany/tCompany_info.js"></script>
+<script type="application/javascript">
+ $(function() {
+ TCompanyInfoDlg.checkbox1();
+ TCompanyInfoDlg.checkbox2();
+ TCompanyInfoDlg.checkbox3();
+ TCompanyInfoDlg.checkbox4();
+ TCompanyInfoDlg.checkbox5();
+ TCompanyInfoDlg.checkbox6();
+
+ var zc = $("input[name='zc']:checked").val();
+ var cz = $("input[name='cz']:checked").val();
+ var tcx = $("input[name='tcx']:checked").val();
+ var kcx = $("input[name='kcx']:checked").val();
+ if (zc == "" || zc == null || zc == undefined){
+ $("#zc1").attr("checked","checked")
+ }
+ if (cz == "" || cz == null || cz == undefined){
+ $("#cz1").attr("checked","checked")
+ }
+ if (tcx == "" || tcx == null || tcx == undefined){
+ $("#tcx1").attr("checked","checked")
+ }
+ if (kcx == "" || kcx == null || kcx == undefined){
+ $("#kcx1").attr("checked","checked")
+ }
+ });
+</script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_detailFranchisee.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_detailFranchisee.html
new file mode 100644
index 0000000..52f5e0b
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_detailFranchisee.html
@@ -0,0 +1,52 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="franchiseeInfoForm">
+ <input type="hidden" id="id" name="id" value="${item.id}">
+ <input type="hidden" id="userId" name="userId" value="${user.id}">
+ <div class="row">
+ <div class="col-sm-10">
+ <#label id="account" name="登录账号" value="${user.account}"/>
+ <#label id="companyName" name="所属分公司" value="${companyName}"/>
+ <#label id="name" name="加盟商名称" value="${item.name}"/>
+ <#label id="detailAddress" name="加盟商地址" value="${item.detailAddress}"/>
+ <#label id="principalName" name="联系人" value="${item.principalName}"/>
+ <#label id="principalPhone" name="联系电话" value="${item.principalPhone}"/>
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-sm-10">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">经营业务：</label>
+ <div class="col-sm-9">
+ <fieldset>
+ <div class="checkbox checkbox-primary">
+ <input name="checkbox" id="checkbox2" type="checkbox" disabled value="2" ${1 == item.isTaxi ? 'checked=checked' : ''}>
+ <label for="checkbox2">
+ 出租车
+ </label>
+
+ </div>
+ </fieldset>
+ </div>
+ </div>
+
+ </div>
+ </div>
+
+ </div>
+
+</div>
+</div>
+<script src="${ctxPath}/static/modular/system/tCompany/franchisee_info.js"></script>
+<script type="application/javascript">
+ $(function() {
+ FranchiseeInfoDlg.checkbox2();
+
+ var cz = $("input[name='cz']:checked").val();
+ if (cz == "" || cz == null || cz == undefined){
+ $("#cz1").attr("checked","checked")
+ }
+ });
+</script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_edit.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_edit.html
new file mode 100644
index 0000000..a86b9e2
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_edit.html
@@ -0,0 +1,171 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="companyInfoForm">
+ <input type="hidden" id="id" name="id" value="${item.id}">
+ <input type="hidden" id="userId" name="userId" value="${user.id}">
+ <div class="row">
+ <div class="col-sm-6 b-r">
+ <#input id="name" name="分公司名称" value="${item.name}" />
+ <#input id="code" name="分公司代码" value="${item.code}" />
+ <#input id="principalName" name="分公司负责人" value="${item.principalName}" />
+ <#input id="adminName" name="分公司管理人" value="${item.adminName}" />
+ <#input id="documentAddress" name="行政文书送达地址" value="${item.documentAddress}" />
+ <#input id="setupTime" name="服务机构设立日期" value="${item.setupTime}" />
+ <#input id="licenseNumber" name="网络预约出租汽<br>车经营许可证号" value="${item.licenseNumber}" />
+ <#input id="addressCode" name="注册地行政区域划<br>分代码" value="${item.addressCode}" />
+ <#input id="licenseTime" name="经营许可证初次发证日期" value="${item.licenseTime}" />
+ <#input id="licenseEndTime" name="经营许可证有效期止" value="${item.licenseEndTime}" />
+ <#input id="regCapital" name="注册资本" value="${item.regCapital}" />
+ <#input id="driverNum" name="注册网络预约车驾驶员数量" value="${item.driverNum}" />
+ <#input id="legalId" name="法人代表身份证号" value="${item.legalId}" />
+ <#avatar id="idCardPositive" name="法定代表人身份<br>证照片(正面)：" avatarImg="${item.idCardPositive}"/>
+ <#input id="contactAddress" name="通信地址" value="${item.contactAddress}"/>
+ </div>
+
+ <div class="col-sm-6">
+ <#input id="scopeCode" name="分公司区划代码" value="${item.scopeCode}"/>
+ <#input id="detailAddress" name="分公司具体地址" value="${item.detailAddress}"/>
+ <#input id="principalPhone" name="负责人电话" value="${item.principalPhone}"/>
+ <#input id="adminPhone" name="管理员电话" value="${item.adminPhone}"/>
+ <#input id="urgentPhoen" name="紧急联系电话" value="${item.urgentPhoen}"/>
+ <#input id="identifier" name="统一社会信用代码" value="${item.identifier}"/>
+ <#input id="serviceScope" name="经营区域" value="${item.serviceScope}"/>
+ <#input id="licensingAgency" name="经营许可证发证机构" value="${item.licensingAgency}"/>
+ <#input id="licenseStartTime" name="经营许可证有效期起" value="${item.licenseStartTime}"/>
+ <#input id="economicType" name="经营业户经济类型" value="${item.economicType}"/>
+ <#input id="carNum" name="注册网络预约出租车<br>车辆数" value="${item.carNum}"/>
+ <#input id="legalName" name="法人代表姓名" value="${item.legalName}"/>
+ <#input id="legalPhone" name="法人代表电话" value="${item.legalPhone}"/>
+ <#avatar id="idCardReverse" name="法定代表人身份<br>证照片(反面)：" avatarImg="${item.idCardReverse}"/>
+ <#input id="businessScope" name="经营范围" value="${item.businessScope}"/>
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-sm-12">
+ <div class="form-group">
+ <label class="col-sm-2 control-label">经营业务：</label>
+ <div class="col-sm-10">
+ <fieldset>
+ <div class="checkbox checkbox-primary">
+ <input name="checkbox" id="checkbox2" type="checkbox" value="2" ${1 == item.isTaxi ? 'checked=checked' : ''} onclick="TCompanyInfoDlg.checkbox2()">
+ <label for="checkbox2">
+ 出租车
+ </label>
+
+ </div>
+ </fieldset>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row">
+ <div class="col-sm-12">
+ <div class="form-group">
+ <label class="col-sm-2 control-label">经营区域：</label>
+ <div class="col-sm-2">
+ <select class="form-control" id="province" onchange="TCompanyInfoDlg.provinceChange(this)">
+ <option value="">选择省</option>
+ @for(obj in provinceList){
+ <option value="${obj.code}">${obj.name}</option>
+ @}
+ </select>
+ </div>
+ <div class="col-sm-2">
+ <select class="form-control" id="city" onchange="TCompanyInfoDlg.cityChage(this)">
+ <option value="">选择市</option>
+ </select>
+ </div>
+ <div class="col-sm-2">
+ <select class="form-control" id="area">
+ <option value="">选择区</option>
+ </select>
+ </div>
+ <div class="col-sm-1">
+ <#button btnCss="info" name="添加" id="ensure" icon="fa-check" clickFun="TCompanyInfoDlg.addScope()"/>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">添加区域</label>
+ <div class="col-sm-9">
+ <div style="height: 200px; border: 1px solid #e5e6e7;overflow-y: auto;">
+ <table class="table table-striped table-bordered table-hover table-condensed">
+ <thead>
+ <tr>
+ <th style="width: 300px;">区域</th>
+ <th style="width: 200px;">操作</th>
+ </tr>
+ </thead>
+ <tbody id="conn">
+ @for(obj in scopeList){
+ <tr class="timeClass">
+ <td><input type="hidden" id="recordId" name="recordId" value="${obj.id}">
+ <input type="hidden" id="provinceCode" name="provinceCode" value="${obj.provinceCode}">
+ <input type="hidden" id="cityCode" name="cityCode" value="${obj.cityCode}">
+ <input type="hidden" id="areaCode" name="areaCode" value="${obj.areaCode}">${obj.value}</td>
+ <td><button onclick="deleteSub(this)">移除</button></td>
+ </tr>
+ @}
+ </tbody>
+ </table>
+ </div>
+ </div>
+ </div>
+
+ <div class="form-group">
+ <label class="col-sm-2 control-label">限登录MAC地址：</label>
+ <div class="col-sm-9">
+ <input type="text" class="form-control" id="mac" name="mac" value="${item.mac}">
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">登录账号：</label>
+ <div class="col-sm-9">
+ <input type="text" class="form-control" id="account" name="account" value="${user.account}">
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">登录密码：</label>
+ <div class="col-sm-9">
+ <input type="password" class="form-control" id="password" name="password" >
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TCompanyInfoDlg.editSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TCompanyInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tCompany/tCompany_info.js"></script>
+<script type="application/javascript">
+ laydate.render({
+ elem: '#setupTime'
+ });
+ laydate.render({
+ elem: '#licenseTime'
+ });
+ laydate.render({
+ elem: '#licenseStartTime'
+ });
+ laydate.render({
+ elem: '#licenseEndTime'
+ });
+
+ $(function() {
+ TCompanyInfoDlg.checkbox2();
+
+ var cz = $("input[name='cz']:checked").val();
+ if (cz == "" || cz == null || cz == undefined){
+ $("#cz1").attr("checked","checked")
+ }
+ });
+</script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_updateFranchisee.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_updateFranchisee.html
new file mode 100644
index 0000000..4aaf45a
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_updateFranchisee.html
@@ -0,0 +1,77 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="franchiseeInfoForm">
+ <input type="hidden" id="id" name="id" value="${item.id}">
+ <input type="hidden" id="userId" name="userId" value="${user.id}">
+ <div class="row">
+ <div class="col-sm-10">
+ @if(roleType == 1){
+ <#select id="superiorId" name="所属分公司：" onchange="TOpenCityInfoDlg.provinceChange()">
+ <option value="">选择所属分公司</option>
+ @for(obj in companyList){
+ <option value="${obj.id}" ${obj.id == item.superiorId ? 'selected=selected' : ''}>${obj.name}</option>
+ @}
+ </#select>
+ @}else if(roleType == 2){
+ <#label id="companyName" name="所属分公司" value="${company.name}"/>
+ @}
+ <#input id="name" name="加盟商名称" value="${item.name}"/>
+ <#input id="detailAddress" name="加盟商地址" value="${item.detailAddress}"/>
+ <#input id="principalName" name="联系人" value="${item.principalName}"/>
+ <#input id="principalPhone" name="联系电话" value="${item.principalPhone}" />
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-sm-10">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">经营业务：</label>
+ <div class="col-sm-9">
+ <fieldset>
+ <div class="checkbox checkbox-primary">
+ <input name="checkbox" id="checkbox2" type="checkbox" value="2" ${1 == item.isTaxi ? 'checked=checked' : ''} onclick="FranchiseeInfoDlg.checkbox2()">
+ <label for="checkbox2">
+ 出租车
+ </label>
+ </div>
+ </fieldset>
+ </div>
+ </div>
+
+ <div class="form-group">
+ <label class="col-sm-3 control-label">登录账号：</label>
+ <div class="col-sm-9">
+ <input type="text" class="form-control" id="account" name="account" value="${user.account}">
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">登录密码：</label>
+ <div class="col-sm-9">
+ <input type="password" class="form-control" id="password" name="password" >
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="FranchiseeInfoDlg.updateFranchisee()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="FranchiseeInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tCompany/franchisee_info.js"></script>
+<script type="application/javascript">
+ $(function() {
+ FranchiseeInfoDlg.checkbox2();
+
+ var cz = $("input[name='cz']:checked").val();
+ if (cz == "" || cz == null || cz == undefined){
+ $("#cz1").attr("checked","checked")
+ }
+ });
+</script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tComplaint/lookDetail.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tComplaint/lookDetail.html
new file mode 100644
index 0000000..e9a69a5
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tComplaint/lookDetail.html
@@ -0,0 +1,29 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+
+ <div class="row">
+ <div class="col-sm-12">
+ <div class="ibox-content">
+ <div class="alert alert-success">
+ ${str}
+ </div>
+ <!--<div class="alert alert-info">
+ ${str}
+ </div>
+ <div class="alert alert-warning">
+ ${str}
+ </div>
+ <div class="alert alert-danger">
+ ${str}
+ </div>-->
+ </div>
+ </div>
+ </div>
+
+ </div>
+
+ </div>
+</div>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tComplaint/tComplaint.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tComplaint/tComplaint.html
new file mode 100644
index 0000000..2eebeb2
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tComplaint/tComplaint.html
@@ -0,0 +1,58 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>投诉列表管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#TimeCon id="insertTime" name="投诉时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="userName" name="投诉人昵称" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="userPhone" name="投诉人电话" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="driverPhone" name="投诉司机电话" />
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="isHandle" name="状态" >
+ <option value="">全部</option>
+ <option value="2">未处理</option>
+ <option value="1">已处理</option>
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="TComplaint.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="TComplaint.resetSearch()" space="true"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="TComplaintTableToolbar" role="group">
+ @if(shiro.hasPermission("/tComplaint/immediately")){
+ <#button name="立即处理" icon="fa-edit" clickFun="TComplaint.immediately()"/>
+ @}
+ @if(shiro.hasPermission("/tComplaint/delete")){
+ <#button name="删除记录" icon="fa-remove" clickFun="TComplaint.delete()" space="true"/>
+ @}
+ </div>
+ <#table id="TComplaintTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tComplaint/tComplaint.js"></script>
+<script>
+ laydate.render({
+ elem: '#insertTime'
+ ,range: true
+ });
+</script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tComplaint/tComplaint_add.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tComplaint/tComplaint_add.html
new file mode 100644
index 0000000..2b53ab9
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tComplaint/tComplaint_add.html
@@ -0,0 +1,34 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+
+ <div class="row">
+ <div class="col-sm-6 b-r">
+ <#input id="id" name="主键" underline="true"/>
+ <#input id="userId" name="用户Id" underline="true"/>
+ <#input id="reason" name="投诉原因" underline="true"/>
+ <#input id="driverId" name="被投诉人Id" underline="true"/>
+ <#input id="description" name="描述"/>
+ </div>
+
+ <div class="col-sm-6">
+ <#input id="isHandle" name="是否处理（0：未处理，1：已处理）" underline="true"/>
+ <#input id="insertTime" name="投诉时间" underline="true"/>
+ <#input id="handleResult" name="处理结果" underline="true"/>
+ <#input id="handleUserId" name="处理人id" underline="true"/>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TComplaintInfoDlg.addSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TComplaintInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tComplaint/tComplaint_info.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tComplaint/tComplaint_edit.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tComplaint/tComplaint_edit.html
new file mode 100644
index 0000000..2affa4e
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tComplaint/tComplaint_edit.html
@@ -0,0 +1,34 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+
+ <div class="row">
+ <div class="col-sm-6 b-r">
+ <#input id="id" name="主键" value="${item.id}" underline="true"/>
+ <#input id="userId" name="用户Id" value="${item.userId}" underline="true"/>
+ <#input id="reason" name="投诉原因" value="${item.reason}" underline="true"/>
+ <#input id="driverId" name="被投诉人Id" value="${item.driverId}" underline="true"/>
+ <#input id="description" name="描述" value="${item.description}" />
+ </div>
+
+ <div class="col-sm-6">
+ <#input id="isHandle" name="是否处理（0：未处理，1：已处理）" value="${item.isHandle}" underline="true"/>
+ <#input id="insertTime" name="投诉时间" value="${item.insertTime}" underline="true"/>
+ <#input id="handleResult" name="处理结果" value="${item.handleResult}" underline="true"/>
+ <#input id="handleUserId" name="处理人id" value="${item.handleUserId}" />
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TComplaintInfoDlg.editSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TComplaintInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tComplaint/tComplaint_info.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tComplaint/tComplaint_immediately.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tComplaint/tComplaint_immediately.html
new file mode 100644
index 0000000..906ce24
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tComplaint/tComplaint_immediately.html
@@ -0,0 +1,28 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="complaintFormInfo">
+ <input type="hidden" id="id" name="id" value="${tComplaintId}">
+ <div class="row">
+ <div class="col-sm-11">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">填写备注：</label>
+ <div class="col-sm-9">
+ <textarea type="text/plain" class="form-control" name="handleResult" id="handleResult" placeholder="多行输入,最多500字" style="width:100%;height:150px;"></textarea>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TComplaintInfoDlg.immediately()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TComplaintInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tComplaint/tComplaint_info.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tComplaintDriver/lookDetail.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tComplaintDriver/lookDetail.html
new file mode 100644
index 0000000..e9a69a5
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tComplaintDriver/lookDetail.html
@@ -0,0 +1,29 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+
+ <div class="row">
+ <div class="col-sm-12">
+ <div class="ibox-content">
+ <div class="alert alert-success">
+ ${str}
+ </div>
+ <!--<div class="alert alert-info">
+ ${str}
+ </div>
+ <div class="alert alert-warning">
+ ${str}
+ </div>
+ <div class="alert alert-danger">
+ ${str}
+ </div>-->
+ </div>
+ </div>
+ </div>
+
+ </div>
+
+ </div>
+</div>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tComplaintDriver/tComplaint.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tComplaintDriver/tComplaint.html
new file mode 100644
index 0000000..2b05cae
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tComplaintDriver/tComplaint.html
@@ -0,0 +1,58 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>投诉列表管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#TimeCon id="insertTime" name="投诉时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="driverName" name="投诉司机" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="userName" name="被投诉用户" />
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="isHandle" name="状态" >
+ <option value="">全部</option>
+ <option value="2">未处理</option>
+ <option value="1">已处理</option>
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="TComplaintDriver.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="TComplaintDriver.resetSearch()" space="true"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="TComplaintTableToolbar" role="group">
+ @if(shiro.hasPermission("/tComplaintDriver/immediately")){
+ <#button name="立即处理" icon="fa-edit" clickFun="TComplaintDriver.immediately()"/>
+ @}
+ @if(shiro.hasPermission("/tComplaintDriver/blackList")){
+ <#button name="查看黑名单" icon="fa-remove" clickFun="TComplaintDriver.blackList()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tComplaintDriver/delete")){
+ <#button name="删除" icon="fa-remove" clickFun="TComplaintDriver.delete()" space="true"/>
+ @}
+ </div>
+ <#table id="TComplaintDriverTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tComplaintDriver/tComplaint.js"></script>
+<script>
+ laydate.render({
+ elem: '#insertTime'
+ ,range: true
+ });
+</script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tComplaintDriver/tComplaint_BlackList.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tComplaintDriver/tComplaint_BlackList.html
new file mode 100644
index 0000000..802e0ea
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tComplaintDriver/tComplaint_BlackList.html
@@ -0,0 +1,45 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>黑名单列表</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#TimeCon id="insertTime" name="投诉时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="phone" name="用户手机号" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="userName" name="用户姓名" />
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="TComplaint.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="TComplaint.resetSearch()" space="true"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="TComplaintTableToolbar" role="group">
+ @if(shiro.hasPermission("/tComplaint/removeBlack")){
+ <#button name="移除黑名单" icon="fa-edit" clickFun="TComplaint.removeBlack()"/>
+ @}
+ </div>
+ <#table id="TComplaintTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tComplaintDriver/tComplaint_blackList.js"></script>
+<script>
+ laydate.render({
+ elem: '#insertTime'
+ ,range: true
+ });
+</script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tComplaintDriver/tComplaint_add.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tComplaintDriver/tComplaint_add.html
new file mode 100644
index 0000000..5456926
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tComplaintDriver/tComplaint_add.html
@@ -0,0 +1,34 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+
+ <div class="row">
+ <div class="col-sm-6 b-r">
+ <#input id="id" name="主键" underline="true"/>
+ <#input id="userId" name="用户Id" underline="true"/>
+ <#input id="reason" name="投诉原因" underline="true"/>
+ <#input id="driverId" name="被投诉人Id" underline="true"/>
+ <#input id="description" name="描述"/>
+ </div>
+
+ <div class="col-sm-6">
+ <#input id="isHandle" name="是否处理（0：未处理，1：已处理）" underline="true"/>
+ <#input id="insertTime" name="投诉时间" underline="true"/>
+ <#input id="handleResult" name="处理结果" underline="true"/>
+ <#input id="handleUserId" name="处理人id" underline="true"/>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TComplaintInfoDlg.addSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TComplaintInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tComplaintDriver/tComplaint_info.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tComplaintDriver/tComplaint_edit.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tComplaintDriver/tComplaint_edit.html
new file mode 100644
index 0000000..7b8fc00
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tComplaintDriver/tComplaint_edit.html
@@ -0,0 +1,34 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+
+ <div class="row">
+ <div class="col-sm-6 b-r">
+ <#input id="id" name="主键" value="${item.id}" underline="true"/>
+ <#input id="userId" name="用户Id" value="${item.userId}" underline="true"/>
+ <#input id="reason" name="投诉原因" value="${item.reason}" underline="true"/>
+ <#input id="driverId" name="被投诉人Id" value="${item.driverId}" underline="true"/>
+ <#input id="description" name="描述" value="${item.description}" />
+ </div>
+
+ <div class="col-sm-6">
+ <#input id="isHandle" name="是否处理（0：未处理，1：已处理）" value="${item.isHandle}" underline="true"/>
+ <#input id="insertTime" name="投诉时间" value="${item.insertTime}" underline="true"/>
+ <#input id="handleResult" name="处理结果" value="${item.handleResult}" underline="true"/>
+ <#input id="handleUserId" name="处理人id" value="${item.handleUserId}" />
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TComplaintInfoDlg.editSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TComplaintInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tComplaintDriver/tComplaint_info.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tComplaintDriver/tComplaint_immediately.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tComplaintDriver/tComplaint_immediately.html
new file mode 100644
index 0000000..08a0238
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tComplaintDriver/tComplaint_immediately.html
@@ -0,0 +1,36 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="complaintFormInfo">
+ <input type="hidden" id="id" name="id" value="${tComplaintId}">
+
+ <div class="row">
+ <div class="col-lg-6">
+ <div class="form-group">
+ <label class="col-sm-5 control-label" style="margin-left: 32px">
+ 处理类型：<input checked type="radio" name="handleType" value="1" >加入黑名单
+
+ <input type="radio" name="handleType" value="2" >暂不处理
+ </label>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">填写备注：</label>
+ <div class="col-sm-9">
+ <textarea type="text/plain" class="form-control" name="handleResult" id="handleResult" placeholder="多行输入,最多500字" style="width:100%;height:150px;"></textarea>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TComplaintInfoDlg.immediately()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TComplaintInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tComplaintDriver/tComplaint_info.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDispatch/tDispatch.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDispatch/tDispatch.html
new file mode 100644
index 0000000..ce876ec
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDispatch/tDispatch.html
@@ -0,0 +1,70 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>调度管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#TimeCon id="insertTime" name="添加时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="name" name="调度名称" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="companyName" name="所属分公司" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="franchiseeName" name="所属加盟商" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="account" name="账号" />
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="state" name="状态" >
+ <option value="">全部</option>
+ <option value="1">正常</option>
+ <option value="2">冻结</option>
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="TDispatch.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="TDispatch.resetSearch()" space="true"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="TDispatchTableToolbar" role="group">
+ @if(shiro.hasPermission("/tDispatch/add")){
+ <#button name="添加" icon="fa-plus" clickFun="TDispatch.openAddTDispatch()"/>
+ @}
+ @if(shiro.hasPermission("/tDispatch/update")){
+ <#button name="编辑" icon="fa-edit" clickFun="TDispatch.openTDispatchDetail()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tDispatch/delete")){
+ <#button name="删除" icon="fa-remove" clickFun="TDispatch.opt(1)" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tDispatch/freeze")){
+ <#button name="冻结" icon="fa-remove" clickFun="TDispatch.opt(2)" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tDispatch/thaw")){
+ <#button name="解冻" icon="fa-remove" clickFun="TDispatch.opt(3)" space="true"/>
+ @}
+ </div>
+ <#table id="TDispatchTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tDispatch/tDispatch.js"></script>
+<script>
+ laydate.render({
+ elem: '#insertTime'
+ ,range: true
+ });
+</script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDispatch/tDispatch_add.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDispatch/tDispatch_add.html
new file mode 100644
index 0000000..47924fa
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDispatch/tDispatch_add.html
@@ -0,0 +1,47 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="dispatchInfoForm">
+ <input type="hidden" id="roleType" name="roleType" value="${roleType}">
+ <div class="row">
+ <div class="col-sm-11">
+ <#input id="name" name="调度名称"/>
+
+ @if(roleType == 1){
+ <#select id="oneId" name="所属分公司：" onchange="TDispatchInfoDlg.companyChange(this)">
+ <option value="">选择所属分公司</option>
+ @for(obj in companyList){
+ <option value="${obj.id}">${obj.name}</option>
+ @}
+ </#select>
+ <#select id="twoId" name="所属加盟商：" >
+ <option value="">选择所属加盟商</option>
+ </#select>
+ @}
+ @if(roleType == 2){
+ <#select id="franchiseeId" name="所属加盟商：" >
+ <option value="">选择所属加盟商</option>
+ @for(obj in franchiseeList){
+ <option value="${obj.id}">${obj.name}</option>
+ @}
+ </#select>
+ @}
+ <#input id="phone" name="联系电话"/>
+ <#input id="account" name="登录账号"/>
+ <#input id="password" name="登录密码" type="password"/>
+ <#input id="rePassword" name="确认密码" type="password"/>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TDispatchInfoDlg.addSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TDispatchInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tDispatch/tDispatch_info.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDispatch/tDispatch_edit.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDispatch/tDispatch_edit.html
new file mode 100644
index 0000000..1a36c30
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDispatch/tDispatch_edit.html
@@ -0,0 +1,51 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="dispatchInfoForm">
+ <input type="hidden" id="roleType" name="roleType" value="${roleType}">
+ <input type="hidden" id="id" name="id" value="${item.id}">
+ <div class="row">
+ <div class="col-sm-11">
+ <#input id="name" name="调度名称" value="${item.name}"/>
+
+ @if(roleType == 1){
+ <#select id="oneId" name="所属分公司：" onchange="TDispatchInfoDlg.companyChange(this)">
+ <option value="">选择所属分公司</option>
+ @for(obj in companyList){
+ <option value="${obj.id}" ${obj.id == item.companyId ? 'selected=selected' : ''}>${obj.name}</option>
+ @}
+ </#select>
+ <#select id="twoId" name="所属加盟商：" >
+ <option value="">选择所属加盟商</option>
+ @for(obj in franchiseeList){
+ <option value="${obj.id}" ${obj.id == item.franchiseeId ? 'selected=selected' : ''}>${obj.name}</option>
+ @}
+ </#select>
+ @}
+ @if(roleType == 2){
+ <#select id="franchiseeId" name="所属加盟商：" >
+ <option value="">选择所属加盟商</option>
+ @for(obj in franchiseeList){
+ <option value="${obj.id}" ${obj.id == item.franchiseeId ? 'selected=selected' : ''}>${obj.name}</option>
+ @}
+ </#select>
+ @}
+ <#input id="phone" name="联系电话" value="${item.phone}" />
+ <#input id="account" name="登录账号" value="${item.account}"/>
+ <#input id="password" name="登录密码" value="" type="password"/>
+ <#input id="rePassword" name="确认密码" value="" type="password"/>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TDispatchInfoDlg.editSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TDispatchInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tDispatch/tDispatch_info.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/punish.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/punish.html
new file mode 100644
index 0000000..dcc440b
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/punish.html
@@ -0,0 +1,62 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <input type="hidden" id="netCarDriverId" value="${id}">
+ <input type="hidden" id="id">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+ <div class="hr-line-dashed"></div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">课程日期</label>
+ <div class="col-sm-9">
+ <input type="text" class="layui-input form-control" id="punishTime">
+ </div>
+ </div>
+ <div class="hr-line-dashed"></div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">处罚原因</label>
+ <div class="col-sm-8">
+ <textarea type="text" class="form-control" id="punishReason"></textarea>
+ </div>
+ </div>
+ <div class="hr-line-dashed"></div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">处罚结果</label>
+ <div class="col-sm-8">
+ <textarea type="text" class="form-control" id="punishReault"></textarea>
+ </div>
+ <button type="button" class="btn btn-default btn-sm" id="add" onclick="add()">添加</button>
+ </div>
+ <div class="hr-line-dashed"></div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">已添加的培训记录</label>
+ <div class="col-sm-9">
+ <div style="height: 150px; border: 1px solid #e5e6e7;overflow-y: auto;">
+ <table class="table table-striped table-bordered table-hover table-condensed">
+ <thead>
+ <tr>
+ <th style="width: 50px; text-align: center;">序号</th>
+ <th style="width: 200px; text-align: center;">处罚时间</th>
+ <th style="width: 200px; text-align: center;">处罚原因</th>
+ <th style="width: 200px; text-align: center;">处罚结果</th>
+ <th style="width: 200px; text-align: center;">操作</th>
+ </tr>
+ </thead>
+ <tbody id="transAreaAdd">
+
+ </tbody>
+ </table>
+ </div>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-sm-10">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="save()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="Training.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tDriver/punish.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver.html
new file mode 100644
index 0000000..cedbd84
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver.html
@@ -0,0 +1,70 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>司机审核列表管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#TimeCon id="insertTime" name="注册时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="companyName" name="所属分公司/加盟商" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="phone" name="手机号" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="account" name="账号" />
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="addType" 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">
+ <#SelectCon id="authState" name="状态" >
+ <option value="">全部</option>
+ <option value="1">待审核</option>
+ <option value="4">已拒绝</option>
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="TDriver.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="TDriver.resetSearch()" space="true"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="TDriverTableToolbar" role="group">
+ @if(shiro.hasPermission("/tDriver/immediately")){
+ <#button name="立即审核" icon="fa-plus" clickFun="TDriver.immediately()"/>
+ @}
+ @if(shiro.hasPermission("/tDriver/look")){
+ <#button name="查看详情" icon="fa-edit" clickFun="TDriver.look()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tDriver/delete")){
+ <#button name="删除" icon="fa-remove" clickFun="TDriver.delete()" space="true"/>
+ @}
+ </div>
+ <#table id="TDriverTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tDriver/tDriver.js"></script>
+<script>
+ laydate.render({
+ elem: '#insertTime'
+ ,range: true
+ });
+</script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_add.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_add.html
new file mode 100644
index 0000000..218a122
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_add.html
@@ -0,0 +1,237 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="yesDriverInfoForm">
+ <input type="hidden" id="roleType" name="roleType" value="${roleType}">
+ <div class="row">
+ <div class="col-sm-10">
+ <#input id="name" name="司机姓名" />
+
+ <div class="form-group">
+ <label class="col-sm-3 control-label">所属机构：</label>
+ <div class="col-sm-9" style="display: flex;align-items: center;">
+ @if(roleType == 1){
+ <div class="radio radio-info radio-inline">
+ <input type="radio" id="companyType1" value="1" name="companyType" checked="" onclick="YesDriverInfoDlg.companyTypeClick(1)">
+ <label for="companyType1"> 平台司机 </label>
+ </div>
+ <div class="radio radio-success radio-inline">
+ <input type="radio" id="companyTyp2" value="2" name="companyType" onclick="YesDriverInfoDlg.companyTypeClick(2)">
+ <label for="companyTyp2"> 加盟司机 </label>
+ </div>
+ <select class="form-control companyDiv" id="oneId" onchange="YesDriverInfoDlg.oneChange(this)" style="width: 200px;display: none;" >
+ <option value="">选择所属分公司</option>
+ @for(obj in companyList!){
+ <option value="${obj.id}">${obj.name}</option>
+ @}
+ </select>
+ <select class="form-control companyDiv" id="twoId" style="width: 200px;margin-left: 30px;display: none;">
+ <option value="">选择所属加盟商</option>
+ </select>
+ @}else if(roleType == 2){
+ <span class="control-label">${objectName!}</span>
+ <select class="form-control" id="franchiseeId" style="width: 200px;margin-left: 30px;">
+ <option value="">选择所属加盟商</option>
+ @for(obj in franchiseeList!){
+ <option value="${obj.id}">${obj.name}</option>
+ @}
+ </select>
+ @}else if(roleType == 3){
+ <span class="control-label">${objectName!}</span>
+ @}
+ </div>
+ </div>
+
+ <#avatar id="headImgUrl" name="头像：" />
+ <#avatar id="faceImgUrl" name="人脸识别照片：" />
+ <!--<#input id="phone" name="手机号" />-->
+ <div class="form-group">
+ <label class="col-sm-3 control-label">性别：</label>
+ <div class="col-sm-9" style="display: flex;align-items: center;">
+ <div class="radio radio-info radio-inline">
+ <input type="radio" id="sex1" value="1" name="sex" checked="" >
+ <label for="sex1"> 男 </label>
+ </div>
+ <div class="radio radio-success radio-inline">
+ <input type="radio" id="sex2" value="2" name="sex" >
+ <label for="sex2"> 女 </label>
+ </div>
+ </div>
+ </div>
+ <#input id="driveCard" name="驾驶证号码"/>
+ <#avatar id="driveCardImgUrl" name="驾驶证照片：" />
+ <#input id="driverAge" name="驾龄" />
+ <#input id="idCard" name="身份证号" />
+ <#input id="driverAddress" name="居住地址" />
+ <#input id="taxiAptitudeCard" name="出租车资格证号" />
+ <#avatar id="networkCarlssueImg" name="网约车资格证照片：" />
+ <#input id="jobNumber" name="工号(选填)" />
+ <div class="form-group">
+ <fieldset>
+ <label class="col-sm-3 control-label">经营业务：</label>
+ <div class="col-sm-9">
+ <div class="checkbox checkbox-success checkbox-inline">
+ <input type="checkbox" name="serverBox" id="serverBox2" value="2">
+ <label for="serverBox2"> 出租车 </label>
+ </div>
+ </div>
+ </fieldset>
+ </div>
+ <div id="lineDiv" style="display: none;">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">关联线路：</label>
+ <div class="col-sm-3">
+ <select class="form-control" id="selectLineId">
+ <option value="">选择关联线路</option>
+ @for(obj in lineList){
+ <option value="${obj.id}">${obj.name}</option>
+ @}
+ </select>
+ </div>
+ <div class="col-sm-2">
+ <#button btnCss="info" name="添加" id="ensure" icon="fa-check" clickFun="YesDriverInfoDlg.addLine()"/>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">已添加线路</label>
+ <div class="col-sm-9">
+ <div style="height: 200px; border: 1px solid #e5e6e7;overflow-y: auto;">
+ <table class="table table-striped table-bordered table-hover table-condensed">
+ <thead>
+ <tr>
+ <th style="width: 300px;text-align: center;">关联时间</th>
+ <th style="width: 300px;text-align: center;">线路名称</th>
+ <th style="width: 100px;text-align: center;">操作</th>
+ </tr>
+ </thead>
+ <tbody id="line">
+
+ </tbody>
+ </table>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <#input id="phone" name="登录账号【手机号】" />
+ <#input id="password" name="密码" type="password"/>
+ <#input id="rePassword" name="确认密码" type="password"/>
+
+ <#input id="driverNationality" name="国籍"/>
+ <#input id="driverNation" name="民族"/>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">婚姻状况：</label>
+ <div class="col-sm-3">
+ <select class="form-control" id="driverMaritalStatus">
+ <option value="1">已婚</option>
+ <option value="2">未婚</option>
+ <option value="3">离异</option>
+ </select>
+ </div>
+ </div>
+ <#input id="driverLanguageLevel" name="外语能力"/>
+ <#input id="driverEducation" name="学历"/>
+ <#input id="driverCensus" name="户口登记机关名称"/>
+ <#input id="driverAddress" name="户口地址"/>
+ <#input id="driverContactAddress" name="通信地址"/>
+ <#input id="getDriverLicenseDate" name="初次领取驾驶证日期"/>
+ <#input id="driverLicenseOn" name="驾驶证有效期限起"/>
+ <#input id="driverLicenseOff" name="驾驶证有效期限止"/>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">是否巡游出租车驾驶员：</label>
+ <div class="col-sm-3">
+ <select class="form-control" id="taxiDriver">
+ <option value="0">否</option>
+ <option value="1">是</option>
+ </select>
+ </div>
+ </div>
+ <#input id="networkCarlssueOrganization" name="网络预约出租车驾驶员证发证机构"/>
+ <#input id="networkCarlssueDate" name="资格证发证日期"/>
+ <#input id="getNetworkCarProofDate" name="初次认领资格证日期"/>
+ <#input id="networkCarProofOn" name="资格证有效起始日期"/>
+ <#input id="networkCarProofOff" name="资格证有效截至日期"/>
+ <#input id="registerDate" name="报备日期"/>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">是否是专职驾驶员：</label>
+ <div class="col-sm-3">
+ <select class="form-control" id="fullTimeDriver">
+ <option value="0">否</option>
+ <option value="1">是</option>
+ </select>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">是否在驾驶员黑名单内：</label>
+ <div class="col-sm-3">
+ <select class="form-control" id="inDriverBlacklist">
+ <option value="0">否</option>
+ <option value="1">是</option>
+ </select>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">服务类型：</label>
+ <div class="col-sm-3">
+ <select class="form-control" id="commercialType">
+ <option value="1">网络预约出租汽车</option>
+ <option value="2">巡游出租汽车</option>
+ <option value="3">私人小客车合乘</option>
+ </select>
+ </div>
+ </div>
+ <#input id="contractCompany" name="驾驶员合同签署公司"/>
+ <#input id="contractOn" name="合同有效期起"/>
+ <#input id="contractOff" name="合同有效期止"/>
+ <#input id="emergencyContact" name="紧急联系人"/>
+ <#input id="emergencyContactPhone" name="紧急联系电话"/>
+ <#input id="emergencyContactAddress" name="紧急联系地址"/>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="YesDriverInfoDlg.addSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="YesDriverInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tDriver/yesDriver_info.js"></script>
+
+<script>
+ laydate.render({
+ elem: '#getDriverLicenseDate'
+ });
+ laydate.render({
+ elem: '#driverLicenseOn'
+ });
+ laydate.render({
+ elem: '#driverLicenseOff'
+ });
+ laydate.render({
+ elem: '#networkCarlssueDate'
+ });
+ laydate.render({
+ elem: '#getNetworkCarProofDate'
+ });
+ laydate.render({
+ elem: '#networkCarProofOn'
+ });
+ laydate.render({
+ elem: '#networkCarProofOff'
+ });
+ laydate.render({
+ elem: '#contractOn'
+ });
+ laydate.render({
+ elem: '#contractOff'
+ });
+ laydate.render({
+ elem: '#registerDate'
+ });
+</script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_changeCar.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_changeCar.html
new file mode 100644
index 0000000..e831775
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_changeCar.html
@@ -0,0 +1,46 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <input type="hidden" id="tDriverId" name="tDriverId" value="${tDriverId}">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#NameCon id="carLicensePlate" name="车牌号" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="brandName" name="车辆品牌" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="modelName" name="车辆类型" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="color" name="车辆颜色" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="serverStr" name="服务模式" />
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="SelectCar.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="SelectCar.resetSearch()" space="true"/>
+ <#button btnCss="info" name="确定" id="ensure" icon="fa-check" clickFun="SelectCar.selectCarOpt()" space="true"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="SelectCar.close()" space="true"/>
+ </div>
+ </div>
+ <#table id="SelectCarTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tDriver/yesDriver_selectCar.js"></script>
+<script>
+ laydate.render({
+ elem: '#insertTime'
+ ,range: true
+ });
+</script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_edit.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_edit.html
new file mode 100644
index 0000000..059c409
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_edit.html
@@ -0,0 +1,263 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="yesDriverInfoForm">
+ <input type="hidden" id="id" name="id" value="${item.id}">
+ <input type="hidden" id="roleType" name="roleType" value="${roleType}">
+ <div class="row">
+ <div class="col-sm-11">
+ <#input id="name" name="司机姓名" value="${item.name}"/>
+
+ <div class="form-group">
+ <label class="col-sm-3 control-label">所属机构：</label>
+ <div class="col-sm-9" style="display: flex;align-items: center;">
+ @if(roleType == 1){
+ <div class="radio radio-info radio-inline">
+ <input type="radio" id="companyType1" value="1" name="companyType" ${1 == companyType ? 'checked=checked' : ''} onclick="YesDriverInfoDlg.companyTypeClick(1)">
+ <label for="companyType1"> 平台司机 </label>
+ </div>
+ <div class="radio radio-success radio-inline">
+ <input type="radio" id="companyTyp2" value="2" name="companyType" ${2 == companyType ? 'checked=checked' : ''} onclick="YesDriverInfoDlg.companyTypeClick(2)">
+ <label for="companyTyp2"> 加盟司机 </label>
+ </div>
+ <select class="form-control companyDiv" id="oneId" onchange="YesDriverInfoDlg.oneChange(this)" style="width: 200px">
+ <option value="">选择所属分公司</option>
+ @for(obj in companyList!){
+ <option value="${obj.id}" ${obj.id == item.companyId ? 'selected=selected' : ''}>${obj.name}</option>
+ @}
+ </select>
+ <select class="form-control companyDiv" id="twoId" style="width: 200px;margin-left: 30px;">
+ <option value="">选择所属加盟商</option>
+ @for(obj in franchiseeList!){
+ <option value="${obj.id}" ${obj.id == item.franchiseeId ? 'selected=selected' : ''}>${obj.name}</option>
+ @}
+ </select>
+ @}else if(roleType == 2){
+ <span class="control-label">${objectName!}</span>
+ <select class="form-control" id="franchiseeId" style="width: 200px;margin-left: 30px;">
+ <option value="">选择所属加盟商</option>
+ @for(obj in franchiseeList!){
+ <option value="${obj.id}" ${obj.id == item.franchiseeId ? 'selected=selected' : ''}>${obj.name}</option>
+ @}
+ </select>
+ @}else if(roleType == 3){
+ <span class="control-label">${objectName!}</span>
+ @}
+ </div>
+ </div>
+
+ <#avatar id="headImgUrl" name="头像：" avatarImg="${item.headImgUrl}"/>
+ <#avatar id="faceImgUrl" name="人脸识别照片：" avatarImg="${item.faceImgUrl}"/>
+ <!--<#input id="phone" name="手机号" value="${item.phone}"/>-->
+ <div class="form-group">
+ <label class="col-sm-3 control-label">性别：</label>
+ <div class="col-sm-9" style="display: flex;align-items: center;">
+ <div class="radio radio-info radio-inline">
+ <input type="radio" id="sex1" value="1" name="sex" ${1 == item.sex ? 'checked=checked' : ''} >
+ <label for="sex1"> 男 </label>
+ </div>
+ <div class="radio radio-success radio-inline">
+ <input type="radio" id="sex2" value="2" name="sex" ${2 == item.sex ? 'checked=checked' : ''} >
+ <label for="sex2"> 女 </label>
+ </div>
+ </div>
+ </div>
+ <#input id="driveCard" name="驾驶证号码" value="${item.driveCard}"/>
+ <#avatar id="driveCardImgUrl" name="驾驶证照片：" avatarImg="${item.driveCardImgUrl}"/>
+ <#input id="driverAge" name="驾龄" value="${item.driverAge}"/>
+ <#input id="idCard" name="身份证号" value="${item.idCard}"/>
+ <#input id="driverAddress" name="居住地址" value="${item.driverAddress}"/>
+ <#input id="taxiAptitudeCard" name="出租车资格证号" value="${item.taxiAptitudeCard}"/>
+ <#input id="jobNumber" name="工号(选填)" value="${item.jobNumber}"/>
+ <div class="form-group">
+ <fieldset>
+ <label class="col-sm-3 control-label">经营业务：</label>
+ <div class="col-sm-9">
+ <div class="checkbox checkbox-success checkbox-inline">
+ <input type="checkbox" name="serverBox" id="serverBox2" value="2" ${2 == two ? 'checked=checked' : ''}>
+ <label for="serverBox2"> 出租车 </label>
+ </div>
+ </div>
+ </fieldset>
+ </div>
+
+ <div id="lineDiv" style="display: none;">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">关联线路：</label>
+ <div class="col-sm-3">
+ <select class="form-control" id="selectLineId">
+ <option value="">选择关联线路</option>
+ @for(obj in lineList){
+ <option value="${obj.id}">${obj.name}</option>
+ @}
+ </select>
+ </div>
+ <div class="col-sm-2">
+ <#button btnCss="info" name="添加" id="ensure" icon="fa-check" clickFun="YesDriverInfoDlg.addLine()"/>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">已添加线路</label>
+ <div class="col-sm-9">
+ <div style="height: 200px; border: 1px solid #e5e6e7;overflow-y: auto;">
+ <table class="table table-striped table-bordered table-hover table-condensed">
+ <thead>
+ <tr>
+ <th style="width: 300px;">关联时间</th>
+ <th style="width: 300px;">项目名称</th>
+ <th style="width: 100px;">操作</th>
+ </tr>
+ </thead>
+ <tbody id="line">
+ @for(line in driverLineList!){
+ <tr class="lineClass">
+ <td><input type="hidden" id="lineId" name="lineId" value="${line.lineId}">
+ <input type="hidden" id="time" name="time" value="${line.addTime}">${line.addTime}</td>
+ <td>${line.lineName}</td>
+ <td><button onclick="deleteSub(this)">移除</button></td>
+ </tr>
+ @}
+ </tbody>
+ </table>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <#input id="phone" name="登录账号【手机号】" value="${item.phone}"/>
+ <#input id="password" name="密码" type="password" />
+ <#input id="rePassword" name="确认密码" type="password" />
+
+ <#input id="driverNationality" name="国籍" value="${item.driverNationality}"/>
+ <#input id="driverNation" name="民族" value="${item.driverNation}"/>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">婚姻状况：</label>
+ <div class="col-sm-3">
+ <select class="form-control" id="driverMaritalStatus">
+ <option value="1" ${item.driverMaritalStatus == 1 ? 'selected' : ''}>已婚</option>
+ <option value="2" ${item.driverMaritalStatus == 2 ? 'selected' : ''}>未婚</option>
+ <option value="3" ${item.driverMaritalStatus == 3 ? 'selected' : ''}>离异</option>
+ </select>
+ </div>
+ </div>
+ <#input id="driverLanguageLevel" name="外语能力" value="${item.driverLanguageLevel}"/>
+ <#input id="driverEducation" name="学历" value="${item.driverEducation}"/>
+ <#input id="driverCensus" name="户口登记机关名称" value="${item.driverCensus}"/>
+ <#input id="driverAddress" name="户口地址" value="${item.driverAddress}"/>
+ <#input id="driverContactAddress" name="通信地址" value="${item.driverContactAddress}"/>
+ <#input id="getDriverLicenseDate" name="初次领取驾驶证日期" value="${item.getDriverLicenseDate}"/>
+ <#input id="driverLicenseOn" name="驾驶证有效期限起" value="${item.driverLicenseOn}"/>
+ <#input id="driverLicenseOff" name="驾驶证有效期限止" value="${item.driverLicenseOff}"/>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">是否巡游出租车驾驶员：</label>
+ <div class="col-sm-3">
+ <select class="form-control" id="taxiDriver">
+ <option value="0" ${item.taxiDriver == 0 ? 'selected' : ''}>否</option>
+ <option value="1" ${item.taxiDriver == 1 ? 'selected' : ''}>是</option>
+ </select>
+ </div>
+ </div>
+ <#input id="networkCarlssueOrganization" name="网络预约出租车驾驶员证发证机构" value="${item.networkCarlssueOrganization}"/>
+ <#input id="networkCarlssueDate" name="资格证发证日期" value="${item.networkCarlssueDate}"/>
+ <#input id="getNetworkCarProofDate" name="初次认领资格证日期" value="${item.getNetworkCarProofDate}"/>
+ <#input id="networkCarProofOn" name="资格证有效起始日期" value="${item.networkCarProofOn}"/>
+ <#input id="networkCarProofOff" name="资格证有效截至日期" value="${item.networkCarProofOff}"/>
+ <#input id="registerDate" name="报备日期" value="${item.registerDate}"/>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">是否是专职驾驶员：</label>
+ <div class="col-sm-3">
+ <select class="form-control" id="fullTimeDriver">
+ <option value="0" ${item.fullTimeDriver == 0 ? 'selected' : ''}>否</option>
+ <option value="1" ${item.fullTimeDriver == 1 ? 'selected' : ''}>是</option>
+ </select>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">是否在驾驶员黑名单内：</label>
+ <div class="col-sm-3">
+ <select class="form-control" id="inDriverBlacklist">
+ <option value="0" ${item.inDriverBlacklist == 0 ? 'selected' : ''}>否</option>
+ <option value="1" ${item.inDriverBlacklist == 1 ? 'selected' : ''}>是</option>
+ </select>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">服务类型：</label>
+ <div class="col-sm-3">
+ <select class="form-control" id="commercialType">
+ <option value="1" ${item.commercialType == 1 ? 'selected' : ''}>网络预约出租汽车</option>
+ <option value="2" ${item.commercialType == 2 ? 'selected' : ''}>巡游出租汽车</option>
+ <option value="3" ${item.commercialType == 3 ? 'selected' : ''}>私人小客车合乘</option>
+ </select>
+ </div>
+ </div>
+ <#input id="contractCompany" name="驾驶员合同签署公司" value="${item.contractCompany}"/>
+ <#input id="contractOn" name="合同有效期起" value="${item.contractOn}"/>
+ <#input id="contractOff" name="合同有效期止" value="${item.contractOff}"/>
+ <#input id="emergencyContact" name="紧急联系人" value="${item.emergencyContact}"/>
+ <#input id="emergencyContactPhone" name="紧急联系电话" value="${item.emergencyContactPhone}"/>
+ <#input id="emergencyContactAddress" name="紧急联系地址" value="${item.emergencyContactAddress}"/>
+
+
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="YesDriverInfoDlg.editSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="YesDriverInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tDriver/yesDriver_info.js"></script>
+<script type="application/javascript">
+ laydate.render({
+ elem: '#getDriverLicenseDate'
+ });
+ laydate.render({
+ elem: '#driverLicenseOn'
+ });
+ laydate.render({
+ elem: '#driverLicenseOff'
+ });
+ laydate.render({
+ elem: '#networkCarlssueDate'
+ });
+ laydate.render({
+ elem: '#getNetworkCarProofDate'
+ });
+ laydate.render({
+ elem: '#networkCarProofOn'
+ });
+ laydate.render({
+ elem: '#networkCarProofOff'
+ });
+ laydate.render({
+ elem: '#contractOn'
+ });
+ laydate.render({
+ elem: '#contractOff'
+ });
+ laydate.render({
+ elem: '#registerDate'
+ });
+
+ $(function() {
+ var serverBox3 = $('#serverBox3').prop('checked');
+ if (serverBox3){
+ $("#lineDiv").show();
+ } else {
+ $("#lineDiv").hide();
+ }
+ var companyType = $("input[name='companyType']:checked").val();
+ if (1 == companyType){
+ $(".companyDiv").hide();
+ } else if (2 == companyType){
+ $(".companyDiv").show();
+ }
+ });
+</script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_immediately.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_immediately.html
new file mode 100644
index 0000000..55187a5
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_immediately.html
@@ -0,0 +1,64 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+ <input type="hidden" id="id" name="id" value="${item.id}">
+ <div class="row">
+ <div class="col-sm-6 b-r">
+ <#label id="name" name="姓名" value="${item.name}"/>
+ <#label id="phone" name="手机号" value="${item.phone}"/>
+ <#label id="sexStr" name="性别" value="${item.sexStr}"/>
+ <#label id="addTypeStr" name="司机来源" value="${item.addTypeStr}"/>
+
+ <#label id="serverStr" name="服务模式" value="${item.serverStr}"/>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">审核结果：</label>
+ <div class="col-sm-9">
+ <div class="radio radio-info radio-inline">
+ <input type="radio" id="authState1" value="1" name="authState" checked="" >
+ <label for="authState1"> 审核通过 </label>
+ </div>
+ <div class="radio radio-success radio-inline">
+ <input type="radio" id="authState4" value="4" name="authState" >
+ <label for="authState4"> 审核不通过 </label>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="col-sm-6">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">头像：</label>
+ <div class="col-sm-9">
+ <div class="form-group">
+ <div class="col-sm-6">
+ <div id="headImgUrlPreId">
+ <div>
+ @if(isEmpty(item.headImgUrl)){
+ <img onclick="lookBigImg('${ctxPath}/static/img/NoPIC.png')" src="${ctxPath}/static/img/NoPIC.png" style="max-width:150px;">
+ @}else{
+ <img onclick="lookBigImg('${item.headImgUrl}')" src="${item.headImgUrl}" style="max-width:250px;">
+ @}
+ </div>
+ </div>
+ </div>
+ <input type="hidden" id="headImgUrl" name="headImgUrl" value="${item.headImgUrl}"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="确定" id="ensure" icon="fa-check" clickFun="TDriverInfoDlg.authOpt()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TDriverInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tDriver/tDriver_info.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_look.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_look.html
new file mode 100644
index 0000000..097ae0e
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_look.html
@@ -0,0 +1,43 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+ <input type="hidden" id="id" name="id" value="${item.id}">
+ <div class="row">
+ <div class="col-sm-6 b-r">
+ <#label id="name" name="姓名" value="${item.name}"/>
+ <#label id="phone" name="手机号" value="${item.phone}"/>
+ <#label id="sexStr" name="性别" value="${item.sexStr}"/>
+ <#label id="addTypeStr" name="司机来源" value="${item.addTypeStr}"/>
+
+ <#label id="serverStr" name="服务模式" value="${item.serverStr}"/>
+ <#label id="authStateStr" name="审核结果" value="${item.authStateStr}"/>
+ </div>
+
+ <div class="col-sm-6">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">头像：</label>
+ <div class="col-sm-9">
+ <div class="form-group">
+ <div class="col-sm-6">
+ <div id="headImgUrlPreId">
+ <div>
+ @if(isEmpty(item.headImgUrl)){
+ <img onclick="lookBigImg('${ctxPath}/static/img/NoPIC.png')" src="${ctxPath}/static/img/NoPIC.png" style="max-width:150px;">
+ @}else{
+ <img onclick="lookBigImg('${item.headImgUrl}')" src="${item.headImgUrl}" style="max-width:250px;">
+ @}
+ </div>
+ </div>
+ </div>
+ <input type="hidden" id="headImgUrl" name="headImgUrl" value="${item.headImgUrl}"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tDriver/tDriver_info.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_optDriver.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_optDriver.html
new file mode 100644
index 0000000..415a59f
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_optDriver.html
@@ -0,0 +1,29 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="yesDriverInfoForm">
+ <input type="hidden" id="tDriverId" name="tDriverId" value="${tDriverId}">
+ <input type="hidden" id="optType" name="optType" value="${optType}">
+ <div class="row">
+ <div class="col-sm-11">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">操作备注：</label>
+ <div class="col-sm-9">
+ <textarea type="text/plain" class="form-control" name="remark" id="remark" style="width:100%;height:150px;"></textarea>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t" style="text-align: center;">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="YesDriverInfoDlg.optDriver()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="YesDriverInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tDriver/yesDriver_info.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/training.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/training.html
new file mode 100644
index 0000000..30739cc
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/training.html
@@ -0,0 +1,75 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <input type="hidden" id="netCarDriverId" value="${id}">
+ <input type="hidden" id="id">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+ <div class="form-group">
+ <label class="col-sm-2 control-label">课程名称</label>
+ <div class="col-sm-9">
+ <input type="text" class="layui-input form-control" id="courseName">
+ </div>
+ </div>
+ <div class="hr-line-dashed"></div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">课程日期</label>
+ <div class="col-sm-9">
+ <input type="text" class="layui-input form-control" id="courseTime">
+ </div>
+ </div>
+ <div class="hr-line-dashed"></div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">课程时间</label>
+ <div class="col-sm-4">
+ <input type="text" class="layui-input form-control" id="startTime">
+ </div>
+ <div class="col-sm-1">
+ ~
+ </div>
+ <div class="col-sm-4">
+ <input type="text" class="layui-input form-control" id="endTime">
+ </div>
+ </div>
+ <div class="hr-line-dashed"></div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">时长</label>
+ <div class="col-sm-8">
+ <input type="number" class="layui-input form-control" id="duration" min="0">
+ </div>
+ <button type="button" class="btn btn-default btn-sm" id="add" onclick="add()">添加</button>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">已添加的培训记录</label>
+ <div class="col-sm-9">
+ <div style="height: 150px; border: 1px solid #e5e6e7;overflow-y: auto;">
+ <table class="table table-striped table-bordered table-hover table-condensed">
+ <thead>
+ <tr>
+ <th style="width: 50px; text-align: center;">序号</th>
+ <th style="width: 200px; text-align: center;">课程名称</th>
+ <th style="width: 200px; text-align: center;">课程日期</th>
+ <th style="width: 200px; text-align: center;">开始时间</th>
+ <th style="width: 200px; text-align: center;">结束时间</th>
+ <th style="width: 80px; text-align: center;">时长</th>
+ <th style="width: 200px; text-align: center;">操作</th>
+ </tr>
+ </thead>
+ <tbody id="transAreaAdd">
+
+ </tbody>
+ </table>
+ </div>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-sm-10">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="save()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="Training.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tDriver/training.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/yesDriver.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/yesDriver.html
new file mode 100644
index 0000000..1fb0ee4
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/yesDriver.html
@@ -0,0 +1,98 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>司机列表管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#TimeCon id="insertTime" name="注册时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="companyName" name="所属分公司/加盟商" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="phone" name="手机号" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="name" name="姓名" />
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="addType" 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">
+ <#SelectCon id="authState" name="状态" >
+ <option value="">全部</option>
+ <option value="2">正常</option>
+ <option value="3">冻结</option>
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="YesDriver.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="YesDriver.resetSearch()" space="true"/>
+ </div>
+ <div class="col-sm-3">
+ <input type="file" name="file" style="width:0px;height:0px;" id="uploadEventFile" onchange="YesDriver.exportDriver()">
+ </div>
+ </div>
+ <div class="hidden-xs" id="YesDriverTableToolbar" role="group">
+ @if(shiro.hasPermission("/tDriver/add")){
+ <#button name="添加司机" icon="fa-plus" clickFun="YesDriver.add()"/>
+ @}
+ @if(shiro.hasPermission("/tDriver/update")){
+ <#button name="编辑司机" icon="fa-edit" clickFun="YesDriver.update()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tDriver/deleteDriver")){
+ <#button name="删除司机" icon="fa-edit" clickFun="YesDriver.deleteDriver()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tDriver/freeze")){
+ <#button name="冻结司机" icon="fa-remove" clickFun="YesDriver.freeze()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tDriver/thaw")){
+ <#button name="解冻司机" icon="fa-remove" clickFun="YesDriver.thaw()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tDriver/training")){
+ <#button name="添加培训记录" icon="fa-remove" clickFun="YesDriver.training()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tDriver/illegal")){
+ <#button name="添加处罚记录" icon="fa-remove" clickFun="YesDriver.punish()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tDriver/import")){
+ <#button btnCss="info" name="下载模板" id="uploadModel" icon="fa fa-level-down" clickFun="YesDriver.uploadDriverModel()" space="true"/>
+ <#button btnCss="danger" name="导入" id="uploadEventBtn" icon="fa fa-level-up" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tDriver/export")){
+ <#button name="导出司机" icon="fa-remove" clickFun="YesDriver.outDriver()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tDriver/changeCar")){
+ <#button name="更换/绑定车辆" icon="fa-remove" clickFun="YesDriver.changeCar()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tDriver/changeMoney")){
+ <#button name="余额修改" icon="fa-edit" clickFun="YesDriver.changeMoney()" space="true"/>
+ @}
+ </div>
+ <#table id="YesDriverTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tDriver/yesDriver.js"></script>
+<script>
+ laydate.render({
+ elem: '#insertTime'
+ ,range: true
+ });
+</script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tFeedback/tFeedback.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tFeedback/tFeedback.html
new file mode 100644
index 0000000..7303056
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tFeedback/tFeedback.html
@@ -0,0 +1,52 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>司机反馈管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#TimeCon id="insertTime" name="反馈时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="driverName" name="反馈人" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="driverPhone" name="反馈人手机号" />
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="state" name="状态" >
+ <option value="">全部</option>
+ <option value="1">未处理</option>
+ <option value="2">已处理</option>
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="TFeedback.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="TFeedback.resetSearch()" space="true"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="TFeedbackTableToolbar" role="group">
+ @if(shiro.hasPermission("/tFeedback/immediately")){
+ <#button name="立即处理" icon="fa-edit" clickFun="TFeedback.immediately()"/>
+ @}
+ </div>
+ <#table id="TFeedbackTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tFeedback/tFeedback.js"></script>
+<script>
+ laydate.render({
+ elem: '#insertTime'
+ ,range: true
+ });
+</script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tFeedback/tFeedback_add.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tFeedback/tFeedback_add.html
new file mode 100644
index 0000000..8ef6e4b
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tFeedback/tFeedback_add.html
@@ -0,0 +1,36 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+
+ <div class="row">
+ <div class="col-sm-6 b-r">
+ <#input id="id" name="" underline="true"/>
+ <#input id="userId" name="反馈人ID" underline="true"/>
+ <#input id="handleUserId" name="处理人Id" underline="true"/>
+ <#input id="content" name="反馈内容" underline="true"/>
+ <#input id="insertTime" name="反馈时间" underline="true"/>
+ <#input id="imgUrl" name="图片"/>
+ </div>
+
+ <div class="col-sm-6">
+ <#input id="flag" name="状态(1=正常,2=删除)" underline="true"/>
+ <#input id="state" name="处理状态 1=未处理 2=已处理" underline="true"/>
+ <#input id="cldate" name="处理时间" underline="true"/>
+ <#input id="remark" name="处理备注" underline="true"/>
+ <#input id="type" name="1=用户，2=司机" underline="true"/>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TFeedbackInfoDlg.addSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TFeedbackInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tFeedback/tFeedback_info.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tFeedback/tFeedback_edit.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tFeedback/tFeedback_edit.html
new file mode 100644
index 0000000..ab2343a
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tFeedback/tFeedback_edit.html
@@ -0,0 +1,36 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+
+ <div class="row">
+ <div class="col-sm-6 b-r">
+ <#input id="id" name="" value="${item.id}" underline="true"/>
+ <#input id="userId" name="反馈人ID" value="${item.userId}" underline="true"/>
+ <#input id="handleUserId" name="处理人Id" value="${item.handleUserId}" underline="true"/>
+ <#input id="content" name="反馈内容" value="${item.content}" underline="true"/>
+ <#input id="insertTime" name="反馈时间" value="${item.insertTime}" underline="true"/>
+ <#input id="imgUrl" name="图片" value="${item.imgUrl}" />
+ </div>
+
+ <div class="col-sm-6">
+ <#input id="flag" name="状态(1=正常,2=删除)" value="${item.flag}" underline="true"/>
+ <#input id="state" name="处理状态 1=未处理 2=已处理" value="${item.state}" underline="true"/>
+ <#input id="cldate" name="处理时间" value="${item.cldate}" underline="true"/>
+ <#input id="remark" name="处理备注" value="${item.remark}" underline="true"/>
+ <#input id="type" name="1=用户，2=司机" value="${item.type}" />
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TFeedbackInfoDlg.editSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TFeedbackInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tFeedback/tFeedback_info.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tFeedback/tFeedback_immediately.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tFeedback/tFeedback_immediately.html
new file mode 100644
index 0000000..a902b13
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tFeedback/tFeedback_immediately.html
@@ -0,0 +1,29 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content" >
+ <div class="form-horizontal" id="feedbackInfoForm">
+ <input type="hidden" id="id" name="id" value="${tFeedbackId}">
+ <input type="hidden" id="type" name="type" value="${type}">
+ <div class="row">
+ <div class="col-sm-11">
+ <div class="form-group">
+ <label class="col-sm-2 control-label">备注：</label>
+ <div class="col-sm-9">
+ <textarea type="text/plain" class="form-control" name="remark" id="remark" placeholder="多行输入,最多500字" style="width:100%;height:150px;"></textarea>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TFeedbackInfoDlg.immediately()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TFeedbackInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tFeedback/tFeedback_info.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tFeedback/userFeedback.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tFeedback/userFeedback.html
new file mode 100644
index 0000000..ea7f094
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tFeedback/userFeedback.html
@@ -0,0 +1,52 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>用户反馈管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#TimeCon id="insertTime" name="反馈时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="userName" name="反馈人" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="userPhone" name="反馈人手机号" />
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="state" name="状态" >
+ <option value="">全部</option>
+ <option value="1">未处理</option>
+ <option value="2">已处理</option>
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="TUserFeedback.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="TUserFeedback.resetSearch()" space="true"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="TUserFeedbackTableToolbar" role="group">
+ @if(shiro.hasPermission("/tFeedback/immediatelyUser")){
+ <#button name="立即处理" icon="fa-edit" clickFun="TUserFeedback.immediately()"/>
+ @}
+ </div>
+ <#table id="TUserFeedbackTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+</div>
+<script src="${ctxPath}/static/modular/system/tFeedback/userFeedback.js"></script>
+<script>
+ laydate.render({
+ elem: '#insertTime'
+ ,range: true
+ });
+</script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tIntegralGoods/tIntegralGoods.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tIntegralGoods/tIntegralGoods.html
new file mode 100644
index 0000000..55468ff
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tIntegralGoods/tIntegralGoods.html
@@ -0,0 +1,61 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>商品管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#TimeCon id="insertTime" name="添加时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="name" name="商品名称" />
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="state" name="状态" >
+ <option value="">全部</option>
+ <option value="1">正常</option>
+ <option value="2">已下架</option>
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="TIntegralGoods.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="TIntegralGoods.resetSearch()" space="true"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="TIntegralGoodsTableToolbar" role="group">
+ @if(shiro.hasPermission("/tIntegralGoods/add")){
+ <#button name="添加" icon="fa-plus" clickFun="TIntegralGoods.openAddTIntegralGoods()"/>
+ @}
+ @if(shiro.hasPermission("/tIntegralGoods/update")){
+ <#button name="编辑" icon="fa-edit" clickFun="TIntegralGoods.openTIntegralGoodsDetail()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tIntegralGoods/delete")){
+ <#button name="删除" icon="fa-remove" clickFun="TIntegralGoods.opt(3)" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tIntegralGoods/up")){
+ <#button name="上架" icon="fa-remove" clickFun="TIntegralGoods.opt(1)" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tIntegralGoods/down")){
+ <#button name="下架" icon="fa-remove" clickFun="TIntegralGoods.opt(2)" space="true"/>
+ @}
+ </div>
+ <#table id="TIntegralGoodsTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tIntegralGoods/tIntegralGoods.js"></script>
+<script>
+ laydate.render({
+ elem: '#insertTime'
+ ,range: true
+ });
+</script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tIntegralGoods/tIntegralGoods_add.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tIntegralGoods/tIntegralGoods_add.html
new file mode 100644
index 0000000..9c113eb
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tIntegralGoods/tIntegralGoods_add.html
@@ -0,0 +1,31 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="integralGoodsInfoForm">
+
+ <div class="row">
+ <div class="col-sm-11">
+ <#input id="name" name="商品名称"/>
+ <#avatar id="imgUrl" name="商品图片：" />
+ <#input id="integral" name="兑换积分"/>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">商品说明：</label>
+ <div class="col-sm-9">
+ <textarea type="text/plain" id="editor" style="width:100%;height:350px;"></textarea>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TIntegralGoodsInfoDlg.addSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TIntegralGoodsInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tIntegralGoods/tIntegralGoods_info.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tIntegralGoods/tIntegralGoods_edit.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tIntegralGoods/tIntegralGoods_edit.html
new file mode 100644
index 0000000..c05bc99
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tIntegralGoods/tIntegralGoods_edit.html
@@ -0,0 +1,31 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="integralGoodsInfoForm">
+ <input type="hidden" id="id" name="id" value="${item.id}">
+ <div class="row">
+ <div class="col-sm-11">
+ <#input id="name" name="商品名称" value="${item.name}"/>
+ <#avatar id="imgUrl" name="商品图片：" avatarImg="${item.imgUrl}"/>
+ <#input id="integral" name="兑换积分" value="${item.integral}"/>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">商品说明：</label>
+ <div class="col-sm-9">
+ <textarea type="text/plain" id="editor" style="width:100%;height:350px;">${item.instructions}</textarea>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TIntegralGoodsInfoDlg.editSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TIntegralGoodsInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tIntegralGoods/tIntegralGoods_info.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tIntegralOrder/tIntegralOrder.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tIntegralOrder/tIntegralOrder.html
new file mode 100644
index 0000000..8d1842e
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tIntegralOrder/tIntegralOrder.html
@@ -0,0 +1,61 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>积分兑换订单管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#TimeCon id="insertTime" name="兑换时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="userName" name="兑换用户" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="goodsName" name="兑换商品" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="consigneeName" name="收货人" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="consigneePhone" name="联系电话" />
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="state" name="状态" >
+ <option value="">全部</option>
+ <option value="1">待处理</option>
+ <option value="2">已处理</option>
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="TIntegralOrder.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="TIntegralOrder.resetSearch()" space="true"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="TIntegralOrderTableToolbar" role="group">
+ @if(shiro.hasPermission("/tIntegralOrder/immediately")){
+ <#button name="立即处理" icon="fa-edit" clickFun="TIntegralOrder.immediately()"/>
+ @}
+ @if(shiro.hasPermission("/tIntegralOrder/delete")){
+ <#button name="删除记录" icon="fa-remove" clickFun="TIntegralOrder.delete()" space="true"/>
+ @}
+ </div>
+ <#table id="TIntegralOrderTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tIntegralOrder/tIntegralOrder.js"></script>
+<script>
+ laydate.render({
+ elem: '#insertTime'
+ ,range: true
+ });
+</script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tIntegralOrder/tIntegralOrder_add.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tIntegralOrder/tIntegralOrder_add.html
new file mode 100644
index 0000000..57fbd7c
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tIntegralOrder/tIntegralOrder_add.html
@@ -0,0 +1,35 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+
+ <div class="row">
+ <div class="col-sm-6 b-r">
+ <#input id="id" name="主键ID" underline="true"/>
+ <#input id="insertTime" name="兑换时间" underline="true"/>
+ <#input id="userId" name="兑换用户ID" underline="true"/>
+ <#input id="goodsId" name="兑换商品ID" underline="true"/>
+ <#input id="num" name="兑换数量"/>
+ </div>
+
+ <div class="col-sm-6">
+ <#input id="consigneeName" name="收货人" underline="true"/>
+ <#input id="consigneePhone" name="收货人联系电话" underline="true"/>
+ <#input id="consigneeAddress" name="收货人收货地址" underline="true"/>
+ <#input id="remark" name="备注" underline="true"/>
+ <#input id="state" name="状态 1=未处理 2=已处理 3=已删除" underline="true"/>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TIntegralOrderInfoDlg.addSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TIntegralOrderInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tIntegralOrder/tIntegralOrder_info.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tIntegralOrder/tIntegralOrder_edit.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tIntegralOrder/tIntegralOrder_edit.html
new file mode 100644
index 0000000..49d4252
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tIntegralOrder/tIntegralOrder_edit.html
@@ -0,0 +1,35 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+
+ <div class="row">
+ <div class="col-sm-6 b-r">
+ <#input id="id" name="主键ID" value="${item.id}" underline="true"/>
+ <#input id="insertTime" name="兑换时间" value="${item.insertTime}" underline="true"/>
+ <#input id="userId" name="兑换用户ID" value="${item.userId}" underline="true"/>
+ <#input id="goodsId" name="兑换商品ID" value="${item.goodsId}" underline="true"/>
+ <#input id="num" name="兑换数量" value="${item.num}" />
+ </div>
+
+ <div class="col-sm-6">
+ <#input id="consigneeName" name="收货人" value="${item.consigneeName}" underline="true"/>
+ <#input id="consigneePhone" name="收货人联系电话" value="${item.consigneePhone}" underline="true"/>
+ <#input id="consigneeAddress" name="收货人收货地址" value="${item.consigneeAddress}" underline="true"/>
+ <#input id="remark" name="备注" value="${item.remark}" underline="true"/>
+ <#input id="state" name="状态 1=未处理 2=已处理 3=已删除" value="${item.state}" />
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TIntegralOrderInfoDlg.editSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TIntegralOrderInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tIntegralOrder/tIntegralOrder_info.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tIntegralOrder/tIntegralOrder_immediately.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tIntegralOrder/tIntegralOrder_immediately.html
new file mode 100644
index 0000000..8e7ce0b
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tIntegralOrder/tIntegralOrder_immediately.html
@@ -0,0 +1,28 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="integralOrderInfoForm">
+ <input type="hidden" id="id" name="id" value="${id}">
+ <div class="row">
+ <div class="col-sm-11">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">处理备注：</label>
+ <div class="col-sm-9">
+ <textarea type="text/plain" class="form-control" name="remark" id="remark" style="width:100%;height:150px;" placeholder="多行输入"></textarea>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TIntegralOrderInfoDlg.immediately()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TIntegralOrderInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tIntegralOrder/tIntegralOrder_info.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tInvoice/tInvoice.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tInvoice/tInvoice.html
new file mode 100644
index 0000000..d17d306
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tInvoice/tInvoice.html
@@ -0,0 +1,63 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>开发票列表管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#TimeCon id="insertTime" name="申请时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="email" name="邮箱" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="name" name="发票抬头" />
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="type" name="抬头类型" >
+ <option value="">全部</option>
+ <option value="1">个人发票</option>
+ <option value="2">单位发票</option>
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="state" name="状态" >
+ <option value="">全部</option>
+ <option value="1">待开票</option>
+ <option value="2">开票成功</option>
+ <option value="3">开票失败</option>
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="TInvoice.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="TInvoice.resetSearch()" space="true"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="TInvoiceTableToolbar" role="group">
+ @if(shiro.hasPermission("/tInvoice/again")){
+ <#button name="重新开票" icon="fa-edit" clickFun="TInvoice.again()"/>
+ @}
+ @if(shiro.hasPermission("/tInvoice/delete")){
+ <#button name="删除记录" icon="fa-remove" clickFun="TInvoice.delete()" space="true"/>
+ @}
+ </div>
+ <#table id="TInvoiceTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tInvoice/tInvoice.js"></script>
+<script>
+ laydate.render({
+ elem: '#insertTime'
+ ,range: true
+ });
+</script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tInvoice/tInvoice_add.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tInvoice/tInvoice_add.html
new file mode 100644
index 0000000..ab8a523
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tInvoice/tInvoice_add.html
@@ -0,0 +1,39 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+
+ <div class="row">
+ <div class="col-sm-6 b-r">
+ <#input id="id" name="" underline="true"/>
+ <#input id="money" name="开票金额" underline="true"/>
+ <#input id="orderNum" name="开票订单数量" underline="true"/>
+ <#input id="type" name="开票类型（1=个人发票，2=单位发票）" underline="true"/>
+ <#input id="name" name="抬头名称（公司名称/个人姓名）" underline="true"/>
+ <#input id="code" name="税号" underline="true"/>
+ <#input id="content" name="发票内容"/>
+ </div>
+
+ <div class="col-sm-6">
+ <#input id="remark" name="备注" underline="true"/>
+ <#input id="address" name="地址+电话" underline="true"/>
+ <#input id="bank" name="开户行+账号" underline="true"/>
+ <#input id="email" name="邮箱" underline="true"/>
+ <#input id="userId" name="开票用户id" underline="true"/>
+ <#input id="state" name="状态（1=待开票，2=成功，3=失败）" underline="true"/>
+ <#input id="insertTime" name="申请时间" underline="true"/>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TInvoiceInfoDlg.addSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TInvoiceInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tInvoice/tInvoice_info.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tInvoice/tInvoice_edit.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tInvoice/tInvoice_edit.html
new file mode 100644
index 0000000..093e97f
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tInvoice/tInvoice_edit.html
@@ -0,0 +1,39 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+
+ <div class="row">
+ <div class="col-sm-6 b-r">
+ <#input id="id" name="" value="${item.id}" underline="true"/>
+ <#input id="money" name="开票金额" value="${item.money}" underline="true"/>
+ <#input id="orderNum" name="开票订单数量" value="${item.orderNum}" underline="true"/>
+ <#input id="type" name="开票类型（1=个人发票，2=单位发票）" value="${item.type}" underline="true"/>
+ <#input id="name" name="抬头名称（公司名称/个人姓名）" value="${item.name}" underline="true"/>
+ <#input id="code" name="税号" value="${item.code}" underline="true"/>
+ <#input id="content" name="发票内容" value="${item.content}" />
+ </div>
+
+ <div class="col-sm-6">
+ <#input id="remark" name="备注" value="${item.remark}" underline="true"/>
+ <#input id="address" name="地址+电话" value="${item.address}" underline="true"/>
+ <#input id="bank" name="开户行+账号" value="${item.bank}" underline="true"/>
+ <#input id="email" name="邮箱" value="${item.email}" underline="true"/>
+ <#input id="userId" name="开票用户id" value="${item.userId}" underline="true"/>
+ <#input id="state" name="状态（1=待开票，2=成功，3=失败）" value="${item.state}" underline="true"/>
+ <#input id="insertTime" name="申请时间" value="${item.insertTime}" />
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TInvoiceInfoDlg.editSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TInvoiceInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tInvoice/tInvoice_info.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tLine/tLine.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tLine/tLine.html
new file mode 100644
index 0000000..c450377
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tLine/tLine.html
@@ -0,0 +1,70 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>跨城线路管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#TimeCon id="insertTime" name="添加时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="name" name="线路名称" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="insertUser" name="创建者" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="modelStr" name="关联车型" />
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="state" name="状态" >
+ <option value="">全部</option>
+ <option value="1">正常</option>
+ <option value="2">冻结</option>
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="TLine.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="TLine.resetSearch()" space="true"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="TLineTableToolbar" role="group">
+ @if(shiro.hasPermission("/tLine/add")){
+ <#button name="添加" icon="fa-plus" clickFun="TLine.openAddTLine()"/>
+ @}
+ @if(shiro.hasPermission("/tLine/update")){
+ <#button name="编辑" icon="fa-edit" clickFun="TLine.openTLineDetail()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tLine/delete")){
+ <#button name="删除" icon="fa-remove" clickFun="TLine.opt(1)" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tLine/freeze")){
+ <#button name="冻结" icon="fa-remove" clickFun="TLine.opt(2)" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tLine/thaw")){
+ <#button name="解冻" icon="fa-remove" clickFun="TLine.opt(3)" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tLine/addCompany")){
+ <#button name="分配企业" icon="fa-plus" clickFun="TLine.addCompany()" space="true"/>
+ @}
+ </div>
+ <#table id="TLineTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tLine/tLine.js"></script>
+<script>
+ laydate.render({
+ elem: '#insertTime'
+ ,range: true
+ });
+</script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tLine/tLine_add.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tLine/tLine_add.html
new file mode 100644
index 0000000..da95513
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tLine/tLine_add.html
@@ -0,0 +1,243 @@
+@layout("/common/_container.html"){
+<style>
+ .newWidth, .single-line{
+ max-width:150px !important;display: initial !important;
+ }
+ .newWidth1, .single-line{
+ max-width:200px !important;display: initial !important;
+ }
+</style>
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="lineInfoForm">
+ <div class="row" style="margin-top: 15px;">
+ <div class="col-sm-4">
+ <h2 style="font-weight: 700;">基础设置</h2>
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-sm-11">
+ <div class="form-group">
+ <label class="col-sm-2 control-label">线路名称：</label>
+ <div class="col-sm-5">
+ <input type="text" class="form-control" id="name" name="name">
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">起点：</label>
+ <div class="col-sm-2">
+ <select class="form-control" id="startSiteId" >
+ <option value="">选择站点</option>
+ @for(obj in siteList){
+ <option value="${obj.id}">${obj.name}</option>
+ @}
+ </select>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">终点：</label>
+ <div class="col-sm-2">
+ <select class="form-control" id="endSiteId" >
+ <option value="">选择站点</option>
+ @for(obj in siteList){
+ <option value="${obj.id}">${obj.name}</option>
+ @}
+ </select>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">司机申请限制：</label>
+ <div class="col-sm-6">
+ 司机申请班次的最小时间间隔为 <input type="text" oninput="checkIsMinute(this)" class="form-control newWidth" id="shiftInterval" name="shiftInterval"> 分钟
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">抽成比例：</label>
+ <div class="col-sm-6">
+ <input type="text" oninput="checkIsBiLi(this)" class="form-control newWidth" id="rakeRate" name="rakeRate"> %
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row" style="margin-top: 30px;">
+ <div class="col-sm-4">
+ <h2 style="font-weight: 700;">价格设置</h2>
+ </div>
+ </div>
+
+ <div class="row">
+ <div class="col-sm-11">
+ <div class="form-group">
+ <label class="col-sm-2 control-label">选择车型：</label>
+ <div class="col-sm-2">
+ <select class="form-control" id="serverModelId" >
+ <option value="">选择车型</option>
+ @for(obj in carmodelList){
+ <option value="${obj.id}">${obj.name}</option>
+ @}
+ </select>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">选择车型：</label>
+ <div class="col-sm-2" style="display: flex;align-items: center;">
+ <div class="radio radio-info radio-inline">
+ <input type="radio" id="type1" value="1" name="type" checked="" onclick="TLineInfoDlg.typeClick(1)">
+ <label for="type1"> 固定计价 </label>
+ </div>
+ <div class="radio radio-success radio-inline">
+ <input type="radio" id="type2" value="2" name="type" onclick="TLineInfoDlg.typeClick(2)">
+ <label for="type2"> 浮动计价 </label>
+ </div>
+ </div>
+ </div>
+
+ <div class="form-group" id="fixedDiv">
+ <label class="col-sm-2 control-label">固定计价：</label>
+ <div class="col-sm-10">
+ 单人价格： <input type="text" oninput="checkIsYuan(this)" name="num1" id="num1" class="form-control newWidth" /> 元；
+ 包车价格： <input type="text" oninput="checkIsYuan(this)" name="num2" id="num2" class="form-control newWidth" /> 元；<br><br>
+ 五座系数： <input type="text" oninput="checkIsXiShu(this)" name="num3" id="num3" class="form-control newWidth" /> ；
+ 七座系数： <input type="text" oninput="checkIsXiShu(this)" name="num4" id="num4" class="form-control newWidth" /> ；
+ </div>
+ </div>
+
+ <div class="form-group" id="floatDiv" style="display: none;">
+ <label class="col-sm-2 control-label">浮动计价：</label>
+ <div class="col-sm-10">
+ 参考费用： <input type="text" oninput="checkIsYuan(this)" name="num11" id="num11" class="form-control newWidth" /> 元；
+ 参考里程： <input type="text" oninput="checkIsYuan(this)" name="num12" id="num12" class="form-control newWidth" /> 公里；<br><br>
+ 基础单价： <input type="text" oninput="checkIsYuan(this)" name="num13" id="num13" class="form-control newWidth" /> 元；
+ 优惠系数： <input type="text" oninput="checkIsXiShu(this)" name="num14" id="num14" class="form-control newWidth" /> ；<br><br>
+ 包车系数： <input type="text" oninput="checkIsXiShu(this)" name="num15" id="num15" class="form-control newWidth" /> ；
+ 五座系数： <input type="text" oninput="checkIsXiShu(this)" name="num16" id="num16" class="form-control newWidth" /> ；<br><br>
+ 七座系数： <input type="text" oninput="checkIsXiShu(this)" name="num17" id="num17" class="form-control newWidth" /> ；
+ </div>
+ </div>
+
+ <div class="form-group">
+ <label class="col-sm-2 control-label"></label>
+ <div class="col-sm-10">
+ <#button btnCss="info" name="添加" id="ensure" icon="fa-check" clickFun="TLineInfoDlg.addPrice()"/>
+ </div>
+ </div>
+
+ <div class="form-group">
+ <label class="col-sm-2 control-label">已添加价格</label>
+ <div class="col-sm-6">
+ <div style="height: 200px; border: 1px solid #e5e6e7;overflow-y: auto;">
+ <table class="table table-striped table-bordered table-hover table-condensed">
+ <thead>
+ <tr>
+ <th style="width: 300px;text-align: center;">添加时间</th>
+ <th style="width: 300px;text-align: center;">车型名称</th>
+ <th style="width: 300px;text-align: center;">价格设置</th>
+ <th style="width: 100px;text-align: center;">操作</th>
+ </tr>
+ </thead>
+ <tbody id="priceValue">
+
+ </tbody>
+ </table>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row" style="margin-top: 30px;">
+ <div class="col-sm-4">
+ <h2 style="font-weight: 700;">班次设置</h2>
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-sm-11">
+ <div class="form-group">
+ <label class="col-sm-2 control-label">班次时间：</label>
+ <div class="col-sm-2">
+ <input type="text" name="shiftTime" id="shiftTime" class="form-control" placeholder="选择时间"/>
+ </div>
+ <label class="col-sm-1 control-label">车次数：</label>
+ <div class="col-sm-2">
+ <input type="text" name="carNum" id="carNum" class="form-control" />
+ </div>
+ <div class="col-sm-2">
+ <#button btnCss="info" name="添加" id="ensure" icon="fa-check" clickFun="TLineInfoDlg.addShift()"/>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">已添加班次</label>
+ <div class="col-sm-6">
+ <div style="height: 200px; border: 1px solid #e5e6e7;overflow-y: auto;">
+ <table class="table table-striped table-bordered table-hover table-condensed">
+ <thead>
+ <tr>
+ <th style="width: 300px;text-align: center;">添加时间</th>
+ <th style="width: 300px;text-align: center;">班次时间</th>
+ <th style="width: 300px;text-align: center;">车次数</th>
+ <th style="width: 100px;text-align: center;">操作</th>
+ </tr>
+ </thead>
+ <tbody id="shiftValue">
+
+ </tbody>
+ </table>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TLineInfoDlg.addSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TLineInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tLine/tLine_info.js"></script>
+<script type="text/javascript">
+ laydate.render({
+ elem: '#shiftTime'
+ ,type: 'time'
+ ,range: '-'
+ ,format: 'HH:mm'
+ });
+ var regDouble = /^(0|[1-9]\d{0,2})(\.\d{1,2})?$/;
+ var regXiShu = /^(0(\.\d{1,2})?|1(\.0{1,2})?)$/;
+ var regBiLi = /^([0-9]{1,2}$)|(^[0-9]{1,2}\.[0-9]{1,2}$)|100$/;
+ var regInt = /^[0-9]{0,3}$/;
+ function checkIsYuan(obj){
+ var num = $(obj).val();
+ if(!regDouble.test(num)){
+ layer.msg("【元】输入框不能超过3位数,保留两位小数");
+ }
+ }
+ function checkIsXiShu(obj){
+ var num = $(obj).val();
+ if(!regXiShu.test(num)){
+ layer.msg("【系数】输入框大于0小于1,保留两位小数");
+ }
+ }
+ function checkIsBiLi(obj){
+ var num = $(obj).val();
+ if(!regBiLi.test(num)){
+ layer.msg("【比例】输入框大于等于0小于100");
+ }
+ }
+ function checkIsMinute(obj){
+ var num = $(obj).val();
+ if(!regInt.test(num)){
+ layer.msg("【分钟】输入框不能超过3位数");
+ }
+ }
+
+</script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tLine/tLine_addCompany.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tLine/tLine_addCompany.html
new file mode 100644
index 0000000..9564a26
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tLine/tLine_addCompany.html
@@ -0,0 +1,65 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="lineInfoForm">
+ <div class="row">
+ <input type="hidden" id="lineId" name="lineId" value="${tLine.id}">
+ <div class="col-sm-11">
+ <div class="form-group">
+ <label class="col-sm-2 control-label">线路名称：</label>
+ <div class="col-sm-9">
+ <label class="control-label" id="name" name="name">${tLine.name}</label>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">选择企业：</label>
+ <div class="col-sm-2">
+ <select class="form-control" id="companyId" >
+ <option value="">选择企业</option>
+ @for(obj in companyList){
+ <option value="${obj.id}">${obj.name}</option>
+ @}
+ </select>
+ </div>
+ <div class="col-sm-2">
+ <#button btnCss="info" name="添加" id="ensure" icon="fa-check" clickFun="TLineInfoDlg.addCompany()"/>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">已分配企业</label>
+ <div class="col-sm-6">
+ <div style="height: 200px; border: 1px solid #e5e6e7;overflow-y: auto;">
+ <table class="table table-striped table-bordered table-hover table-condensed">
+ <thead>
+ <tr>
+ <th style="width: 300px;text-align: center;">公司名称</th>
+ <th style="width: 100px;text-align: center;">操作</th>
+ </tr>
+ </thead>
+ <tbody id="companyValue">
+ @for(obj in lineCompanyList!){
+ <tr class="companyValueClass">
+ <td style="text-align: center;"><input type="hidden" id="companyIdValue" name="companyIdValue" value="${obj.companyId}">${obj.companyName}</td>
+ <td style="text-align: center;"><button onclick="deleteSub(this)">移除</button></td>
+ </tr>
+ @}
+ </tbody>
+ </table>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TLineInfoDlg.addCompanySubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TLineInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tLine/tLine_info.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tLine/tLine_edit.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tLine/tLine_edit.html
new file mode 100644
index 0000000..3835e4f
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tLine/tLine_edit.html
@@ -0,0 +1,257 @@
+@layout("/common/_container.html"){
+<style>
+ .newWidth, .single-line{
+ max-width:150px !important;display: initial !important;
+ }
+ .newWidth1, .single-line{
+ max-width:200px !important;display: initial !important;
+ }
+</style>
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="lineInfoForm">
+ <div class="row" style="margin-top: 15px;">
+ <div class="col-sm-4">
+ <h2 style="font-weight: 700;">基础设置</h2>
+ </div>
+ </div>
+ <input type="hidden" id="id" name="id" value="${item.id}">
+ <div class="row">
+ <div class="col-sm-11">
+ <div class="form-group">
+ <label class="col-sm-2 control-label">线路名称：</label>
+ <div class="col-sm-5">
+ <input type="text" class="form-control" id="name" name="name" value="${item.name}">
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">起点：</label>
+ <div class="col-sm-2">
+ <select class="form-control" id="startSiteId" >
+ <option value="">选择站点</option>
+ @for(obj in siteList){
+ <option value="${obj.id}" ${obj.id == start.siteId ? 'selected=selected' : ''}>${obj.name}</option>
+ @}
+ </select>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">终点：</label>
+ <div class="col-sm-2">
+ <select class="form-control" id="endSiteId" >
+ <option value="">选择站点</option>
+ @for(obj in siteList){
+ <option value="${obj.id}" ${obj.id == end.siteId ? 'selected=selected' : ''}>${obj.name}</option>
+ @}
+ </select>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">司机申请限制：</label>
+ <div class="col-sm-6">
+ 司机申请班次的最小时间间隔为 <input type="text" oninput="checkIsMinute(this)" class="form-control newWidth" id="shiftInterval" name="shiftInterval" value="${item.shiftInterval}" > 分钟
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">抽成比例：</label>
+ <div class="col-sm-6">
+ <input type="text" oninput="checkIsBiLi(this)" class="form-control newWidth" id="rakeRate" name="rakeRate" value="${item.rakeRate}"> %
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row" style="margin-top: 30px;">
+ <div class="col-sm-4">
+ <h2 style="font-weight: 700;">价格设置</h2>
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-sm-11">
+ <div class="form-group">
+ <label class="col-sm-2 control-label">选择车型：</label>
+ <div class="col-sm-2">
+ <select class="form-control" id="serverModelId" >
+ <option value="">选择车型</option>
+ @for(obj in carmodelList){
+ <option value="${obj.id}">${obj.name}</option>
+ @}
+ </select>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">选择车型：</label>
+ <div class="col-sm-2" style="display: flex;align-items: center;">
+ <div class="radio radio-info radio-inline">
+ <input type="radio" id="type1" value="1" name="type" checked="" onclick="TLineInfoDlg.typeClick(1)">
+ <label for="type1"> 固定计价 </label>
+ </div>
+ <div class="radio radio-success radio-inline">
+ <input type="radio" id="type2" value="2" name="type" onclick="TLineInfoDlg.typeClick(2)">
+ <label for="type2"> 浮动计价 </label>
+ </div>
+ </div>
+ </div>
+
+ <div class="form-group" id="fixedDiv">
+ <label class="col-sm-2 control-label">固定计价：</label>
+ <div class="col-sm-10">
+ 单人价格： <input type="text" oninput="checkIsYuan(this)" name="num1" id="num1" class="form-control newWidth" /> 元；
+ 包车价格： <input type="text" oninput="checkIsYuan(this)" name="num2" id="num2" class="form-control newWidth" /> 元；<br><br>
+ 五座系数： <input type="text" oninput="checkIsXiShu(this)" name="num3" id="num3" class="form-control newWidth" /> ；
+ 七座系数： <input type="text" oninput="checkIsXiShu(this)" name="num4" id="num4" class="form-control newWidth" /> ；
+ </div>
+ </div>
+
+ <div class="form-group" id="floatDiv" style="display: none;">
+ <label class="col-sm-2 control-label">浮动计价：</label>
+ <div class="col-sm-10">
+ 参考费用： <input type="text" oninput="checkIsYuan(this)" name="num11" id="num11" class="form-control newWidth" /> 元；
+ 参考里程： <input type="text" oninput="checkIsYuan(this)" name="num12" id="num12" class="form-control newWidth" /> 公里；<br><br>
+ 基础单价： <input type="text" oninput="checkIsYuan(this)" name="num13" id="num13" class="form-control newWidth" /> 元；
+ 优惠系数： <input type="text" oninput="checkIsXiShu(this)" name="num14" id="num14" class="form-control newWidth" /> ；<br><br>
+ 包车系数： <input type="text" oninput="checkIsXiShu(this)" name="num15" id="num15" class="form-control newWidth" /> ；
+ 五座系数： <input type="text" oninput="checkIsXiShu(this)" name="num16" id="num16" class="form-control newWidth" /> ；<br><br>
+ 七座系数： <input type="text" oninput="checkIsXiShu(this)" name="num17" id="num17" class="form-control newWidth" /> ；
+ </div>
+ </div>
+
+ <div class="form-group">
+ <label class="col-sm-2 control-label"></label>
+ <div class="col-sm-10">
+ <#button btnCss="info" name="添加" id="ensure" icon="fa-check" clickFun="TLineInfoDlg.addPrice()"/>
+ </div>
+ </div>
+
+ <div class="form-group">
+ <label class="col-sm-2 control-label">已添加价格</label>
+ <div class="col-sm-6">
+ <div style="height: 200px; border: 1px solid #e5e6e7;overflow-y: auto;">
+ <table class="table table-striped table-bordered table-hover table-condensed">
+ <thead>
+ <tr>
+ <th style="width: 300px;text-align: center;">添加时间</th>
+ <th style="width: 300px;text-align: center;">车型名称</th>
+ <th style="width: 300px;text-align: center;">价格设置</th>
+ <th style="width: 100px;text-align: center;">操作</th>
+ </tr>
+ </thead>
+ <tbody id="priceValue">
+ @for(obj in linePriceList!){
+ <tr class="typeValueClass">
+ <td style="text-align: center;"><input type="hidden" id="timeValue" name="timeValue" value="${obj.addTime}">${obj.addTime}</td>
+ <td style="text-align: center;"><input type="hidden" id="serverModelIdValue" name="serverModelIdValue" value="${obj.serverCarModelId}">${obj.name}</td>
+ <td style="text-align: center;"><input type="hidden" id="typeValue" name="typeValue" value="${obj.type}">
+ <input type="hidden" id="contentValue" name="contentValue" value='${obj.content}'>
+ <input type="hidden" id="contentStrValue" name="contentStrValue" value="${obj.contentStr}">${obj.contentStr}</td>
+ <td style="text-align: center;"><button onclick="deleteSub(this)">移除</button></td>
+ </tr>
+ @}
+ </tbody>
+ </table>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row" style="margin-top: 30px;">
+ <div class="col-sm-4">
+ <h2 style="font-weight: 700;">班次设置</h2>
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-sm-11">
+ <div class="form-group">
+ <label class="col-sm-2 control-label">班次时间：</label>
+ <div class="col-sm-2">
+ <input type="text" name="shiftTime" id="shiftTime" class="form-control" placeholder="选择时间"/>
+ </div>
+ <label class="col-sm-1 control-label">车次数：</label>
+ <div class="col-sm-2">
+ <input type="text" name="carNum" id="carNum" class="form-control" />
+ </div>
+ <div class="col-sm-2">
+ <#button btnCss="info" name="添加" id="ensure" icon="fa-check" clickFun="TLineInfoDlg.addShift()"/>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">已添加班次</label>
+ <div class="col-sm-6">
+ <div style="height: 200px; border: 1px solid #e5e6e7;overflow-y: auto;">
+ <table class="table table-striped table-bordered table-hover table-condensed">
+ <thead>
+ <tr>
+ <th style="width: 300px;text-align: center;">添加时间</th>
+ <th style="width: 300px;text-align: center;">班次时间</th>
+ <th style="width: 300px;text-align: center;">车次数</th>
+ <th style="width: 100px;text-align: center;">操作</th>
+ </tr>
+ </thead>
+ <tbody id="shiftValue">
+ @for(obj in lineShiftList!){
+ <tr class="shiftValueClass">
+ <td style="text-align: center;"><input type="hidden" id="time2Value" name="time2Value" value="${obj.addTime}">${obj.addTime}</td>
+ <td style="text-align: center;"><input type="hidden" id="shiftTimeValue" name="shiftTimeValue" value="${obj.startTime} - ${obj.endTime}">${obj.startTime} - ${obj.endTime}</td>
+ <td style="text-align: center;"><input type="hidden" id="carNumValue" name="carNumValue" value="${obj.carNum}">${obj.carNum}</td>
+ <td style="text-align: center;"><button onclick="deleteSub(this)">移除</button></td>
+ </tr>
+ @}
+ </tbody>
+ </table>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TLineInfoDlg.editSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TLineInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tLine/tLine_info.js"></script>
+<script type="text/javascript">
+ laydate.render({
+ elem: '#shiftTime'
+ ,type: 'time'
+ ,range: '-'
+ ,format: 'HH:mm'
+ });
+ var regDouble = /^(([1-9]{1}\d*)|(0{1}))(\.\d{0,2})?$/;
+ var regXiShu = /^(0(\.\d{1,2})?|1(\.0{1,2})?)$/;
+ var regBiLi = /^([0-9]{1,2}$)|(^[0-9]{1,2}\.[0-9]{1,2}$)|100$/;
+ var regInt = /^[0-9]{0,3}$/;
+ function checkIsYuan(obj){
+ var num = $(obj).val();
+ if(!regDouble.test(num)){
+ layer.msg("【元】输入框不能超过3位数,保留两位小数");
+ }
+ }
+ function checkIsXiShu(obj){
+ var num = $(obj).val();
+ if(!regXiShu.test(num)){
+ layer.msg("【系数】输入框大于0小于1,保留两位小数");
+ }
+ }
+ function checkIsBiLi(obj){
+ var num = $(obj).val();
+ if(!regBiLi.test(num)){
+ layer.msg("【比例】输入框大于等于0小于100");
+ }
+ }
+ function checkIsMinute(obj){
+ var num = $(obj).val();
+ if(!regInt.test(num)){
+ layer.msg("【分钟】输入框不能超过3位数");
+ }
+ }
+
+</script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tNotices/system.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tNotices/system.html
new file mode 100644
index 0000000..e7c74a4
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tNotices/system.html
@@ -0,0 +1,51 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>系统公告设置管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#TimeCon id="insertTime" name="添加时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="content" name="消息内容" />
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="System.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="System.resetSearch()" space="true"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="SystemTableToolbar" role="group">
+ @if(shiro.hasPermission("/tNotices/addSystem")){
+ <#button name="添加" icon="fa-plus" clickFun="System.addSystem()"/>
+ @}
+ @if(shiro.hasPermission("/tNotices/updateSystem")){
+ <#button name="编辑" icon="fa-edit" clickFun="System.updateSystem()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tNotices/deleteSystem")){
+ <#button name="删除" icon="fa-remove" clickFun="System.deleteSystem()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tNotices/sendSystem")){
+ <#button name="发布" icon="fa-remove" clickFun="System.sendSystem()" space="true"/>
+ @}
+ </div>
+ <#table id="SystemTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tNotices/system.js"></script>
+<script>
+ laydate.render({
+ elem: '#insertTime'
+ ,range: true
+ });
+</script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tNotices/system_add.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tNotices/system_add.html
new file mode 100644
index 0000000..e84a1fd
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tNotices/system_add.html
@@ -0,0 +1,58 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="systemInfoForm">
+ <div class="row">
+ <div class="col-sm-11">
+ <div class="form-group">
+ <fieldset>
+ <label class="col-sm-3 control-label">发布对象：</label>
+ <div class="col-sm-9">
+ <div class="checkbox checkbox-success checkbox-inline">
+ <input type="checkbox" name="serverBox" id="serverBox1" checked="checked" value="1">
+ <label for="serverBox1"> 用户 </label>
+ </div>
+ <div class="checkbox checkbox-success checkbox-inline">
+ <input type="checkbox" name="serverBox" id="serverBox2" value="2">
+ <label for="serverBox2"> 司机 </label>
+ </div>
+ </div>
+ </fieldset>
+ </div>
+ <#avatar id="imgUrl" name="封面：" />
+ <#input id="title" name="标题"/>
+<!-- <#select id="isBroadcast" name="是否播报：" >-->
+<!-- <option value="">选择是否播报</option>-->
+<!-- <option value="1">是</option>-->
+<!-- <option value="2">否</option>-->
+<!-- </#select>-->
+ <div class="form-group" id="contentDiv">
+ <label class="col-sm-3 control-label">公告内容：</label>
+ <div class="col-sm-9">
+ <textarea type="text/plain" id="editor" style="width:100%;height:350px;"></textarea>
+ </div>
+ </div>
+ <#select id="isShow" name="是否发布：" >
+ <option value="">选择是否发布</option>
+ <option value="1">是</option>
+ <option value="2">否</option>
+ </#select>
+ <#select id="isAlert" name="是否首页弹框：" >
+ <option value="">选择是否首页弹框</option>
+ <option value="1">是</option>
+ <option value="2">否</option>
+ </#select>
+ </div>
+ </div>
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="SystemInfoDlg.addSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="SystemInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+</div>
+</div>
+<script src="${ctxPath}/static/modular/system/tNotices/system_info.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tNotices/system_update.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tNotices/system_update.html
new file mode 100644
index 0000000..604db84
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tNotices/system_update.html
@@ -0,0 +1,44 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="systemInfoForm">
+ <input type="hidden" id="id" name="id" value="${item.id}">
+ <div class="row">
+ <div class="col-sm-11">
+ <#avatar id="imgUrl" name="封面：" avatarImg="${item.imgUrl}"/>
+ <#input id="title" name="标题" value="${item.title}"/>
+<!-- <#select id="isBroadcast" name="是否播报：" >-->
+<!-- <option value="">选择是否播报</option>-->
+<!-- <option value="1" ${1 == item.isBroadcast ? 'selected=selected' : ''}>是</option>-->
+<!-- <option value="2" ${2 == item.isBroadcast ? 'selected=selected' : ''}>否</option>-->
+<!-- </#select>-->
+ <div class="form-group" id="contentDiv">
+ <label class="col-sm-3 control-label">公告内容：</label>
+ <div class="col-sm-9">
+ <textarea type="text/plain" id="editor" style="width:100%;height:350px;">${item.content}</textarea>
+ </div>
+ </div>
+ <#select id="isShow" name="是否发布：" >
+ <option value="">选择是否发布</option>
+ <option value="1" ${1 == item.isShow ? 'selected=selected' : ''}>是</option>
+ <option value="2" ${2 == item.isShow ? 'selected=selected' : ''}>否</option>
+ </#select>
+ <#select id="isAlert" name="是否首页弹框：" >
+ <option value="">选择是否首页弹框</option>
+ <option value="1"${1 == item.isAlert ? 'selected=selected' : ''}>是</option>
+ <option value="2"${2 == item.isAlert ? 'selected=selected' : ''}>否</option>
+ </#select>
+ </div>
+ </div>
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="SystemInfoDlg.editSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="SystemInfoDlg.close()"/>
+ </div>
+ </div>
+</div>
+
+</div>
+</div>
+<script src="${ctxPath}/static/modular/system/tNotices/system_info.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tNotices/tNotices.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tNotices/tNotices.html
new file mode 100644
index 0000000..fbf8f2a
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tNotices/tNotices.html
@@ -0,0 +1,48 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>滚动消息设置管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#TimeCon id="insertTime" name="添加时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="content" name="消息内容" />
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="TNotices.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="TNotices.resetSearch()" space="true"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="TNoticesTableToolbar" role="group">
+ @if(shiro.hasPermission("/tNotices/add")){
+ <#button name="添加" icon="fa-plus" clickFun="TNotices.openAddTNotices()"/>
+ @}
+ @if(shiro.hasPermission("/tNotices/update")){
+ <#button name="编辑" icon="fa-edit" clickFun="TNotices.openTNoticesDetail()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tNotices/delete")){
+ <#button name="删除" icon="fa-remove" clickFun="TNotices.delete()" space="true"/>
+ @}
+ </div>
+ <#table id="TNoticesTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tNotices/tNotices.js"></script>
+<script>
+ laydate.render({
+ elem: '#insertTime'
+ ,range: true
+ });
+</script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tNotices/tNotices_add.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tNotices/tNotices_add.html
new file mode 100644
index 0000000..b8d2f90
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tNotices/tNotices_add.html
@@ -0,0 +1,29 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="noticeInfoForm">
+
+ <div class="row">
+ <div class="col-sm-11">
+ <#input id="content" name="消息内容" />
+ <#input id="sort" name="排序"/>
+ <#select id="isShow" name="是否显示：" >
+ <option value="">选择是否显示</option>
+ <option value="1">是</option>
+ <option value="2">否</option>
+ </#select>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TNoticesInfoDlg.addSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TNoticesInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tNotices/tNotices_info.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tNotices/tNotices_edit.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tNotices/tNotices_edit.html
new file mode 100644
index 0000000..0b13d67
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tNotices/tNotices_edit.html
@@ -0,0 +1,29 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="noticeInfoForm">
+ <input type="hidden" id="id" name="id" value="${item.id}">
+ <div class="row">
+ <div class="col-sm-11">
+ <#input id="content" name="消息内容" value="${item.content}"/>
+ <#input id="sort" name="排序" value="${item.sort}"/>
+ <#select id="isShow" name="是否显示：" >
+ <option value="">选择是否显示</option>
+ <option value="1" ${1 == item.isShow ? 'selected=selected' : ''}>是</option>
+ <option value="2" ${2 == item.isShow ? 'selected=selected' : ''}>否</option>
+ </#select>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TNoticesInfoDlg.editSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TNoticesInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tNotices/tNotices_info.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOpenCity/tOpenCity.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOpenCity/tOpenCity.html
new file mode 100644
index 0000000..48eea26
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOpenCity/tOpenCity.html
@@ -0,0 +1,48 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>城市管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#TimeCon id="insertTime" name="添加时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="condition" name="省/市/区名称" />
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="TOpenCity.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="TOpenCity.resetSearch()" space="true"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="TOpenCityTableToolbar" role="group">
+ @if(shiro.hasPermission("/tOpenCity/add")){
+ <#button name="添加" icon="fa-plus" clickFun="TOpenCity.openAddTOpenCity()"/>
+ @}
+ @if(shiro.hasPermission("/tOpenCity/update")){
+ <#button name="编辑" icon="fa-edit" clickFun="TOpenCity.openTOpenCityDetail()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tOpenCity/delete")){
+ <#button name="删除" icon="fa-remove" clickFun="TOpenCity.delete()" space="true"/>
+ @}
+ </div>
+ <#table id="TOpenCityTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tOpenCity/tOpenCity.js"></script>
+<script>
+ laydate.render({
+ elem: '#insertTime'
+ ,range: true
+ });
+</script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOpenCity/tOpenCity_add.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOpenCity/tOpenCity_add.html
new file mode 100644
index 0000000..93c4d4c
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOpenCity/tOpenCity_add.html
@@ -0,0 +1,74 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="openCityForm">
+ <div class="row">
+ <div class="col-sm-10">
+ <#select id="provinceId" name="省：" onchange="TOpenCityInfoDlg.provinceChange()">
+ <option value="">选择省</option>
+ @for(province in provinceList){
+ <option value="${province.id}">${province.name}</option>
+ @}
+ </#select>
+ <#select id="cityId" name="市：" onchange="TOpenCityInfoDlg.cityChange()">
+ <option value="">选择市</option>
+ </#select>
+ <#select id="areaId" name="区：">
+ <option value="">选择区</option>
+ </#select>
+ <#select id="isQualifications" name="是否需要网约车资格证：">
+ <option value="">选择是否需要网约车资格证</option>
+ <option value="1">是</option>
+ <option value="2">否</option>
+ </#select>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">经营业务：</label>
+ <div class="col-sm-3">
+ <select class="form-control" id="businessType">
+ <option value="">选择经营业务</option>
+ <option value="2">出租车</option>
+ </select>
+ </div>
+ <div class="col-sm-3" >
+ <#input id="businessSort" name="排序" value="" />
+ </div>
+ <div class="col-sm-2">
+ <#button btnCss="info" name="添加" id="ensure" icon="fa-check" clickFun="addBusinessType()"/>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">已添加经营业务</label>
+ <div class="col-sm-9">
+ <div style="height: 200px; border: 1px solid #e5e6e7;overflow-y: auto;">
+ <table class="table table-striped table-bordered table-hover table-condensed">
+ <thead>
+ <tr>
+ <th style="width: 300px;">添加时间</th>
+ <th style="width: 300px;">经营业务</th>
+ <th style="width: 300px;">排序</th>
+ <th style="width: 100px;">操作</th>
+ </tr>
+ </thead>
+ <tbody id="coun">
+
+ </tbody>
+ </table>
+ </div>
+ </div>
+ </div>
+
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TOpenCityInfoDlg.addSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TOpenCityInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tOpenCity/tOpenCity_info.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOpenCity/tOpenCity_edit.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOpenCity/tOpenCity_edit.html
new file mode 100644
index 0000000..2d6e338
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOpenCity/tOpenCity_edit.html
@@ -0,0 +1,90 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="openCityForm">
+ <input type="hidden" id="id" name="id" value="${item.id}">
+ <div class="row">
+ <div class="col-sm-10">
+ <#select id="provinceId" name="省：" onchange="TOpenCityInfoDlg.provinceChange()">
+ <option value="">选择省</option>
+ @for(province in provinceList){
+ <option value="${province.id}" ${province.id == item.areaId ? 'selected=selected' : ''}>${province.name}</option>
+ @}
+ </#select>
+ <#select id="cityId" name="市：" onchange="TOpenCityInfoDlg.cityChange()">
+ <option value="">选择市</option>
+ @for(city in cityList){
+ <option value="${city.id}" ${city.id == item.cityId ? 'selected=selected' : ''}>${city.name}</option>
+ @}
+ </#select>
+ <#select id="areaId" name="区：">
+ <option value="">选择区</option>
+ @for(area in areaList){
+ <option value="${area.id}" ${area.id == item.provinceId ? 'selected=selected' : ''}>${area.name}</option>
+ @}
+ </#select>
+ <#select id="isQualifications" name="是否需要网约车资格证：">
+ <option value="">选择是否需要网约车资格证</option>
+ <option value="1" ${1 == item.isQualifications ? 'selected=selected' : ''}>是</option>
+ <option value="2" ${2 == item.isQualifications ? 'selected=selected' : ''}>否</option>
+ </#select>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">经营业务：</label>
+ <div class="col-sm-3">
+ <select class="form-control" id="businessType">
+ <option value="">选择经营业务</option>
+ <option value="2">出租车</option>
+ </select>
+ </div>
+ <div class="col-sm-3" >
+ <#input id="businessSort" name="排序" value="" />
+ </div>
+ <div class="col-sm-2">
+ <#button btnCss="info" name="添加" id="ensure" icon="fa-check" clickFun="addBusinessType()"/>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">已添加经营业务</label>
+ <div class="col-sm-9">
+ <div style="height: 200px; border: 1px solid #e5e6e7;overflow-y: auto;">
+ <table class="table table-striped table-bordered table-hover table-condensed">
+ <thead>
+ <tr>
+ <th style="width: 300px;">添加时间</th>
+ <th style="width: 300px;">经营业务</th>
+ <th style="width: 300px;">排序</th>
+ <th style="width: 100px;">操作</th>
+ </tr>
+ </thead>
+ <tbody id="coun">
+ @for(obj in businessList){
+ <tr class="timeClass">
+ <td>
+ <input type="hidden" id="busId" name="busId" value="${obj.id}">
+ <input type="hidden" id="time" name="time" value="${obj.insertTimeStr}">${obj.insertTimeStr}</td>
+ <td><input type="hidden" id="type" name="type" value="${obj.businessTypeStr}">${obj.businessTypeStr}</td>
+ <td><input type="hidden" id="sort" name="sort" value="${obj.sort}">${obj.sort}</td>
+ <td><button onclick="deleteSub(this)">移除</button></td></td>
+ </tr>
+ @}
+ </tbody>
+ </table>
+ </div>
+ </div>
+ </div>
+
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TOpenCityInfoDlg.editSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TOpenCityInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tOpenCity/tOpenCity_info.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCharter/tOrderCharter.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCharter/tOrderCharter.html
new file mode 100644
index 0000000..69948d4
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCharter/tOrderCharter.html
@@ -0,0 +1,61 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>旅游包车订单管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#TimeCon id="insertTime" name="添加时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="userName" name="提交用户" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="contactName" name="联系人" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="contactPhone" name="联系电话" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="useDemand" name="用车需求" />
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="state" name="状态" >
+ <option value="">全部</option>
+ <option value="1">待处理</option>
+ <option value="2">已处理</option>
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="TOrderCharter.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="TOrderCharter.resetSearch()" space="true"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="TOrderCharterTableToolbar" role="group">
+ @if(shiro.hasPermission("/tOrderCharter/immediately")){
+ <#button name="立即处理" icon="fa-edit" clickFun="TOrderCharter.immediately()"/>
+ @}
+ @if(shiro.hasPermission("/tOrderCharter/delete")){
+ <#button name="删除记录" icon="fa-remove" clickFun="TOrderCharter.delete()" space="true"/>
+ @}
+ </div>
+ <#table id="TOrderCharterTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tOrderCharter/tOrderCharter.js"></script>
+<script>
+ laydate.render({
+ elem: '#insertTime'
+ ,range: true
+ });
+</script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCharter/tOrderCharter_add.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCharter/tOrderCharter_add.html
new file mode 100644
index 0000000..546f8a7
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCharter/tOrderCharter_add.html
@@ -0,0 +1,35 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+
+ <div class="row">
+ <div class="col-sm-6 b-r">
+ <#input id="id" name="主键ID" underline="true"/>
+ <#input id="insertTime" name="提交时间" underline="true"/>
+ <#input id="userId" name="用户ID" underline="true"/>
+ <#input id="useTime" name="用车时间" underline="true"/>
+ <#input id="useDuration" name="用车时长"/>
+ </div>
+
+ <div class="col-sm-6">
+ <#input id="useDemand" name="用车需求" underline="true"/>
+ <#input id="contactName" name="联系人" underline="true"/>
+ <#input id="contactPhone" name="联系电话" underline="true"/>
+ <#input id="remark" name="处理备注" underline="true"/>
+ <#input id="state" name="状态 1=未处理 2=已处理 3=已删除" underline="true"/>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TOrderCharterInfoDlg.addSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TOrderCharterInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tOrderCharter/tOrderCharter_info.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCharter/tOrderCharter_edit.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCharter/tOrderCharter_edit.html
new file mode 100644
index 0000000..1d8eecb
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCharter/tOrderCharter_edit.html
@@ -0,0 +1,35 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+
+ <div class="row">
+ <div class="col-sm-6 b-r">
+ <#input id="id" name="主键ID" value="${item.id}" underline="true"/>
+ <#input id="insertTime" name="提交时间" value="${item.insertTime}" underline="true"/>
+ <#input id="userId" name="用户ID" value="${item.userId}" underline="true"/>
+ <#input id="useTime" name="用车时间" value="${item.useTime}" underline="true"/>
+ <#input id="useDuration" name="用车时长" value="${item.useDuration}" />
+ </div>
+
+ <div class="col-sm-6">
+ <#input id="useDemand" name="用车需求" value="${item.useDemand}" underline="true"/>
+ <#input id="contactName" name="联系人" value="${item.contactName}" underline="true"/>
+ <#input id="contactPhone" name="联系电话" value="${item.contactPhone}" underline="true"/>
+ <#input id="remark" name="处理备注" value="${item.remark}" underline="true"/>
+ <#input id="state" name="状态 1=未处理 2=已处理 3=已删除" value="${item.state}" />
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TOrderCharterInfoDlg.editSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TOrderCharterInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tOrderCharter/tOrderCharter_info.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCharter/tOrderCharter_immediately.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCharter/tOrderCharter_immediately.html
new file mode 100644
index 0000000..3abd254
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCharter/tOrderCharter_immediately.html
@@ -0,0 +1,28 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="orderCharterInfoForm">
+ <input type="hidden" id="id" name="id" value="${id}">
+ <div class="row">
+ <div class="col-sm-11">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">处理备注：</label>
+ <div class="col-sm-9">
+ <textarea type="text/plain" class="form-control" name="remark" id="remark" style="width:100%;height:150px;" placeholder="多行输入"></textarea>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TOrderCharterInfoDlg.immediately()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TOrderCharterInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tOrderCharter/tOrderCharter_info.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCharteredCar/tOrderCharteredCar.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCharteredCar/tOrderCharteredCar.html
new file mode 100644
index 0000000..533d084
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCharteredCar/tOrderCharteredCar.html
@@ -0,0 +1,61 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>旅游包车订单管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#TimeCon id="insertTime" name="提交时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="userName" name="提交用户" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="contactPerson" name="联系人" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="contactPhone" name="联系电话" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="modelUse" name="用车需求" />
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="state" name="状态" >
+ <option value="">全部</option>
+ <option value="1">待处理</option>
+ <option value="2">已处理</option>
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="TOrderCharteredCar.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="TOrderCharter.resetSearch()" space="true"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="TOrderCharteredCarTableToolbar" role="group">
+ @if(shiro.hasPermission("/tOrderCharteredCar/immediately")){
+ <#button name="立即处理" icon="fa-edit" clickFun="TOrderCharteredCar.immediately()"/>
+ @}
+ @if(shiro.hasPermission("/tOrderCharteredCar/delete")){
+ <#button name="删除记录" icon="fa-remove" clickFun="TOrderCharteredCar.delete()" space="true"/>
+ @}
+ </div>
+ <#table id="TOrderCharteredCarTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tOrderCharteredCar/tOrderCharteredCar.js"></script>
+<script>
+ laydate.render({
+ elem: '#insertTime'
+ ,range: true
+ });
+</script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCharteredCar/tOrderCharteredCar_add.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCharteredCar/tOrderCharteredCar_add.html
new file mode 100644
index 0000000..0e5eedd
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCharteredCar/tOrderCharteredCar_add.html
@@ -0,0 +1,40 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+
+ <div class="row">
+ <div class="col-sm-6 b-r">
+ <#input id="id" name="" underline="true"/>
+ <#input id="userId" name="用户id" underline="true"/>
+ <#input id="companyId" name="企业id" underline="true"/>
+ <#input id="orderNumber" name="订单编号" underline="true"/>
+ <#input id="traveltime" name="出行时间" underline="true"/>
+ <#input id="carTime" name="用车时长（天）" underline="true"/>
+ <#input id="serverCarModelId" name="服务车型id" underline="true"/>
+ <#input id="modelUse" name="车型用途"/>
+ </div>
+
+ <div class="col-sm-6">
+ <#input id="peopleNumber" name="乘车人数" underline="true"/>
+ <#input id="contactPerson" name="联系人" underline="true"/>
+ <#input id="contactPhone" name="联系电话" underline="true"/>
+ <#input id="state" name="订单状态（1=待处理，2=已处理）" underline="true"/>
+ <#input id="remark" name="处理备注" underline="true"/>
+ <#input id="isDelete" name="删除状态（1=否，2=是）" underline="true"/>
+ <#input id="insertTime" name="添加时间" underline="true"/>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TOrderCharteredCarInfoDlg.addSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TOrderCharteredCarInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tOrderCharteredCar/tOrderCharteredCar_info.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCharteredCar/tOrderCharteredCar_edit.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCharteredCar/tOrderCharteredCar_edit.html
new file mode 100644
index 0000000..fa6e2a4
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCharteredCar/tOrderCharteredCar_edit.html
@@ -0,0 +1,40 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+
+ <div class="row">
+ <div class="col-sm-6 b-r">
+ <#input id="id" name="" value="${item.id}" underline="true"/>
+ <#input id="userId" name="用户id" value="${item.userId}" underline="true"/>
+ <#input id="companyId" name="企业id" value="${item.companyId}" underline="true"/>
+ <#input id="orderNumber" name="订单编号" value="${item.orderNumber}" underline="true"/>
+ <#input id="traveltime" name="出行时间" value="${item.traveltime}" underline="true"/>
+ <#input id="carTime" name="用车时长（天）" value="${item.carTime}" underline="true"/>
+ <#input id="serverCarModelId" name="服务车型id" value="${item.serverCarModelId}" underline="true"/>
+ <#input id="modelUse" name="车型用途" value="${item.modelUse}" />
+ </div>
+
+ <div class="col-sm-6">
+ <#input id="peopleNumber" name="乘车人数" value="${item.peopleNumber}" underline="true"/>
+ <#input id="contactPerson" name="联系人" value="${item.contactPerson}" underline="true"/>
+ <#input id="contactPhone" name="联系电话" value="${item.contactPhone}" underline="true"/>
+ <#input id="state" name="订单状态（1=待处理，2=已处理）" value="${item.state}" underline="true"/>
+ <#input id="remark" name="处理备注" value="${item.remark}" underline="true"/>
+ <#input id="isDelete" name="删除状态（1=否，2=是）" value="${item.isDelete}" underline="true"/>
+ <#input id="insertTime" name="添加时间" value="${item.insertTime}" />
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TOrderCharteredCarInfoDlg.editSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TOrderCharteredCarInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tOrderCharteredCar/tOrderCharteredCar_info.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCharteredCar/tOrderCharteredCar_immediately.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCharteredCar/tOrderCharteredCar_immediately.html
new file mode 100644
index 0000000..18978c9
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCharteredCar/tOrderCharteredCar_immediately.html
@@ -0,0 +1,28 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="orderCharterCarInfoForm">
+ <input type="hidden" id="id" name="id" value="${id}">
+ <div class="row">
+ <div class="col-sm-11">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">处理备注：</label>
+ <div class="col-sm-9">
+ <textarea type="text/plain" class="form-control" name="remark" id="remark" style="width:100%;height:150px;" placeholder="多行输入"></textarea>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TOrderCharteredCarInfoDlg.immediately()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TOrderCharteredCarInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tOrderCharteredCar/tOrderCharteredCar_info.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCrossCity/tOrderCrossCity.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCrossCity/tOrderCrossCity.html
new file mode 100644
index 0000000..e3a09d2
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCrossCity/tOrderCrossCity.html
@@ -0,0 +1,109 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>跨城出行订单管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#TimeCon id="insertTime" name="订单时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="orderNum" name="订单编号" />
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="orderSource" name="订单来源" >
+ <option value="">全部</option>
+ <option value="1">APP下单</option>
+ <option value="2">扫码下单</option>
+ <option value="3">小程序下单</option>
+ <option value="4">司机下单</option>
+ <option value="5">调度下单</option>
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="userName" name="下单用户昵称" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="userPhone" name="下单用户手机" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="passengers" name="乘车用户姓名" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="passengersPhone" name="乘车用户手机" />
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="serverCarModelId" name="车型" >
+ <option value="">全部</option>
+ @for(obj in carmodelList){
+ <option value="${obj.id}">${obj.name}</option>
+ @}
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="driver" name="接单司机" />
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="lineId" name="线路" >
+ <option value="">全部</option>
+ @for(obj in lineList){
+ <option value="${obj.id}">${obj.name}</option>
+ @}
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="state" name="状态" >
+ <option value="">全部</option>
+ <option value="1">待接单</option>
+ <option value="2">待出发</option>
+ <option value="3">待到达预约地点</option>
+ <option value="4">待乘客上车</option>
+ <option value="5">服务中</option>
+ <option value="6">完成服务</option>
+ <option value="7">待支付</option>
+ <option value="8">待评价</option>
+ <option value="9">已完成</option>
+ <option value="10">已取消</option>
+ <option value="11">改派中</option>
+ <option value="12">取消待支付</option>
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="TOrderCrossCity.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="TOrderCrossCity.resetSearch()" space="true"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="TOrderCrossCityTableToolbar" role="group">
+ @if(shiro.hasPermission("/tOrderCrossCity/detail")){
+ <#button name="订单详情" icon="fa-plus" clickFun="TOrderCrossCity.detail()"/>
+ @}
+ @if(shiro.hasPermission("/tOrderCrossCity/cancel")){
+ <#button name="取消订单" icon="fa-edit" clickFun="TOrderCrossCity.cancel()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tOrderCrossCity/track")){
+ <#button name="订单轨迹" icon="fa-remove" clickFun="TOrderCrossCity.track()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tOrderCrossCity/delete")){
+ <#button name="删除记录" icon="fa-remove" clickFun="TOrderCrossCity.delete()" space="true"/>
+ @}
+ </div>
+ <#table id="TOrderCrossCityTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tOrderCrossCity/tOrderCrossCity.js"></script>
+<script>
+ laydate.render({
+ elem: '#insertTime'
+ ,range: true
+ });
+</script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCrossCity/tOrderCrossCity_detail.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCrossCity/tOrderCrossCity_detail.html
new file mode 100644
index 0000000..991ca55
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCrossCity/tOrderCrossCity_detail.html
@@ -0,0 +1,107 @@
+@layout("/common/_container.html"){
+<style type="text/css">
+ html, body, #container {
+ height: 100%;
+ width: 100%;
+ }
+
+ .input-card .btn{
+ margin-right: 1.2rem;
+ width: 9rem;
+ }
+
+ .input-card .btn:last-child{
+ margin-right: 0;
+ }
+</style>
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+ <input type="hidden" id="id" name="id" value="${item.id}">
+ <div class="row" style="margin-top: 30px;">
+ <div class="col-sm-4">
+ <h2 class="h3Class" style="font-weight: 700;">订单详情</h2>
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-sm-6 b-r">
+ <#label id="insertTimeStr" name="下单时间" value="${item.insertTimeStr}"/>
+ <#label id="orderSourceStr" name="订单来源" value="${item.orderSourceStr}"/>
+ <#label id="userName" name="下单用户昵称" value="${item.userName}"/>
+ <#label id="passengers" name="乘车用户昵称" value="${item.passengers}"/>
+ <#label id="placementAddress" name="起点" value="${item.startAddress}"/>
+ <#label id="driver" name="接单司机" value="${item.driver}"/>
+ <#label id="car" name="接单车辆" value="${item.car}"/>
+ <#label id="boardingAddress" name="上车地点" value="${item.boardingAddress}"/>
+ <#label id="getoffAddress" name="下车地点" value="${item.getoffAddress}"/>
+ <#label id="serverCarModel" name="选择车型" value="${item.serverCarModel}"/>
+ </div>
+
+ <div class="col-sm-6">
+ <#label id="orderNum" name="订单编号" value="${item.orderNum}"/>
+ <#label id="travelTimeStr" name="乘车时间" value="${item.travelTimeStr}"/>
+ <#label id="userPhone" name="下单用户手机号" value="${item.userPhone}"/>
+ <#label id="passengersPhone" name="乘车用户手机号" value="${item.passengersPhone}"/>
+ <#label id="endAddress" name="终点" value="${item.endAddress}"/>
+ <#label id="companyName" name="车辆所属机构" value="${item.companyName}"/>
+ <#label id="boardingTimeStr" name="上车时间" value="${item.boardingTimeStr}"/>
+ <#label id="getoffTimeStr" name="下车时间" value="${item.getoffTimeStr}"/>
+ <#label id="lineName" name="线路" value="${item.lineName}"/>
+ </div>
+ </div>
+
+ <div class="row" style="margin-top: 30px;">
+ <div class="col-sm-4">
+ <h2 class="h3Class" style="font-weight: 700;">费用明细</h2>
+ </div>
+ </div>
+ <div class="row">
+ @if(isNotEmpty(item.orderMoney) && item.orderMoney > 0){
+ <div class="col-sm-6 b-r">
+ <#label id="orderMoney" name="订单总价" value="${item.orderMoney}元"/>
+ <#label id="couponMoney" name="优惠券抵扣费用" value="${item.couponMoney}元"/>
+ </div>
+ <div class="col-sm-6">
+ @if(isNotEmpty(item.payMoney)){
+ <#label id="payMoney" name="实际支付费用" value="${item.payMoney}元"/>
+ @}else{
+ <#label id="payMoney" name="实际支付费用" value="0.00元"/>
+ @}
+ <#label id="payTypeStr" name="支付方式" value="${item.payTypeStr}"/>
+ </div>
+ @}else{
+ <h4 style="margin-left: 10%">暂无费用明细</h4>
+ @}
+ </div>
+
+ <div class="row" style="margin-top: 30px;">
+ <div class="col-sm-4">
+ <h2 class="h3Class" style="font-weight: 700;">线路轨迹</h2>
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-sm-10">
+ <div class="form-horizontal" id="container" style="margin-left: 50px;width: 100%; height: 500px;"></div>
+ <div class="input-card" style="margin-left: 50px;">
+ <h4>轨迹回放控制</h4>
+ <div class="input-item">
+ <input type="button" class="btn" value="开始动画" id="start" onclick="startAnimation()"/>
+ <input type="button" class="btn" value="暂停动画" id="pause" onclick="pauseAnimation()"/>
+ <input type="button" class="btn" value="继续动画" id="resume" onclick="resumeAnimation()"/>
+ <input type="button" class="btn" value="停止动画" id="stop" onclick="stopAnimation()"/>
+ </div>
+ <div class="input-item">
+
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="https://a.amap.com/jsapi_demos/static/demo-center/js/demoutils.js"></script>
+<script src="https://webapi.amap.com/maps?v=1.4.8&key=e17d799b2506d05faf7f88320a266803"></script>
+<script src="https://cache.amap.com/lbs/static/addToolbar.js"></script>
+<script src="${ctxPath}/static/modular/system/tOrderCrossCity/tOrderCrossCity_info.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCrossCity/tOrderCrossCity_track.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCrossCity/tOrderCrossCity_track.html
new file mode 100644
index 0000000..f749bb9
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCrossCity/tOrderCrossCity_track.html
@@ -0,0 +1,52 @@
+@layout("/common/_container.html"){
+<style type="text/css">
+ html, body, #container {
+ height: 100%;
+ width: 100%;
+ }
+
+ .input-card .btn{
+ margin-right: 1.2rem;
+ width: 9rem;
+ }
+
+ .input-card .btn:last-child{
+ margin-right: 0;
+ }
+</style>
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+ <input type="hidden" id="id" name="id" value="${tOrderCrossCityId}">
+ <div class="row" style="margin-top: 30px;">
+ <div class="col-sm-4">
+ <h2 class="h3Class" style="font-weight: 700;">线路轨迹</h2>
+ </div>
+ </div>
+ <div class="row" style="margin-top: 30px;">
+ <div class="col-sm-10">
+ <div class="form-horizontal" id="container" style="margin-left: 50px;width: 100%; height: 500px;"></div>
+ <div class="input-card" style="margin-left: 50px;">
+ <h4>轨迹回放控制</h4>
+ <div class="input-item">
+ <input type="button" class="btn" value="开始动画" id="start" onclick="startAnimation()"/>
+ <input type="button" class="btn" value="暂停动画" id="pause" onclick="pauseAnimation()"/>
+ <input type="button" class="btn" value="继续动画" id="resume" onclick="resumeAnimation()"/>
+ <input type="button" class="btn" value="停止动画" id="stop" onclick="stopAnimation()"/>
+ </div>
+ <div class="input-item">
+
+ </div>
+ </div>
+ </div>
+ </div>
+
+ </div>
+
+ </div>
+</div>
+<script src="https://a.amap.com/jsapi_demos/static/demo-center/js/demoutils.js"></script>
+<script src="https://webapi.amap.com/maps?v=1.4.8&key=e17d799b2506d05faf7f88320a266803"></script>
+<script src="https://cache.amap.com/lbs/static/addToolbar.js"></script>
+<script src="${ctxPath}/static/modular/system/tOrderCrossCity/tOrderCrossCity_info.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderEvaluate/tOrderEvaluate.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderEvaluate/tOrderEvaluate.html
new file mode 100644
index 0000000..5fc0c65
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderEvaluate/tOrderEvaluate.html
@@ -0,0 +1,66 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>评价列表管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#TimeCon id="insertTime" name="评论时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="userName" name="评论用户" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="userPhone" name="评论用户手机号" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="driverName" name="评论司机" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="driverPhone" name="评论司机手机号" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="fraction" name="评分分数" />
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="orderType" name="订单类型" >
+ <option value="">全部</option>
+ <option value="2">出租车</option>
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="TOrderEvaluate.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="TOrderEvaluate.resetSearch()" space="true"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="TOrderEvaluateTableToolbar" role="group">
+ @if(shiro.hasPermission("/tOrderEvaluate/add")){
+ <#button name="添加" icon="fa-plus" clickFun="TOrderEvaluate.openAddTOrderEvaluate()"/>
+ @}
+ @if(shiro.hasPermission("/tOrderEvaluate/update")){
+ <#button name="修改" icon="fa-edit" clickFun="TOrderEvaluate.openTOrderEvaluateDetail()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tOrderEvaluate/delete")){
+ <#button name="删除" icon="fa-remove" clickFun="TOrderEvaluate.delete()" space="true"/>
+ @}
+ </div>
+ <#table id="TOrderEvaluateTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tOrderEvaluate/tOrderEvaluate.js"></script>
+<script>
+ laydate.render({
+ elem: '#insertTime'
+ ,range: true
+ });
+</script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderEvaluate/tOrderEvaluate_add.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderEvaluate/tOrderEvaluate_add.html
new file mode 100644
index 0000000..7506902
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderEvaluate/tOrderEvaluate_add.html
@@ -0,0 +1,33 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+
+ <div class="row">
+ <div class="col-sm-6 b-r">
+ <#input id="id" name="" underline="true"/>
+ <#input id="orderId" name="订单id" underline="true"/>
+ <#input id="driverId" name="司机id" underline="true"/>
+ <#input id="orderType" name="1=专车，2=出租车，3=跨城出行，4=跨城小件物流，5=同城小件物流，6=包车"/>
+ </div>
+
+ <div class="col-sm-6">
+ <#input id="fraction" name="评分 0-5" underline="true"/>
+ <#input id="content" name="评价内容" underline="true"/>
+ <#input id="insertTime" name="评价时间" underline="true"/>
+ <#input id="userId" name="评价用户ID" underline="true"/>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TOrderEvaluateInfoDlg.addSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TOrderEvaluateInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tOrderEvaluate/tOrderEvaluate_info.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderEvaluate/tOrderEvaluate_edit.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderEvaluate/tOrderEvaluate_edit.html
new file mode 100644
index 0000000..28b8bb2
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderEvaluate/tOrderEvaluate_edit.html
@@ -0,0 +1,33 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+
+ <div class="row">
+ <div class="col-sm-6 b-r">
+ <#input id="id" name="" value="${item.id}" underline="true"/>
+ <#input id="orderId" name="订单id" value="${item.orderId}" underline="true"/>
+ <#input id="driverId" name="司机id" value="${item.driverId}" underline="true"/>
+ <#input id="orderType" name="1=专车，2=出租车，3=跨城出行，4=跨城小件物流，5=同城小件物流，6=包车" value="${item.orderType}" />
+ </div>
+
+ <div class="col-sm-6">
+ <#input id="fraction" name="评分 0-5" value="${item.fraction}" underline="true"/>
+ <#input id="content" name="评价内容" value="${item.content}" underline="true"/>
+ <#input id="insertTime" name="评价时间" value="${item.insertTime}" underline="true"/>
+ <#input id="userId" name="评价用户ID" value="${item.userId}" />
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TOrderEvaluateInfoDlg.editSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TOrderEvaluateInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tOrderEvaluate/tOrderEvaluate_info.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderLogistics/tOrderLogistics.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderLogistics/tOrderLogistics.html
new file mode 100644
index 0000000..047e4a8
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderLogistics/tOrderLogistics.html
@@ -0,0 +1,94 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>小件物流订单管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#TimeCon id="insertTime" name="订单时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="orderNum" name="订单编号" />
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="type" name="订单类型" >
+ <option value="">全部</option>
+ <option value="4">同城物流</option>
+ <option value="5">跨城物流</option>
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="orderSource" name="订单来源" >
+ <option value="">全部</option>
+ <option value="1">APP下单</option>
+ <option value="2">扫码下单</option>
+ <option value="3">小程序下单</option>
+ <option value="4">司机下单</option>
+ <option value="5">调度下单</option>
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="userName" name="下单用户昵称" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="userPhone" name="下单用户手机" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="recipient" name="收货人姓名" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="recipientPhone" name="收货人手机" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="driver" name="接单司机" />
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="state" name="状态" >
+ <option value="">全部</option>
+ <option value="1">待接单</option>
+ <option value="2">待出发</option>
+ <option value="3">待到达预约地点</option>
+ <option value="4">待取货</option>
+ <option value="5">服务中</option>
+ <option value="6">完成服务</option>
+ <option value="7">待支付</option>
+ <option value="9">已完成</option>
+ <option value="10">已取消</option>
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="TOrderLogistics.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="TOrderLogistics.resetSearch()" space="true"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="TOrderLogisticsTableToolbar" role="group">
+ @if(shiro.hasPermission("/tOrderLogistics/detail")){
+ <#button name="订单详情" icon="fa-plus" clickFun="TOrderLogistics.detail()"/>
+ @}
+ @if(shiro.hasPermission("/tOrderLogistics/cancel")){
+ <#button name="取消订单" icon="fa-edit" clickFun="TOrderLogistics.cancel()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tOrderLogistics/delete")){
+ <#button name="删除记录" icon="fa-remove" clickFun="TOrderLogistics.delete()" space="true"/>
+ @}
+ </div>
+ <#table id="TOrderLogisticsTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tOrderLogistics/tOrderLogistics.js"></script>
+<script>
+ laydate.render({
+ elem: '#insertTime'
+ ,range: true
+ });
+</script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderLogistics/tOrderLogistics_add.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderLogistics/tOrderLogistics_add.html
new file mode 100644
index 0000000..c033fa7
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderLogistics/tOrderLogistics_add.html
@@ -0,0 +1,82 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+
+ <div class="row">
+ <div class="col-sm-6 b-r">
+ <#input id="id" name="主键id" underline="true"/>
+ <#input id="type" name="订单类型（4=同城物流，5=跨城物流）" underline="true"/>
+ <#input id="userId" name="用户id" underline="true"/>
+ <#input id="driverId" name="接单司机ID" underline="true"/>
+ <#input id="carId" name="车辆id" underline="true"/>
+ <#input id="orderNum" name="订单号" underline="true"/>
+ <#input id="cargoType" name="货物类型（1=普通货物，2=贵重货物）" underline="true"/>
+ <#input id="cargoNumber" name="货物数量" underline="true"/>
+ <#input id="remark" name="备注" underline="true"/>
+ <#input id="placementLon" name="下单地点经度" underline="true"/>
+ <#input id="placementLat" name="下单地点纬度" underline="true"/>
+ <#input id="placementAddress" name="下单地点" underline="true"/>
+ <#input id="startLon" name="出发地经度值" underline="true"/>
+ <#input id="startLat" name="出发地纬度值" underline="true"/>
+ <#input id="startAddress" name="出发地地点" underline="true"/>
+ <#input id="endLon" name="目的地经度" underline="true"/>
+ <#input id="endLat" name="目的地纬度" underline="true"/>
+ <#input id="endAddress" name="目的地地点" underline="true"/>
+ <#input id="recipient" name="收件人姓名" underline="true"/>
+ <#input id="recipientPhone" name="收件人电话" underline="true"/>
+ <#input id="boardingLon" name="上车点经度" underline="true"/>
+ <#input id="boardingLat" name="上车点纬度" underline="true"/>
+ <#input id="boardingAddress" name="上车点" underline="true"/>
+ <#input id="boardingTime" name="上车时间" underline="true"/>
+ <#input id="getoffLon" name="下车点经度" underline="true"/>
+ <#input id="getoffLat" name="下车点纬度" underline="true"/>
+ <#input id="getoffAddress" name="下车地点" underline="true"/>
+ <#input id="getoffTime" name="下车时间" underline="true"/>
+ <#input id="mileage" name="行驶里程数（米）"/>
+ </div>
+
+ <div class="col-sm-6">
+ <#input id="payManner" name="支付方式（1=OK平台支付，2=其他方式支付）" underline="true"/>
+ <#input id="payType" name="支付方式(1=微信，2=支付宝，3=其他)" underline="true"/>
+ <#input id="orderMoney" name="订单金额" underline="true"/>
+ <#input id="travelMoney" name="行程费" underline="true"/>
+ <#input id="tipMoney" name="小费" underline="true"/>
+ <#input id="redPacketMoney" name="红包抵扣金额" underline="true"/>
+ <#input id="couponMoney" name="优惠券抵扣金额" underline="true"/>
+ <#input id="redPacketId" name="红包记录id" underline="true"/>
+ <#input id="couponId" name="优惠券id" underline="true"/>
+ <#input id="discount" name="折扣" underline="true"/>
+ <#input id="discountMoney" name="折扣优惠金额" underline="true"/>
+ <#input id="activityId" name="折扣活动id" underline="true"/>
+ <#input id="companyId" name="公司id" underline="true"/>
+ <#input id="payMoney" name="支付金额" underline="true"/>
+ <#input id="state" name="状态(1=待接单，2=待出发，3=待到达预约地点，4=待取货，5=服务中，6=完成服务，7=待支付，9=已完成，10=已取消)" underline="true"/>
+ <#input id="insertTime" name="下单时间" underline="true"/>
+ <#input id="travelTime" name="出行时间" underline="true"/>
+ <#input id="snatchOrderTime" name="抢单时间" underline="true"/>
+ <#input id="setOutTime" name="司机点出发时间" underline="true"/>
+ <#input id="arriveTime" name="司机到达预约地点时间" underline="true"/>
+ <#input id="startServiceTime" name="开始服务时间" underline="true"/>
+ <#input id="endServiceTime" name="结束服务时间" underline="true"/>
+ <#input id="orderSource" name="下单方式（1：APP下单，2：扫码下单，3：小程序下单，4：司机下单，5：调度下单）" underline="true"/>
+ <#input id="invoiceId" name="发票id" underline="true"/>
+ <#input id="trackId" name="高德猎鹰上的轨迹id" underline="true"/>
+ <#input id="isDelete" name="是否删除 1=否 2=是" underline="true"/>
+ <#input id="telX" name="移动小号" underline="true"/>
+ <#input id="bindId" name="移动小号绑定关系id" underline="true"/>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TOrderLogisticsInfoDlg.addSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TOrderLogisticsInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tOrderLogistics/tOrderLogistics_info.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderLogistics/tOrderLogistics_detail.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderLogistics/tOrderLogistics_detail.html
new file mode 100644
index 0000000..b6cb775
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderLogistics/tOrderLogistics_detail.html
@@ -0,0 +1,63 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+ <div class="row" style="margin-top: 30px;">
+ <div class="col-sm-4">
+ <h2 class="h3Class" style="font-weight: 700;">订单详情</h2>
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-sm-6 b-r">
+ <#label id="insertTimeStr" name="下单时间" value="${item.insertTimeStr}"/>
+ <#label id="orderSourceStr" name="订单来源" value="${item.orderSourceStr}"/>
+ <#label id="userName" name="下单用户昵称" value="${item.userName}"/>
+ <#label id="recipient" name="收货人昵称" value="${item.recipient}"/>
+ <#label id="startAddress" name="起点" value="${item.startAddress}"/>
+ <#label id="driver" name="接单司机" value="${item.driver}"/>
+ <#label id="companyName" name="车辆所属机构" value="${item.companyName}"/>
+ </div>
+
+ <div class="col-sm-6">
+ <#label id="typeStr" name="订单类型" value="${item.typeStr}"/>
+ <#label id="orderNum" name="订单编号" value="${item.orderNum}"/>
+ <#label id="travelTimeStr" name="乘车时间" value="${item.travelTimeStr}"/>
+ <#label id="userPhone" name="下单用户手机号" value="${item.userPhone}"/>
+ <#label id="passengersPhone" name="收货人手机号" value="${item.passengersPhone}"/>
+ <#label id="endAddress" name="终点" value="${item.endAddress}"/>
+ <#label id="car" name="接单车辆" value="${item.car}"/>
+ </div>
+ </div>
+ <div class="row" style="margin-top: 30px;">
+ <div class="col-sm-4">
+ <h2 class="h3Class" style="font-weight: 700;">费用明细</h2>
+ </div>
+ </div>
+ <div class="row">
+ @if(isNotEmpty(item.orderMoney) && item.orderMoney > 0){
+ <div class="col-sm-6 b-r">
+ <#label id="orderMoney" name="订单总价" value="${item.orderMoney}元"/>
+ @if(isNotEmpty(item.payMoney)){
+ <#label id="payMoney" name="实际支付费用" value="${item.payMoney}元"/>
+ @}else{
+ <#label id="payMoney" name="实际支付费用" value="0.00元"/>
+ @}
+ @if(isNotEmpty(item.couponMoney)){
+ <#label id="couponMoney" name="优惠券抵扣费用" value="${item.couponMoney}元"/>
+ @}else{
+ <#label id="couponMoney" name="优惠券抵扣费用" value="0.00元"/>
+ @}
+ </div>
+ <div class="col-sm-6">
+ <#label id="payTypeStr" name="支付方式" value="${item.payTypeStr}"/>
+ </div>
+ @}else{
+ <h4 style="margin-left: 10%">暂无费用明细</h4>
+ @}
+ </div>
+
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tOrderLogistics/tOrderLogistics_info.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderLogistics/tOrderLogistics_edit.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderLogistics/tOrderLogistics_edit.html
new file mode 100644
index 0000000..46b7cb9
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderLogistics/tOrderLogistics_edit.html
@@ -0,0 +1,82 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+
+ <div class="row">
+ <div class="col-sm-6 b-r">
+ <#input id="id" name="主键id" value="${item.id}" underline="true"/>
+ <#input id="type" name="订单类型（4=同城物流，5=跨城物流）" value="${item.type}" underline="true"/>
+ <#input id="userId" name="用户id" value="${item.userId}" underline="true"/>
+ <#input id="driverId" name="接单司机ID" value="${item.driverId}" underline="true"/>
+ <#input id="carId" name="车辆id" value="${item.carId}" underline="true"/>
+ <#input id="orderNum" name="订单号" value="${item.orderNum}" underline="true"/>
+ <#input id="cargoType" name="货物类型（1=普通货物，2=贵重货物）" value="${item.cargoType}" underline="true"/>
+ <#input id="cargoNumber" name="货物数量" value="${item.cargoNumber}" underline="true"/>
+ <#input id="remark" name="备注" value="${item.remark}" underline="true"/>
+ <#input id="placementLon" name="下单地点经度" value="${item.placementLon}" underline="true"/>
+ <#input id="placementLat" name="下单地点纬度" value="${item.placementLat}" underline="true"/>
+ <#input id="placementAddress" name="下单地点" value="${item.placementAddress}" underline="true"/>
+ <#input id="startLon" name="出发地经度值" value="${item.startLon}" underline="true"/>
+ <#input id="startLat" name="出发地纬度值" value="${item.startLat}" underline="true"/>
+ <#input id="startAddress" name="出发地地点" value="${item.startAddress}" underline="true"/>
+ <#input id="endLon" name="目的地经度" value="${item.endLon}" underline="true"/>
+ <#input id="endLat" name="目的地纬度" value="${item.endLat}" underline="true"/>
+ <#input id="endAddress" name="目的地地点" value="${item.endAddress}" underline="true"/>
+ <#input id="recipient" name="收件人姓名" value="${item.recipient}" underline="true"/>
+ <#input id="recipientPhone" name="收件人电话" value="${item.recipientPhone}" underline="true"/>
+ <#input id="boardingLon" name="上车点经度" value="${item.boardingLon}" underline="true"/>
+ <#input id="boardingLat" name="上车点纬度" value="${item.boardingLat}" underline="true"/>
+ <#input id="boardingAddress" name="上车点" value="${item.boardingAddress}" underline="true"/>
+ <#input id="boardingTime" name="上车时间" value="${item.boardingTime}" underline="true"/>
+ <#input id="getoffLon" name="下车点经度" value="${item.getoffLon}" underline="true"/>
+ <#input id="getoffLat" name="下车点纬度" value="${item.getoffLat}" underline="true"/>
+ <#input id="getoffAddress" name="下车地点" value="${item.getoffAddress}" underline="true"/>
+ <#input id="getoffTime" name="下车时间" value="${item.getoffTime}" underline="true"/>
+ <#input id="mileage" name="行驶里程数（米）" value="${item.mileage}" />
+ </div>
+
+ <div class="col-sm-6">
+ <#input id="payManner" name="支付方式（1=OK平台支付，2=其他方式支付）" value="${item.payManner}" underline="true"/>
+ <#input id="payType" name="支付方式(1=微信，2=支付宝，3=其他)" value="${item.payType}" underline="true"/>
+ <#input id="orderMoney" name="订单金额" value="${item.orderMoney}" underline="true"/>
+ <#input id="travelMoney" name="行程费" value="${item.travelMoney}" underline="true"/>
+ <#input id="tipMoney" name="小费" value="${item.tipMoney}" underline="true"/>
+ <#input id="redPacketMoney" name="红包抵扣金额" value="${item.redPacketMoney}" underline="true"/>
+ <#input id="couponMoney" name="优惠券抵扣金额" value="${item.couponMoney}" underline="true"/>
+ <#input id="redPacketId" name="红包记录id" value="${item.redPacketId}" underline="true"/>
+ <#input id="couponId" name="优惠券id" value="${item.couponId}" underline="true"/>
+ <#input id="discount" name="折扣" value="${item.discount}" underline="true"/>
+ <#input id="discountMoney" name="折扣优惠金额" value="${item.discountMoney}" underline="true"/>
+ <#input id="activityId" name="折扣活动id" value="${item.activityId}" underline="true"/>
+ <#input id="companyId" name="公司id" value="${item.companyId}" underline="true"/>
+ <#input id="payMoney" name="支付金额" value="${item.payMoney}" underline="true"/>
+ <#input id="state" name="状态(1=待接单，2=待出发，3=待到达预约地点，4=待取货，5=服务中，6=完成服务，7=待支付，9=已完成，10=已取消)" value="${item.state}" underline="true"/>
+ <#input id="insertTime" name="下单时间" value="${item.insertTime}" underline="true"/>
+ <#input id="travelTime" name="出行时间" value="${item.travelTime}" underline="true"/>
+ <#input id="snatchOrderTime" name="抢单时间" value="${item.snatchOrderTime}" underline="true"/>
+ <#input id="setOutTime" name="司机点出发时间" value="${item.setOutTime}" underline="true"/>
+ <#input id="arriveTime" name="司机到达预约地点时间" value="${item.arriveTime}" underline="true"/>
+ <#input id="startServiceTime" name="开始服务时间" value="${item.startServiceTime}" underline="true"/>
+ <#input id="endServiceTime" name="结束服务时间" value="${item.endServiceTime}" underline="true"/>
+ <#input id="orderSource" name="下单方式（1：APP下单，2：扫码下单，3：小程序下单，4：司机下单，5：调度下单）" value="${item.orderSource}" underline="true"/>
+ <#input id="invoiceId" name="发票id" value="${item.invoiceId}" underline="true"/>
+ <#input id="trackId" name="高德猎鹰上的轨迹id" value="${item.trackId}" underline="true"/>
+ <#input id="isDelete" name="是否删除 1=否 2=是" value="${item.isDelete}" underline="true"/>
+ <#input id="telX" name="移动小号" value="${item.telX}" underline="true"/>
+ <#input id="bindId" name="移动小号绑定关系id" value="${item.bindId}" />
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TOrderLogisticsInfoDlg.editSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TOrderLogisticsInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tOrderLogistics/tOrderLogistics_info.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar.html
new file mode 100644
index 0000000..1ff3203
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar.html
@@ -0,0 +1,101 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>专车订单管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#TimeCon id="insertTime" name="订单时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="orderNum" name="订单编号" />
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="orderSource" name="订单来源" >
+ <option value="">全部</option>
+ <option value="1">APP下单</option>
+ <option value="2">扫码下单</option>
+ <option value="3">小程序下单</option>
+ <option value="4">司机下单</option>
+ <option value="5">调度下单</option>
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="userName" name="下单用户昵称" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="userPhone" name="下单用户手机" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="passengers" name="乘车用户姓名" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="passengersPhone" name="乘车用户手机" />
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="serverCarModelId" name="车型" >
+ <option value="">全部</option>
+ @for(obj in carmodelList){
+ <option value="${obj.id}">${obj.name}</option>
+ @}
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="driver" name="接单司机" />
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="state" name="状态" >
+ <option value="">全部</option>
+ <option value="1">待接单</option>
+ <option value="2">待出发</option>
+ <option value="3">待到达预约地点</option>
+ <option value="4">待乘客上车</option>
+ <option value="5">服务中</option>
+ <option value="6">完成服务</option>
+ <option value="7">待支付</option>
+ <option value="8">待评价</option>
+ <option value="9">已完成</option>
+ <option value="10">已取消</option>
+ <option value="11">改派中</option>
+ <option value="12">取消待支付</option>
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="TOrderPrivateCar.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="TOrderPrivateCar.resetSearch()" space="true"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="TOrderPrivateCarTableToolbar" role="group">
+ @if(shiro.hasPermission("/tOrderPrivateCar/orderDetail")){
+ <#button name="订单详情" icon="fa-plus" clickFun="TOrderPrivateCar.orderDetail()"/>
+ @}
+ @if(shiro.hasPermission("/tOrderPrivateCar/cancelOrder")){
+ <#button name="取消订单" icon="fa-edit" clickFun="TOrderPrivateCar.cancelOrder()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tOrderPrivateCar/orderTrack")){
+ <#button name="订单轨迹" icon="fa-edit" clickFun="TOrderPrivateCar.trajectory()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tOrderPrivateCar/deleteOrder")){
+ <#button name="删除记录" icon="fa-remove" clickFun="TOrderPrivateCar.deleteOrder()" space="true"/>
+ @}
+ </div>
+ <#table id="TOrderPrivateCarTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tOrderPrivateCar/tOrderPrivateCar.js"></script>
+<script>
+ laydate.render({
+ elem: '#insertTime'
+ ,range: true
+ });
+</script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar_add.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar_add.html
new file mode 100644
index 0000000..e5b17b4
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar_add.html
@@ -0,0 +1,89 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+
+ <div class="row">
+ <div class="col-sm-6 b-r">
+ <#input id="id" name="主键id" underline="true"/>
+ <#input id="type" name="类型（1=普通订单，2=摆渡订单）" underline="true"/>
+ <#input id="userId" name="用户id" underline="true"/>
+ <#input id="driverId" name="接单司机ID" underline="true"/>
+ <#input id="carId" name="车辆id" underline="true"/>
+ <#input id="orderNum" name="订单号" underline="true"/>
+ <#input id="placementLon" name="下单地点经度" underline="true"/>
+ <#input id="placementLat" name="下单地点纬度" underline="true"/>
+ <#input id="placementAddress" name="下单地点" underline="true"/>
+ <#input id="startLon" name="出发地经度值" underline="true"/>
+ <#input id="startLat" name="出发地纬度值" underline="true"/>
+ <#input id="endLon" name="目的地经度" underline="true"/>
+ <#input id="startAddress" name="出发地地点" underline="true"/>
+ <#input id="endLat" name="目的地纬度" underline="true"/>
+ <#input id="endAddress" name="目的地地点" underline="true"/>
+ <#input id="boardingLon" name="上车点经度" underline="true"/>
+ <#input id="boardingLat" name="上车点纬度" underline="true"/>
+ <#input id="boardingAddress" name="上车点" underline="true"/>
+ <#input id="boardingTime" name="上车时间" underline="true"/>
+ <#input id="getoffLon" name="下车点经度" underline="true"/>
+ <#input id="getoffLat" name="下车点纬度" underline="true"/>
+ <#input id="getoffAddress" name="下车地点" underline="true"/>
+ <#input id="getoffTime" name="下车时间" underline="true"/>
+ <#input id="mileage" name="行驶里程数（米）" underline="true"/>
+ <#input id="payManner" name="支付方式（1=OK平台支付，2=其他方式支付）" underline="true"/>
+ <#input id="payType" name="支付方式(1=微信，2=支付宝，3=其他)" underline="true"/>
+ <#input id="orderMoney" name="订单金额" underline="true"/>
+ <#input id="startMoney" name="起步价" underline="true"/>
+ <#input id="mileageMoney" name="里程费" underline="true"/>
+ <#input id="durationMoney" name="时长费" underline="true"/>
+ <#input id="longDistanceMoney" name="远途费" underline="true"/>
+ <#input id="parkMoney" name="停车费"/>
+ </div>
+
+ <div class="col-sm-6">
+ <#input id="roadTollMoney" name="过路费" underline="true"/>
+ <#input id="redPacketMoney" name="红包抵扣金额" underline="true"/>
+ <#input id="couponMoney" name="优惠券抵扣金额" underline="true"/>
+ <#input id="redPacketId" name="红包记录id" underline="true"/>
+ <#input id="couponId" name="优惠券id" underline="true"/>
+ <#input id="discount" name="折扣" underline="true"/>
+ <#input id="discountMoney" name="折扣优惠金额" underline="true"/>
+ <#input id="activityId" name="折扣活动id" underline="true"/>
+ <#input id="companyId" name="公司id" underline="true"/>
+ <#input id="payMoney" name="支付金额" underline="true"/>
+ <#input id="substitute" name="是否是代下单（0：否，1：是）" underline="true"/>
+ <#input id="passengers" name="乘车人" underline="true"/>
+ <#input id="passengersPhone" name="乘车人电话" underline="true"/>
+ <#input id="state" name="状态(1=待接单，2=待出发，3=待到达预约地点，4=待乘客上车，5=服务中，6=完成服务，7=待支付，8=待评价，9=已完成，10=已取消，11=改派中，12=取消待支付)" underline="true"/>
+ <#input id="insertTime" name="下单时间" underline="true"/>
+ <#input id="travelTime" name="出行时间" underline="true"/>
+ <#input id="snatchOrderTime" name="抢单时间" underline="true"/>
+ <#input id="setOutTime" name="司机点出发时间" underline="true"/>
+ <#input id="arriveTime" name="司机到达预约地点时间" underline="true"/>
+ <#input id="startServiceTime" name="开始服务时间" underline="true"/>
+ <#input id="endServiceTime" name="结束服务时间" underline="true"/>
+ <#input id="orderType" name="订单类型(1=普通，2=预约)" underline="true"/>
+ <#input id="orderSource" name="下单方式（1：APP下单，2：扫码下单，3：小程序下单，4：司机下单，5：调度下单）" underline="true"/>
+ <#input id="invoiceId" name="发票id" underline="true"/>
+ <#input id="isReassign" name="是否是改派单（1=否，2=是）" underline="true"/>
+ <#input id="reassignNotice" name="改派通知（0=没有改派，1=改派中，2=已改派）" underline="true"/>
+ <#input id="trackId" name="高德猎鹰上的轨迹id" underline="true"/>
+ <#input id="isDelete" name="是否删除 1=否 2=是" underline="true"/>
+ <#input id="oldState" name="状态(改派前订单状态)" underline="true"/>
+ <#input id="telX" name="移动小号" underline="true"/>
+ <#input id="bindId" name="移动小号绑定关系id" underline="true"/>
+ <#input id="serverCarModelId" name="专车车型ID 关联t_server_carmodel表" underline="true"/>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TOrderPrivateCarInfoDlg.addSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TOrderPrivateCarInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tOrderPrivateCar/tOrderPrivateCar_info.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar_orderDetail.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar_orderDetail.html
new file mode 100644
index 0000000..f5acceb
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar_orderDetail.html
@@ -0,0 +1,115 @@
+@layout("/common/_container.html"){
+<style type="text/css">
+ html, body, #container {
+ height: 100%;
+ width: 100%;
+ }
+
+ .input-card .btn{
+ margin-right: 1.2rem;
+ width: 9rem;
+ }
+
+ .input-card .btn:last-child{
+ margin-right: 0;
+ }
+</style>
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+ <input type="hidden" id="id" name="id" value="${item.id}">
+ <div class="row" style="margin-top: 30px;">
+ <div class="col-sm-4">
+ <h2 class="h3Class" style="font-weight: 700;">订单详情</h2>
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-sm-6 b-r">
+ <#label id="insertTimeStr" name="下单时间" value="${item.insertTimeStr}"/>
+ <#label id="orderSourceStr" name="订单来源" value="${item.orderSourceStr}"/>
+ <#label id="userName" name="下单用户昵称" value="${item.userName}"/>
+ <#label id="passengers" name="乘车用户昵称" value="${item.passengers}"/>
+ <#label id="placementAddress" name="起点" value="${item.startAddress}"/>
+ <#label id="serverCarModel" name="选择车型" value="${item.serverCarModel}"/>
+ <#label id="car" name="接单车辆" value="${item.car}"/>
+ <#label id="boardingAddress" name="上车地点" value="${item.boardingAddress}"/>
+ <#label id="getoffAddress" name="下车地点" value="${item.getoffAddress}"/>
+ </div>
+
+ <div class="col-sm-6">
+ <#label id="orderNum" name="订单编号" value="${item.orderNum}"/>
+ <#label id="travelTimeStr" name="乘车时间" value="${item.travelTimeStr}"/>
+ <#label id="userPhone" name="下单用户手机号" value="${item.userPhone}"/>
+ <#label id="passengersPhone" name="乘车用户手机号" value="${item.passengersPhone}"/>
+ <#label id="endAddress" name="终点" value="${item.endAddress}"/>
+ <#label id="driver" name="接单司机" value="${item.driver}"/>
+ <#label id="companyName" name="车辆所属机构" value="${item.companyName}"/>
+ <#label id="boardingTimeStr" name="上车时间" value="${item.boardingTimeStr}"/>
+ <#label id="getoffTimeStr" name="下车时间" value="${item.getoffTimeStr}"/>
+ </div>
+ </div>
+ <div class="row" style="margin-top: 30px;">
+ <div class="col-sm-4">
+ <h2 class="h3Class" style="font-weight: 700;">费用明细</h2>
+ </div>
+ </div>
+ <div class="row">
+ @if(isNotEmpty(item.orderMoney) && item.orderMoney > 0){
+ <div class="col-sm-6 b-r">
+ <#label id="orderMoney" name="订单总价" value="${item.orderMoney}元"/>
+ <#label id="travelMoney" name="行程费" value="${item.travelMoney}元"/>
+ <#label id="parkMoney" name="停车费" value="${item.parkMoney}元"/>
+ <#label id="roadTollMoney" name="过路费" value="${item.roadTollMoney}元"/>
+ <#label id="tipMoney" name="小费" value="${item.tipMoney}元"/>
+
+ @if(isNotEmpty(item.payMoney)){
+ <#label id="payMoney" name="实际支付费用" value="${item.payMoney}元"/>
+ @}else{
+ <#label id="payMoney" name="实际支付费用" value="0.00元"/>
+ @}
+
+ <#label id="payTypeStr" name="支付方式" value="${item.payTypeStr}"/>
+ <#label id="couponMoney" name="优惠券抵扣费用" value="${item.couponMoney}元"/>
+ <#label id="redPacketMoney" name="红包抵扣金额" value="${item.redPacketMoney}元"/>
+ </div>
+ <div class="col-sm-6">
+ <#label id="platIncome" name="平台收益" value="${item.platIncome}元"/>
+ <#label id="companyIncome" name="分公司收益" value="${item.companyIncome}元"/>
+ <#label id="franchiseeIncome" name="加盟商收益" value="${item.franchiseeIncome}元"/>
+ <#label id="driverIncome" name="司机收益" value="${item.driverIncome}元"/>
+ </div>
+ @}else{
+ <h4 style="margin-left: 10%">暂无费用明细</h4>
+ @}
+ </div>
+ <div class="row" style="margin-top: 30px;">
+ <div class="col-sm-4">
+ <h2 class="h3Class" style="font-weight: 700;">线路轨迹</h2>
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-sm-10">
+ <div class="form-horizontal" id="container" style="margin-left: 50px;width: 100%; height: 500px;"></div>
+ <div class="input-card" style="margin-left: 50px;">
+ <h4>轨迹回放控制</h4>
+ <div class="input-item">
+ <input type="button" class="btn" value="开始动画" id="start" onclick="startAnimation()"/>
+ <input type="button" class="btn" value="暂停动画" id="pause" onclick="pauseAnimation()"/>
+ <input type="button" class="btn" value="继续动画" id="resume" onclick="resumeAnimation()"/>
+ <input type="button" class="btn" value="停止动画" id="stop" onclick="stopAnimation()"/>
+ </div>
+ <div class="input-item">
+
+ </div>
+ </div>
+ </div>
+ </div>
+
+ </div>
+ </div>
+</div>
+<script src="https://a.amap.com/jsapi_demos/static/demo-center/js/demoutils.js"></script>
+<script src="https://webapi.amap.com/maps?v=1.4.8&key=e17d799b2506d05faf7f88320a266803"></script>
+<script src="https://cache.amap.com/lbs/static/addToolbar.js"></script>
+<script src="${ctxPath}/static/modular/system/tOrderPrivateCar/tOrderPrivateCar_info.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar_trajectory.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar_trajectory.html
new file mode 100644
index 0000000..308863e
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar_trajectory.html
@@ -0,0 +1,52 @@
+@layout("/common/_container.html"){
+<style type="text/css">
+ html, body, #container {
+ height: 100%;
+ width: 100%;
+ }
+
+ .input-card .btn{
+ margin-right: 1.2rem;
+ width: 9rem;
+ }
+
+ .input-card .btn:last-child{
+ margin-right: 0;
+ }
+</style>
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+ <input type="hidden" id="id" name="id" value="${tOrderPrivateCarId}">
+ <div class="row" style="margin-top: 30px;">
+ <div class="col-sm-4">
+ <h2 class="h3Class" style="font-weight: 700;">线路轨迹</h2>
+ </div>
+ </div>
+ <div class="row" style="margin-top: 30px;">
+ <div class="col-sm-10">
+ <div class="form-horizontal" id="container" style="margin-left: 50px;width: 100%; height: 500px;"></div>
+ <div class="input-card" style="margin-left: 50px;">
+ <h4>轨迹回放控制</h4>
+ <div class="input-item">
+ <input type="button" class="btn" value="开始动画" id="start" onclick="startAnimation()"/>
+ <input type="button" class="btn" value="暂停动画" id="pause" onclick="pauseAnimation()"/>
+ <input type="button" class="btn" value="继续动画" id="resume" onclick="resumeAnimation()"/>
+ <input type="button" class="btn" value="停止动画" id="stop" onclick="stopAnimation()"/>
+ </div>
+ <div class="input-item">
+
+ </div>
+ </div>
+ </div>
+ </div>
+
+ </div>
+
+ </div>
+</div>
+<script src="https://a.amap.com/jsapi_demos/static/demo-center/js/demoutils.js"></script>
+<script src="https://webapi.amap.com/maps?v=1.4.8&key=e17d799b2506d05faf7f88320a266803"></script>
+<script src="https://cache.amap.com/lbs/static/addToolbar.js"></script>
+<script src="${ctxPath}/static/modular/system/tOrderPrivateCar/tOrderPrivateCar_info.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderTaxi/tOrderTaxi.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderTaxi/tOrderTaxi.html
new file mode 100644
index 0000000..a195eb6
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderTaxi/tOrderTaxi.html
@@ -0,0 +1,100 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>出租车订单管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#TimeCon id="insertTime" name="下单时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="orderNum" name="订单编号" />
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="orderSource" name="订单来源" >
+ <option value="">全部</option>
+ <option value="1">APP下单</option>
+ <option value="2">扫码下单</option>
+ <option value="3">小程序下单</option>
+ <option value="4">司机下单</option>
+ <option value="5">调度下单</option>
+ <option value="6">道行龙城下单</option>
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="userName" name="下单用户昵称" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="userPhone" name="下单用户手机" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="passengers" name="乘车用户姓名" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="passengersPhone" name="乘车用户手机" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="driver" name="接单司机" />
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="state" name="状态" >
+ <option value="">全部</option>
+ <option value="1">待接单</option>
+ <option value="2">待出发</option>
+ <option value="3">待到达预约地点</option>
+ <option value="4">待乘客上车</option>
+ <option value="5">服务中</option>
+ <option value="6">完成服务</option>
+ <option value="7">待支付</option>
+ <option value="8">待评价</option>
+ <option value="9">已完成</option>
+ <option value="10">已取消</option>
+ <option value="11">改派中</option>
+ <option value="12">取消待支付</option>
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="TOrderTaxi.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="TOrderTaxi.resetSearch()" space="true"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="TOrderTaxiTableToolbar" role="group">
+ @if(shiro.hasPermission("/tOrderTaxi/addOrderTaxi")){
+ <#button name="添加订单" icon="fa-plus" clickFun="TOrderTaxi.addOrderTaxi()"/>
+ @}
+ @if(shiro.hasPermission("/tOrderTaxi/detail")){
+ <#button name="订单详情" icon="fa-plus" clickFun="TOrderTaxi.detail()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tOrderTaxi/cancel")){
+ <#button name="取消订单" icon="fa-edit" clickFun="TOrderTaxi.cancel()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tOrderTaxi/trajectory")){
+ <#button name="订单轨迹" icon="fa-remove" clickFun="TOrderTaxi.trajectory()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tOrderTaxi/delete")){
+ <#button name="删除记录" icon="fa-remove" clickFun="TOrderTaxi.delete()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tOrderTaxi/changeOrder")){
+ <#button name="改派订单" icon="fa-remove" clickFun="TOrderTaxi.changeOrder()" space="true"/>
+ @}
+ </div>
+ <#table id="TOrderTaxiTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tOrderTaxi/tOrderTaxi.js"></script>
+<script>
+ laydate.render({
+ elem: '#insertTime'
+ ,range: true
+ });
+</script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderTaxi/tOrderTaxi_add.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderTaxi/tOrderTaxi_add.html
new file mode 100644
index 0000000..066c3f9
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderTaxi/tOrderTaxi_add.html
@@ -0,0 +1,79 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="orderTaxiInfoForm">
+ <div class="row">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">乘车人姓名：</label>
+ <div class="col-sm-8">
+ <input class="form-control" id="passengers" name="passengers">
+ </div>
+ </div>
+ <div class="hr-line-dashed"></div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">乘车人电话：</label>
+ <div class="col-sm-8">
+ <input class="form-control" id="passengersPhone" name="passengersPhone">
+ </div>
+ </div>
+ <div class="hr-line-dashed"></div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">起点：</label>
+ <div class="col-sm-8">
+ <input class="form-control" id="startAddress" name="startAddress">
+ </div>
+ </div>
+ <div class="hr-line-dashed"></div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">终点：</label>
+ <div class="col-sm-8">
+ <input class="form-control" id="endAddress" name="endAddress">
+ </div>
+ </div>
+ <div class="hr-line-dashed"></div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">订单类型：</label>
+ <div class="col-sm-8">
+ <select class="form-control" id="orderType" name="orderType">
+ <option value="1">即时单</option>
+ <option value="2">预约单</option>
+ </select>
+ </div>
+ </div>
+ <div class="hr-line-dashed"></div>
+ <div class="travelTime" hidden>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">出行时间：</label>
+ <div class="col-sm-8">
+ <input class="form-control" id="travelTime" name="travelTime">
+ </div>
+ </div>
+ <div class="hr-line-dashed"></div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">备注：</label>
+ <div class="col-sm-8">
+ <textarea class="form-control" id="remark" name="remark"></textarea>
+ </div>
+ </div>
+ <div class="hr-line-dashed"></div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TOrderTaxiInfoDlg.addSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TOrderTaxiInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tOrderTaxi/tOrderTaxi_info.js"></script>
+<script>
+ laydate.render({
+ elem: '#travelTime'
+ ,type: 'datetime'
+ });
+</script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderTaxi/tOrderTaxi_changeOrder.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderTaxi/tOrderTaxi_changeOrder.html
new file mode 100644
index 0000000..055996b
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderTaxi/tOrderTaxi_changeOrder.html
@@ -0,0 +1,35 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>选择改派司机</h5>
+ </div>
+ <input type="hidden" id="id" name="id" value="${item.id}">
+ <input type="hidden" id="companyId" name="companyId" value="${item.companyId}">
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#NameCon id="name" name="司机姓名" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="phone" name="司机手机号" />
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="SelectDriver.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="SelectDriver.resetSearch()" space="true"/>
+ <#button btnCss="info" name="确定" id="ensure" icon="fa-check" clickFun="SelectDriver.selectDriver()" space="true"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="SelectDriver.close()" space="true"/>
+ </div>
+ </div>
+ <#table id="SelectDriverTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tOrderTaxi/selectDriver.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderTaxi/tOrderTaxi_edit.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderTaxi/tOrderTaxi_edit.html
new file mode 100644
index 0000000..1760aa5
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderTaxi/tOrderTaxi_edit.html
@@ -0,0 +1,81 @@
+@layout("/common/_container.html"){
+<style type="text/css">
+ html, body, #container {
+ height: 100%;
+ width: 100%;
+ }
+
+ .input-card .btn{
+ margin-right: 1.2rem;
+ width: 9rem;
+ }
+
+ .input-card .btn:last-child{
+ margin-right: 0;
+ }
+</style>
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+ <input type="hidden" id="id" name="id" value="${item.id}">
+ <div class="row" style="margin-top: 30px;">
+ <div class="col-sm-4">
+ <h2 class="h3Class" style="font-weight: 700;">订单详情</h2>
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-sm-6 b-r">
+ <#label id="insertTimeStr" name="下单时间" value="${item.insertTimeStr}"/>
+ <#label id="orderSourceStr" name="订单来源" value="${item.orderSourceStr}"/>
+ <#label id="userName" name="下单用户昵称" value="${item.userName}"/>
+ <#label id="passengers" name="乘车用户昵称" value="${item.passengers}"/>
+ <#label id="placementAddress" name="起点" value="${item.startAddress}"/>
+ <#label id="driver" name="接单司机" value="${item.driver}"/>
+ <#label id="car" name="接单车辆" value="${item.car}"/>
+ <#label id="boardingAddress" name="上车地点" value="${item.boardingAddress}"/>
+ <#label id="getoffAddress" name="下车地点" value="${item.getoffAddress}"/>
+ </div>
+
+ <div class="col-sm-6">
+ <#label id="orderNum" name="订单编号" value="${item.orderNum}"/>
+ <#label id="travelTimeStr" name="乘车时间" value="${item.travelTimeStr}"/>
+ <#label id="userPhone" name="下单用户手机号" value="${item.userPhone}"/>
+ <#label id="passengersPhone" name="乘车用户手机号" value="${item.passengersPhone}"/>
+ <#label id="endAddress" name="终点" value="${item.endAddress}"/>
+ <#label id="companyName" name="车辆所属机构" value="${item.companyName}"/>
+ <#label id="boardingTimeStr" name="上车时间" value="${item.boardingTimeStr}"/>
+ <#label id="getoffTimeStr" name="下车时间" value="${item.getoffTimeStr}"/>
+ </div>
+ </div>
+ <div class="row" style="margin-top: 30px;">
+ <div class="col-sm-4">
+ <h2 class="h3Class" style="font-weight: 700;">线路轨迹</h2>
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-sm-10">
+ <div class="form-horizontal" id="container" style="margin-left: 50px;width: 100%; height: 500px;"></div>
+ <div class="input-card" style="margin-left: 50px;">
+ <h4>轨迹回放控制</h4>
+ <div class="input-item">
+ <input type="button" class="btn" value="开始动画" id="start" onclick="startAnimation()"/>
+ <input type="button" class="btn" value="暂停动画" id="pause" onclick="pauseAnimation()"/>
+ <input type="button" class="btn" value="继续动画" id="resume" onclick="resumeAnimation()"/>
+ <input type="button" class="btn" value="停止动画" id="stop" onclick="stopAnimation()"/>
+ </div>
+ <div class="input-item">
+
+ </div>
+ </div>
+ </div>
+ </div>
+
+ </div>
+
+ </div>
+</div>
+<script src="https://a.amap.com/jsapi_demos/static/demo-center/js/demoutils.js"></script>
+<script src="https://webapi.amap.com/maps?v=1.4.8&key=e17d799b2506d05faf7f88320a266803"></script>
+<script src="https://cache.amap.com/lbs/static/addToolbar.js"></script>
+<script src="${ctxPath}/static/modular/system/tOrderTaxi/tOrderTaxi_info.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderTaxi/tOrderTaxi_trajectory.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderTaxi/tOrderTaxi_trajectory.html
new file mode 100644
index 0000000..6bdd85e
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderTaxi/tOrderTaxi_trajectory.html
@@ -0,0 +1,52 @@
+@layout("/common/_container.html"){
+<style type="text/css">
+ html, body, #container {
+ height: 100%;
+ width: 100%;
+ }
+
+ .input-card .btn{
+ margin-right: 1.2rem;
+ width: 9rem;
+ }
+
+ .input-card .btn:last-child{
+ margin-right: 0;
+ }
+</style>
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+ <input type="hidden" id="id" name="id" value="${tOrderTaxiId}">
+ <div class="row" style="margin-top: 30px;">
+ <div class="col-sm-4">
+ <h2 class="h3Class" style="font-weight: 700;">线路轨迹</h2>
+ </div>
+ </div>
+ <div class="row" style="margin-top: 30px;">
+ <div class="col-sm-10">
+ <div class="form-horizontal" id="container" style="margin-left: 50px;width: 100%; height: 500px;"></div>
+ <div class="input-card" style="margin-left: 50px;">
+ <h4>轨迹回放控制</h4>
+ <div class="input-item">
+ <input type="button" class="btn" value="开始动画" id="start" onclick="startAnimation()"/>
+ <input type="button" class="btn" value="暂停动画" id="pause" onclick="pauseAnimation()"/>
+ <input type="button" class="btn" value="继续动画" id="resume" onclick="resumeAnimation()"/>
+ <input type="button" class="btn" value="停止动画" id="stop" onclick="stopAnimation()"/>
+ </div>
+ <div class="input-item">
+
+ </div>
+ </div>
+ </div>
+ </div>
+
+ </div>
+
+ </div>
+</div>
+<script src="https://a.amap.com/jsapi_demos/static/demo-center/js/demoutils.js"></script>
+<script src="https://webapi.amap.com/maps?v=1.4.8&key=e17d799b2506d05faf7f88320a266803"></script>
+<script src="https://cache.amap.com/lbs/static/addToolbar.js"></script>
+<script src="${ctxPath}/static/modular/system/tOrderTaxi/tOrderTaxi_info.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tProblem/tProblem.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tProblem/tProblem.html
new file mode 100644
index 0000000..23ccd05
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tProblem/tProblem.html
@@ -0,0 +1,49 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>用户留言管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#TimeCon id="insertTime" name="提问时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="userName" name="留言用户" />
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="state" name="处理状态" >
+ <option value="">全部</option>
+ <option value="1">待处理</option>
+ <option value="2">已处理</option>
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="TProblem.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="TProblem.resetSearch()" space="true"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="TProblemTableToolbar" role="group">
+ @if(shiro.hasPermission("/tProblem/immediately")){
+ <#button name="立即处理" icon="fa-plus" clickFun="TProblem.immediately()"/>
+ @}
+ </div>
+ <#table id="TProblemTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tProblem/tProblem.js"></script>
+<script>
+ laydate.render({
+ elem: '#insertTime'
+ ,range: true
+ });
+</script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tProblem/tProblem_add.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tProblem/tProblem_add.html
new file mode 100644
index 0000000..df5620a
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tProblem/tProblem_add.html
@@ -0,0 +1,33 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+
+ <div class="row">
+ <div class="col-sm-6 b-r">
+ <#input id="id" name="" underline="true"/>
+ <#input id="userId" name="用户id" underline="true"/>
+ <#input id="content" name="提问内容" underline="true"/>
+ <#input id="answer" name="回答内容"/>
+ </div>
+
+ <div class="col-sm-6">
+ <#input id="handleUserId" name="处理人id" underline="true"/>
+ <#input id="handleTime" name="处理时间" underline="true"/>
+ <#input id="insertTime" name="提问时间" underline="true"/>
+ <#input id="state" name="状态（1=待处理，2=已处理）" underline="true"/>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TProblemInfoDlg.addSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TProblemInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tProblem/tProblem_info.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tProblem/tProblem_edit.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tProblem/tProblem_edit.html
new file mode 100644
index 0000000..09cb49c
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tProblem/tProblem_edit.html
@@ -0,0 +1,33 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+
+ <div class="row">
+ <div class="col-sm-6 b-r">
+ <#input id="id" name="" value="${item.id}" underline="true"/>
+ <#input id="userId" name="用户id" value="${item.userId}" underline="true"/>
+ <#input id="content" name="提问内容" value="${item.content}" underline="true"/>
+ <#input id="answer" name="回答内容" value="${item.answer}" />
+ </div>
+
+ <div class="col-sm-6">
+ <#input id="handleUserId" name="处理人id" value="${item.handleUserId}" underline="true"/>
+ <#input id="handleTime" name="处理时间" value="${item.handleTime}" underline="true"/>
+ <#input id="insertTime" name="提问时间" value="${item.insertTime}" underline="true"/>
+ <#input id="state" name="状态（1=待处理，2=已处理）" value="${item.state}" />
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TProblemInfoDlg.editSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TProblemInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tProblem/tProblem_info.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tProblem/tProblem_immediately.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tProblem/tProblem_immediately.html
new file mode 100644
index 0000000..bf912ed
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tProblem/tProblem_immediately.html
@@ -0,0 +1,28 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="problemInfoForm">
+ <input type="hidden" id="tProblemId" name="tProblemId" value="${tProblemId}">
+ <div class="row">
+ <div class="col-sm-11">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">回复内容：</label>
+ <div class="col-sm-9">
+ <textarea type="text/plain" class="form-control" name="answer" id="answer" style="width:100%;height:150px;" placeholder="多行输入,最多500字"></textarea>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TProblemInfoDlg.immediately()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TProblemInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tProblem/tProblem_info.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tPubWithdrawal/tPubWithdrawal.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tPubWithdrawal/tPubWithdrawal.html
new file mode 100644
index 0000000..317fb0f
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tPubWithdrawal/tPubWithdrawal.html
@@ -0,0 +1,49 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>提现列表管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#TimeCon id="insertTime" name="申请时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="name" name="提现人" />
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="withdrawalType" name="提现方式" >
+ <option value="">全部</option>
+ <option value="1">银行卡</option>
+ <option value="2">线下</option>
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="TPubWithdrawal.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="TPubWithdrawal.resetSearch()" space="true"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="TPubWithdrawalTableToolbar" role="group">
+ @if(shiro.hasPermission("/tPubWithdrawal/immediately")){
+ <#button name="立即处理" icon="fa-edit" clickFun="TPubWithdrawal.immediately()"/>
+ @}
+ </div>
+ <#table id="TPubWithdrawalTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tPubWithdrawal/tPubWithdrawal.js"></script>
+<script>
+ laydate.render({
+ elem: '#insertTime'
+ ,range: true
+ });
+</script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tPubWithdrawal/tPubWithdrawal_add.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tPubWithdrawal/tPubWithdrawal_add.html
new file mode 100644
index 0000000..c23416c
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tPubWithdrawal/tPubWithdrawal_add.html
@@ -0,0 +1,38 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+
+ <div class="row">
+ <div class="col-sm-6 b-r">
+ <#input id="id" name="主键id" underline="true"/>
+ <#input id="userId" name="用户id" underline="true"/>
+ <#input id="handleTime" name="处理时间" underline="true"/>
+ <#input id="balance" name="原钱包余额" underline="true"/>
+ <#input id="money" name="提现金额" underline="true"/>
+ <#input id="state" name="状态(1=待处理，2=成功，3=失败)" underline="true"/>
+ <#input id="remark" name="备注"/>
+ </div>
+
+ <div class="col-sm-6">
+ <#input id="code" name="银行账号" underline="true"/>
+ <#input id="name" name="账户持有人姓名" underline="true"/>
+ <#input id="userType" name="用户类型(1=用户，2=司机)" underline="true"/>
+ <#input id="insertTime" name="申请时间" underline="true"/>
+ <#input id="flag" name="1：创建，2：修改，3：删除" underline="true"/>
+ <#input id="withdrawalType" name="提现方式 1=银行卡 2=线下" underline="true"/>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TPubWithdrawalInfoDlg.addSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TPubWithdrawalInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tPubWithdrawal/tPubWithdrawal_info.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tPubWithdrawal/tPubWithdrawal_edit.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tPubWithdrawal/tPubWithdrawal_edit.html
new file mode 100644
index 0000000..2b01284
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tPubWithdrawal/tPubWithdrawal_edit.html
@@ -0,0 +1,38 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+
+ <div class="row">
+ <div class="col-sm-6 b-r">
+ <#input id="id" name="主键id" value="${item.id}" underline="true"/>
+ <#input id="userId" name="用户id" value="${item.userId}" underline="true"/>
+ <#input id="handleTime" name="处理时间" value="${item.handleTime}" underline="true"/>
+ <#input id="balance" name="原钱包余额" value="${item.balance}" underline="true"/>
+ <#input id="money" name="提现金额" value="${item.money}" underline="true"/>
+ <#input id="state" name="状态(1=待处理，2=成功，3=失败)" value="${item.state}" underline="true"/>
+ <#input id="remark" name="备注" value="${item.remark}" />
+ </div>
+
+ <div class="col-sm-6">
+ <#input id="code" name="银行账号" value="${item.code}" underline="true"/>
+ <#input id="name" name="账户持有人姓名" value="${item.name}" underline="true"/>
+ <#input id="userType" name="用户类型(1=用户，2=司机)" value="${item.userType}" underline="true"/>
+ <#input id="insertTime" name="申请时间" value="${item.insertTime}" underline="true"/>
+ <#input id="flag" name="1：创建，2：修改，3：删除" value="${item.flag}" underline="true"/>
+ <#input id="withdrawalType" name="提现方式 1=银行卡 2=线下" value="${item.withdrawalType}" />
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TPubWithdrawalInfoDlg.editSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TPubWithdrawalInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tPubWithdrawal/tPubWithdrawal_info.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tPubWithdrawal/tPubWithdrawal_immediately.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tPubWithdrawal/tPubWithdrawal_immediately.html
new file mode 100644
index 0000000..16d1d49
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tPubWithdrawal/tPubWithdrawal_immediately.html
@@ -0,0 +1,41 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="withdrawalInfoForm">
+ <input type="hidden" id="id" name="id" value="${tPubWithdrawalId}">
+ <div class="row">
+ <div class="col-sm-10">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">处理意见：</label>
+ <div class="col-sm-9" style="display: flex;align-items: center;">
+ <div class="radio radio-info radio-inline">
+ <input type="radio" id="state2" value="2" name="state" checked="" >
+ <label for="state2"> 同意 </label>
+ </div>
+ <div class="radio radio-success radio-inline">
+ <input type="radio" id="state3" value="3" name="state" >
+ <label for="state3"> 拒绝 </label>
+ </div>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">填写备注：</label>
+ <div class="col-sm-9">
+ <textarea type="text/plain" class="form-control" name="remark" id="remark" style="width:100%;height:150px;"></textarea>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TPubWithdrawalInfoDlg.immediately()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TPubWithdrawalInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tPubWithdrawal/tPubWithdrawal_info.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/cross.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/cross.html
new file mode 100644
index 0000000..b7b5faa
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/cross.html
@@ -0,0 +1,87 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>跨城改派管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#TimeCon id="insertTime" name="申请改派时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="originalDriverName" name="申请司机姓名" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="originalDriverPhone" name="申请司机手机号" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="orderNum" name="订单编号" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="nowDriverName" name="改派服务司机姓名" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="nowDriverPhone" name="改派服务司机手机号" />
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="orderState" name="订单当前状态" >
+ <option value="">全部</option>
+ <option value="1">待接单</option>
+ <option value="2">待出发</option>
+ <option value="3">待到达预约地点</option>
+ <option value="4">待乘客上车</option>
+ <option value="5">服务中</option>
+ <option value="6">完成服务</option>
+ <option value="7">待支付</option>
+ <option value="8">待评价</option>
+ <option value="9">已完成</option>
+ <option value="10">已取消</option>
+ <option value="11">改派中</option>
+ <option value="12">取消待支付</option>
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="state" 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">
+ <#button name="搜索" icon="fa-search" clickFun="TCross.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="TCross.resetSearch()" space="true"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="TCrossTableToolbar" role="group">
+ @if(shiro.hasPermission("/tReassign/refusedCross")){
+ <#button name="拒绝改派" icon="fa-plus" clickFun="TCross.opt(1)"/>
+ @}
+ @if(shiro.hasPermission("/tReassign/reassignmentCross")){
+ <#button name="立即改派" icon="fa-edit" clickFun="TCross.reassignmentCross()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tReassign/cancelCross")){
+ <#button name="取消订单" icon="fa-remove" clickFun="TCross.opt(2)" space="true"/>
+ @}
+ </div>
+ <#table id="TCrossTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tReassign/tCross.js"></script>
+<script>
+ laydate.render({
+ elem: '#insertTime'
+ ,range: true
+ });
+</script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/smallPieceLogistics.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/smallPieceLogistics.html
new file mode 100644
index 0000000..259c40f
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/smallPieceLogistics.html
@@ -0,0 +1,86 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>小件物流改派管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#TimeCon id="insertTime" name="申请改派时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="originalDriverName" name="申请司机姓名" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="originalDriverPhone" name="申请司机手机号" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="orderNum" name="订单编号" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="nowDriverName" name="改派服务司机姓名" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="nowDriverPhone" name="改派服务司机手机号" />
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="orderState" name="订单当前状态" >
+ <option value="">全部</option>
+ <option value="1">待接单</option>
+ <option value="2">待出发</option>
+ <option value="3">待到达预约地点</option>
+ <option value="4">待取件</option>
+ <option value="5">送件中</option>
+ <option value="6">已送达</option>
+ <option value="7">待支付</option>
+ <option value="8">需补差价</option>
+ <option value="9">已取货</option>
+ <option value="10">已取消</option>
+ <option value="11">已支付差价</option>
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="state" 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">
+ <#button name="搜索" icon="fa-search" clickFun="TReassign.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="TReassign.resetSearch()" space="true"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="TReassignTableToolbar" role="group">
+ @if(shiro.hasPermission("/smallPieceLogistics/refused")){
+ <#button name="拒绝改派" icon="fa-plus" clickFun="TReassign.opt(1)"/>
+ @}
+ @if(shiro.hasPermission("/smallPieceLogistics/reassignment")){
+ <#button name="立即改派" icon="fa-edit" clickFun="TReassign.reassignment()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/smallPieceLogistics/cancel")){
+ <#button name="取消订单" icon="fa-remove" clickFun="TReassign.opt(2)" space="true"/>
+ @}
+ </div>
+ <#table id="TReassignTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tReassign/smallPieceLogistics.js"></script>
+<script>
+ laydate.render({
+ elem: '#insertTime'
+ ,range: true
+ });
+</script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/tReassign.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/tReassign.html
new file mode 100644
index 0000000..e5fbcb1
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/tReassign.html
@@ -0,0 +1,87 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>专车改派管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#TimeCon id="insertTime" name="申请改派时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="originalDriverName" name="申请司机姓名" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="originalDriverPhone" name="申请司机手机号" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="orderNum" name="订单编号" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="nowDriverName" name="改派服务司机姓名" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="nowDriverPhone" name="改派服务司机手机号" />
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="orderState" name="订单当前状态" >
+ <option value="">全部</option>
+ <option value="1">待接单</option>
+ <option value="2">待出发</option>
+ <option value="3">待到达预约地点</option>
+ <option value="4">待乘客上车</option>
+ <option value="5">服务中</option>
+ <option value="6">完成服务</option>
+ <option value="7">待支付</option>
+ <option value="8">待评价</option>
+ <option value="9">已完成</option>
+ <option value="10">已取消</option>
+ <option value="11">改派中</option>
+ <option value="12">取消待支付</option>
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="state" 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">
+ <#button name="搜索" icon="fa-search" clickFun="TReassign.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="TReassign.resetSearch()" space="true"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="TReassignTableToolbar" role="group">
+ @if(shiro.hasPermission("/tReassign/refused")){
+ <#button name="拒绝改派" icon="fa-plus" clickFun="TReassign.opt(1)"/>
+ @}
+ @if(shiro.hasPermission("/tReassign/reassignment")){
+ <#button name="立即改派" icon="fa-edit" clickFun="TReassign.reassignment()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tReassign/cancel")){
+ <#button name="取消订单" icon="fa-remove" clickFun="TReassign.opt(2)" space="true"/>
+ @}
+ </div>
+ <#table id="TReassignTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tReassign/tReassign.js"></script>
+<script>
+ laydate.render({
+ elem: '#insertTime'
+ ,range: true
+ });
+</script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/tReassign_reassignment.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/tReassign_reassignment.html
new file mode 100644
index 0000000..62241b2
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/tReassign_reassignment.html
@@ -0,0 +1,34 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>选择改派司机</h5>
+ </div>
+ <input type="hidden" id="id" name="id" value="${tReassignId}">
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#NameCon id="name" name="司机姓名" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="phone" name="司机手机号" />
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="SelectPrivateCarDriver.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="SelectPrivateCarDriver.resetSearch()" space="true"/>
+ <#button btnCss="info" name="确定" id="ensure" icon="fa-check" clickFun="SelectPrivateCarDriver.selectDriver()" space="true"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="SelectPrivateCarDriver.close()" space="true"/>
+ </div>
+ </div>
+ <#table id="SelectPrivateCarDriverTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tReassign/selectPrivateCarDriver.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/tReassign_reassignmentCross.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/tReassign_reassignmentCross.html
new file mode 100644
index 0000000..a4a739b
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/tReassign_reassignmentCross.html
@@ -0,0 +1,34 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>选择改派司机</h5>
+ </div>
+ <input type="hidden" id="id" name="id" value="${tReassignId}">
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#NameCon id="name" name="司机姓名" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="phone" name="司机手机号" />
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="SelectCrossDriver.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="SelectCrossDriver.resetSearch()" space="true"/>
+ <#button btnCss="info" name="确定" id="ensure" icon="fa-check" clickFun="SelectCrossDriver.selectDriver()" space="true"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="SelectCrossDriver.close()" space="true"/>
+ </div>
+ </div>
+ <#table id="SelectCrossDriverTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tReassign/selectCrossDriver.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/tReassign_reassignmentSmall.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/tReassign_reassignmentSmall.html
new file mode 100644
index 0000000..6af6c90
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/tReassign_reassignmentSmall.html
@@ -0,0 +1,34 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>选择改派司机</h5>
+ </div>
+ <input type="hidden" id="id" name="id" value="${tReassignId}">
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#NameCon id="name" name="司机姓名" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="phone" name="司机手机号" />
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="SelectPrivateCarDriver.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="SelectPrivateCarDriver.resetSearch()" space="true"/>
+ <#button btnCss="info" name="确定" id="ensure" icon="fa-check" clickFun="SelectPrivateCarDriver.selectDriver()" space="true"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="SelectPrivateCarDriver.close()" space="true"/>
+ </div>
+ </div>
+ <#table id="SelectPrivateCarDriverTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tReassign/selectSmallDriver.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/tReassign_reassignmentTaxi.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/tReassign_reassignmentTaxi.html
new file mode 100644
index 0000000..23d8b9f
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/tReassign_reassignmentTaxi.html
@@ -0,0 +1,34 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>选择改派司机</h5>
+ </div>
+ <input type="hidden" id="id" name="id" value="${tReassignId}">
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#NameCon id="name" name="司机姓名" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="phone" name="司机手机号" />
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="SelectCrossDriver.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="SelectCrossDriver.resetSearch()" space="true"/>
+ <#button btnCss="info" name="确定" id="ensure" icon="fa-check" clickFun="SelectCrossDriver.selectDriver()" space="true"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="SelectCrossDriver.close()" space="true"/>
+ </div>
+ </div>
+ <#table id="SelectCrossDriverTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tReassign/selectTaxiDriver.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/taxi.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/taxi.html
new file mode 100644
index 0000000..838c763
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/taxi.html
@@ -0,0 +1,90 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>出租车改派管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#TimeCon id="insertTime" name="申请改派时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="originalDriverName" name="申请司机姓名" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="originalDriverPhone" name="申请司机手机号" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="orderNum" name="订单编号" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="nowDriverName" name="改派服务司机姓名" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="nowDriverPhone" name="改派服务司机手机号" />
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="orderState" name="订单当前状态" >
+ <option value="">全部</option>
+ <option value="1">待接单</option>
+ <option value="2">待出发</option>
+ <option value="3">待到达预约地点</option>
+ <option value="4">待乘客上车</option>
+ <option value="5">服务中</option>
+ <option value="6">完成服务</option>
+ <option value="7">待支付</option>
+ <option value="8">待评价</option>
+ <option value="9">已完成</option>
+ <option value="10">已取消</option>
+ <option value="11">改派中</option>
+ <option value="12">取消待支付</option>
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="state" 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">
+ <#button name="搜索" icon="fa-search" clickFun="TCross.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="TCross.resetSearch()" space="true"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="TCrossTableToolbar" role="group">
+ @if(shiro.hasPermission("/tReassign/refusedTaxi")){
+ <#button name="拒绝改派" icon="fa-plus" clickFun="TCross.opt(1)"/>
+ @}
+ @if(shiro.hasPermission("/tReassign/reassignmentTaxi")){
+ <#button name="立即改派" icon="fa-edit" clickFun="TCross.reassignmentCross()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tReassign/cancelTaxi")){
+ <#button name="取消订单" icon="fa-remove" clickFun="TCross.opt(2)" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tReassign/excelTaxi")){
+ <#button name="导出" icon="fa-remove" clickFun="TCross.excel()" space="true"/>
+ @}
+ </div>
+ <#table id="TCrossTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tReassign/taxi.js"></script>
+<script>
+ laydate.render({
+ elem: '#insertTime'
+ ,range: true
+ });
+</script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tServerCarmodel/acrossCity.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tServerCarmodel/acrossCity.html
new file mode 100644
index 0000000..a821e59
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tServerCarmodel/acrossCity.html
@@ -0,0 +1,49 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>跨城车型设置管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#NameCon id="name" name="车型名称" />
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="state" name="状态" >
+ <option value="">全部</option>
+ <option value="1">正常</option>
+ <option value="2">禁用</option>
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="TAcrossCity.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="TAcrossCity.resetSearch()" space="true"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="TAcrossCityTableToolbar" role="group">
+ @if(shiro.hasPermission("/tServerCarmodel/addAcrossCity")){
+ <#button name="添加" icon="fa-plus" clickFun="TAcrossCity.addAcrossCity()"/>
+ @}
+ @if(shiro.hasPermission("/tServerCarmodel/updateServerCarmodel")){
+ <#button name="修改" icon="fa-edit" clickFun="TAcrossCity.updateServerCarmodel()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tServerCarmodel/noAcrossCity")){
+ <#button name="禁用" icon="fa-edit" clickFun="TAcrossCity.noAcrossCity()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tServerCarmodel/yesAcrossCity")){
+ <#button name="启用" icon="fa-remove" clickFun="TAcrossCity.yesAcrossCity()" space="true"/>
+ @}
+ </div>
+ <#table id="TAcrossCityTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tServerCarmodel/acrossCity.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tServerCarmodel/acrossCity_add.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tServerCarmodel/acrossCity_add.html
new file mode 100644
index 0000000..0a5a200
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tServerCarmodel/acrossCity_add.html
@@ -0,0 +1,24 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="acrossCityInfoForm">
+
+ <div class="row">
+ <div class="col-sm-11">
+ <#input id="name" name="车型名称"/>
+ <#avatar id="img" name="车型图片：" />
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TAcrossCityInfoDlg.addAcrossCity()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TAcrossCityInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tServerCarmodel/acrossCity_info.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tServerCarmodel/acrossCity_edit.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tServerCarmodel/acrossCity_edit.html
new file mode 100644
index 0000000..1ff94c8
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tServerCarmodel/acrossCity_edit.html
@@ -0,0 +1,24 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="acrossCityInfoForm">
+ <input type="hidden" id="id" value="${data.id}">
+ <div class="row">
+ <div class="col-sm-11">
+ <#input id="name" name="车型名称" value="${data.name}"/>
+ <#avatar id="img" name="车型图片：" avatarImg="${data.img}"/>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TAcrossCityInfoDlg.editAcrossCity()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TAcrossCityInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tServerCarmodel/acrossCity_info.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tServerCarmodel/charter.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tServerCarmodel/charter.html
new file mode 100644
index 0000000..09f6d97
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tServerCarmodel/charter.html
@@ -0,0 +1,49 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>包车车型设置管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#NameCon id="name" name="车型名称" />
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="state" name="状态" >
+ <option value="">全部</option>
+ <option value="1">正常</option>
+ <option value="2">禁用</option>
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="TCharter.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="TCharter.resetSearch()" space="true"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="TCharterTableToolbar" role="group">
+ @if(shiro.hasPermission("/tServerCarmodel/addCharter")){
+ <#button name="添加" icon="fa-plus" clickFun="TCharter.addCharter()"/>
+ @}
+ @if(shiro.hasPermission("/tServerCarmodel/update")){
+ <#button name="修改" icon="fa-edit" clickFun="TCharter.editCharter()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tServerCarmodel/noCharter")){
+ <#button name="禁用" icon="fa-edit" clickFun="TCharter.noCharter()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tServerCarmodel/yesCharter")){
+ <#button name="启用" icon="fa-remove" clickFun="TCharter.yesCharter()" space="true"/>
+ @}
+ </div>
+ <#table id="TCharterTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tServerCarmodel/charter.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tServerCarmodel/charter_add.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tServerCarmodel/charter_add.html
new file mode 100644
index 0000000..3e6c009
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tServerCarmodel/charter_add.html
@@ -0,0 +1,47 @@
+@layout("/common/_container.html"){
+<style>
+ .newWidth, .single-line{
+ max-width:150px !important;display: initial !important;
+ }
+</style>
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="charterInfoForm">
+
+ <div class="row">
+ <div class="col-sm-11">
+ <#input id="name" name="车型名称"/>
+
+ <div class="form-group">
+ <label class="col-sm-3 control-label">车型价格范围为：</label>
+ <div class="col-sm-9">
+ <input type="text" oninput="checkIsYuan(this)" name="one" id="one" class="form-control newWidth" />
+ 至 <input type="text" oninput="checkIsYuan(this)" name="two" id="two" class="form-control newWidth" /> 元
+ </div>
+ </div>
+
+ <#avatar id="img" name="车型图片：" />
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TCharterInfoDlg.addCharter()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TCharterInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tServerCarmodel/charter_info.js"></script>
+<script type="text/javascript">
+ var regDouble = /^(([1-9]{1}\d*)|(0{1}))(\.\d{0,2})?$/;
+ function checkIsYuan(obj){
+ var num = $(obj).val();
+ if(!regDouble.test(num)){
+ layer.msg("【元】格式不正确,保留两位小数");
+ }
+ }
+</script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tServerCarmodel/charter_edit.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tServerCarmodel/charter_edit.html
new file mode 100644
index 0000000..00db466
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tServerCarmodel/charter_edit.html
@@ -0,0 +1,47 @@
+@layout("/common/_container.html"){
+<style>
+ .newWidth, .single-line{
+ max-width:150px !important;display: initial !important;
+ }
+</style>
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="charterInfoForm">
+ <input type="hidden" id="id" value="${data.id}">
+ <div class="row">
+ <div class="col-sm-11">
+ <#input id="name" name="车型名称" value="${data.name}"/>
+
+ <div class="form-group">
+ <label class="col-sm-3 control-label">车型价格范围为：</label>
+ <div class="col-sm-9">
+ <input type="text" oninput="checkIsYuan(this)" name="one" id="one" class="form-control newWidth" value="${price1}"/>
+ 至 <input type="text" oninput="checkIsYuan(this)" name="two" id="two" class="form-control newWidth" value="${price2}"/> 元
+ </div>
+ </div>
+
+ <#avatar id="img" name="车型图片：" avatarImg="${data.img}"/>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TCharterInfoDlg.editCharter()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TCharterInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tServerCarmodel/charter_info.js"></script>
+<script type="text/javascript">
+ var regDouble = /^(([1-9]{1}\d*)|(0{1}))(\.\d{0,2})?$/;
+ function checkIsYuan(obj){
+ var num = $(obj).val();
+ if(!regDouble.test(num)){
+ layer.msg("【元】格式不正确,保留两位小数");
+ }
+ }
+</script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tServerCarmodel/tServerCarmodel.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tServerCarmodel/tServerCarmodel.html
new file mode 100644
index 0000000..0d7ea20
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tServerCarmodel/tServerCarmodel.html
@@ -0,0 +1,49 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>专车车型设置管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#NameCon id="name" name="车型名称" />
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="state" name="状态" >
+ <option value="">全部</option>
+ <option value="1">正常</option>
+ <option value="2">禁用</option>
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="TServerCarmodel.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="TServerCarmodel.resetSearch()" space="true"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="TServerCarmodelTableToolbar" role="group">
+ @if(shiro.hasPermission("/tServerCarmodel/add")){
+ <#button name="添加" icon="fa-plus" clickFun="TServerCarmodel.openAddTServerCarmodel()"/>
+ @}
+ @if(shiro.hasPermission("/tServerCarmodel/update")){
+ <#button name="修改" icon="fa-edit" clickFun="TServerCarmodel.updateTOrderEvaluateDetail()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tServerCarmodel/no")){
+ <#button name="禁用" icon="fa-edit" clickFun="TServerCarmodel.no()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tServerCarmodel/yes")){
+ <#button name="启用" icon="fa-remove" clickFun="TServerCarmodel.yes()" space="true"/>
+ @}
+ </div>
+ <#table id="TServerCarmodelTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tServerCarmodel/tServerCarmodel.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tServerCarmodel/tServerCarmodel_add.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tServerCarmodel/tServerCarmodel_add.html
new file mode 100644
index 0000000..b650cf8
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tServerCarmodel/tServerCarmodel_add.html
@@ -0,0 +1,24 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="serverCarModelInfoForm">
+
+ <div class="row">
+ <div class="col-sm-11">
+ <#input id="name" name="车型名称"/>
+ <#avatar id="img" name="车型图片：" />
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TServerCarmodelInfoDlg.addSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TServerCarmodelInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tServerCarmodel/tServerCarmodel_info.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tServerCarmodel/tServerCarmodel_edit.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tServerCarmodel/tServerCarmodel_edit.html
new file mode 100644
index 0000000..587aa9c
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tServerCarmodel/tServerCarmodel_edit.html
@@ -0,0 +1,24 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="serverCarModelInfoForm">
+ <input type="hidden" id="id" value="${data.id}">
+ <div class="row">
+ <div class="col-sm-11">
+ <#input id="name" name="车型名称" value="${data.name}"/>
+ <#avatar id="img" name="车型图片：" avatarImg="${data.img}"/>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TServerCarmodelInfoDlg.editSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TServerCarmodelInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tServerCarmodel/tServerCarmodel_info.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSite/tSite.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSite/tSite.html
new file mode 100644
index 0000000..20a8dd3
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSite/tSite.html
@@ -0,0 +1,67 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>跨城站点管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#TimeCon id="insertTime" name="添加时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="name" name="站点名称" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="insertUser" name="创建者" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="city" name="所属城市" />
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="state" name="状态" >
+ <option value="">全部</option>
+ <option value="1">正常</option>
+ <option value="2">冻结</option>
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="TSite.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="TSite.resetSearch()" space="true"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="TSiteTableToolbar" role="group">
+ @if(shiro.hasPermission("/tSite/add")){
+ <#button name="添加" icon="fa-plus" clickFun="TSite.openAddTSite()"/>
+ @}
+ @if(shiro.hasPermission("/tSite/update")){
+ <#button name="编辑" icon="fa-edit" clickFun="TSite.openTSiteDetail()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tSite/delete")){
+ <#button name="删除" icon="fa-remove" clickFun="TSite.opt(1)" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tSite/freeze")){
+ <#button name="冻结" icon="fa-remove" clickFun="TSite.opt(2)" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tSite/thaw")){
+ <#button name="解冻" icon="fa-remove" clickFun="TSite.opt(3)" space="true"/>
+ @}
+ </div>
+ <#table id="TSiteTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tSite/tSite.js"></script>
+<script>
+ laydate.render({
+ elem: '#insertTime'
+ ,range: true
+ });
+</script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSite/tSite_add.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSite/tSite_add.html
new file mode 100644
index 0000000..284514e
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSite/tSite_add.html
@@ -0,0 +1,170 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="siteInfoForm">
+ <div class="row">
+ <div class="col-sm-12">
+ <div class="">
+ <h3 style="margin-left: 100px;">站点信息</h3>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">站点名称：</label>
+ <div class="col-sm-6">
+ <input type="text" class="form-control" id="name" name="name">
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">所属城市：</label>
+ <div class="col-sm-2">
+ <select class="form-control" id="provinceCode" onchange="TSiteInfoDlg.provinceChange(this)">
+ <option value="">选择省</option>
+ @for(obj in provinceList){
+ <option value="${obj.code}">${obj.name}</option>
+ @}
+ </select>
+ </div>
+ <div class="col-sm-2">
+ <select class="form-control" id="cityCode" onchange="TSiteInfoDlg.cityChange(this)">
+ <option value="">选择市</option>
+ </select>
+ </div>
+ <div class="col-sm-2">
+ <select class="form-control" id="districtCode">
+ <option value="">选择区</option>
+ </select>
+ </div>
+ </div>
+
+ <div class="">
+ <h3 style="margin-left: 100px;margin-top: 70px;">站点区域</h3>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">区域名称：</label>
+ <div class="col-sm-2">
+ <input type="text" class="form-control" id="areaName" name="areaName">
+ </div>
+ <label class="col-sm-1 control-label">类型：</label>
+ <div class="col-sm-2" style="display: flex;align-items: center;">
+ <div class="radio radio-info radio-inline">
+ <input type="radio" id="areaType1" value="1" name="areaType" checked="" onclick="TSiteInfoDlg.areaTypeClick(1)">
+ <label for="areaType1"> 行政区域 </label>
+ </div>
+ <div class="radio radio-success radio-inline">
+ <input type="radio" id="areaType2" value="2" name="areaType" onclick="TSiteInfoDlg.areaTypeClick(2)">
+ <label for="areaType2"> 电子围栏 </label>
+ </div>
+ </div>
+ <div class="col-sm-2">
+ <#button btnCss="info" name="添加" id="ensure" icon="fa-check" clickFun="TSiteInfoDlg.addArea()"/>
+ </div>
+ </div>
+ <div class="form-group" id="areaType1Div">
+ <label class="col-sm-2 control-label">行政区域：</label>
+ <div class="col-sm-2">
+ <select class="form-control" id="provinceCode1" onchange="TSiteInfoDlg.provinceChange1(this)">
+ <option value="">选择省</option>
+ @for(obj in provinceList){
+ <option value="${obj.code}">${obj.name}</option>
+ @}
+ </select>
+ </div>
+ <div class="col-sm-2">
+ <select class="form-control" id="cityCode1" onchange="TSiteInfoDlg.cityChange1(this)">
+ <option value="">选择市</option>
+ </select>
+ </div>
+ <div class="col-sm-2">
+ <select class="form-control" id="districtCode1">
+ <option value="">选择区</option>
+ </select>
+ </div>
+ </div>
+ <div class="form-group" id="areaType2Div" style="display: none;">
+ <label class="col-sm-2 control-label">电子围栏：</label>
+ <div class="col-sm-8">
+ <div id="container" style="height: 350px;width: 1000px;"></div>
+ <div class='info' style="margin-top:10px;position: absolute; z-index: 999; left: 20px; width: 450px;">操作说明：圆和矩形通过拖拽来绘制，其他覆盖物通过点击来绘制</div>
+ <div class="input-card" style='margin-top:28px;width: 100rem; z-index: 999; bottom: 20px;'>
+ <div class="input-item">
+ <!--<input type="radio" name='func' checked="" value='marker'><span class="input-text">画点</span>-->
+ <!--<input type="radio" name='func' value='polyline'><span class="input-text">画折线</span> -->
+ <input type="radio" name='func' value='polygon'><span class="input-text" style='width:5rem;'>画多边形</span>
+ <!--<input type="radio" name='func' value='rectangle'><span class="input-text" style='width:5rem;'>画矩形</span> -->
+ <input type="radio" name='func' value='circle'><span class="input-text" style='width:5rem;'>画圆</span>
+ </div>
+ <div class="input-item">
+ <input id="clear" type="button" class="btn" value="清除" />
+ <input id="close" type="button" class="btn" value="关闭绘图" />
+ <input type="button" class="btn" value="开始编辑" onclick="editAll()" />
+ <input type="button" class="btn" value="结束编辑" onclick="closeEdit()" />
+ </div>
+ </div>
+ </div>
+ <div class="col-sm-2">
+ <div class="form-group">
+ <label style='color:grey'>行政区边界查询</label>
+ <div class="input-group">
+ <div class="input-group-btn">
+ <button data-toggle="dropdown" class="btn btn-white dropdown-toggle"
+ type="button">行政级别
+ </button>
+ </div>
+ <select id="level" class="form-control">
+ <option value="district">区</option>
+ <option value="city">市</option>
+ <option value="province">省</option>
+ </select>
+
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="input-group">
+ <div class="input-group-btn">
+ <button data-toggle="dropdown" class="btn btn-white dropdown-toggle"
+ type="button">名称/adcode
+ </button>
+ </div>
+ <input id='district' class="layui-input form-control" type="text" value=''>
+ </div>
+ </div>
+ <input id="find" type="button" class="btn btn-primary btn-sm" value="查询" />
+ </div>
+ </div>
+
+ <div class="form-group">
+ <label class="col-sm-2 control-label">已添加区域</label>
+ <div class="col-sm-6">
+ <div style="height: 200px; border: 1px solid #e5e6e7;overflow-y: auto;">
+ <table class="table table-striped table-bordered table-hover table-condensed">
+ <thead>
+ <tr>
+ <th style="width: 300px;text-align: center;">添加时间</th>
+ <th style="width: 300px;text-align: center;">区域名称</th>
+ <th style="width: 100px;text-align: center;">操作</th>
+ </tr>
+ </thead>
+ <tbody id="areaValue">
+
+ </tbody>
+ </table>
+ </div>
+ </div>
+ </div>
+
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TSiteInfoDlg.addSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TSiteInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="https://webapi.amap.com/maps?v=1.4.15&key=c59c0ec8058a8305009eb315584e07d1&plugin=AMap.MouseTool,AMap.DistrictSearch,AMap.PolyEditor,AMap.RectangleEditor,AMap.CircleEditor"></script>
+<script src="${ctxPath}/static/modular/system/tSite/electricFence.js"></script>
+<script src="${ctxPath}/static/modular/system/tSite/tSite_info.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSite/tSite_edit.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSite/tSite_edit.html
new file mode 100644
index 0000000..319a285
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSite/tSite_edit.html
@@ -0,0 +1,193 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="siteInfoForm">
+ <input type="hidden" id="id" name="id" value="${item.id}">
+ <div class="row">
+ <div class="col-sm-12">
+ <div class="">
+ <h3 style="margin-left: 100px;">站点信息</h3>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">站点名称：</label>
+ <div class="col-sm-6">
+ <input type="text" class="form-control" id="name" name="name" value="${item.name}">
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">所属城市：</label>
+ <div class="col-sm-2">
+ <select class="form-control" id="provinceCode" onchange="TSiteInfoDlg.provinceChange(this)">
+ <option value="">选择省</option>
+ @for(obj in provinceList){
+ <option value="${obj.code}" ${obj.code == item.provinceCode ? 'selected=selected' : ''}>${obj.name}</option>
+ @}
+ </select>
+ </div>
+ <div class="col-sm-2">
+ <select class="form-control" id="cityCode" onchange="TSiteInfoDlg.cityChange(this)">
+ <option value="">选择市</option>
+ @for(obj in cityList){
+ <option value="${obj.code}" ${obj.code == item.cityCode ? 'selected=selected' : ''}>${obj.name}</option>
+ @}
+ </select>
+ </div>
+ <div class="col-sm-2">
+ <select class="form-control" id="districtCode">
+ <option value="">选择区</option>
+ @for(obj in areaList){
+ <option value="${obj.code}" ${obj.code == item.districtCode ? 'selected=selected' : ''}>${obj.name}</option>
+ @}
+ </select>
+ </div>
+ </div>
+
+ <div class="">
+ <h3 style="margin-left: 100px;margin-top: 70px;">站点区域</h3>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">区域名称：</label>
+ <div class="col-sm-2">
+ <input type="text" class="form-control" id="areaName" name="areaName">
+ </div>
+ <label class="col-sm-1 control-label">类型：</label>
+ <div class="col-sm-2" style="display: flex;align-items: center;">
+ <div class="radio radio-info radio-inline">
+ <input type="radio" id="areaType1" value="1" name="areaType" ${checked1} disabled onclick="TSiteInfoDlg.areaTypeClick(1)">
+ <label for="areaType1"> 行政区域 </label>
+ </div>
+ <div class="radio radio-success radio-inline">
+ <input type="radio" id="areaType2" value="2" name="areaType" ${checked2} disabled onclick="TSiteInfoDlg.areaTypeClick(2)">
+ <label for="areaType2"> 电子围栏 </label>
+ </div>
+ </div>
+ <div class="col-sm-2">
+ <#button btnCss="info" name="添加" id="ensure" icon="fa-check" clickFun="TSiteInfoDlg.addArea()"/>
+ </div>
+ </div>
+ <div class="form-group" id="areaType1Div" style="display: ${type1};">
+ <label class="col-sm-2 control-label">行政区域：</label>
+ <div class="col-sm-2">
+ <select class="form-control" id="provinceCode1" onchange="TSiteInfoDlg.provinceChange1(this)">
+ <option value="">选择省</option>
+ @for(obj in provinceList){
+ <option value="${obj.code}">${obj.name}</option>
+ @}
+ </select>
+ </div>
+ <div class="col-sm-2">
+ <select class="form-control" id="cityCode1" onchange="TSiteInfoDlg.cityChange1(this)">
+ <option value="">选择市</option>
+ </select>
+ </div>
+ <div class="col-sm-2">
+ <select class="form-control" id="districtCode1">
+ <option value="">选择区</option>
+ </select>
+ </div>
+ </div>
+ <div class="form-group" id="areaType2Div" style="display: ${type2};">
+ <label class="col-sm-2 control-label">电子围栏：</label>
+ <div class="col-sm-8">
+ <div id="container" style="height: 350px;width: 1000px;"></div>
+ <div class='info' style="margin-top:10px;position: absolute; z-index: 999; left: 20px; width: 450px;">操作说明：圆和矩形通过拖拽来绘制，其他覆盖物通过点击来绘制</div>
+ <div class="input-card" style='margin-top:28px;width: 100rem; z-index: 999; bottom: 20px;'>
+ <div class="input-item">
+ <!--<input type="radio" name='func' checked="" value='marker'><span class="input-text">画点</span>-->
+ <!--<input type="radio" name='func' value='polyline'><span class="input-text">画折线</span> -->
+ <input type="radio" name='func' value='polygon'><span class="input-text" style='width:5rem;'>画多边形</span>
+ <!--<input type="radio" name='func' value='rectangle'><span class="input-text" style='width:5rem;'>画矩形</span> -->
+ <input type="radio" name='func' value='circle'><span class="input-text" style='width:5rem;'>画圆</span>
+ </div>
+ <div class="input-item">
+ <input id="clear" type="button" class="btn" value="清除" />
+ <input id="close" type="button" class="btn" value="关闭绘图" />
+ <input type="button" class="btn" value="开始编辑" onclick="editAll()" />
+ <input type="button" class="btn" value="结束编辑" onclick="closeEdit()" />
+ </div>
+ </div>
+ </div>
+ <div class="col-sm-2">
+ <div class="form-group">
+ <label style='color:grey'>行政区边界查询</label>
+ <div class="input-group">
+ <div class="input-group-btn">
+ <button data-toggle="dropdown" class="btn btn-white dropdown-toggle"
+ type="button">行政级别
+ </button>
+ </div>
+ <select id="level" class="form-control">
+ <option value="district">区</option>
+ <option value="city">市</option>
+ <option value="province">省</option>
+ </select>
+
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="input-group">
+ <div class="input-group-btn">
+ <button data-toggle="dropdown" class="btn btn-white dropdown-toggle"
+ type="button">名称/adcode
+ </button>
+ </div>
+ <input id='district' class="layui-input form-control" type="text" value=''>
+ </div>
+ </div>
+ <input id="find" type="button" class="btn btn-primary btn-sm" value="查询" />
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">已添加区域</label>
+ <div class="col-sm-6">
+ <div style="height: 200px; border: 1px solid #e5e6e7;overflow-y: auto;">
+ <table class="table table-striped table-bordered table-hover table-condensed">
+ <thead>
+ <tr>
+ <th style="width: 300px;text-align: center;">添加时间</th>
+ <th style="width: 300px;text-align: center;">区域名称</th>
+ <th style="width: 100px;text-align: center;">操作</th>
+ </tr>
+ </thead>
+ <tbody id="areaValue">
+ @for(obj in locationList!){
+ <tr class="areaValueClass">
+ <td style="text-align: center;"><input type="hidden" id="areaType1" name="areaType1" value="${obj.type}">
+ <input type="hidden" id="time" name="time" value="${obj.addTime}">${obj.addTime}</td>
+ <td style="text-align: center;">
+ <input type="hidden" id="id" name="id" value="${obj.id}">
+ <input type="hidden" id="name" name="name" value="${obj.name}">
+ <input type="hidden" id="provinceCode1" name="provinceCode1" value="${obj.provinceCode}">
+ <input type="hidden" id="province1" name="province1" value="${obj.province}">
+ <input type="hidden" id="cityCode1" name="cityCode1" value="${obj.cityCode}">
+ <input type="hidden" id="city1" name="city1" value="${obj.city}">
+ <input type="hidden" id="districtCode1" name="districtCode1" value="${obj.districtCode}">
+ <input type="hidden" id="district1" name="district1" value="${obj.district}">
+ <input type="hidden" id="coordinate1" name="coordinate1" value="${obj.coordinate}">
+ ${obj.name}</td>
+ <td style="text-align: center;"><button onclick="deleteSub(this)">移除</button></td>
+ </tr>
+ @}
+ </tbody>
+ </table>
+ </div>
+ </div>
+ </div>
+
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TSiteInfoDlg.editSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TSiteInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="https://webapi.amap.com/maps?v=1.4.15&key=c59c0ec8058a8305009eb315584e07d1&plugin=AMap.MouseTool,AMap.DistrictSearch,AMap.PolyEditor,AMap.RectangleEditor,AMap.CircleEditor"></script>
+<script src="${ctxPath}/static/modular/system/tSite/electricFence.js"></script>
+<script src="${ctxPath}/static/modular/system/tSite/tSite_info.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSmsrecord/tSmsrecord.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSmsrecord/tSmsrecord.html
new file mode 100644
index 0000000..4514c5e
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSmsrecord/tSmsrecord.html
@@ -0,0 +1,48 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>短信记录管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#TimeCon id="insertTime" name="发送时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="phone" name="手机号" />
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="TSmsrecord.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="TSmsrecord.resetSearch()" space="true"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="TSmsrecordTableToolbar" role="group">
+ @if(shiro.hasPermission("/tSmsrecord/add")){
+ <#button name="添加" icon="fa-plus" clickFun="TSmsrecord.openAddTSmsrecord()"/>
+ @}
+ @if(shiro.hasPermission("/tSmsrecord/update")){
+ <#button name="修改" icon="fa-edit" clickFun="TSmsrecord.openTSmsrecordDetail()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tSmsrecord/delete")){
+ <#button name="删除" icon="fa-remove" clickFun="TSmsrecord.delete()" space="true"/>
+ @}
+ </div>
+ <#table id="TSmsrecordTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tSmsrecord/tSmsrecord.js"></script>
+<script>
+ laydate.render({
+ elem: '#insertTime'
+ ,range: true
+ });
+</script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSmsrecord/tSmsrecord_add.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSmsrecord/tSmsrecord_add.html
new file mode 100644
index 0000000..1bffdff
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSmsrecord/tSmsrecord_add.html
@@ -0,0 +1,31 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+
+ <div class="row">
+ <div class="col-sm-6 b-r">
+ <#input id="id" name="主键ID" underline="true"/>
+ <#input id="type" name="类型：1=用户端注册/登录，2=用户端更换手机,3=用户端忘记密码，4=用户修改密码，5=司机注册，6=司机忘记密码，7=司机修改手机号，8=司机修改密码" underline="true"/>
+ <#input id="phone" name="电话 "/>
+ </div>
+
+ <div class="col-sm-6">
+ <#input id="code" name="验证码" underline="true"/>
+ <#input id="content" name="短信内容" underline="true"/>
+ <#input id="createTime" name="添加时间 " underline="true"/>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TSmsrecordInfoDlg.addSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TSmsrecordInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tSmsrecord/tSmsrecord_info.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSmsrecord/tSmsrecord_edit.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSmsrecord/tSmsrecord_edit.html
new file mode 100644
index 0000000..63926d0
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSmsrecord/tSmsrecord_edit.html
@@ -0,0 +1,31 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+
+ <div class="row">
+ <div class="col-sm-6 b-r">
+ <#input id="id" name="主键ID" value="${item.id}" underline="true"/>
+ <#input id="type" name="类型：1=用户端注册/登录，2=用户端更换手机,3=用户端忘记密码，4=用户修改密码，5=司机注册，6=司机忘记密码，7=司机修改手机号，8=司机修改密码" value="${item.type}" underline="true"/>
+ <#input id="phone" name="电话 " value="${item.phone}" />
+ </div>
+
+ <div class="col-sm-6">
+ <#input id="code" name="验证码" value="${item.code}" underline="true"/>
+ <#input id="content" name="短信内容" value="${item.content}" underline="true"/>
+ <#input id="createTime" name="添加时间 " value="${item.createTime}" />
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TSmsrecordInfoDlg.editSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TSmsrecordInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tSmsrecord/tSmsrecord_info.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSysReformist/tSysReformist.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSysReformist/tSysReformist.html
new file mode 100644
index 0000000..52c6f6f
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSysReformist/tSysReformist.html
@@ -0,0 +1,521 @@
+@layout("/common/_container.html"){
+<style>
+ .newWidth, .single-line{
+ max-width:150px !important;display: initial !important;
+ }
+</style>
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+ <div class="row">
+ <div class="col-sm-11">
+ <div class="ibox-title">
+ <h3>系统设置:</h3>
+ </div>
+
+ <!--<div class="form-group">
+ <label class="col-sm-2 control-label">改派设置：</label>
+ <div class="col-sm-10">
+ 改派费用为 <input type="text" oninput="checkIsDouble(this)"
+ @if(isNotEmpty(reformist)){
+ value="${reformist.money}"
+ @}else{
+ value=""
+ @}
+ name="one" id="one" class="form-control newWidth" /> 元；<br/>
+ </div>
+ </div>
+
+ <div class="form-group">
+ <label class="col-sm-2 control-label">积分设置：</label>
+ <div class="col-sm-10">
+ 消费一元积 <input type="text" oninput="checkIsInt(this)"
+ @if(isNotEmpty(integral)){
+ value="${integral.integral}"
+ @}else{
+ value=""
+ @}
+ name="two" id="two" class="form-control newWidth" /> 积分；<br/>
+ </div>
+ </div>-->
+
+
+
+ <!--<div class="form-group">
+ <label class="col-sm-2 control-label">专车改派：</label>
+ <div class="col-sm-10">
+ <div class="form-group">
+ <div class="col-sm-9">
+ <input type="checkbox" class="js-switch" id="isSpecialCar"
+ @if(isNotEmpty(reformist)){
+ ${1 == reformist.isSpecialCar ? '' : 'checked=checked'}
+ @}
+ />
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="form-group">
+ <label class="col-sm-2 control-label">出租车改派：</label>
+ <div class="col-sm-10">
+ <div class="form-group">
+ <div class="col-sm-9">
+ <input type="checkbox" class="js-switch1" id="isTaxiCar"
+ @if(isNotEmpty(reformist)){
+ ${1 == reformist.isTaxiCar ? '' : 'checked=checked'}
+ @}
+ />
+ </div>
+ </div>
+ </div>
+ </div>-->
+
+ <div class="ibox-title" >
+ <h3>推单设置:</h3>
+ </div>
+ <!--<div class="form-group">
+ <label class="col-sm-2 control-label">专车推单：</label>
+ <div class="col-sm-10">
+ 第一轮推单：推单距离为 <input type="text" oninput="checkIsDouble(this)"
+ @if(isNotEmpty(zcOne)){
+ value="${zcOne.pushDistance}"
+ @}else{
+ value=""
+ @}
+ name="zc1" id="zc1" class="form-control newWidth" /> 公里，
+ 推单时间为 <input type="text" oninput="checkIsInt(this)"
+ @if(isNotEmpty(zcOne)){
+ value="${zcOne.pushTime}"
+ @}else{
+ value=""
+ @}
+ name="zc2" id="zc2" class="form-control newWidth" /> 秒钟；
+ 每次推所有司机的 <input type="text" oninput="checkIsDouble(this)"
+ @if(isNotEmpty(zcOne)){
+ value="${zcOne.driverProportion}"
+ @}else{
+ value=""
+ @}
+ name="zc3" id="zc3" class="form-control newWidth" /> %
+ <br/>
+ <br/>
+ 第二轮推单：推单距离为 <input type="text" oninput="checkIsDouble(this)"
+ @if(isNotEmpty(zcTwo)){
+ value="${zcTwo.pushDistance}"
+ @}else{
+ value=""
+ @}
+ name="zc4" id="zc4" class="form-control newWidth" /> 公里，
+ 推单时间为 <input type="text" oninput="checkIsInt(this)"
+ @if(isNotEmpty(zcTwo)){
+ value="${zcTwo.pushTime}"
+ @}else{
+ value=""
+ @}
+ name="zc5" id="zc5" class="form-control newWidth" /> 秒钟；
+ 每次推所有司机的 <input type="text" oninput="checkIsDouble(this)"
+ @if(isNotEmpty(zcTwo)){
+ value="${zcTwo.driverProportion}"
+ @}else{
+ value=""
+ @}
+ name="zc6" id="zc6" class="form-control newWidth" /> %
+ <br/>
+ <br/>
+ 第三轮推单：推单距离为 <input type="text" oninput="checkIsDouble(this)"
+ @if(isNotEmpty(zcThree)){
+ value="${zcThree.pushDistance}"
+ @}else{
+ value=""
+ @}
+ name="zc7" id="zc7" class="form-control newWidth" /> 公里，
+ 推单时间为 <input type="text" oninput="checkIsInt(this)"
+ @if(isNotEmpty(zcThree)){
+ value="${zcThree.pushTime}"
+ @}else{
+ value=""
+ @}
+ name="zc8" id="zc8" class="form-control newWidth" /> 秒钟；
+ 每次推所有司机的 <input type="text" oninput="checkIsDouble(this)"
+ @if(isNotEmpty(zcThree)){
+ value="${zcThree.driverProportion}"
+ @}else{
+ value=""
+ @}
+ name="zc9" id="zc9" class="form-control newWidth" /> %
+ <br/>
+ </div>
+ </div>-->
+ <div class="form-group">
+ <label class="col-sm-2 control-label">出租车推单：</label>
+ <div class="col-sm-10">
+ 第一轮推单：推单距离为 <input type="text" oninput="checkIsDouble(this)"
+ @if(isNotEmpty(czcOne)){
+ value="${czcOne.pushDistance}"
+ @}else{
+ value=""
+ @}
+ name="czc1" id="czc1" class="form-control newWidth" /> 公里，
+ 推单时间为 <input type="text" oninput="checkIsInt(this)"
+ @if(isNotEmpty(czcOne)){
+ value="${czcOne.pushTime}"
+ @}else{
+ value=""
+ @}
+ name="czc2" id="czc2" class="form-control newWidth" /> 秒钟；
+ 每次推所有司机的 <input type="text" oninput="checkIsDouble(this)"
+ @if(isNotEmpty(czcOne)){
+ value="${czcOne.driverProportion}"
+ @}else{
+ value=""
+ @}
+ name="czc3" id="czc3" class="form-control newWidth" /> %
+ <br/>
+ <br/>
+ 第二轮推单：推单距离为 <input type="text" oninput="checkIsDouble(this)"
+ @if(isNotEmpty(czcTwo)){
+ value="${czcTwo.pushDistance}"
+ @}else{
+ value=""
+ @}
+ name="czc4" id="czc4" class="form-control newWidth" /> 公里，
+ 推单时间为 <input type="text" oninput="checkIsInt(this)"
+ @if(isNotEmpty(czcTwo)){
+ value="${czcTwo.pushTime}"
+ @}else{
+ value=""
+ @}
+ name="czc5" id="czc5" class="form-control newWidth" /> 秒钟；
+ 每次推所有司机的 <input type="text" oninput="checkIsDouble(this)"
+ @if(isNotEmpty(czcTwo)){
+ value="${czcTwo.driverProportion}"
+ @}else{
+ value=""
+ @}
+ name="czc6" id="czc6" class="form-control newWidth" /> %
+ <br/>
+ <br/>
+ 第三轮推单：推单距离为 <input type="text" oninput="checkIsDouble(this)"
+ @if(isNotEmpty(czcThree)){
+ value="${czcThree.pushDistance}"
+ @}else{
+ value=""
+ @}
+ name="czc7" id="czc7" class="form-control newWidth" /> 公里，
+ 推单时间为 <input type="text" oninput="checkIsInt(this)"
+ @if(isNotEmpty(czcThree)){
+ value="${czcThree.pushTime}"
+ @}else{
+ value=""
+ @}
+ name="czc8" id="czc8" class="form-control newWidth" /> 秒钟；
+ 每次推所有司机的 <input type="text" oninput="checkIsDouble(this)"
+ @if(isNotEmpty(czcThree)){
+ value="${czcThree.driverProportion}"
+ @}else{
+ value=""
+ @}
+ name="czc9" id="czc9" class="form-control newWidth" /> %
+ <br/>
+ </div>
+ </div>
+ <!--<div class="form-group">
+ <label class="col-sm-2 control-label">取消设置：</label>
+ <div class="col-sm-10">
+ 专车订单取消规则：专车订单在司机接单 <input type="text" oninput="checkIsInt(this)"
+ @if(isNotEmpty(ptCancel1)){
+ value="${ptCancel1.minuteNum}"
+ @}else{
+ value=""
+ @}
+ name="ptCancel1" id="ptCancel1" class="form-control newWidth" /> 分钟后，
+ 取消订单收取 <input type="text" oninput="checkIsDouble(this)"
+ @if(isNotEmpty(ptCancel1)){
+ value="${ptCancel1.money}"
+ @}else{
+ value=""
+ @}
+ name="ptCancel2" id="ptCancel2" class="form-control newWidth" /> 元取消费用；
+ <br/>
+ <br/>
+ 出租车订单取消规则：出租车订单在司机接单 <input type="text" oninput="checkIsInt(this)"
+ @if(isNotEmpty(ptCancel2)){
+ value="${ptCancel2.minuteNum}"
+ @}else{
+ value=""
+ @}
+ name="ptCancel3" id="ptCancel3" class="form-control newWidth" /> 分钟后，
+ 取消订单收取 <input type="text" oninput="checkIsDouble(this)"
+ @if(isNotEmpty(ptCancel2)){
+ value="${ptCancel2.money}"
+ @}else{
+ value=""
+ @}
+ name="ptCancel4" id="ptCancel4" class="form-control newWidth" /> 元取消费用；
+ <br/>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">预约单取消设置：</label>
+ <div class="col-sm-10">
+ 专车订单取消规则：专车订单在司机接单 <input type="text" oninput="checkIsInt(this)"
+ @if(isNotEmpty(yyCancel1)){
+ value="${yyCancel1.minuteNum}"
+ @}else{
+ value=""
+ @}
+ name="yyCancel1" id="yyCancel1" class="form-control newWidth" /> 分钟后，
+ 取消订单收取 <input type="text" oninput="checkIsDouble(this)"
+ @if(isNotEmpty(yyCancel1)){
+ value="${yyCancel1.money}"
+ @}else{
+ value=""
+ @}
+ name="yyCancel2" id="yyCancel2" class="form-control newWidth" /> 元取消费用；
+ <br/>
+ <br/>
+ 出租车订单取消规则：出租车订单在司机接单 <input type="text" oninput="checkIsInt(this)"
+ @if(isNotEmpty(yyCancel2)){
+ value="${yyCancel2.minuteNum}"
+ @}else{
+ value=""
+ @}
+ name="yyCancel3" id="yyCancel3" class="form-control newWidth" /> 分钟后，
+ 取消订单收取 <input type="text" oninput="checkIsDouble(this)"
+ @if(isNotEmpty(yyCancel2)){
+ value="${yyCancel2.money}"
+ @}else{
+ value=""
+ @}
+ name="yyCancel4" id="yyCancel4" class="form-control newWidth" /> 元取消费用；
+ <br/>
+ </div>
+ </div>-->
+ <div class="form-group">
+ <label class="col-sm-2 control-label">电话设置：</label>
+ <div class="col-sm-10">
+ 报警电话： <input type="text"
+ @if(isNotEmpty(phone1)){
+ value="${phone1.phone}"
+ @}else{
+ value=""
+ @}
+ name="phone1" id="phone1" class="form-control newWidth" />
+ <br/>
+ <br/>
+ 客服电话： <input type="text"
+ @if(isNotEmpty(phone2)){
+ value="${phone2.phone}"
+ @}else{
+ value=""
+ @}
+ name="phone2" id="phone2" class="form-control newWidth" />
+ <br/>
+ <br/>
+ 95128电召电话： <input type="text"
+ @if(isNotEmpty(phone3)){
+ value="${phone3.phone}"
+ @}else{
+ value=""
+ @}
+ name="phone3" id="phone3" class="form-control newWidth" />
+ <br/>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">软件使用费：</label>
+ <div class="col-sm-10">
+ 每笔订单扣除费用： <input type="text"
+ @if(isNotEmpty(money1)){
+ value="${money1.money}"
+ @}else{
+ value=""
+ @}
+ name="money1" id="money1" class="form-control newWidth" /> 元
+ <br/>
+ <br/>
+ </div>
+ </div>
+ <div class="form-group">
+ <div style="display: flex">
+ <label class="col-sm-2 control-label">充值金额：</label>
+ <div class="col-sm-10">
+ <#button btnCss="info" name="添加" id="ensure" icon="fa-check" />
+ </div>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-6">
+ <div style="margin-left:270px;height: 300px;width: 350px; border: 1px solid #e5e6e7;overflow-y: auto;">
+ <table class="table table-striped table-bordered table-hover table-condensed">
+ <thead>
+ </thead>
+ <tbody id="rules">
+ </tbody>
+ </table>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="setUp()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script type="text/javascript">
+ $(function() {
+ var rulesTable = document.getElementById("rules");
+ var c = "${recharge}";
+ var strings = c.split(",");
+ for (var i = 0; i < strings.length; i++) {
+ var rule = strings[i];
+ var row = document.createElement("tr");
+ row.className = "rulesClass";
+ row.style.display = "flex";
+ var td1 = document.createElement("td");
+ var td4 = document.createElement("td");
+
+ td1.style.textAlign = "center";
+ td4.style.textAlign = "center";
+
+ td1.innerHTML = "*充值金额：<input placeholder='请输入充值金额' id='recharge' name='recharge' type='number' value='" + rule + "'>";
+ row.appendChild(td1);
+ td4.innerHTML = "<button onclick=\"deleteSub(this)\">删除</button>";
+ row.appendChild(td4);
+ rulesTable.appendChild(row);
+ }
+ var addButton = document.getElementById('ensure');
+ addButton.addEventListener('click', function () {
+ //封装数据
+ var str = '<tr class="rulesClass" style="display: flex; ">' +
+ '<td style="text-align: center;">*充值金额：<input placeholder="请输入充值金额" id="recharge" name="rulesClassValue" value="" type="number"></td>' +
+ '<td style="text-align: center;"><button onclick="deleteSub(this)">移除</button></td></tr>';
+ $("#rules").append(str);
+ });
+
+ var elem = document.querySelector(".js-switch");
+ var init = new Switchery(elem);
+ var elem1 = document.querySelector(".js-switch1");
+ var init1 = new Switchery(elem1);
+
+ var three = $("input[name='three']:checked").val();
+ if (three == "" || three == null || three == undefined){
+ $("#three1").attr("checked","checked");
+ }
+ threeClick($("input[name='three']:checked").val());
+ });
+ function deleteSub(e) {
+ console.log("删除")
+ $(e).parent().parent().remove();
+ }
+ //人脸识别打开按钮被点击
+ function threeClick(obj) {
+ if (obj == 1){
+ $("#openDiv").show();
+ } else {
+ $("#openDiv").hide();
+ }
+ }
+
+ var regDouble = /^[0-9]\d*(\.\d*[0-9])?$/;
+ function checkIsDouble(obj){
+ var num = $(obj).val();
+ if(!regDouble.test(num)){
+ layer.msg("小数/正整数格式");
+ }
+ }
+
+ //验证是否输入正整数
+ var regInt = /^[0-9]\d*$/;
+ function checkIsInt(obj){
+ var num = $(obj).val();
+ if(!regInt.test(num)){
+ layer.msg("正整数格式");
+ }
+ }
+
+ /**
+ * 提交操作
+ */
+ function setUp() {
+ var res = "";
+ var rulesClassElements = document.querySelectorAll('#rules .rulesClass');
+ rulesClassElements.forEach(function(rulesTimeClassElement) {
+ var recharge = rulesTimeClassElement.querySelector("#recharge").value;
+ if (recharge!=""){
+ res = res+recharge+",";
+ }
+ });
+ var openValue = $("#openValue").val();
+ var czc1 = $("#czc1").val().trim();
+ var czc2 = $("#czc2").val().trim();
+ var czc3 = $("#czc3").val().trim();
+ var czc4 = $("#czc4").val().trim();
+ var czc5 = $("#czc5").val().trim();
+ var czc6 = $("#czc6").val().trim();
+ var czc7 = $("#czc7").val().trim();
+ var czc8 = $("#czc8").val().trim();
+ var czc9 = $("#czc9").val().trim();
+
+ var phone1 = $("#phone1").val();
+ var phone2 = $("#phone2").val();
+ var phone3 = $("#phone3").val();
+ var phone4 = $("#phone4").val();
+ var money1 = $("#money1").val();
+
+ if (
+ "" == czc1 || "" == czc2 || "" == czc3 || "" == czc4 || "" == czc5 || "" == czc6 || "" == czc7 || "" == czc8 || "" == czc9
+ || "" == phone1 || "" == phone2 ) {
+ Feng.info("输入框不能为空!");
+ return;
+ } else if (
+ !regDouble.test(czc1) || !regInt.test(czc2) || !regDouble.test(czc3)
+ || !regDouble.test(czc4) || !regInt.test(czc5) || !regDouble.test(czc6)
+ || !regDouble.test(czc7) || !regInt.test(czc8) || !regDouble.test(czc9)
+ ) {
+ Feng.info("格式不正确!");
+ return ;
+ }
+
+ //提交信息
+ var ajax = new $ax(Feng.ctxPath + "/tSysReformist/setUp", function(data){
+ Feng.success("操作成功!");
+ location.reload();
+ },function(data){
+ Feng.error("操作失败!" + data.responseJSON.message + "!");
+ });
+ ajax.set("czc1", czc1);
+ ajax.set("czc2", czc2);
+ ajax.set("czc3", czc3);
+ ajax.set("czc4", czc4);
+ ajax.set("czc5", czc5);
+ ajax.set("czc6", czc6);
+ ajax.set("czc7", czc7);
+ ajax.set("czc8", czc8);
+ ajax.set("czc9", czc9);
+ ajax.set("ptCancel5", 0);
+ ajax.set("ptCancel6", 0);
+ ajax.set("phone1", phone1);
+ ajax.set("phone2", phone2);
+ ajax.set("phone3", phone3);
+ ajax.set("phone4", phone4);
+ ajax.set("res", res);
+ ajax.set("money", money1);
+ ajax.start();
+
+ }
+
+</script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSysSensitiveWords/tSysSensitiveWords.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSysSensitiveWords/tSysSensitiveWords.html
new file mode 100644
index 0000000..f3cf3bf
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSysSensitiveWords/tSysSensitiveWords.html
@@ -0,0 +1,48 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>敏感词管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#TimeCon id="createTime" name="创建时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="content" name="敏感词" />
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="TSysSensitiveWords.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="TSysSensitiveWords.resetSearch()" space="true"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="TSysSensitiveWordsTableToolbar" role="group">
+ @if(shiro.hasPermission("/tSysSensitiveWords/add")){
+ <#button name="添加" icon="fa-plus" clickFun="TSysSensitiveWords.openAddTSysSensitiveWords()"/>
+ @}
+ @if(shiro.hasPermission("/tSysSensitiveWords/update")){
+ <#button name="修改" icon="fa-edit" clickFun="TSysSensitiveWords.openTSysSensitiveWordsDetail()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tSysSensitiveWords/delete")){
+ <#button name="删除" icon="fa-remove" clickFun="TSysSensitiveWords.delete()" space="true"/>
+ @}
+ </div>
+ <#table id="TSysSensitiveWordsTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tSysSensitiveWords/tSysSensitiveWords.js"></script>
+<script>
+ laydate.render({
+ elem: '#createTime'
+ ,range: true
+ });
+</script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSysSensitiveWords/tSysSensitiveWords_add.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSysSensitiveWords/tSysSensitiveWords_add.html
new file mode 100644
index 0000000..f154a18
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSysSensitiveWords/tSysSensitiveWords_add.html
@@ -0,0 +1,22 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="sysSensitiveWordsForm">
+ <div class="row">
+ <div class="col-sm-11">
+ <#input id="content" name="敏感词" placeholder="敏感词最多15个字"/>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TSysSensitiveWordsInfoDlg.addSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TSysSensitiveWordsInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tSysSensitiveWords/tSysSensitiveWords_info.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSysSensitiveWords/tSysSensitiveWords_edit.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSysSensitiveWords/tSysSensitiveWords_edit.html
new file mode 100644
index 0000000..0099bfe
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSysSensitiveWords/tSysSensitiveWords_edit.html
@@ -0,0 +1,28 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+
+ <div class="row">
+ <div class="col-sm-6 b-r">
+ <#input id="id" name="主键id" value="${item.id}" underline="true"/>
+ <#input id="createTime" name="创建时间" value="${item.createTime}" />
+ </div>
+
+ <div class="col-sm-6">
+ <#input id="content" name="敏感词" value="${item.content}" />
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TSysSensitiveWordsInfoDlg.editSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TSysSensitiveWordsInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tSysSensitiveWords/tSysSensitiveWords_info.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemPrice/small.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemPrice/small.html
new file mode 100644
index 0000000..c84815f
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemPrice/small.html
@@ -0,0 +1,397 @@
+@layout("/common/_container.html"){
+<style>
+ .newWidth, .single-line{
+ max-width:150px !important;display: initial !important;
+ }
+</style>
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" >
+
+ <div class="row">
+ <div class="col-sm-11">
+ <div class="ibox-title">
+ <h3>跨城小件物流价格设置:</h3>
+ </div>
+ <input type="hidden" id="kcId" name="kcId"
+ @if(isNotEmpty(kcId)){
+ value="${kcId}"
+ @}else{
+ value=""
+ @}
+ >
+ <div class="form-group">
+ <label class="col-sm-1 control-label"></label>
+ <div class="col-sm-10">
+ 普通小件价格为 <input type="text" oninput="checkIsYuan(this)"
+ @if(isNotEmpty(json1)){
+ value="${json1.num1}"
+ @}else{
+ value=""
+ @}
+ name="num101" id="num101" class="form-control newWidth" /> 元/件<br/>
+ </div>
+ </div>
+
+ <div class="form-group">
+ <label class="col-sm-1 control-label"></label>
+ <div class="col-sm-10">
+ 贵重物品价格为 <input type="text" oninput="checkIsYuan(this)"
+ @if(isNotEmpty(json1)){
+ value="${json1.num2}"
+ @}else{
+ value=""
+ @}
+ name="num102" id="num102" class="form-control newWidth" /> 元/件<br/>
+ </div>
+ </div>
+
+ <div class="ibox-title">
+ <h3>同城小件物流价格设置:</h3>
+ </div>
+ <input type="hidden" id="tcId" name="tcId"
+ @if(isNotEmpty(tcId)){
+ value="${tcId}"
+ @}else{
+ value=""
+ @}
+ >
+
+ <div class="form-group">
+ <label class="col-sm-1 control-label"></label>
+ <div class="col-sm-10">
+ 普通小件价格为(根据起点终点距离收费)：<br/>
+ </div>
+ </div>
+
+ <div class="form-group">
+ <label class="col-sm-1 control-label"></label>
+ <div class="col-sm-10">
+ 0 - <input type="text" oninput="checkIsGongLi(this)"
+ @if(isNotEmpty(json2)){
+ value="${json2.num1}"
+ @}else{
+ value=""
+ @}
+ name="num1" id="num1" class="form-control newWidth" /> 公里时,
+ 为 <input type="text" oninput="checkIsYuan(this)"
+ @if(isNotEmpty(json2)){
+ value="${json2.num2}"
+ @}else{
+ value=""
+ @}
+ name="num2" id="num2" class="form-control newWidth" />元/件 <br/>
+ </div>
+ </div>
+
+ <div class="form-group">
+ <label class="col-sm-1 control-label"></label>
+ <div class="col-sm-10">
+ <input type="text" disabled oninput="checkIsGongLi(this)"
+ @if(isNotEmpty(json2)){
+ value="${json2.num3}"
+ @}else{
+ value=""
+ @}
+ name="num3" id="num3" class="form-control newWidth" />
+ - <input type="text" oninput="checkIsGongLi(this)"
+ @if(isNotEmpty(json2)){
+ value="${json2.num4}"
+ @}else{
+ value=""
+ @}
+ name="num4" id="num4" class="form-control newWidth" /> 公里时,
+ 为 <input type="text" oninput="checkIsYuan(this)"
+ @if(isNotEmpty(json2)){
+ value="${json2.num5}"
+ @}else{
+ value=""
+ @}
+ name="num5" id="num5" class="form-control newWidth" />元/件 <br/>
+ </div>
+ </div>
+
+ <div class="form-group">
+ <label class="col-sm-1 control-label"></label>
+ <div class="col-sm-10">
+ <input type="text" disabled oninput="checkIsGongLi(this)"
+ @if(isNotEmpty(json2)){
+ value="${json2.num6}"
+ @}else{
+ value=""
+ @}
+ name="num6" id="num6" class="form-control newWidth" />
+ - <input type="text" oninput="checkIsGongLi(this)"
+ @if(isNotEmpty(json2)){
+ value="${json2.num7}"
+ @}else{
+ value=""
+ @}
+ name="num7" id="num7" class="form-control newWidth" /> 公里时,
+ 为 <input type="text" oninput="checkIsYuan(this)"
+ @if(isNotEmpty(json2)){
+ value="${json2.num8}"
+ @}else{
+ value=""
+ @}
+ name="num8" id="num8" class="form-control newWidth" />元/件 <br/>
+ </div>
+ </div>
+
+ <div class="form-group">
+ <label class="col-sm-1 control-label"></label>
+ <div class="col-sm-10">
+ <input type="text" disabled oninput="checkIsGongLi(this)"
+ @if(isNotEmpty(json2)){
+ value="${json2.num9}"
+ @}else{
+ value=""
+ @}
+ name="num9" id="num9" class="form-control newWidth" />
+ - <input type="text" oninput="checkIsGongLi(this)"
+ @if(isNotEmpty(json2)){
+ value="${json2.num10}"
+ @}else{
+ value=""
+ @}
+ name="num10" id="num10" class="form-control newWidth" /> 公里时,
+ 为 <input type="text" oninput="checkIsYuan(this)"
+ @if(isNotEmpty(json2)){
+ value="${json2.num11}"
+ @}else{
+ value=""
+ @}
+ name="num11" id="num11" class="form-control newWidth" />元/件 <br/>
+ </div>
+ </div>
+
+ <div class="form-group">
+ <label class="col-sm-1 control-label"></label>
+ <div class="col-sm-10">
+ 贵重物品价格为(根据起点终点距离收费)：<br/>
+ </div>
+ </div>
+
+ <div class="form-group">
+ <label class="col-sm-1 control-label"></label>
+ <div class="col-sm-10">
+ 0 - <input type="text" oninput="checkIsGongLi(this)"
+ @if(isNotEmpty(json2)){
+ value="${json2.num12}"
+ @}else{
+ value=""
+ @}
+ name="num12" id="num12" class="form-control newWidth" /> 公里时,
+ 为 <input type="text" oninput="checkIsYuan(this)"
+ @if(isNotEmpty(json2)){
+ value="${json2.num13}"
+ @}else{
+ value=""
+ @}
+ name="num13" id="num13" class="form-control newWidth" />元/件 <br/>
+ </div>
+ </div>
+
+ <div class="form-group">
+ <label class="col-sm-1 control-label"></label>
+ <div class="col-sm-10">
+ <input type="text" disabled oninput="checkIsGongLi(this)"
+ @if(isNotEmpty(json2)){
+ value="${json2.num14}"
+ @}else{
+ value=""
+ @}
+ name="num14" id="num14" class="form-control newWidth" />
+ - <input type="text" oninput="checkIsGongLi(this)"
+ @if(isNotEmpty(json2)){
+ value="${json2.num15}"
+ @}else{
+ value=""
+ @}
+ name="num15" id="num15" class="form-control newWidth" /> 公里时,
+ 为 <input type="text" oninput="checkIsYuan(this)"
+ @if(isNotEmpty(json2)){
+ value="${json2.num16}"
+ @}else{
+ value=""
+ @}
+ name="num16" id="num16" class="form-control newWidth" />元/件 <br/>
+ </div>
+ </div>
+
+ <div class="form-group">
+ <label class="col-sm-1 control-label"></label>
+ <div class="col-sm-10">
+ <input type="text" disabled oninput="checkIsGongLi(this)"
+ @if(isNotEmpty(json2)){
+ value="${json2.num17}"
+ @}else{
+ value=""
+ @}
+ name="num17" id="num17" class="form-control newWidth" />
+ - <input type="text" oninput="checkIsGongLi(this)"
+ @if(isNotEmpty(json2)){
+ value="${json2.num18}"
+ @}else{
+ value=""
+ @}
+ name="num18" id="num18" class="form-control newWidth" /> 公里时,
+ 为 <input type="text" oninput="checkIsYuan(this)"
+ @if(isNotEmpty(json2)){
+ value="${json2.num19}"
+ @}else{
+ value=""
+ @}
+ name="num19" id="num19" class="form-control newWidth" />元/件 <br/>
+ </div>
+ </div>
+
+ <div class="form-group">
+ <label class="col-sm-1 control-label"></label>
+ <div class="col-sm-10">
+ <input type="text" disabled oninput="checkIsGongLi(this)"
+ @if(isNotEmpty(json2)){
+ value="${json2.num20}"
+ @}else{
+ value=""
+ @}
+ name="num20" id="num20" class="form-control newWidth" />
+ - <input type="text" oninput="checkIsGongLi(this)"
+ @if(isNotEmpty(json2)){
+ value="${json2.num21}"
+ @}else{
+ value=""
+ @}
+ name="num21" id="num21" class="form-control newWidth" /> 公里时,
+ 为 <input type="text" oninput="checkIsYuan(this)"
+ @if(isNotEmpty(json2)){
+ value="${json2.num22}"
+ @}else{
+ value=""
+ @}
+ name="num22" id="num22" class="form-control newWidth" />元/件 <br/>
+ </div>
+ </div>
+
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-1">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="addSubmit()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tSystemPrice/tSystemPrice_info.js"></script>
+<script type="text/javascript">
+ var regDouble = /^(0|[1-9]\d{0,2})(\.\d{1,2})?$/;
+ var regInt = /^[0-9]{0,3}$/;
+ function checkIsYuan(obj){
+ var num = $(obj).val();
+ if(!regDouble.test(num)){
+ layer.msg("【元】输入框不能超过3位数,保留两位小数");
+ }
+ }
+ function checkIsGongLi(obj){
+ var num = $(obj).val();
+ if(!regDouble.test(num)){
+ layer.msg("【公里】输入框不能超过3位数,保留两位小数");
+ }
+ if (obj.id == "num1"){
+ $("#num3").val(num);
+ }else if (obj.id == "num4"){
+ $("#num6").val(num);
+ }else if (obj.id == "num7"){
+ $("#num9").val(num);
+ }else if (obj.id == "num12"){
+ $("#num14").val(num);
+ }else if (obj.id == "num15"){
+ $("#num17").val(num);
+ }else if (obj.id == "num18"){
+ $("#num20").val(num);
+ }
+ }
+ function checkIsMinute(obj){
+ var num = $(obj).val();
+ if(!regInt.test(num)){
+ layer.msg("【分钟】输入框不能超过3位数");
+ }
+ }
+
+ //提交数据
+ function addSubmit() {
+ //验证数据格式-跨城小件物流价格设置
+ var kcId = $("#kcId").val();
+ var num101 = $("#num101").val();
+ var num102 = $("#num102").val();
+ if ("" == num101 || "" == num102){
+ Feng.error("【跨城小件物流价格设置】输入框不能为空");
+ return;
+ }else if (!regDouble.test(num101) || !regDouble.test(num102)){
+ Feng.error("【跨城小件物流价格设置】输入框格式不正确");
+ return;
+ }
+ //验证数据格式-同城小件物流价格设置
+ var tcId = $("#tcId").val();
+ var num1 = $("#num1").val();
+ var num2 = $("#num2").val();
+ var num3 = $("#num3").val();
+ var num4 = $("#num4").val();
+ var num5 = $("#num5").val();
+ var num6 = $("#num6").val();
+ var num7 = $("#num7").val();
+ var num8 = $("#num8").val();
+ var num9 = $("#num9").val();
+ var num10 = $("#num10").val();
+ var num11 = $("#num11").val();
+ var num12 = $("#num12").val();
+ var num13 = $("#num13").val();
+ var num14 = $("#num14").val();
+ var num15 = $("#num15").val();
+ var num16 = $("#num16").val();
+ var num17 = $("#num17").val();
+ var num18 = $("#num18").val();
+ var num19 = $("#num19").val();
+ var num20 = $("#num20").val();
+ var num21 = $("#num21").val();
+ var num22 = $("#num22").val();
+
+ if ("" == num1 || "" == num2 || "" == num3 || "" == num4 || "" == num5 || "" == num6 || "" == num7 || "" == num8 || "" == num9 || "" == num10
+ || "" == num11 || "" == num12 || "" == num13 || "" == num14 || "" == num15 || "" == num16 || "" == num17 || "" == num18 || "" == num19 || "" == num20
+ || "" == num21 || "" == num22 ){
+ Feng.error("【同城小件物流价格设置】输入框不能为空");
+ return;
+ }else if (!regDouble.test(num1) || !regDouble.test(num2) || !regDouble.test(num3) || !regDouble.test(num4) || !regDouble.test(num5) || !regDouble.test(num6)
+ || !regDouble.test(num7) || !regDouble.test(num8) || !regDouble.test(num9) || !regDouble.test(num10) || !regDouble.test(num11) || !regDouble.test(num12)
+ || !regDouble.test(num13) || !regDouble.test(num14) || !regDouble.test(num15) || !regDouble.test(num16) || !regDouble.test(num17) || !regDouble.test(num18)
+ || !regDouble.test(num19) || !regDouble.test(num20) || !regDouble.test(num21) || !regDouble.test(num22) ){
+ Feng.error("【同城小件物流价格设置】输入框格式不正确");
+ return;
+ }
+ //封装数据
+ var json1 = '{"num1":"'+num101+'","num2":"'+num102+'"}';
+ var json2 = '{"num1":"'+num1+'","num2":"'+num2+'","num3":"'+num3+'","num4":"'+num4+'","num5":"'+num5+'","num6":"'+num6+'"' +
+ ',"num7":"'+num7+'","num8":"'+num8+'","num9":"'+num9+'","num10":"'+num10+'","num11":"'+num11+'","num12":"'+num12+'"' +
+ ',"num13":"'+num13+'","num14":"'+num14+'","num15":"'+num15+'","num16":"'+num16+'","num17":"'+num17+'","num18":"'+num18+'"' +
+ ',"num19":"'+num19+'","num20":"'+num20+'","num21":"'+num21+'","num22":"'+num22+'"}';
+
+ //提交信息
+ var ajax = new $ax(Feng.ctxPath + "/tSystemPrice/smallSubmit", function(data){
+ Feng.success("操作成功!");
+ location.reload();
+ },function(data){
+ Feng.error("操作失败!" + data.responseJSON.message + "!");
+ });
+ ajax.set("kcId", kcId);
+ ajax.set("json1", json1);
+ ajax.set("tcId", tcId);
+ ajax.set("json2", json2);
+ ajax.start();
+ }
+
+
+</script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemPrice/tSystemPrice.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemPrice/tSystemPrice.html
new file mode 100644
index 0000000..3d98984
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemPrice/tSystemPrice.html
@@ -0,0 +1,52 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>专车价格设置管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#NameCon id="name" name="车型名称" />
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="state" name="状态" >
+ <option value="">全部</option>
+ <option value="1">正常</option>
+ <option value="2">冻结</option>
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="TSystemPrice.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="TSystemPrice.resetSearch()" space="true"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="TSystemPriceTableToolbar" role="group">
+ @if(shiro.hasPermission("/tSystemPrice/addSpecial")){
+ <#button name="添加" icon="fa-plus" clickFun="TSystemPrice.addSpecial()"/>
+ @}
+ @if(shiro.hasPermission("/tSystemPrice/updateSpecial")){
+ <#button name="修改" icon="fa-edit" clickFun="TSystemPrice.updateSpecial()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tSystemPrice/deleteSpecial")){
+ <#button name="删除" icon="fa-remove" clickFun="TSystemPrice.deleteSpecial()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tSystemPrice/freezeSpecial")){
+ <#button name="冻结" icon="fa-remove" clickFun="TSystemPrice.freezeSpecial()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tSystemPrice/thawSpecial")){
+ <#button name="解冻" icon="fa-remove" clickFun="TSystemPrice.thawSpecial()" space="true"/>
+ @}
+ </div>
+ <#table id="TSystemPriceTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tSystemPrice/tSystemPrice.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemPrice/tSystemPrice_add.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemPrice/tSystemPrice_add.html
new file mode 100644
index 0000000..41ed804
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemPrice/tSystemPrice_add.html
@@ -0,0 +1,182 @@
+@layout("/common/_container.html"){
+<style>
+ .newWidth, .single-line{
+ max-width:150px !important;display: initial !important;
+ }
+</style>
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="specialPriceInfoForm">
+
+ <div class="row">
+ <div class="col-sm-11">
+ <div class="form-group">
+ <label class="col-sm-2 control-label">选择车型：</label>
+ <div class="col-sm-10">
+ <select class="form-control" id="serverCarModelId" name="serverCarModelId" style="width: 200px;">
+ <option value="">选择车型</option>
+ @for(obj in modelList!){
+ <option value="${obj.id}">${obj.name}</option>
+ @}
+ </select>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">运价类型说明：</label>
+ <div class="col-sm-10">
+ <textarea class="form-control" id="fareTypeNote" name="fareTypeNote" style="height: 100px;"></textarea>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">起步价设置：</label>
+ <div class="col-sm-10">
+ 起步价为 <input type="text" oninput="checkIsYuan(this)" name="num1" id="num1" class="form-control newWidth" placeholder="最多3位数"/> 元,
+ 起步包含 <input type="text" oninput="checkIsGongLi(this)" name="num2" id="num2" class="form-control newWidth" placeholder="最多3位数"/> 公里,
+ <input type="text" oninput="checkIsMinute(this)" name="num3" id="num3" class="form-control newWidth" placeholder="最多3位数"/> 分钟
+ <br/>
+ </div>
+ </div>
+
+ <div class="form-group">
+ <label class="col-sm-2 control-label">里程费设置：</label>
+ <div class="col-sm-10">
+ 超过起步里程后每公里 <input type="text" oninput="checkIsYuan(this)" name="num4" id="num4" class="form-control newWidth" placeholder="最多3位数"/> 元
+ <br/>
+ </div>
+ </div>
+
+ <div class="form-group">
+ <label class="col-sm-2 control-label">时长费设置：</label>
+ <div class="col-sm-10">
+ 超过起步时长后每分钟 <input type="text" oninput="checkIsYuan(this)" name="num5" id="num5" class="form-control newWidth" placeholder="最多3位数"/> 元
+ <br/>
+ </div>
+ </div>
+
+ <div class="form-group">
+ <label class="col-sm-2 control-label">等待费设置：</label>
+ <div class="col-sm-10">
+ 司机到达预约地点 <input type="text" oninput="checkIsMinute(this)" name="num6" id="num6" class="form-control newWidth" placeholder="最多3位数"/> 分钟过后开始收取等待费,
+ 为 <input type="text" oninput="checkIsYuan(this)" name="num7" id="num7" class="form-control newWidth" placeholder="最多3位数"/> 元/分,不足一分钟按照一分钟计算
+ <br/>
+ </div>
+ </div>
+
+ <div class="form-group">
+ <label class="col-sm-2 control-label">远途费设置：</label>
+ <div class="col-sm-10">
+ 总里程超过 <input type="text" oninput="checkIsGongLi(this)" name="num8" id="num8" class="form-control newWidth" placeholder="最多3位数"/> 公里
+ 不足 <input type="text" oninput="checkIsGongLi(this)" name="num9" id="num9" class="form-control newWidth" placeholder="最多3位数"/> 公里,
+ 超出部分每公里加收 <input type="text" oninput="checkIsYuan(this)" name="num10" id="num10" class="form-control newWidth" placeholder="最多3位数"/> 元
+ <br>
+ <br>
+ 超过 <input type="text" disabled oninput="checkIsGongLi(this)" name="num11" id="num11" class="form-control newWidth" placeholder="最多3位数"/> 公里
+ 不足 <input type="text" oninput="checkIsGongLi(this)" name="num12" id="num12" class="form-control newWidth" placeholder="最多3位数"/> 公里时,
+ 超出部分每公里加收 <input type="text" oninput="checkIsYuan(this)" name="num13" id="num13" class="form-control newWidth" placeholder="最多3位数"/> 元
+ <br/>
+ <br>
+ 超过 <input type="text" disabled oninput="checkIsGongLi(this)" name="num14" id="num14" class="form-control newWidth" placeholder="最多3位数"/> 公里以后,
+ 超出部分每公里加收 <input type="text" oninput="checkIsYuan(this)" name="num15" id="num15" class="form-control newWidth" placeholder="最多3位数"/> 元
+ <br/>
+ </div>
+ </div>
+
+ <div class="form-group">
+ <label class="col-sm-2 control-label">夜间行驶费用设置：</label>
+ <div class="col-sm-10">
+ <input type="text" name="num16" id="num16" class="form-control newWidth" placeholder="选择时间"/> 点为夜间行驶时间,
+ 起步价变为 <input type="text" oninput="checkIsYuan(this)" name="num17" id="num17" class="form-control newWidth" placeholder="最多3位数"/> 元
+ <br>
+ <br>
+ 里程费为每公里 <input type="text" oninput="checkIsYuan(this)" name="num18" id="num18" class="form-control newWidth" placeholder="最多3位数"/> 元,
+ 时长费为每分钟 <input type="text" oninput="checkIsYuan(this)" name="num19" id="num19" class="form-control newWidth" placeholder="最多3位数"/> 元
+ <br>
+ <br>
+ 远途费为每公里加收 <input type="text" oninput="checkIsYuan(this)" name="num20" id="num20" class="form-control newWidth" placeholder="最多3位数"/>
+ 、 <input type="text" oninput="checkIsYuan(this)" name="num21" id="num21" class="form-control newWidth" placeholder="最多3位数"/>
+ 、 <input type="text" oninput="checkIsYuan(this)" name="num22" id="num22" class="form-control newWidth" placeholder="最多3位数"/> 元
+ <br/>
+ </div>
+ </div>
+
+ <div class="form-group">
+ <label class="col-sm-2 control-label">高峰期费用设置：</label>
+ <div class="col-sm-10">
+ <input type="text" name="num23" id="num23" class="form-control newWidth" placeholder="选择时间段"/>
+ 和 <input type="text" name="num24" id="num24" class="form-control newWidth" placeholder="选择时间段"/> 为高峰期行车时间,
+ 起步价变为 <input type="text" oninput="checkIsYuan(this)" name="num25" id="num25" class="form-control newWidth" placeholder="最多3位数"/> 元
+ <br>
+ <br>
+ 里程费为每公里 <input type="text" oninput="checkIsYuan(this)" name="num26" id="num26" class="form-control newWidth" placeholder="最多3位数"/> 元,
+ 时长费为每分钟 <input type="text" oninput="checkIsYuan(this)" name="num27" id="num27" class="form-control newWidth" placeholder="最多3位数"/> 元
+ <br>
+ <br>
+ 远途费为每公里加收 <input type="text" oninput="checkIsYuan(this)" name="num28" id="num28" class="form-control newWidth" placeholder="最多3位数"/>
+ 、 <input type="text" oninput="checkIsYuan(this)" name="num29" id="num29" class="form-control newWidth" placeholder="最多3位数"/>
+ 、 <input type="text" oninput="checkIsYuan(this)" name="num30" id="num30" class="form-control newWidth" placeholder="最多3位数"/> 元
+ <br/>
+ </div>
+ </div>
+
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TSystemPriceInfoDlg.addSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TSystemPriceInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tSystemPrice/tSystemPrice_info.js"></script>
+<script type="text/javascript">
+ laydate.render({
+ elem: '#num16'
+ ,type: 'time'
+ ,range: '-'
+ ,format: 'HH:mm'
+ });
+ laydate.render({
+ elem: '#num23'
+ ,type: 'time'
+ ,range: '-'
+ ,format: 'HH:mm'
+ });
+ laydate.render({
+ elem: '#num24'
+ ,type: 'time'
+ ,range: '-'
+ ,format: 'HH:mm'
+ });
+
+ var regDouble = /^(0|[1-9]\d{0,2})(\.\d{1,2})?$/;
+ var regInt = /^[0-9]{0,3}$/;
+ function checkIsYuan(obj){
+ var num = $(obj).val();
+ if(!regDouble.test(num)){
+ layer.msg("【元】输入框不能超过3位数,保留两位小数");
+ }
+ }
+ function checkIsGongLi(obj){
+ var num = $(obj).val();
+ if(!regDouble.test(num)){
+ layer.msg("【公里】输入框不能超过3位数,保留两位小数");
+ }
+ if (obj.id == "num9"){
+ $("#num11").val(num);
+ }else if (obj.id == "num12"){
+ $("#num14").val(num);
+ }
+ }
+ function checkIsMinute(obj){
+ var num = $(obj).val();
+ if(!regInt.test(num)){
+ layer.msg("【分钟】输入框不能超过3位数");
+ }
+ }
+
+</script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemPrice/tSystemPrice_edit.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemPrice/tSystemPrice_edit.html
new file mode 100644
index 0000000..d7a30f4
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemPrice/tSystemPrice_edit.html
@@ -0,0 +1,182 @@
+@layout("/common/_container.html"){
+<style>
+ .newWidth, .single-line{
+ max-width:150px !important;display: initial !important;
+ }
+</style>
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="specialPriceInfoForm">
+ <label style="display: none;" id="id">${item.id}</label>
+ <div class="row">
+ <div class="col-sm-111">
+ <div class="form-group">
+ <label class="col-sm-2 control-label">选择车型：</label>
+ <div class="col-sm-10">
+ <select class="form-control" id="serverCarModelId" name="serverCarModelId" style="width: 200px;">
+ <option value="">选择车型</option>
+ @for(obj in modelList!){
+ <option value="${obj.id}" ${obj.id == item.serverCarModelId ? 'selected=selected' : ''}>${obj.name}</option>
+ @}
+ </select>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">运价类型说明：</label>
+ <div class="col-sm-10">
+ <textarea class="form-control" id="fareTypeNote" name="fareTypeNote" style="height: 100px;">${item.fareTypeNote}</textarea>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">起步价设置：</label>
+ <div class="col-sm-10">
+ 起步价为 <input type="text" oninput="checkIsYuan(this)" name="num1" id="num1" value="${json.num1}" class="form-control newWidth" placeholder="最多3位数"/> 元,
+ 起步包含 <input type="text" oninput="checkIsGongLi(this)" name="num2" id="num2" value="${json.num2}" class="form-control newWidth" placeholder="最多3位数"/> 公里,
+ <input type="text" oninput="checkIsMinute(this)" name="num3" id="num3" value="${json.num3}" class="form-control newWidth" placeholder="最多3位数"/> 分钟
+ <br/>
+ </div>
+ </div>
+
+ <div class="form-group">
+ <label class="col-sm-2 control-label">里程费设置：</label>
+ <div class="col-sm-10">
+ 超过起步里程后每公里 <input type="text" oninput="checkIsYuan(this)" name="num4" id="num4" value="${json.num4}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ <br/>
+ </div>
+ </div>
+
+ <div class="form-group">
+ <label class="col-sm-2 control-label">时长费设置：</label>
+ <div class="col-sm-10">
+ 超过起步时长后每分钟 <input type="text" oninput="checkIsYuan(this)" name="num5" id="num5" value="${json.num5}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ <br/>
+ </div>
+ </div>
+
+ <div class="form-group">
+ <label class="col-sm-2 control-label">等待费设置：</label>
+ <div class="col-sm-10">
+ 司机到达预约地点 <input type="text" oninput="checkIsMinute(this)" name="num6" id="num6" value="${json.num6}" class="form-control newWidth" placeholder="最多3位数"/> 分钟过后开始收取等待费,
+ 为 <input type="text" oninput="checkIsYuan(this)" name="num7" id="num7" value="${json.num7}" class="form-control newWidth" placeholder="最多3位数"/> 元/分,不足一分钟按照一分钟计算
+ <br/>
+ </div>
+ </div>
+
+ <div class="form-group">
+ <label class="col-sm-2 control-label">远途费设置：</label>
+ <div class="col-sm-10">
+ 总里程超过 <input type="text" oninput="checkIsGongLi(this)" name="num8" id="num8" value="${json.num8}" class="form-control newWidth" placeholder="最多3位数"/> 公里
+ 不足 <input type="text" oninput="checkIsGongLi(this)" name="num9" id="num9" value="${json.num9}" class="form-control newWidth" placeholder="最多3位数"/> 公里,
+ 超出部分每公里加收 <input type="text" oninput="checkIsYuan(this)" name="num10" id="num10" value="${json.num10}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ <br>
+ <br>
+ 超过 <input type="text" disabled oninput="checkIsGongLi(this)" name="num11" id="num11" value="${json.num11}" class="form-control newWidth" placeholder="最多3位数"/> 公里
+ 不足 <input type="text" oninput="checkIsGongLi(this)" name="num12" id="num12" value="${json.num12}" class="form-control newWidth" placeholder="最多3位数"/> 公里时,
+ 超出部分每公里加收 <input type="text" oninput="checkIsYuan(this)" name="num13" value="${json.num13}" id="num13" class="form-control newWidth" placeholder="最多3位数"/> 元
+ <br/>
+ <br>
+ 超过 <input type="text" disabled oninput="checkIsGongLi(this)" name="num14" id="num14" value="${json.num14}" class="form-control newWidth" placeholder="最多3位数"/> 公里以后,
+ 超出部分每公里加收 <input type="text" oninput="checkIsYuan(this)" name="num15" id="num15" value="${json.num15}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ <br/>
+ </div>
+ </div>
+
+ <div class="form-group">
+ <label class="col-sm-2 control-label">夜间行驶费用设置：</label>
+ <div class="col-sm-10">
+ <input type="text" name="num16" id="num16" value="${json.num16}" class="form-control newWidth" placeholder="选择时间"/> 点为夜间行驶时间,
+ 起步价变为 <input type="text" oninput="checkIsYuan(this)" name="num17" id="num17" value="${json.num17}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ <br>
+ <br>
+ 里程费为每公里 <input type="text" oninput="checkIsYuan(this)" name="num18" id="num18" value="${json.num18}" class="form-control newWidth" placeholder="最多3位数"/> 元,
+ 时长费为每分钟 <input type="text" oninput="checkIsYuan(this)" name="num19" id="num19" value="${json.num19}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ <br>
+ <br>
+ 远途费为每公里加收 <input type="text" oninput="checkIsYuan(this)" name="num20" id="num20" value="${json.num20}" class="form-control newWidth" placeholder="最多3位数"/>
+ 、 <input type="text" oninput="checkIsYuan(this)" name="num21" id="num21" value="${json.num21}" class="form-control newWidth" placeholder="最多3位数"/>
+ 、 <input type="text" oninput="checkIsYuan(this)" name="num22" id="num22" value="${json.num22}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ <br/>
+ </div>
+ </div>
+
+ <div class="form-group">
+ <label class="col-sm-2 control-label">高峰期费用设置：</label>
+ <div class="col-sm-10">
+ <input type="text" name="num23" id="num23" value="${json.num23}" class="form-control newWidth" placeholder="选择时间段"/>
+ 和 <input type="text" name="num24" id="num24" value="${json.num24}" class="form-control newWidth" placeholder="选择时间段"/> 为高峰期行车时间,
+ 起步价变为 <input type="text" oninput="checkIsYuan(this)" name="num25" id="num25" value="${json.num25}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ <br>
+ <br>
+ 里程费为每公里 <input type="text" oninput="checkIsYuan(this)" name="num26" id="num26" value="${json.num26}" class="form-control newWidth" placeholder="最多3位数"/> 元,
+ 时长费为每分钟 <input type="text" oninput="checkIsYuan(this)" name="num27" id="num27" value="${json.num27}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ <br>
+ <br>
+ 远途费为每公里加收 <input type="text" oninput="checkIsYuan(this)" name="num28" id="num28" value="${json.num28}" class="form-control newWidth" placeholder="最多3位数"/>
+ 、 <input type="text" oninput="checkIsYuan(this)" name="num29" id="num29" value="${json.num29}" class="form-control newWidth" placeholder="最多3位数"/>
+ 、 <input type="text" oninput="checkIsYuan(this)" name="num30" id="num30" value="${json.num30}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ <br/>
+ </div>
+ </div>
+
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TSystemPriceInfoDlg.editSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TSystemPriceInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tSystemPrice/tSystemPrice_info.js"></script>
+<script type="text/javascript">
+ laydate.render({
+ elem: '#num16'
+ ,type: 'time'
+ ,range: '-'
+ ,format: 'HH:mm'
+ });
+ laydate.render({
+ elem: '#num23'
+ ,type: 'time'
+ ,range: '-'
+ ,format: 'HH:mm'
+ });
+ laydate.render({
+ elem: '#num24'
+ ,type: 'time'
+ ,range: '-'
+ ,format: 'HH:mm'
+ });
+
+ var regDouble = /^(0|[1-9]\d{0,2})(\.\d{1,2})?$/;
+ var regInt = /^[0-9]{0,3}$/;
+ function checkIsYuan(obj){
+ var num = $(obj).val();
+ if(!regDouble.test(num)){
+ layer.msg("【元】输入框不能超过3位数,保留两位小数");
+ }
+ }
+ function checkIsGongLi(obj){
+ var num = $(obj).val();
+ if(!regDouble.test(num)){
+ layer.msg("【公里】输入框不能超过3位数,保留两位小数");
+ }
+ if (obj.id == "num9"){
+ $("#num11").val(num);
+ }else if (obj.id == "num12"){
+ $("#num14").val(num);
+ }
+ }
+ function checkIsMinute(obj){
+ var num = $(obj).val();
+ if(!regInt.test(num)){
+ layer.msg("【分钟】输入框不能超过3位数");
+ }
+ }
+
+</script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tUser/tUser.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tUser/tUser.html
new file mode 100644
index 0000000..a6e9ced
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tUser/tUser.html
@@ -0,0 +1,84 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>用户管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#TimeCon id="insertTime" name="注册时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="id" name="用户ID" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="nickName" name="昵称" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="phone" name="手机号" />
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="isAuth" name="是否实名认证" >
+ <option value="">全部</option>
+ <option value="1">否</option>
+ <option value="2">是</option>
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="state" name="状态" >
+ <option value="">全部</option>
+ <option value="1">正常</option>
+ <option value="2">冻结</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"/>
+ </div>
+ <div class="col-sm-3">
+ <input type="file" name="file" style="width:0px;height:0px;" id="uploadEventFile" onchange="TUser.exportUser()">
+ </div>
+ </div>
+ <div class="hidden-xs" id="TUserTableToolbar" role="group">
+ @if(shiro.hasPermission("/tUser/userDetail")){
+ <#button name="用户详情" icon="fa-plus" clickFun="TUser.userDetail()"/>
+ @}
+ @if(shiro.hasPermission("/tUser/updateBalance")){
+ <#button name="修改余额" icon="fa-edit" clickFun="TUser.updateBalance()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tUser/updatePassword")){
+ <#button name="修改密码" icon="fa-remove" clickFun="TUser.updatePassword()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tUser/freezeUser")){
+ <#button name="冻结" icon="fa-remove" clickFun="TUser.freezeUser()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tUser/trawUser")){
+ <#button name="解冻" icon="fa-remove" clickFun="TUser.trawUser()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tUser/inUser")){
+ <#button btnCss="info" name="下载模板" id="uploadModel" icon="fa fa-level-down" clickFun="TUser.uploadUserModel()" space="true"/>
+ <#button btnCss="danger" name="导入" id="uploadEventBtn" icon="fa fa-level-up" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tUser/outUser")){
+ <#button name="导出" icon="fa-remove" clickFun="TUser.outUser()" space="true"/>
+ @}
+ </div>
+ <#table id="TUserTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tUser/tUser.js"></script>
+<script>
+ laydate.render({
+ elem: '#insertTime'
+ ,range: true
+ });
+</script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tUser/tUser_add.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tUser/tUser_add.html
new file mode 100644
index 0000000..b239da4
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tUser/tUser_add.html
@@ -0,0 +1,54 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+
+ <div class="row">
+ <div class="col-sm-6 b-r">
+ <#input id="id" name="主键id" underline="true"/>
+ <#input id="companyId" name="企业id" underline="true"/>
+ <#input id="registIp" name="注册ip" underline="true"/>
+ <#input id="registAreaCode" name="注册地区县code" underline="true"/>
+ <#input id="phone" name="手机号" underline="true"/>
+ <#input id="nickName" name="昵称" underline="true"/>
+ <#input id="avatar" name="头像" underline="true"/>
+ <#input id="birthday" name="生日" underline="true"/>
+ <#input id="sex" name="性别（1：男，2：女）" underline="true"/>
+ <#input id="emergencyContact" name="紧急联系人" underline="true"/>
+ <#input id="emergencyContactNumber" name="紧急联系电话" underline="true"/>
+ <#input id="isAuth" name="是否实名认证(1=否，2=是)" underline="true"/>
+ <#input id="name" name="真实姓名" underline="true"/>
+ <#input id="idCard" name="身份证号" underline="true"/>
+ <#input id="idCardFront" name="身份证正面"/>
+ </div>
+
+ <div class="col-sm-6">
+ <#input id="idCardReverse" name="身份证反面" underline="true"/>
+ <#input id="consumption" name="历史消费" underline="true"/>
+ <#input id="balance" name="余额" underline="true"/>
+ <#input id="integral" name="积分" underline="true"/>
+ <#input id="passWord" name="密码" underline="true"/>
+ <#input id="openId" name="微信openid" underline="true"/>
+ <#input id="unionid" name="微信unionid" underline="true"/>
+ <#input id="remark" name="备注" underline="true"/>
+ <#input id="state" name="1=正常，2=冻结" underline="true"/>
+ <#input id="flag" name="1：创建，2：修改，3：删除" underline="true"/>
+ <#input id="insertTime" name="" underline="true"/>
+ <#input id="insertUser" name="" underline="true"/>
+ <#input id="updateTime" name="" underline="true"/>
+ <#input id="updateUser" name="" underline="true"/>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TUserInfoDlg.addSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TUserInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tUser/tUser_info.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tUser/tUser_edit.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tUser/tUser_edit.html
new file mode 100644
index 0000000..ae6955d
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tUser/tUser_edit.html
@@ -0,0 +1,54 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+
+ <div class="row">
+ <div class="col-sm-6 b-r">
+ <#input id="id" name="主键id" value="${item.id}" underline="true"/>
+ <#input id="companyId" name="企业id" value="${item.companyId}" underline="true"/>
+ <#input id="registIp" name="注册ip" value="${item.registIp}" underline="true"/>
+ <#input id="registAreaCode" name="注册地区县code" value="${item.registAreaCode}" underline="true"/>
+ <#input id="phone" name="手机号" value="${item.phone}" underline="true"/>
+ <#input id="nickName" name="昵称" value="${item.nickName}" underline="true"/>
+ <#input id="avatar" name="头像" value="${item.avatar}" underline="true"/>
+ <#input id="birthday" name="生日" value="${item.birthday}" underline="true"/>
+ <#input id="sex" name="性别（1：男，2：女）" value="${item.sex}" underline="true"/>
+ <#input id="emergencyContact" name="紧急联系人" value="${item.emergencyContact}" underline="true"/>
+ <#input id="emergencyContactNumber" name="紧急联系电话" value="${item.emergencyContactNumber}" underline="true"/>
+ <#input id="isAuth" name="是否实名认证(1=否，2=是)" value="${item.isAuth}" underline="true"/>
+ <#input id="name" name="真实姓名" value="${item.name}" underline="true"/>
+ <#input id="idCard" name="身份证号" value="${item.idCard}" underline="true"/>
+ <#input id="idCardFront" name="身份证正面" value="${item.idCardFront}" />
+ </div>
+
+ <div class="col-sm-6">
+ <#input id="idCardReverse" name="身份证反面" value="${item.idCardReverse}" underline="true"/>
+ <#input id="consumption" name="历史消费" value="${item.consumption}" underline="true"/>
+ <#input id="balance" name="余额" value="${item.balance}" underline="true"/>
+ <#input id="integral" name="积分" value="${item.integral}" underline="true"/>
+ <#input id="passWord" name="密码" value="${item.passWord}" underline="true"/>
+ <#input id="openId" name="微信openid" value="${item.openId}" underline="true"/>
+ <#input id="unionid" name="微信unionid" value="${item.unionid}" underline="true"/>
+ <#input id="remark" name="备注" value="${item.remark}" underline="true"/>
+ <#input id="state" name="1=正常，2=冻结" value="${item.state}" underline="true"/>
+ <#input id="flag" name="1：创建，2：修改，3：删除" value="${item.flag}" underline="true"/>
+ <#input id="insertTime" name="" value="${item.insertTime}" underline="true"/>
+ <#input id="insertUser" name="" value="${item.insertUser}" underline="true"/>
+ <#input id="updateTime" name="" value="${item.updateTime}" underline="true"/>
+ <#input id="updateUser" name="" value="${item.updateUser}" />
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TUserInfoDlg.editSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TUserInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tUser/tUser_info.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tUser/tUser_optUser.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tUser/tUser_optUser.html
new file mode 100644
index 0000000..918c7bc
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tUser/tUser_optUser.html
@@ -0,0 +1,29 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="userInfoForm">
+ <input type="hidden" id="tUserId" name="tUserId" value="${tUserId}">
+ <input type="hidden" id="optType" name="optType" value="${optType}">
+ <div class="row">
+ <div class="col-sm-11">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">备注</label>
+ <div class="col-sm-9">
+ <textarea type="text/plain" class="form-control" name="remark" id="remark" style="width:100%;height:150px;"></textarea>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t" style="text-align: center;">
+ <div class="col-sm-12">
+ <#button btnCss="info" name="保存" id="ensure" icon="fa-check" clickFun="TUserInfoDlg.optUser()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TUserInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tUser/tUser_info.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tUser/tUser_updateBalance.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tUser/tUser_updateBalance.html
new file mode 100644
index 0000000..9b01dad
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tUser/tUser_updateBalance.html
@@ -0,0 +1,28 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="userInfoForm">
+ <input type="hidden" id="tUserId" name="tUserId" value="${tUserId}">
+ <div class="row">
+ <div class="col-sm-11">
+ <#select id="updateType" name="修改类型：">
+ <option value="">请选择</option>
+ <option value="1">增加</option>
+ <option value="2">减少</option>
+ </#select>
+ <#input id="money" name="修改值" value=""/>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t" style="text-align: center;">
+ <div class="col-sm-12">
+ <#button btnCss="info" name="保存" id="ensure" icon="fa-check" clickFun="TUserInfoDlg.updateBalance()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TUserInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tUser/tUser_info.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tUser/tUser_updatePassword.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tUser/tUser_updatePassword.html
new file mode 100644
index 0000000..7c641f3
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tUser/tUser_updatePassword.html
@@ -0,0 +1,24 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="userInfoForm">
+ <input type="hidden" id="tUserId" name="tUserId" value="${tUserId}">
+ <div class="row">
+ <div class="col-sm-11">
+ <#input id="password" name="密码" type="password"/>
+ <#input id="rePassword" name="确认密码" type="password"/>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t" style="text-align: center;">
+ <div class="col-sm-12">
+ <#button btnCss="info" name="保存" id="ensure" icon="fa-check" clickFun="TUserInfoDlg.updatePassword()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TUserInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tUser/tUser_info.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tUser/tUser_userDetail.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tUser/tUser_userDetail.html
new file mode 100644
index 0000000..b0851bb
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tUser/tUser_userDetail.html
@@ -0,0 +1,99 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+ <div class="row" style="margin-top: 30px;">
+ <div class="col-sm-4">
+ <h2 class="h3Class" style="font-weight: 700;">用户详情</h2>
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-sm-6 b-r">
+ <#label id="insertTimeStr" name="注册时间" value="${item.insertTimeStr}"/>
+ <#label id="registIp" name="注册地IP" value="${item.registIp}"/>
+ <#label id="phone" name="手机号" value="${item.phone}"/>
+ <#label id="emergencyContact" name="紧急联系人姓名" value="${item.emergencyContact}"/>
+ <#label id="isAuthStr" name="是否实名认证" value="${item.isAuthStr}"/>
+
+ </div>
+ <div class="col-sm-6">
+ <#label id="id" name="用户ID" value="${item.id}"/>
+ <#label id="companyName" name="注册地分公司" value="${item.companyName}"/>
+ <#label id="nickName" name="昵称" value="${item.nickName}"/>
+ <#label id="emergencyContactNumber" name="紧急联系人电话" value="${item.emergencyContactNumber}"/>
+ </div>
+ </div>
+
+ <div class="row" style="margin-top: 30px;">
+ <div class="col-sm-4">
+ <h2 class="h3Class" style="font-weight: 700;">认证资料</h2>
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-sm-6">
+ <#label id="name" name="姓名" value="${item.name}"/>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">身份证正面照：</label>
+ <div class="col-sm-9">
+ <div class="form-group">
+ <div class="col-sm-6">
+ <div id="idCardFrontPreId">
+ <div>
+ @if(isEmpty(item.idCardFront)){
+ <img onclick="lookBigImg('${ctxPath}/static/img/NoPIC.png')" src="${ctxPath}/static/img/NoPIC.png" style="max-width:150px;">
+ @}else{
+ <img onclick="lookBigImg('${item.idCardFront}')" src="${item.idCardFront}" style="max-width:250px;">
+ @}
+ </div>
+ </div>
+ </div>
+ <input type="hidden" id="idCardFront" name="idCardFront" value="${item.idCardFront}"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="col-sm-6">
+ <#label id="idCard" name="身份证号" value="${item.idCard}"/>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">身份证正面照：</label>
+ <div class="col-sm-9">
+ <div class="form-group">
+ <div class="col-sm-6">
+ <div id="idCardReversePreId">
+ <div>
+ @if(isEmpty(item.idCardReverse)){
+ <img onclick="lookBigImg('${ctxPath}/static/img/NoPIC.png')" src="${ctxPath}/static/img/NoPIC.png" style="max-width:150px;">
+ @}else{
+ <img onclick="lookBigImg('${item.idCardReverse}')" src="${item.idCardReverse}" style="max-width:250px;">
+ @}
+ </div>
+ </div>
+ </div>
+ <input type="hidden" id="idCardReverse" name="idCardReverse" value="${item.idCardReverse}"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row" style="margin-top: 30px;">
+ <div class="col-sm-4">
+ <h2 class="h3Class" style="font-weight: 700;">历史出行次数</h2>
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-sm-6">
+ @if(item.state == 1){
+ <#label id="state" name="状态" value="正常" style="color: #0d8ddb;"/>
+ @}else if(item.state == 2){
+ <#label id="state" name="状态" value="冻结" style="color: red;"/>
+ @}
+ </div>
+ </div>
+
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tUser/tUser_info.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tUserRedPacketRecord/tUserRedPacketRecord.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tUserRedPacketRecord/tUserRedPacketRecord.html
new file mode 100644
index 0000000..96f063e
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tUserRedPacketRecord/tUserRedPacketRecord.html
@@ -0,0 +1,61 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <input type="hidden" id="couponActivityId" value="${couponActivityId}">
+ <div class="row">
+ <div class="col-sm-3">
+ <#TimeCon id="createTime" name="领取时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="userName" name="领取人" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="userPhone" name="领取人电话" />
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="state" name="状态" >
+ <option value="">全部</option>
+ <option value="1">未使用</option>
+ <option value="2">已使用</option>
+ <option value="3">已过期</option>
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="TUserRedPacketRecord.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="TUserRedPacketRecord.resetSearch()" space="true"/>
+ </div>
+ </div>
+
+ <div class="hidden-xs" id="TUserRedPacketRecordTableToolbar" role="group">
+ @if(shiro.hasPermission("/tUserRedPacketRecord/add")){
+ <#button name="添加" icon="fa-plus" clickFun="TUserRedPacketRecord.openAddTUserRedPacketRecord()"/>
+ @}
+ @if(shiro.hasPermission("/tUserRedPacketRecord/update")){
+ <#button name="修改" icon="fa-edit" clickFun="TUserRedPacketRecord.openTUserRedPacketRecordDetail()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tUserRedPacketRecord/delete")){
+ <#button name="删除" icon="fa-remove" clickFun="TUserRedPacketRecord.delete()" space="true"/>
+ @}
+ </div>
+ <#table id="TUserRedPacketRecordTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tUserRedPacketRecord/tUserRedPacketRecord.js"></script>
+<script>
+ laydate.render({
+ elem: '#createTime'
+ ,range: true
+ });
+</script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tUserRedPacketRecord/tUserRedPacketRecord_add.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tUserRedPacketRecord/tUserRedPacketRecord_add.html
new file mode 100644
index 0000000..979bddc
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tUserRedPacketRecord/tUserRedPacketRecord_add.html
@@ -0,0 +1,35 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+
+ <div class="row">
+ <div class="col-sm-6 b-r">
+ <#input id="id" name="" underline="true"/>
+ <#input id="money" name="金额" underline="true"/>
+ <#input id="expirationTime" name="过期时间" underline="true"/>
+ <#input id="insertTime" name="获取时间" underline="true"/>
+ <#input id="companyId" name="公司id"/>
+ </div>
+
+ <div class="col-sm-6">
+ <#input id="state" name="状态(0=临时，1=未使用，2=已使用，3=已过期)" underline="true"/>
+ <#input id="orderId" name="订单id" underline="true"/>
+ <#input id="orderType" name="订单类型(1=专车，2=出租车，3=城际，4=小件物流)" underline="true"/>
+ <#input id="userId" name="用户id" underline="true"/>
+ <#input id="redPacketActivityId" name="活动id" underline="true"/>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TUserRedPacketRecordInfoDlg.addSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TUserRedPacketRecordInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tUserRedPacketRecord/tUserRedPacketRecord_info.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tUserRedPacketRecord/tUserRedPacketRecord_edit.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tUserRedPacketRecord/tUserRedPacketRecord_edit.html
new file mode 100644
index 0000000..5b092c2
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tUserRedPacketRecord/tUserRedPacketRecord_edit.html
@@ -0,0 +1,35 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+
+ <div class="row">
+ <div class="col-sm-6 b-r">
+ <#input id="id" name="" value="${item.id}" underline="true"/>
+ <#input id="money" name="金额" value="${item.money}" underline="true"/>
+ <#input id="expirationTime" name="过期时间" value="${item.expirationTime}" underline="true"/>
+ <#input id="insertTime" name="获取时间" value="${item.insertTime}" underline="true"/>
+ <#input id="companyId" name="公司id" value="${item.companyId}" />
+ </div>
+
+ <div class="col-sm-6">
+ <#input id="state" name="状态(0=临时，1=未使用，2=已使用，3=已过期)" value="${item.state}" underline="true"/>
+ <#input id="orderId" name="订单id" value="${item.orderId}" underline="true"/>
+ <#input id="orderType" name="订单类型(1=专车，2=出租车，3=城际，4=小件物流)" value="${item.orderType}" underline="true"/>
+ <#input id="userId" name="用户id" value="${item.userId}" underline="true"/>
+ <#input id="redPacketActivityId" name="活动id" value="${item.redPacketActivityId}" />
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TUserRedPacketRecordInfoDlg.editSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TUserRedPacketRecordInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tUserRedPacketRecord/tUserRedPacketRecord_info.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tVerified/tVerified.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tVerified/tVerified.html
new file mode 100644
index 0000000..7c32649
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tVerified/tVerified.html
@@ -0,0 +1,59 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>实名认证列表管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#TimeCon id="insertTime" name="提交时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="userName" name="用户昵称" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="userPhone" name="手机号" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="name" name="姓名" />
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="state" name="状态" >
+ <option value="">全部</option>
+ <option value="1">待认证</option>
+ <option value="2">认证通过</option>
+ <option value="3">认证失败</option>
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="TVerified.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="TVerified.resetSearch()" space="true"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="TVerifiedTableToolbar" role="group">
+ @if(shiro.hasPermission("/tVerified/immediately")){
+ <#button name="立即审核" icon="fa-edit" clickFun="TVerified.immediately()"/>
+ @}
+ @if(shiro.hasPermission("/tVerified/delete")){
+ <#button name="删除记录" icon="fa-remove" clickFun="TVerified.delete()"/>
+ @}
+ </div>
+ <#table id="TVerifiedTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tVerified/tVerified.js"></script>
+<script>
+ laydate.render({
+ elem: '#insertTime'
+ ,range: true
+ });
+</script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tVerified/tVerified_add.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tVerified/tVerified_add.html
new file mode 100644
index 0000000..5fb3278
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tVerified/tVerified_add.html
@@ -0,0 +1,33 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+
+ <div class="row">
+ <div class="col-sm-6 b-r">
+ <#input id="id" name="" underline="true"/>
+ <#input id="userId" name="用户id" underline="true"/>
+ <#input id="name" name="认证姓名" underline="true"/>
+ <#input id="idcode" name="身份证号码"/>
+ </div>
+
+ <div class="col-sm-6">
+ <#input id="img1" name="身份证正面照" underline="true"/>
+ <#input id="img2" name="身份证背面照" underline="true"/>
+ <#input id="state" name="认证结果（1=待认证，2=认证通过，3=认证失败）" underline="true"/>
+ <#input id="insertTime" name="请求时间" underline="true"/>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TVerifiedInfoDlg.addSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TVerifiedInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tVerified/tVerified_info.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tVerified/tVerified_edit.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tVerified/tVerified_edit.html
new file mode 100644
index 0000000..7ce2271
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tVerified/tVerified_edit.html
@@ -0,0 +1,33 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+
+ <div class="row">
+ <div class="col-sm-6 b-r">
+ <#input id="id" name="" value="${item.id}" underline="true"/>
+ <#input id="userId" name="用户id" value="${item.userId}" underline="true"/>
+ <#input id="name" name="认证姓名" value="${item.name}" underline="true"/>
+ <#input id="idcode" name="身份证号码" value="${item.idcode}" />
+ </div>
+
+ <div class="col-sm-6">
+ <#input id="img1" name="身份证正面照" value="${item.img1}" underline="true"/>
+ <#input id="img2" name="身份证背面照" value="${item.img2}" underline="true"/>
+ <#input id="state" name="认证结果（1=待认证，2=认证通过，3=认证失败）" value="${item.state}" underline="true"/>
+ <#input id="insertTime" name="请求时间" value="${item.insertTime}" />
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TVerifiedInfoDlg.editSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TVerifiedInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tVerified/tVerified_info.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tVerified/tVerified_immediately.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tVerified/tVerified_immediately.html
new file mode 100644
index 0000000..3c7b069
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tVerified/tVerified_immediately.html
@@ -0,0 +1,35 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+ <input type="hidden" id="id" name="id" value="${tVerifiedId}">
+ <div class="row">
+ <div class="col-sm-10">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">处理意见：</label>
+ <div class="col-sm-9" style="display: flex;align-items: center;">
+ <div class="radio radio-info radio-inline">
+ <input type="radio" id="state2" value="2" name="state" checked="" >
+ <label for="state2"> 审核成功 </label>
+ </div>
+ <div class="radio radio-success radio-inline">
+ <input type="radio" id="state3" value="3" name="state" >
+ <label for="state3"> 审核失败 </label>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TVerifiedInfoDlg.immediately()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TVerifiedInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tVerified/tVerified_info.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tVersionManagement/tVersionManagement.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tVersionManagement/tVersionManagement.html
new file mode 100644
index 0000000..1af1137
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tVersionManagement/tVersionManagement.html
@@ -0,0 +1,49 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>版本管理</h5>
+ </div>
+ <input style="position: fixed;left: -50000%;top: 0;" id="input" name="input">
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#TimeCon id="insertTime" name="添加时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="version" name="版本编号" />
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="TVersionManagement.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="TVersionManagement.resetSearch()" space="true"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="TVersionManagementTableToolbar" role="group">
+ @if(shiro.hasPermission("/tVersionManagement/add")){
+ <#button name="添加" icon="fa-plus" clickFun="TVersionManagement.openAddTVersionManagement()"/>
+ @}
+ @if(shiro.hasPermission("/tVersionManagement/update")){
+ <#button name="修改" icon="fa-edit" clickFun="TVersionManagement.openTVersionManagementDetail()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tVersionManagement/delete")){
+ <#button name="删除" icon="fa-remove" clickFun="TVersionManagement.delete()" space="true"/>
+ @}
+ </div>
+ <#table id="TVersionManagementTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tVersionManagement/tVersionManagement.js"></script>
+<script>
+ laydate.render({
+ elem: '#insertTime'
+ ,range: true
+ });
+</script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tVersionManagement/tVersionManagement_add.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tVersionManagement/tVersionManagement_add.html
new file mode 100644
index 0000000..6d08858
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tVersionManagement/tVersionManagement_add.html
@@ -0,0 +1,72 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="versionInfoForm">
+
+ <div class="row">
+ <div class="col-sm-11">
+ <#input id="version" name="版本编号" />
+ <div class="form-group">
+ <label class="col-sm-3 control-label">端口类型：</label>
+ <div class="col-sm-9" style="display: flex;align-items: center;">
+<!-- <div class="radio radio-info radio-inline">-->
+<!-- <input type="radio" id="type1" value="1" name="type" checked="" >-->
+<!-- <label for="type1"> 用户端 </label>-->
+<!-- </div>-->
+ <div class="radio radio-success radio-inline">
+ <input type="radio" id="type2" value="2" name="type" >
+ <label for="type2"> 司机端 </label>
+ </div>
+<!-- <div class="radio radio-primary radio-inline">-->
+<!-- <input type="radio" id="type3" value="3" name="type" >-->
+<!-- <label for="type3"> 车载端 </label>-->
+<!-- </div>-->
+<!-- <div class="radio radio-primary radio-inline">-->
+<!-- <input type="radio" id="type4" value="4" name="type" >-->
+<!-- <label for="type4"> 调度端 </label>-->
+<!-- </div>-->
+ </div>
+ </div>
+ <div id="androidDiv">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">上传apk文件：</label>
+ <div class="col-sm-9">
+ <input type="file" name="images" onchange="TVersionManagementInfoDlg.previewFile()">
+ </div>
+ </div>
+ </div>
+ <#input id="url" name="版本链接" disabled="disabled"/>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">是否强制更新：</label>
+ <div class="col-sm-9" style="display: flex;align-items: center;">
+ <div class="radio radio-info radio-inline">
+ <input type="radio" id="mandatory1" value="1" name="mandatory" checked="" >
+ <label for="mandatory1"> 是 </label>
+ </div>
+ <div class="radio radio-success radio-inline">
+ <input type="radio" id="mandatory2" value="2" name="mandatory" >
+ <label for="mandatory2"> 否 </label>
+ </div>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">版本公告：</label>
+ <div class="col-sm-9">
+ <textarea type="text/plain" class="form-control" name="content" id="content" placeholder="多行输入" style="width:100%;height:150px;"></textarea>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TVersionManagementInfoDlg.addSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TVersionManagementInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tVersionManagement/tVersionManagement_info.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tVersionManagement/tVersionManagement_edit.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tVersionManagement/tVersionManagement_edit.html
new file mode 100644
index 0000000..e87955b
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tVersionManagement/tVersionManagement_edit.html
@@ -0,0 +1,32 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+
+ <div class="row">
+ <div class="col-sm-6 b-r">
+ <#input id="id" name="主键id" value="${item.id}" underline="true"/>
+ <#input id="url" name="包路径" value="${item.url}" underline="true"/>
+ <#input id="version" name="版本号" value="${item.version}" underline="true"/>
+ <#input id="content" name="更新公告" value="${item.content}" />
+ </div>
+
+ <div class="col-sm-6">
+ <#input id="mandatory" name="是否强制升级(1=是 2=否）" value="${item.mandatory}" underline="true"/>
+ <#input id="insertTime" name="更新时间" value="${item.insertTime}" underline="true"/>
+ <#input id="type" name="类型(1=安卓，2=ios)" value="${item.type}" />
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TVersionManagementInfoDlg.editSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TVersionManagementInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tVersionManagement/tVersionManagement_info.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/user/user.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/user/user.html
new file mode 100644
index 0000000..b444d0f
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/user/user.html
@@ -0,0 +1,80 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>用户管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-lg-2 col-sm-3">
+ <div class="panel panel-default">
+ <div class="panel-heading">组织机构</div>
+ <div class="panel-body dept-tree">
+ <ul id="deptTree" class="ztree"></ul>
+ </div>
+ </div>
+ </div>
+ <div class="col-lg-10 col-sm-9">
+ <div class="row">
+ <div class="col-lg-10 col-sm-9">
+ <div class="row">
+ <div class="col-lg-4 col-sm-6">
+ <#TimeCon id="createTime" name="创建时间" isTime="false"/>
+ </div>
+ <div class="col-lg-4 col-sm-12">
+ <#NameCon id="name" name="用户名称" placeholder="帐号/姓名/手机号"/>
+ </div>
+ </div>
+ </div>
+ <div class="col-lg-2 col-sm-3">
+ <div class="row">
+ <div class="col-lg-12 col-sm-12">
+ <#button name="搜索" icon="fa-search" clickFun="MgrUser.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="MgrUser.resetSearch()" space="true"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="hidden-xs" id="managerTableToolbar" role="group">
+ @if(shiro.hasPermission("/mgr/add")){
+ <#button name="添加" icon="fa-plus" clickFun="MgrUser.openAddMgr()"/>
+ @}
+ @if(shiro.hasPermission("/mgr/edit")){
+ <#button name="修改" icon="fa-edit" clickFun="MgrUser.openChangeUser()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/mgr/delete")){
+ <#button name="删除" icon="fa-remove" clickFun="MgrUser.delMgrUser()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/mgr/reset")){
+ <#button name="重置密码" icon="fa-refresh" clickFun="MgrUser.resetPwd()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/mgr/freeze")){
+ <#button name="冻结" icon="fa-warning" clickFun="MgrUser.freezeAccount()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/mgr/unfreeze")){
+ <#button name="解除冻结" icon="fa-check-circle" clickFun="MgrUser.unfreeze()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/mgr/setRole")){
+ <#button name="角色分配" icon="fa-user-secret" clickFun="MgrUser.roleAssign()" space="true"/>
+ @}
+ </div>
+ <#table id="managerTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/user/user.js"></script>
+<script type="text/javascript">
+ laydate.render({
+ elem: '#createTime'
+ ,range: true
+ });
+</script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/user/user_add.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/user/user_add.html
new file mode 100644
index 0000000..ed9ba50
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/user/user_add.html
@@ -0,0 +1,62 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="userInfoForm">
+
+ <input type="hidden" id="id" value="">
+
+ <div class="row">
+ <div class="col-sm-6 b-r">
+ <#input id="account" name="账户" underline="true"/>
+
+ <#select id="sex" name="性别：" underline="true">
+ <option value="1">男</option>
+ <option value="2">女</option>
+ </#select>
+
+ <#input id="password" name="密码" underline="true" type="password"/>
+ <#input id="rePassword" name="确认密码" type="password"/>
+
+ <#input id="email" name="邮箱" type="email"/>
+ <!--<#input id="roleid" name="角色" underline="true" type="hidden" disabled="disabled"/>-->
+ </div>
+ <div class="col-sm-6">
+ <div id="driverInfoContent">
+ <#input id="name" name="姓名" underline="true"/>
+
+ <#input id="birthday" name="出生日期" underline="true" type="text"/>
+
+ <#input id="citySel" name="部门" underline="true" readonly="readonly" hidden="deptid"
+ clickFun="UserInfoDlg.showDeptSelectTree(); return false;"
+ style="background-color: #ffffff !important;"/>
+
+ <#input id="phone" name="电话"/>
+
+
+ </div>
+ </div>
+ </div>
+
+ <!-- 这是部门选择的下拉框 -->
+ <div id="menuContent" class="menuContent"
+ style="display: none; position: absolute; z-index: 200;">
+ <ul id="treeDemo" class="ztree tree-box" style="width: 249px !important;"></ul>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-4">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="UserInfoDlg.addSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="UserInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/user/user_info.js"></script>
+<script>
+ laydate.render({
+ elem: '#birthday'
+ });
+</script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/user/user_chpwd.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/user/user_chpwd.html
new file mode 100644
index 0000000..06372ae
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/user/user_chpwd.html
@@ -0,0 +1,34 @@
+@layout("/common/_container.html"){
+<div class="col-sm-4 col-sm-offset-4">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>修改密码</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-content" style="border:none !important; ">
+ <div class="form-horizontal">
+ <div class="row">
+ <div class="col-sm-12">
+ <#input id="oldPwd" name="原密码" underline="true" type="password"/>
+ <#input id="newPwd" name="新密码" underline="true" type="password"/>
+ <#input id="rePwd" name="新密码验证" type="password"/>
+ </div>
+ </div>
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="UserInfoDlg.chPwd()"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/user/user_info.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/user/user_edit.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/user/user_edit.html
new file mode 100644
index 0000000..4271878
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/user/user_edit.html
@@ -0,0 +1,58 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="userInfoForm">
+
+ <input type="hidden" id="id" value="${user.id}">
+ <input type="hidden" id="sexValue" value="${user.sex}">
+
+ <div class="row">
+ <div class="col-sm-6 b-r">
+ <#input id="account" name="账户" underline="true" value="${user.account}"/>
+
+ <#select id="sex" name="性别：" underline="true">
+ <option value="1">男</option>
+ <option value="2">女</option>
+ </#select>
+
+ <#input id="citySel" name="部门" underline="false" readonly="readonly" hidden="deptid" hiddenValue="${user.deptid}" value="${deptName}" clickFun="UserInfoDlg.showDeptSelectTree(); return false;" style="background-color: #ffffff !important;"/>
+
+ <!--<#input id="roleid" name="角色" underline="true" value="${roleName}" disabled="disabled"/>-->
+ <#input id="email" name="邮箱" type="email" value="${user.email}"/>
+ </div>
+ <div class="col-sm-6">
+ <div id="driverInfoContent">
+ <#input id="name" name="姓名" underline="true" value="${user.name}"/>
+
+ <#input id="birthday" name="出生日期" underline="true" type="text"
+ value="${user.birthday}"/>
+
+ <#input id="phone" name="电话" value="${user.phone}"/>
+
+ </div>
+ </div>
+ </div>
+
+ <!-- 这是部门选择的下拉框 -->
+ <div id="menuContent" class="menuContent"
+ style="display: none; position: absolute; z-index: 200;">
+ <ul id="treeDemo" class="ztree tree-box" style="width: 249px !important;"></ul>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-4">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="UserInfoDlg.editSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="UserInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/user/user_info.js"></script>
+<script>
+ laydate.render({
+ elem: '#birthday'
+ });
+</script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/user/user_roleassign.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/user/user_roleassign.html
new file mode 100644
index 0000000..8131bc8
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/user/user_roleassign.html
@@ -0,0 +1,79 @@
+@layout("/common/_container.html"){
+
+
+<script type="text/javascript">
+ $(function () {
+
+ var index = parent.layer.getFrameIndex(window.name); //获取窗口索引
+
+ $("#btn_close").bind("click", function () {
+ parent.layer.close(index);
+ });
+
+ $("#btn_save").bind("click", function () {
+ var ids = Feng.zTreeCheckedNodes("zTree");
+ var ajax = new $ax(Feng.ctxPath + "/mgr/setRole", function (data) {
+ Feng.success("分配角色成功!");
+ window.parent.MgrUser.table.refresh();
+ parent.layer.close(index);
+ }, function (data) {
+ Feng.error("分配角色失败!" + data.responseJSON.message + "!");
+ });
+ ajax.set("roleIds", ids);
+ ajax.set("userId", "${userId}");
+ ajax.start();
+ });
+
+ initZtree();
+ });
+
+ function initZtree() {
+ var setting = {
+ check: {
+ enable: true,
+ chkboxType: {
+ "Y": "",
+ "N": ""
+ }
+ },
+ data: {
+ simpleData: {
+ enable: true
+ }
+ }
+ };
+
+ var ztree = new $ZTree("zTree", "/role/roleTreeListByUserId/${userId}");
+ ztree.setSettings(setting);
+ ztree.init();
+ }
+</script>
+
+
+<!-- 配置grid -->
+<div class="container"
+ style="padding: 0px 10px !important; margin-top: -10px; text-align: center !important;">
+ <div class="row">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>${userAccount!}</h5>
+ </div>
+ <div class="ibox-content">
+ <ul id="zTree" class="ztree"></ul>
+ </div>
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-md-12">
+ <button class="btn btn-sm btn-info" type="button" id="btn_save">
+ <i class="ace-icon fa fa-check bigger-110"></i> 保存
+ </button>
+
+ <button class="btn btn-sm btn-danger" type="button" id="btn_close">
+ <i class="ace-icon fa fa-close bigger-110"></i> 关闭
+ </button>
+ </div>
+ </div>
+</div>
+
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/user/user_view.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/user/user_view.html
new file mode 100644
index 0000000..280c7e9
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/user/user_view.html
@@ -0,0 +1,75 @@
+@layout("/common/_container.html"){
+<div class="col-sm-6 col-sm-offset-3">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>用户管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-content" style="border:none !important; ">
+ <div class="form-horizontal" id="userInfoForm">
+
+ <input type="hidden" id="id" value="${user.id}">
+ <input type="hidden" id="sexValue" value="${user.sex}">
+
+ <div class="row">
+ <div class="col-sm-6 b-r">
+ <#avatar id="avatar" name="头像" underline="true" avatarImg="${user.avatar}"/>
+
+ <#input id="account" name="账户" underline="true" value="${user.account}" disabled="disabled" />
+
+ <#select id="sex" name="性别" underline="true" value="${user.sex}">
+ <option value="1">男</option>
+ <option value="2">女</option>
+ </#select>
+
+ <#input id="roleid" name="角色" underline="true" value="${roleName}" disabled="disabled"/>
+
+ <#input id="email" name="邮箱" type="email" value="${user.email}"/>
+ </div>
+
+ <div class="col-sm-6">
+ <div id="driverInfoContent">
+ <#input id="name" name="姓名" underline="true" value="${user.name}"/>
+
+ <#input id="birthday" name="出生日期" underline="true" type="text"
+ value="${user.birthday}"/>
+
+ <#input id="citySel" name="部门" underline="true" readonly="readonly" value="${deptName}"
+ hidden="deptid" hiddenValue="${user.deptid}"
+ clickFun="UserInfoDlg.showInfoDeptSelectTree(); return false;"
+ style="background-color: #ffffff !important;"
+ selectFlag="true" selectId="menuContent" selectTreeId="treeDemo" selectStyle="width:250px !important;"/>
+
+ <#input id="phone" name="电话" value="${user.phone}"/>
+ </div>
+ </div>
+ </div>
+
+ <div class="progress progress-striped" id="progressTipArea" style="margin-top: 20px;">
+ <div id="progressBar" style="width: 0%" aria-valuemax="100" aria-valuemin="0" aria-valuenow="0" role="progressbar" class="progress-bar progress-bar-info">
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="UserInfoDlg.editSubmit()"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/user/user_info.js"></script>
+<script>
+ laydate.render({
+ elem: '#birthday'
+ });
+</script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/addRegist.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/addRegist.html
new file mode 100644
index 0000000..0efdcf4
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/addRegist.html
@@ -0,0 +1,78 @@
+@layout("/common/_container.html"){
+<style>
+ .table{
+ display: inline;
+ width: 16.6666666%;
+ float:left;
+ text-align:center;
+ border-collapse:collapse;
+ font-size: 18px;
+ }
+ .table:hover{
+ background-color: rgba(255,0,0,.3);
+ }
+ .newWidth, .single-line{
+ max-width:150px !important;display: initial !important;
+ }
+</style>
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="sysCouponActivityInfoForm">
+ <input type="hidden" id="activityId">
+ <div class="row">
+ <div class="col-sm-7">
+ <div class="row" id="content5" style="margin-left: 100px;">
+ <div class="col-sm-11">
+ <div class="form-group">
+ <div class="col-sm-10">
+ <input type="hidden" id="id1">
+ <input type="hidden" id="id2">
+ <input type="hidden" id="id3">
+ <input type="hidden" id="id4">
+ 充值： <input type="text" name="zc1" id="num1" class="form-control newWidth" /> 元
+ <br/>
+ <br/>
+ 送
+ <input type="text" name="zc1" id="num2" class="form-control newWidth" /> 张
+ <input type="text" name="zc1" id="num3" class="form-control newWidth" placeholder="请选择" readonly="readonly" onclick="RegistInfoDlg.selecteCoupon(0)"/> 元通用优惠券
+ <br/>
+ <br/>
+ 送
+ <input type="text" name="zc1" id="num4" class="form-control newWidth" /> 张
+ <input type="text" name="zc1" id="num5" class="form-control newWidth" placeholder="请选择" readonly="readonly" onclick="RegistInfoDlg.selecteCoupon(1)"/> 元专车优惠券
+ <br/>
+ <br/>
+ 送
+ <input type="text" name="zc1" id="num6" class="form-control newWidth" /> 张
+ <input type="text" name="zc1" id="num7" class="form-control newWidth" placeholder="请选择" readonly="readonly" onclick="RegistInfoDlg.selecteCoupon(2)"/> 元出租车优惠券
+ <br/>
+ <br/>
+ 送
+ <input type="text" name="zc1" id="num8" class="form-control newWidth" /> 张
+ <input type="text" name="zc1" id="num9" class="form-control newWidth" placeholder="请选择" readonly="readonly" onclick="RegistInfoDlg.selecteCoupon(3)"/> 元城际优惠券
+ <br/>
+ <br/>
+ 有效期
+ <input type="text" name="zc1" id="num10" class="form-control newWidth" /> 天，
+ 最高金额
+ <input type="text" name="zc1" id="num11" class="form-control newWidth" /> 元
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="addSubmit()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/userActivity/addRegist.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/receiveRecord.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/receiveRecord.html
new file mode 100644
index 0000000..8b35875
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/receiveRecord.html
@@ -0,0 +1,296 @@
+@layout("/common/_container.html"){
+<style type="text/css">
+
+ ztree li span. {
+ margin-left: 4px;
+ margin-right: -1px;
+ background-position: -144px 0;
+ vertical-align: top;
+ *vertical-align: middle
+ }
+
+ .titleDiv {
+ overflow: hidden;
+ }
+
+ .titleItem {
+ float: left;
+ text-align: center;
+ width: 180px;
+ line-height: 40px;
+ border-top: 1px solid #E7EBEE;
+ border-bottom: 1px solid #E7EBEE;
+ border-left: 1px solid #E7EBEE;
+ font-size: 16px;
+ }
+
+ .titleItem1 {
+ float: left;
+ text-align: center;
+ width: 180px;
+ line-height: 40px;
+ border-bottom: 1px solid #E7EBEE;
+ border-left: 1px solid #E7EBEE;
+ font-size: 16px;
+ }
+
+ .titleItemCk {
+ color: #fff !important;
+ background: #1AB395 !important;
+ }
+
+ .titleItem:last-child {
+ border-right: 1px solid #E7EBEE;
+ }
+
+ /* 订单分析 */
+ ul {
+ list-style-type: none;
+ }
+
+ .orderFenxiBox {
+ width: 100%;
+ display: flex;
+ align-items: center;
+ background-color: white;
+ }
+
+ .orderFenxiItem {
+ flex: 1;
+ padding: 20px 0;
+ }
+
+ .orderFenxiItem:last-child .orderFenxiItem_number {
+ border-right: 0 none;
+ }
+
+ .orderFenxiItem_number {
+ width: 80%;
+ height: 80%;
+ line-height: 90px;
+ padding: 20px 0;
+ font-size: 32px;
+ color: #1AB394;
+ text-align: center;
+ border-right: 1px solid #eaeaea;
+ }
+
+ .orderFenxiItem_title, .orderFenxiItem_last {
+ line-height: 40px;
+ font-size: 14px;
+ }
+</style>
+
+<div class="row" style="margin-left: 2%;">
+ <div class="col-sm-3">
+ <input id="activityId" value="${activityId}" type="hidden">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h3>活动时间：<input type="text" id="startTime" name="zc7" class="form-control" style="max-width:250px !important;display: initial !important;" onchange="receiveRecordDetail()"/></h3>
+ </div>
+ <div class="ibox-title">
+ <h3>领取总金额<span id="totalMOney"></span></h3>
+ </div>
+ </div>
+ </div>
+</div>
+
+
+<div class="row" style="margin-left: 2%;">
+ <div class="col-sm-3">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h3>注册奖励</h3>
+ </div>
+ <div class="ibox-content">
+ <h1 class="no-margins text-navy">领取人数：<span id="userActivityRegisteredNumber"></span></h1>
+ <h1 class="no-margins text-navy">领取总金额：<span id="userActivityRegisteredMoney"></span></h1>
+ <h1 class="no-margins text-navy">使用总金额：<span id="userActivityRegisteredUseMoney"></span></h1>
+ </div>
+ <h4><a href="#" onclick="driverActivityHistory(1,${userActivityRegisteredId})">领取列表</a></h4>
+ </div>
+ </div>
+ <div class="col-sm-3">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h3>邀请奖励</h3>
+ </div>
+ <div class="ibox-content">
+ <h1 class="no-margins text-navy">领取人数：<span id="userActivityInviteNumber"></span></h1>
+ <h1 class="no-margins text-navy">领取总金额：<span id="userActivityInviteMoney"></span></h1>
+ <h1 class="no-margins text-navy">使用总金额：<span id="userActivityInviteUseMoney"></span></h1>
+ </div>
+ <h4><a href="#" onclick="driverActivityHistory(2,${userActivityInviteId})">领取列表</a></h4>
+ </div>
+ </div>
+ <div class="col-sm-3">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h3>打折活动</h3>
+ </div>
+ <div class="ibox-content">
+ <h1 class="no-margins text-navy">使用人数：<span id="userActivityDiscount1Number"></span></h1>
+ <h1 class="no-margins text-navy">折扣总金额：<span id="userActivityDiscount1Money"></span></h1>
+ </div>
+ </div>
+ </div>
+ <div class="col-sm-3">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h3>红包活动</h3>
+ </div>
+ <div class="ibox-content">
+ <h1 class="no-margins text-navy">领取人数：<span id="userActivityRedenvelopeNumber"></span></h1>
+ <h1 class="no-margins text-navy">领取总金额：<span id="userActivityRedenvelopeMoney"></span></h1>
+ <h1 class="no-margins text-navy">使用总金额：<span id="userActivityRedenvelopeUseMoney"></span></h1>
+ </div>
+ <h4><a href="#" onclick="driverActivityHistory(4,${userActivityRedenvelopeId})">领取列表</a></h4>
+ </div>
+ </div>
+</div>
+
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>充值活动</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <#table id="DriverActivityTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<!-- ChartJS-->
+<script type="text/javascript">
+ $(function () {
+ $("#startTime").val("${startTime} - ${endTime}")
+ receiveRecordDetail("${startTime} - ${endTime}");
+ var defaultColunms = DriverActivity.initColumn();
+ var table = new BSTable(DriverActivity.id, "/userActivity/blanceList", defaultColunms);
+ table.setPaginationType("server");
+ DriverActivity.table = table.init();
+ })
+ laydate.render({
+ elem: '#startTime'
+ ,range: true
+ ,done: function(value, date, endDate){
+ // 回调函数
+ receiveRecordDetail(value);
+ var queryData = {};
+ queryData['createTime'] = value;
+ queryData['activityId'] = $("#activityId").val();
+ DriverActivity.table.refresh({query: queryData});
+ }
+ });
+
+ function receiveRecordDetail(times){
+ var ajax = new $ax(Feng.ctxPath + "/userActivity/receiveRecordDetail", function (data) {
+ $("#totalMOney").html(data.totalMOney);
+ $("#userActivityRegisteredUseMoney").html(data.userActivityRegisteredUseMoney);
+ $("#userActivityRegisteredMoney").html(data.userActivityRegisteredMoney);
+ $("#userActivityRegisteredNumber").html(data.userActivityRegisteredNumber);
+ $("#userActivityInviteUseMoney").html(data.userActivityInviteUseMoney);
+ $("#userActivityInviteMoney").html(data.userActivityInviteMoney);
+ $("#userActivityInviteNumber").html(data.userActivityInviteNumber);
+ $("#userActivityDiscount1Money").html(data.userActivityDiscount1Money);
+ $("#userActivityDiscount1Number").html(data.userActivityDiscount1Number);
+ $("#userActivityRedenvelopeUseMoney").html(data.userActivityRedenvelopeUseMoney);
+ $("#userActivityRedenvelopeMoney").html(data.userActivityRedenvelopeMoney);
+ $("#userActivityRedenvelopeNumber").html(data.userActivityRedenvelopeNumber);
+ }, function (data) {
+ Feng.error("操作失败!" + data.responseJSON.message + "!");
+ });
+ ajax.set("createTime",times);
+ ajax.set("activityId",$("#activityId").val());
+ ajax.start();
+ }
+ /**
+ * 领取记录
+ */
+ function driverActivityHistory(type,id) {
+ if(type==1){
+ layer.open({
+ type: 2,
+ title: '领取记录',
+ area: ['100%', '100%'], //宽高
+ fix: false, //不固定
+ maxmin: true,
+ content: Feng.ctxPath + '/userCouponRecord?couponActivityId='+ id+"&activityType=2"
+ });
+ }else if(type==2){
+ layer.open({
+ type: 2,
+ title: '领取记录',
+ area: ['100%', '100%'], //宽高
+ fix: false, //不固定
+ maxmin: true,
+ content: Feng.ctxPath + '/userCouponRecord?couponActivityId='+ id+"&activityType=3"
+ });
+ }else if(type==4){
+ layer.open({
+ type: 2,
+ title: '领取记录',
+ area: ['100%', '100%'], //宽高
+ fix: false, //不固定
+ maxmin: true,
+ content: Feng.ctxPath + '/tUserRedPacketRecord?couponActivityId='+ id
+ });
+ }else{
+ layer.open({
+ type: 2,
+ title: '领取记录',
+ area: ['100%', '100%'], //宽高
+ fix: false, //不固定
+ maxmin: true,
+ content: Feng.ctxPath + '/userCouponRecord?couponActivityId='+ id+"&activityType=4"
+ });
+ }
+
+ };
+
+ /**
+ * 管理初始化
+ */
+ var DriverActivity = {
+ id: "DriverActivityTable", //表格id
+ seItem: null, //选中的条目
+ table: null,
+ layerIndex: -1
+ };
+
+ /**
+ * 初始化表格的列
+ */
+ DriverActivity.initColumn = function () {
+ return [
+ {field: 'selectItem', radio: true},
+ {title: '', field: 'id', visible: false, align: 'center', valign: 'middle'},
+ {title: '充值金额', field: 'money', visible: true, align: 'center', valign: 'middle'},
+ {title: '通用券领取总数', field: 'number', visible: true, align: 'center', valign: 'middle'},
+ {title: '通用券使用总数', field: 'useNumber', visible: true, align: 'center', valign: 'middle'},
+ {title: '通用券使用总金额', field: 'useMoney', visible: true, align: 'center', valign: 'middle'},
+ {title: '专车券领取总数', field: 'speNumber', visible: true, align: 'center', valign: 'middle'},
+ {title: '专车券使用总数', field: 'speUseNumber', visible: true, align: 'center', valign: 'middle'},
+ {title: '专车券使用总金额', field: 'speUserMoney', visible: true, align: 'center', valign: 'middle'},
+ {title: '出租车券领取总数', field: 'taxiNumber', visible: true, align: 'center', valign: 'middle'},
+ {title: '出租车券使用总数', field: 'taxiUseNumber', visible: true, align: 'center', valign: 'middle'},
+ {title: '出租车券使用总金额', field: 'taxiUserMoney', visible: true, align: 'center', valign: 'middle'},
+ {title: '城际券领取总数', field: 'intercityNumber', visible: true, align: 'center', valign: 'middle'},
+ {title: '城际券使用总数', field: 'intercityUseNumber', visible: true, align: 'center', valign: 'middle'},
+ {title: '城际券使用总金额', field: 'intercityUserMoney', visible: true, align: 'center', valign: 'middle'},
+ {title: '', field: 'insertTime', visible: true, align: 'center', valign: 'middle',
+ formatter: function (value, row) {
+ var btn = '';
+ btn+='<a href="javascript:void(0);" onclick="driverActivityHistory(5,'+row.id+')">领取记录</a>'
+ return [btn];
+ }
+ },
+ ];
+ };
+</script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/sysCouponRecord.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/sysCouponRecord.html
new file mode 100644
index 0000000..7fa06a1
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/sysCouponRecord.html
@@ -0,0 +1,37 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>优惠券管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#TimeCon id="createTime" name="领取时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="SysCouponRecord.search()"/>
+ <#button name="重置" icon="fa-search" clickFun="SysCouponRecord.resetSearch()"/>
+ <#button btnCss="info" name="确定" id="ensure" icon="fa-check" clickFun="SysCouponRecord.selectCouponOpt()" space="true"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="SysCouponRecord.close()" space="true"/>
+
+ </div>
+ </div>
+ <#table id="SysCouponRecordTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/userActivity/sysCouponRecord.js"></script>
+<script>
+ laydate.render({
+ elem: '#createTime'
+ ,range: true
+ });
+</script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/sysCouponRecord1.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/sysCouponRecord1.html
new file mode 100644
index 0000000..7356035
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/sysCouponRecord1.html
@@ -0,0 +1,37 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>优惠券管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#TimeCon id="createTime" name="领取时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="SysCouponRecord.search()"/>
+ <#button name="重置" icon="fa-search" clickFun="SysCouponRecord.resetSearch()"/>
+ <#button btnCss="info" name="确定" id="ensure" icon="fa-check" clickFun="SysCouponRecord.selectCouponOpt1()" space="true"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="SysCouponRecord.close()" space="true"/>
+
+ </div>
+ </div>
+ <#table id="SysCouponRecordTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/userActivity/sysCouponRecord.js"></script>
+<script>
+ laydate.render({
+ elem: '#createTime'
+ ,range: true
+ });
+</script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/sysCouponRecord2.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/sysCouponRecord2.html
new file mode 100644
index 0000000..bcb6ea8
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/sysCouponRecord2.html
@@ -0,0 +1,38 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>优惠券管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <input type="hidden" id="couponUseType" value="${type}">
+ <#TimeCon id="createTime" name="领取时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="SysCouponRecord.search()"/>
+ <#button name="重置" icon="fa-search" clickFun="SysCouponRecord.resetSearch()"/>
+ <#button btnCss="info" name="确定" id="ensure" icon="fa-check" clickFun="SysCouponRecord.selectCouponOpt2()" space="true"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="SysCouponRecord.close1()" space="true"/>
+
+ </div>
+ </div>
+ <#table id="SysCouponRecordTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/userActivity/sysCouponRecord.js"></script>
+<script>
+ laydate.render({
+ elem: '#createTime'
+ ,range: true
+ });
+</script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/sysRedPacketRecord.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/sysRedPacketRecord.html
new file mode 100644
index 0000000..f1bf16c
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/sysRedPacketRecord.html
@@ -0,0 +1,36 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>红包管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#TimeCon id="createTime" name="领取时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="SysRedPacketRecord.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="SysRedPacketRecord.resetSearch()" space="true"/>
+ <#button btnCss="info" name="确定" id="ensure" icon="fa-check" clickFun="SysRedPacketRecord.selectRedOpt()" space="true"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="SysRedPacketRecord.close()" space="true"/>
+ </div>
+ </div>
+ <#table id="SysRedPacketRecordTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/userActivity/sysRedPacketRecord.js"></script>
+<script>
+ laydate.render({
+ elem: '#createTime'
+ ,range: true
+ });
+</script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity.html
new file mode 100644
index 0000000..8630871
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity.html
@@ -0,0 +1,68 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#TimeCon id="createTime" name="添加时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="name" name="名称" />
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="status" name="状态" >
+ <option value="">全部</option>
+ <option value="1">待审核</option>
+ <option value="2">已驳回</option>
+ <option value="4">已暂停</option>
+ <option value="3">未开始</option>
+ <option value="5">进行中</option>
+ <option value="6">已结束</option>
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="UserActivity.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="UserActivity.resetSearch()" space="true"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="UserActivityTableToolbar" role="group">
+ @if(shiro.hasPermission("/userActivity/add")){
+ <#button name="添加" icon="fa-plus" clickFun="UserActivity.openAddUserActivity()"/>
+ @}
+ @if(shiro.hasPermission("/userActivity/update")){
+ <#button name="编辑" icon="fa-edit" clickFun="UserActivity.openUpdateUserActivity()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/userActivity/updateStatus")){
+ <#button name="启动/暂停" icon="" clickFun="UserActivity.updateStatus()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/userActivity/detail")){
+ <#button name="详情" icon="" clickFun="UserActivity.openUserActivityDetail()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/userActivity/receiveRecord")){
+ <#button name="领取记录" icon="" clickFun="UserActivity.receiveRecord()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/userActivity/immediately")){
+ <#button name="审核" icon="" clickFun="UserActivity.immediately()" space="true"/>
+ @}
+ </div>
+ <#table id="UserActivityTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/userActivity/userActivity.js"></script>
+<script>
+ laydate.render({
+ elem: '#createTime'
+ ,range: true
+ });
+</script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_add.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_add.html
new file mode 100644
index 0000000..03ac1ca
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_add.html
@@ -0,0 +1,309 @@
+@layout("/common/_container.html"){
+<link href="${ctxPath}/static/css/plugins/switchery/switchery.css" rel="stylesheet">
+<style>
+ .table1{
+ display: inline;
+ width: 16.6666666%;
+ float:left;
+ text-align:center;
+ border-collapse:collapse;
+ font-size: 18px;
+ }
+ .table1:hover{
+ background-color: rgba(255,0,0,.3);
+ }
+ .newWidth, .single-line{
+ max-width:150px !important;display: initial !important;
+ }
+</style>
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+ <div class="row">
+ <div class="col-sm-10">
+ <div style="height: 50px;box-sizing: border-box;background:#f3f3f4;line-height: 50px;border:1px solid;margin-bottom: 20px;">
+ <div id="div1" class='table1' onclick="getContent(1)" style="border-right: 1px solid #333;background-color: rgb(26, 179, 148);color: white;">活动设置</div>
+ <div id="div2" class='table1' onclick="getContent(2)" style="border-right: 1px solid #333;">注册奖励</div>
+ <div id="div3" class='table1' onclick="getContent(3)" style="border-right: 1px solid #333;">邀请奖励</div>
+ <div id="div4" class='table1' onclick="getContent(4)" style="border-right: 1px solid #333;">充值赠送</div>
+ <div id="div5" class='table1' onclick="getContent(5)" style="border-right: 1px solid #333;">打折活动</div>
+ <div id="div6" class='table1' onclick="getContent(6)" style="border-right: 1px solid #333;">红包活动</div>
+ </div>
+ <div class="row" id="content1" style="margin-left: 100px;">
+ <div class="col-sm-11">
+ <div class="form-group">
+ <div class="col-sm-10">
+ <h1>添加活动</h1>
+ <br/>
+ <br/>
+ 活动名称： <input type="text" name="zc1" id="name" class="form-control newWidth" />
+ <br/>
+ <br/>
+ 活动时间： <input type="text" id="startTime" name="zc7" class="form-control" style="max-width:300px !important;display: initial !important;" />
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="row" id="content2" style="margin-left: 100px;">
+ <div class="col-sm-11">
+ <div class="form-group">
+ <div class="col-sm-15">
+ <input type="hidden" id="content2CouponId">
+ <h1>用户注册既赠送优惠券</h1>
+ <br/>
+ <br/>
+ 启用： <input type="checkbox" class="js-switch" id="content2Check" checked="">
+ <br/>
+ <br/>
+ <#button name="选择优惠券" icon="fa-plus" clickFun="UserActivityInfoDlg.toSelectCouponOpt()"/>
+ <br/>
+ <br/>
+ 优惠券名称： <input type="text" name="zc1" id="content2Num1" class="form-control newWidth" readonly/>
+ <br/>
+ <br/>
+ 服务类型： <input type="text" name="zc1" id="content2Num2" class="form-control newWidth" readonly/>
+ <br/>
+ <br/>
+ 优惠券类型： <input type="text" name="zc1" id="content2Num3" class="form-control newWidth" readonly/>
+ <br/>
+ <br/>
+ 金额：
+
+
+ <input type="text" name="zc1" id="content2Num4" class="form-control newWidth" readonly/>
+ <br/>
+ <br/>
+ 最高金额： <input type="text" name="zc1" id="content2Num7" class="form-control newWidth" />
+ <br/>
+ <br/>
+ 有效期：
+
+ <input type="text" name="zc1" id="content2Num5" class="form-control newWidth" /> 天
+ <br/>
+ <br/>
+ 张数：
+
+
+ <input type="text" name="zc1" id="content2Num6" class="form-control newWidth" />
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="row" id="content3" style="margin-left: 100px;">
+ <div class="col-sm-11">
+ <div class="form-group">
+ <div class="col-sm-10">
+ <input type="hidden" id="content3CouponId">
+ <h1>用户邀请用户奖励</h1>
+ <br/>
+ <br/>
+ 启用： <input type="checkbox" id="content3Check" class="js-switch1" checked="">
+ <br/>
+ <br/>
+ <#button name="选择优惠券" icon="fa-plus" clickFun="UserActivityInfoDlg.toSelectCouponOpt1()"/>
+ <br/>
+ <br/>
+ 优惠券名称： <input type="text" name="zc1" id="content3Num1" class="form-control newWidth" readonly/>
+ <br/>
+ <br/>
+ 服务类型： <input type="text" name="zc1" id="content3Num2" class="form-control newWidth" readonly/>
+ <br/>
+ <br/>
+ 优惠券类型： <input type="text" name="zc1" id="content3Num3" class="form-control newWidth" readonly/>
+ <br/>
+ <br/>
+ 金额：
+
+
+ <input type="text" name="zc1" id="content3Num4" class="form-control newWidth" readonly/>
+ <br/>
+ <br/>
+ 最高金额： <input type="text" name="zc1" id="content3Num7" class="form-control newWidth" />
+ <br/>
+ <br/>
+ 有效期：
+
+ <input type="text" name="zc1" id="content3Num5" class="form-control newWidth" /> 天
+ <br/>
+ <br/>
+ 张数：
+
+
+ <input type="text" name="zc1" id="content3Num6" class="form-control newWidth" />
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="row" id="content4" style="margin-left: 100px;">
+ <div class="col-sm-11">
+ <h1>充值赠送奖励</h1>
+ <br/>
+ <br/>
+ <div class="form-group">
+ <div class="col-sm-10">
+ <#button name="添加" icon="fa-plus" clickFun="UserActivityInfoDlg.toAddRegistOpt()"/> 启用： <input type="checkbox" id="content4Check" class="js-switch4" checked="">
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-sm-15">
+ <div style="height: 200px; border: 1px solid #e5e6e7;overflow-y: auto;">
+ <table class="table table-striped table-bordered table-hover table-condensed">
+ <thead>
+ <tr>
+ <th style="width: 250px;">充值金额</th>
+ <th style="width: 250px;">有效天数</th>
+ <th style="width: 300px;">最高金额</th>
+ <th style="width: 300px;">通用券金额</th>
+ <th style="width: 300px;">通用券数量</th>
+ <th style="width: 300px;">专车券金额</th>
+ <th style="width: 300px;">专车券数量</th>
+ <th style="width: 400px;">出租车券金额</th>
+ <th style="width: 400px;">出租车券数量</th>
+ <th style="width: 300px;">城际金额</th>
+ <th style="width: 300px;">城际券数量</th>
+ <th style="width: 100px;">操作</th>
+ </tr>
+ </thead>
+ <tbody id="coun">
+
+ </tbody>
+ </table>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="row" id="content5" style="margin-left: 100px;">
+ <div class="col-sm-11">
+ <div class="form-group">
+ <div class="col-sm-10">
+ <h1>打折活动奖励</h1>
+ <br/>
+ <br/>
+ 启用： <input type="checkbox" id="content5Check" class="js-switch2" checked="">
+ <br/>
+ <br/>
+ 专车活动打折：
+
+ <input type="text" name="zc1" id="content5Num1" class="form-control newWidth" /> 折
+ <br/>
+ <br/>
+ 出租车活动打折：
+
+ <input type="text" name="zc1" id="content5Num2" class="form-control newWidth" /> 折
+ <br/>
+ <br/>
+ 小件物流活动打折：
+ <input type="text" name="zc1" id="content5Num3" class="form-control newWidth" /> 折
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row" id="content6" style="margin-left: 100px;">
+ <div class="col-sm-11">
+ <div class="form-group">
+ <div class="col-sm-10">
+ <input type="hidden" id="content6RedId">
+ <h1>红包活动奖励</h1>
+ <br/>
+ <br/>
+ 启用： <input type="checkbox" id="content6Check" class="js-switch3" checked="">
+ <br/>
+ <br/>
+ <#button name="选择红包" icon="fa-plus" clickFun="UserActivityInfoDlg.toSelectRedOpt()"/>
+ <br/>
+ <br/>
+ 红包类型：
+
+
+ <input type="text" name="zc1" id="content6Num1" class="form-control newWidth" readonly/>
+ <br/>
+ <br/>
+ 总金额：
+
+
+ <input type="text" name="zc1" id="content6Num2" class="form-control newWidth" readonly/>
+ <br/>
+ <br/>
+ 每个红包金额： <input type="text" name="zc1" id="content6Num3" class="form-control newWidth" readonly/>
+ <br/>
+ <br/>
+ 有效期：
+
+ <input type="text" name="zc1" id="content6Num4" class="form-control newWidth" readonly/> 天
+ <br/>
+ <br/>
+ 最高金额： <input type="text" name="zc1" id="content6Num5" class="form-control newWidth" />
+ <br/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <input type="hidden" id="type" value="1">
+ <#button btnCss="info" name="保存" id="ensure" icon="fa-check" clickFun="UserActivityInfoDlg.addSubmit()"/>
+ <#button btnCss="info" name="下一步" icon="fa-check" id="nextB" clickFun="nextContent()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/js/plugins/switchery/switchery.js"></script>
+<script src="${ctxPath}/static/modular/system/userActivity/userActivity_info.js"></script>
+<script>
+ var elem = document.querySelector('.js-switch');
+ var switchery = new Switchery(elem,{size:"large"});
+ var elem1 = document.querySelector('.js-switch1');
+ var switchery1 = new Switchery(elem1,{size:"large"});
+ var elem2 = document.querySelector('.js-switch2');
+ var switchery2 = new Switchery(elem2,{size:"large"});
+ var elem3 = document.querySelector('.js-switch3');
+ var switchery3 = new Switchery(elem3,{size:"large"});
+ var elem4 = document.querySelector('.js-switch4');
+ var switchery4 = new Switchery(elem4,{size:"large"});
+
+ laydate.render({
+ elem: '#startTime'
+ ,type: 'datetime'
+ ,range: true
+ ,min: 'new Date()' //最小值今天
+ });
+ $(function(){
+ getContent(1);
+ });
+ function getContent(type){
+ //设置点击字体颜色效果
+ for(var i=1;i<7;i++){
+ document.getElementById("div"+i).style.color="#888888";//
+ document.getElementById("div"+i).style.backgroundColor ="";
+ $("#content"+i).hide();
+ }
+ //设置点击背景颜色效果
+ document.getElementById("div"+type).style.color="white";//
+ document.getElementById("div"+type).style.backgroundColor ="rgb(26, 179, 148)";
+ $("#type").val(type);
+ $("#content"+type).show();
+ if(type!=6){
+ $("#ensure").hide();
+ $("#nextB").show();
+ }else{
+ $("#ensure").show();
+ $("#nextB").hide();
+ }
+ }
+ function nextContent(){
+ var type = $("#type").val();
+ getContent(parseInt(type)+1);
+ if(parseInt(type)+1==6){
+ $("#ensure").show();
+ $("#nextB").hide();
+ }
+ }
+</script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_detail.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_detail.html
new file mode 100644
index 0000000..a81ec06
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_detail.html
@@ -0,0 +1,496 @@
+@layout("/common/_container.html"){
+<link href="${ctxPath}/static/css/plugins/switchery/switchery.css" rel="stylesheet">
+<style>
+ .table1{
+ display: inline;
+ width: 16.6666666%;
+ float:left;
+ text-align:center;
+ border-collapse:collapse;
+ font-size: 18px;
+ }
+ .table1:hover{
+ background-color: rgba(255,0,0,.3);
+ }
+ .newWidth, .single-line{
+ max-width:150px !important;display: initial !important;
+ }
+</style>
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+ <div class="row">
+ <input type="hidden" id="id" id="${item.id}">
+ <div class="col-sm-10">
+ <div style="height: 50px;box-sizing: border-box;background:#f3f3f4;line-height: 50px;border:1px solid;margin-bottom: 20px;">
+ <div id="div1" class='table1' onclick="getContent(1)" style="border-right: 1px solid #333;background-color: rgb(26, 179, 148);color: white;">活动设置</div>
+ <div id="div2" class='table1' onclick="getContent(2)" style="border-right: 1px solid #333;">注册奖励</div>
+ <div id="div3" class='table1' onclick="getContent(3)" style="border-right: 1px solid #333;">邀请奖励</div>
+ <div id="div4" class='table1' onclick="getContent(4)" style="border-right: 1px solid #333;">充值赠送</div>
+ <div id="div5" class='table1' onclick="getContent(5)" style="border-right: 1px solid #333;">打折活动</div>
+ <div id="div6" class='table1' onclick="getContent(6)" style="border-right: 1px solid #333;">红包活动</div>
+ </div>
+ <div class="row" id="content1" style="margin-left: 100px;">
+ <div class="col-sm-11">
+ <div class="form-group">
+ <div class="col-sm-10">
+ <h1>活动详情</h1>
+ <br/>
+ <br/>
+ 活动名称： <input type="text" name="zc1" id="name" value="${item.name}" class="form-control newWidth" readonly/>
+ <br/>
+ <br/>
+ 活动时间： <input type="text" id="startTime" name="zc7" class="form-control" style="max-width:300px !important;display: initial !important;" readonly/>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="row" id="content2" style="margin-left: 100px;">
+ <div class="col-sm-11">
+ <div class="form-group">
+ <div class="col-sm-15">
+ <input type="hidden"
+ @if(isNotEmpty(item1)){
+ value="${item1.couponId}"
+ @}else{
+ value=""
+ @}
+ id="content2CouponId">
+
+ <h1>用户注册既赠送优惠券</h1>
+ <br/>
+ <br/>
+ 启用： <input type="checkbox"
+ @if(isNotEmpty(item1) && item1.enable==2){
+ checked=""
+ @}
+ class="js-switch" id="content2Check">
+ <br/>
+ <br/>
+ 优惠券名称： <input type="text"
+ @if(isNotEmpty(item1Coupon)){
+ value="${item1Coupon.name}"
+ @}else{
+ value=""
+ @}
+ name="zc1" id="content2Num1" class="form-control newWidth" readonly/>
+ <br/>
+ <br/>
+ 服务类型： <input type="text"
+ @if(isNotEmpty(item1Coupon)){
+ value="${item1Coupon.couponUseType==0?'通用券':
+ item1Coupon.couponUseType==1?'专车券':
+ item1Coupon.couponUseType==2?'出租券':'跨城出行券'}"
+ @}else{
+ value=""
+ @}
+ name="zc1" id="content2Num2" class="form-control newWidth" readonly/>
+ <br/>
+ <br/>
+ 优惠券类型： <input type="text"
+ @if(isNotEmpty(item1Coupon)){
+ value="${item1Coupon.couponType==1?'抵扣':'满减'}"
+ @}else{
+ value=""
+ @}
+ name="zc1" id="content2Num3" class="form-control newWidth" readonly/>
+ <br/>
+ <br/>
+ 金额：
+
+
+ <input type="text"
+ @if(isNotEmpty(item1Coupon)){
+ value="${item1Coupon.money}"
+ @}else{
+ value=""
+ @}
+ name="zc1" id="content2Num4" class="form-control newWidth" readonly/>
+ <br/>
+ <br/>
+ 最高金额： <input type="text"
+ @if(isNotEmpty(item1)){
+ value="${item1.totalPrice}"
+ @}else{
+ value=""
+ @}
+ name="zc1" id="content2Num7" class="form-control newWidth" readonly/>
+ <br/>
+ <br/>
+ 有效期：
+
+ <input type="text"
+ @if(isNotEmpty(item1)){
+ value="${item1.effective}"
+ @}else{
+ value=""
+ @}
+ name="zc1" id="content2Num5" class="form-control newWidth" readonly/> 天
+ <br/>
+ <br/>
+ 张数：
+
+
+ <input type="text"
+ @if(isNotEmpty(item1)){
+ value="${item1.totalNum}"
+ @}else{
+ value=""
+ @}
+ name="zc1" id="content2Num6" class="form-control newWidth" readonly/>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="row" id="content3" style="margin-left: 100px;">
+ <div class="col-sm-11">
+ <div class="form-group">
+ <div class="col-sm-10">
+ <input type="hidden"
+ @if(isNotEmpty(item2)){
+ value="${item2.couponId}"
+ @}else{
+ value=""
+ @}
+ id="content3CouponId">
+
+ <h1>用户邀请用户奖励</h1>
+ <br/>
+ <br/>
+ 启用： <input
+ @if(isNotEmpty(item2) && item2.enable==2){
+ checked=""
+ @}
+ type="checkbox" id="content3Check" class="js-switch1">
+ <br/>
+ <br/>
+ 优惠券名称： <input type="text"
+ @if(isNotEmpty(item2Coupon)){
+ value="${item2Coupon.name}"
+ @}else{
+ value=""
+ @}
+ name="zc1" id="content3Num1" class="form-control newWidth" readonly/>
+ <br/>
+ <br/>
+ 服务类型： <input type="text"
+
+ @if(isNotEmpty(item2Coupon)){
+ value="${item2Coupon.couponUseType==0?'通用券':
+ item2Coupon.couponUseType==1?'专车券':
+ item2Coupon.couponUseType==2?'出租券':'跨城出行券'}"
+ @}else{
+ value=""
+ @}
+ name="zc1" id="content3Num2" class="form-control newWidth" readonly/>
+ <br/>
+ <br/>
+ 优惠券类型： <input type="text"
+ @if(isNotEmpty(item2Coupon)){
+ value="${item2Coupon.couponType==1?'抵扣':'满减'}"
+ @}else{
+ value=""
+ @}
+ name="zc1" id="content3Num3" class="form-control newWidth" readonly/>
+ <br/>
+ <br/>
+ 金额：
+
+
+ <input type="text"
+ @if(isNotEmpty(item2Coupon)){
+ value="${item2Coupon.money}"
+ @}else{
+ value=""
+ @}
+ name="zc1" id="content3Num4" class="form-control newWidth" readonly/>
+ <br/>
+ <br/>
+ 最高金额： <input type="text"
+ @if(isNotEmpty(item2)){
+ value="${item2.totalPrice}"
+ @}else{
+ value=""
+ @}
+ name="zc1" id="content3Num7" class="form-control newWidth" readonly/>
+ <br/>
+ <br/>
+ 有效期：
+
+ <input type="text"
+ @if(isNotEmpty(item2)){
+ value="${item2.effective}"
+ @}else{
+ value=""
+ @}
+ name="zc1" id="content3Num5" class="form-control newWidth" readonly/> 天
+ <br/>
+ <br/>
+ 张数：
+
+
+ <input type="text"
+ @if(isNotEmpty(item2)){
+ value="${item2.totalNum}"
+ @}else{
+ value=""
+ @}
+ name="zc1" id="content3Num6" class="form-control newWidth" readonly/>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="row" id="content4" style="margin-left: 100px;">
+ <div class="col-sm-11">
+ <h1>充值赠送奖励</h1>
+ <br/>
+ <br/>
+ <div class="form-group">
+ <div class="col-sm-10">
+ 启用：
+ <input type="checkbox"
+ @if(isNotEmpty(balanceInfoList) && balanceInfoList[0].enable==2){
+ checked=""
+ @}
+ id="content4Check" class="js-switch4">
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-sm-15">
+ <div style="height: 200px; border: 1px solid #e5e6e7;overflow-y: auto;">
+ <table class="table table-striped table-bordered table-hover table-condensed">
+ <thead>
+ <tr>
+ <th style="width: 250px;">充值金额</th>
+ <th style="width: 250px;">有效天数</th>
+ <th style="width: 300px;">最高金额</th>
+ <th style="width: 300px;">通用券金额</th>
+ <th style="width: 300px;">通用券数量</th>
+ <th style="width: 300px;">专车券金额</th>
+ <th style="width: 300px;">专车券数量</th>
+ <th style="width: 400px;">出租车券金额</th>
+ <th style="width: 400px;">出租车券数量</th>
+ <th style="width: 300px;">城际金额</th>
+ <th style="width: 300px;">城际券数量</th>
+ </tr>
+ </thead>
+ <tbody id="coun">
+ @for(obj in balanceInfoList){
+ <tr class="timeClass">' +
+ <td><input type="hidden" id="num1" name="num1" value="${obj.money}">${obj.money}</td>
+ <td><input type="hidden" id="num10" name="num10" value="${obj.effective}">${obj.effective}</td>
+ <td><input type="hidden" id="num11" name="num3" value="${obj.totalPrice}">${obj.totalPrice}</td>
+ <td><input type="hidden" id="num3" name="num3" value="${obj.generalCouponMoney}">${obj.generalCouponMoney}</td>
+ <td><input type="hidden" id="num2" name="num2" value="${obj.generalNum}">${obj.generalNum}</td>
+
+ <td><input type="hidden" id="num5" name="num5" value="${obj.specialCouponMoney}">${obj.specialCouponMoney}</td>
+ <td><input type="hidden" id="num4" name="num4" value="${obj.specialNum}">${obj.specialNum}</td>
+
+ <td><input type="hidden" id="num7" name="num7" value="${obj.taxiCouponMoney}">${obj.taxiCouponMoney}</td>
+ <td><input type="hidden" id="num6" name="num6" value="${obj.taxiNum}">${obj.taxiNum}</td>
+
+ <td><input type="hidden" id="num9" name="num9" value="${obj.intercityCouponMoney}">${obj.intercityCouponMoney}</td>
+ <td><input type="hidden" id="num8" name="num8" value="${obj.intercityNum}">${obj.intercityNum}</td>
+ </tr>
+ @}
+ </tbody>
+ </table>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="row" id="content5" style="margin-left: 100px;">
+ <div class="col-sm-11">
+ <div class="form-group">
+ <div class="col-sm-10">
+ <h1>打折活动奖励</h1>
+ <br/>
+ <br/>
+ 启用： <input
+ @if(isNotEmpty(item4) && item4.enable==2){
+ checked=""
+ @}
+ type="checkbox" id="content5Check" class="js-switch2">
+ <br/>
+ <br/>
+ 专车活动打折：
+
+ <input type="text"
+ @if(isNotEmpty(item4)){
+ value="${item4.special}"
+ @}else{
+ value=""
+ @}
+ name="zc1" id="content5Num1" class="form-control newWidth" readonly/>
+ <br/>
+ <br/>
+ 出租车活动打折：
+
+ <input type="text"
+ @if(isNotEmpty(item4)){
+ value="${item4.taxi}"
+ @}else{
+ value=""
+ @}
+ name="zc1" id="content5Num2" class="form-control newWidth" readonly/>
+ <br/>
+ <br/>
+ 小件物流活动打折：
+ <input type="text"
+ @if(isNotEmpty(item4)){
+ value="${item4.logistics}"
+ @}else{
+ value=""
+ @}
+ name="zc1" id="content5Num3" class="form-control newWidth" readonly />
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row" id="content6" style="margin-left: 100px;">
+ <div class="col-sm-11">
+ <div class="form-group">
+ <div class="col-sm-10">
+ <input type="hidden"
+ @if(isNotEmpty(item5)){
+ value="${item5.redEnvelopeId}"
+ @}else{
+ value=""
+ @}
+ id="content6RedId">
+
+ <h1>红包活动奖励</h1>
+ <br/>
+ <br/>
+ 启用： <input type="checkbox"
+ @if(isNotEmpty(item5) && item5.enable==2){
+ checked=""
+ @}
+ id="content6Check" class="js-switch3">
+ <br/>
+ <br/>
+ 红包类型：
+
+
+ <input type="text"
+ @if(isNotEmpty(item5Red)){
+ value="${item5Red.type==1?'固定金额':'随机金额'}"
+ @}else{
+ value=""
+ @}
+ name="zc1" id="content6Num1" class="form-control newWidth" readonly/>
+ <br/>
+ <br/>
+ 总金额：
+
+
+ <input type="text"
+
+ @if(isNotEmpty(item5Red)){
+ value="${item5Red.totalMoney}"
+ @}else{
+ value=""
+ @}
+ name="zc1" id="content6Num2" class="form-control newWidth" readonly/>
+ <br/>
+ <br/>
+ 每个红包金额： <input type="text"
+ @if(isNotEmpty(item5Red)){
+ value="${item5Red.type==1?item5Red.money:item5Red.startMoney+'-'+item5Red.endMoney}"
+ @}else{
+ value=""
+ @}
+ name="zc1" id="content6Num3" class="form-control newWidth" readonly/>
+ <br/>
+ <br/>
+ 有效期：
+
+ <input type="text"
+
+ @if(isNotEmpty(item5Red)){
+ value="${item5Red.effective}"
+ @}else{
+ value=""
+ @}
+ name="zc1" id="content6Num4" class="form-control newWidth" readonly/> 天，
+ 最高金额： <input type="text"
+ @if(isNotEmpty(item5)){
+ value="${item5.totalPrice}"
+ @}else{
+ value=""
+ @}
+ name="zc1" id="content6Num5" class="form-control newWidth" readonly/>
+ <br/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <input type="hidden" id="type" value="1">
+ <#button btnCss="info" name="关闭" id="ensure" icon="fa-check" clickFun="UserActivityInfoDlg.close()"/>
+ <#button btnCss="info" name="下一步" icon="fa-check" id="nextB" clickFun="nextContent()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/js/plugins/switchery/switchery.js"></script>
+<script src="${ctxPath}/static/modular/system/userActivity/userActivity_info.js"></script>
+<script>
+ var elem = document.querySelector('.js-switch');
+ var switchery = new Switchery(elem,{size:"large"});
+ var elem1 = document.querySelector('.js-switch1');
+ var switchery1 = new Switchery(elem1,{size:"large"});
+ var elem2 = document.querySelector('.js-switch2');
+ var switchery2 = new Switchery(elem2,{size:"large"});
+ var elem3 = document.querySelector('.js-switch3');
+ var switchery3 = new Switchery(elem3,{size:"large"});
+ var elem4 = document.querySelector('.js-switch4');
+ var switchery4 = new Switchery(elem4,{size:"large"});
+
+ laydate.render({
+ elem: '#startTime'
+ ,type: 'datetime'
+ ,range: true
+ });
+ $("#startTime").val("${startTime} - ${endTime}")
+ $(function(){
+ getContent(1);
+ });
+ function getContent(type){
+ //设置点击字体颜色效果
+ for(var i=1;i<7;i++){
+ document.getElementById("div"+i).style.color="#888888";//
+ document.getElementById("div"+i).style.backgroundColor ="";
+ $("#content"+i).hide();
+ }
+ //设置点击背景颜色效果
+ document.getElementById("div"+type).style.color="white";//
+ document.getElementById("div"+type).style.backgroundColor ="rgb(26, 179, 148)";
+ $("#type").val(type);
+ $("#content"+type).show();
+ if(type!=6){
+ $("#ensure").hide();
+ $("#nextB").show();
+ }else{
+ $("#ensure").show();
+ $("#nextB").hide();
+ }
+ }
+ function nextContent(){
+ var type = $("#type").val();
+ getContent(parseInt(type)+1);
+ if(parseInt(type)+1==6){
+ $("#ensure").show();
+ $("#nextB").hide();
+ }
+ }
+</script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_edit.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_edit.html
new file mode 100644
index 0000000..46e2c07
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_edit.html
@@ -0,0 +1,509 @@
+@layout("/common/_container.html"){
+<link href="${ctxPath}/static/css/plugins/switchery/switchery.css" rel="stylesheet">
+<style>
+ .table1{
+ display: inline;
+ width: 16.6666666%;
+ float:left;
+ text-align:center;
+ border-collapse:collapse;
+ font-size: 18px;
+ }
+ .table1:hover{
+ background-color: rgba(255,0,0,.3);
+ }
+ .newWidth, .single-line{
+ max-width:150px !important;display: initial !important;
+ }
+</style>
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+ <div class="row">
+ <input type="hidden" id="id" value="${item.id}">
+ <div class="col-sm-10">
+ <div style="height: 50px;box-sizing: border-box;background:#f3f3f4;line-height: 50px;border:1px solid;margin-bottom: 20px;">
+ <div id="div1" class='table1' onclick="getContent(1)" style="border-right: 1px solid #333;background-color: rgb(26, 179, 148);color: white;">活动设置</div>
+ <div id="div2" class='table1' onclick="getContent(2)" style="border-right: 1px solid #333;">注册奖励</div>
+ <div id="div3" class='table1' onclick="getContent(3)" style="border-right: 1px solid #333;">邀请奖励</div>
+ <div id="div4" class='table1' onclick="getContent(4)" style="border-right: 1px solid #333;">充值赠送</div>
+ <div id="div5" class='table1' onclick="getContent(5)" style="border-right: 1px solid #333;">打折活动</div>
+ <div id="div6" class='table1' onclick="getContent(6)" style="border-right: 1px solid #333;">红包活动</div>
+ </div>
+ <div class="row" id="content1" style="margin-left: 100px;">
+ <div class="col-sm-11">
+ <div class="form-group">
+ <div class="col-sm-10">
+ <h1>编辑活动</h1>
+ <br/>
+ <br/>
+ 活动名称： <input type="text" name="zc1" id="name" value="${item.name}" class="form-control newWidth" />
+ <br/>
+ <br/>
+ 活动时间： <input type="text" id="startTime" name="zc7" class="form-control" style="max-width:300px !important;display: initial !important;"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="row" id="content2" style="margin-left: 100px;">
+ <div class="col-sm-11">
+ <div class="form-group">
+ <div class="col-sm-15">
+ <input type="hidden"
+ @if(isNotEmpty(item1)){
+ value="${item1.couponId}"
+ @}else{
+ value=""
+ @}
+ id="content2CouponId">
+
+ <h1>用户注册既赠送优惠券</h1>
+ <br/>
+ <br/>
+ 启用： <input type="checkbox"
+ @if(isNotEmpty(item1) && item1.enable==2){
+ checked=""
+ @}
+ class="js-switch" id="content2Check">
+ <br/>
+ <br/>
+ <#button name="选择优惠券" icon="fa-plus" clickFun="UserActivityInfoDlg.toSelectCouponOpt()"/>
+ <br/>
+ <br/>
+ 优惠券名称： <input type="text"
+ @if(isNotEmpty(item1Coupon)){
+ value="${item1Coupon.name}"
+ @}else{
+ value=""
+ @}
+ name="zc1" id="content2Num1" class="form-control newWidth" readonly/>
+ <br/>
+ <br/>
+ 服务类型： <input type="text"
+ @if(isNotEmpty(item1Coupon)){
+ value="${item1Coupon.couponUseType==0?'通用券':
+ item1Coupon.couponUseType==1?'专车券':
+ item1Coupon.couponUseType==2?'出租券':'跨城出行券'}"
+ @}else{
+ value=""
+ @}
+ name="zc1" id="content2Num2" class="form-control newWidth" readonly/>
+ <br/>
+ <br/>
+ 优惠券类型： <input type="text"
+ @if(isNotEmpty(item1Coupon)){
+ value="${item1Coupon.couponType==1?'抵扣':'满减'}"
+ @}else{
+ value=""
+ @}
+ name="zc1" id="content2Num3" class="form-control newWidth" readonly/>
+ <br/>
+ <br/>
+ 金额：
+
+
+ <input type="text"
+ @if(isNotEmpty(item1Coupon)){
+ value="${item1Coupon.money}"
+ @}else{
+ value=""
+ @}
+ name="zc1" id="content2Num4" class="form-control newWidth" readonly/>
+ <br/>
+ <br/>
+ 最高金额： <input type="text"
+ @if(isNotEmpty(item1)){
+ value="${item1.totalPrice}"
+ @}else{
+ value=""
+ @}
+ name="zc1" id="content2Num7" class="form-control newWidth" />
+ <br/>
+ <br/>
+ 有效期：
+
+ <input type="text"
+ @if(isNotEmpty(item1)){
+ value="${item1.effective}"
+ @}else{
+ value=""
+ @}
+ name="zc1" id="content2Num5" class="form-control newWidth" /> 天
+ <br/>
+ <br/>
+ 张数：
+
+
+ <input type="text"
+ @if(isNotEmpty(item1)){
+ value="${item1.totalNum}"
+ @}else{
+ value=""
+ @}
+ name="zc1" id="content2Num6" class="form-control newWidth" />
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="row" id="content3" style="margin-left: 100px;">
+ <div class="col-sm-11">
+ <div class="form-group">
+ <div class="col-sm-10">
+ <input type="hidden"
+ @if(isNotEmpty(item2)){
+ value="${item2.couponId}"
+ @}else{
+ value=""
+ @}
+ id="content3CouponId">
+
+ <h1>用户邀请用户奖励</h1>
+ <br/>
+ <br/>
+ 启用： <input
+ @if(isNotEmpty(item2) && item2.enable==2){
+ checked=""
+ @}
+ type="checkbox" id="content3Check" class="js-switch1">
+ <br/>
+ <br/>
+ <#button name="选择优惠券" icon="fa-plus" clickFun="UserActivityInfoDlg.toSelectCouponOpt1()"/>
+ <br/>
+ <br/>
+ 优惠券名称： <input type="text"
+ @if(isNotEmpty(item2Coupon)){
+ value="${item2Coupon.name}"
+ @}else{
+ value=""
+ @}
+ name="zc1" id="content3Num1" class="form-control newWidth" readonly/>
+ <br/>
+ <br/>
+ 服务类型： <input type="text"
+
+ @if(isNotEmpty(item2Coupon)){
+ value="${item2Coupon.couponUseType==0?'通用券':
+ item2Coupon.couponUseType==1?'专车券':
+ item2Coupon.couponUseType==2?'出租券':'跨城出行券'}"
+ @}else{
+ value=""
+ @}
+ name="zc1" id="content3Num2" class="form-control newWidth" readonly/>
+ <br/>
+ <br/>
+ 优惠券类型： <input type="text"
+ @if(isNotEmpty(item2Coupon)){
+ value="${item2Coupon.couponType==1?'抵扣':'满减'}"
+ @}else{
+ value=""
+ @}
+ name="zc1" id="content3Num3" class="form-control newWidth" readonly/>
+ <br/>
+ <br/>
+ 金额：
+
+
+ <input type="text"
+ @if(isNotEmpty(item2Coupon)){
+ value="${item2Coupon.money}"
+ @}else{
+ value=""
+ @}
+ name="zc1" id="content3Num4" class="form-control newWidth" readonly/>
+ <br/>
+ <br/>
+ 最高金额： <input type="text"
+ @if(isNotEmpty(item2)){
+ value="${item2.totalPrice}"
+ @}else{
+ value=""
+ @}
+ name="zc1" id="content3Num7" class="form-control newWidth" />
+ <br/>
+ <br/>
+ 有效期：
+
+ <input type="text"
+ @if(isNotEmpty(item2)){
+ value="${item2.effective}"
+ @}else{
+ value=""
+ @}
+ name="zc1" id="content3Num5" class="form-control newWidth" /> 天
+ <br/>
+ <br/>
+ 张数：
+
+
+ <input type="text"
+ @if(isNotEmpty(item2)){
+ value="${item2.totalNum}"
+ @}else{
+ value=""
+ @}
+ name="zc1" id="content3Num6" class="form-control newWidth" />
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="row" id="content4" style="margin-left: 100px;">
+ <div class="col-sm-11">
+ <h1>充值赠送奖励</h1>
+ <br/>
+ <br/>
+
+ <div class="form-group">
+ <div class="col-sm-10">
+ <#button name="添加" icon="fa-plus" clickFun="UserActivityInfoDlg.toAddRegistOpt()"/>
+ 启用：
+ <input type="checkbox"
+ @if(isNotEmpty(balanceInfoList) && balanceInfoList[0].enable==2){
+ checked=""
+ @}
+ id="content4Check" class="js-switch4">
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-sm-15">
+ <div style="height: 200px; border: 1px solid #e5e6e7;overflow-y: auto;">
+ <table class="table table-striped table-bordered table-hover table-condensed">
+ <thead>
+ <tr>
+ <th style="width: 250px;">充值金额</th>
+ <th style="width: 250px;">有效天数</th>
+ <th style="width: 300px;">最高金额</th>
+ <th style="width: 300px;">通用券金额</th>
+ <th style="width: 300px;">通用券数量</th>
+ <th style="width: 300px;">专车券金额</th>
+ <th style="width: 300px;">专车券数量</th>
+ <th style="width: 400px;">出租车券金额</th>
+ <th style="width: 400px;">出租车券数量</th>
+ <th style="width: 300px;">城际金额</th>
+ <th style="width: 300px;">城际券数量</th>
+ <th style="width: 100px;">操作</th>
+ </tr>
+ </thead>
+ <tbody id="coun">
+ @for(obj in balanceInfoList){
+ <tr class="timeClass">' +
+ <td><input type="hidden" id="id1" name="id1" value="${obj.generalCouponId}"><input type="hidden" id="num1" name="num1" value="${obj.money}">${obj.money}</td>
+ <td><input type="hidden" id="id2" name="id2" value="${obj.specialCouponId}"><input type="hidden" id="num10" name="num10" value="${obj.effective}">${obj.effective}</td>
+ <td><input type="hidden" id="num11" name="num11" value="${obj.totalPrice}">${obj.totalPrice}</td>
+ <td><input type="hidden" id="id3" name="id3" value="${obj.taxiCouponId}"><input type="hidden" id="num3" name="num3" value="${obj.generalCouponMoney}">${obj.generalCouponMoney}</td>
+ <td><input type="hidden" id="id4" name="id4" value="${obj.intercityCouponId}"><input type="hidden" id="num2" name="num2" value="${obj.generalNum}">${obj.generalNum}</td>
+
+ <td><input type="hidden" id="num5" name="num5" value="${obj.specialCouponMoney}">${obj.specialCouponMoney}</td>
+ <td><input type="hidden" id="num4" name="num4" value="${obj.specialNum}">${obj.specialNum}</td>
+
+ <td><input type="hidden" id="num7" name="num7" value="${obj.taxiCouponMoney}">${obj.taxiCouponMoney}</td>
+ <td><input type="hidden" id="num6" name="num6" value="${obj.taxiNum}">${obj.taxiNum}</td>
+
+ <td><input type="hidden" id="num9" name="num9" value="${obj.intercityCouponMoney}">${obj.intercityCouponMoney}</td>
+ <td><input type="hidden" id="num8" name="num8" value="${obj.intercityNum}">${obj.intercityNum}</td>
+ <td><button onclick="deleteSub(this)">移除</button></td>
+ </tr>
+ @}
+ </tbody>
+ </table>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="row" id="content5" style="margin-left: 100px;">
+ <div class="col-sm-11">
+ <div class="form-group">
+ <div class="col-sm-10">
+ <h1>打折活动奖励</h1>
+ <br/>
+ <br/>
+ 启用： <input
+ @if(isNotEmpty(item4) && item4.enable==2){
+ checked=""
+ @}
+ type="checkbox" id="content5Check" class="js-switch2">
+ <br/>
+ <br/>
+ 专车活动打折：
+
+ <input type="text"
+ @if(isNotEmpty(item4)){
+ value="${item4.special}"
+ @}else{
+ value=""
+ @}
+ name="zc1" id="content5Num1" class="form-control newWidth" />
+ <br/>
+ <br/>
+ 出租车活动打折：
+
+ <input type="text"
+ @if(isNotEmpty(item4)){
+ value="${item4.taxi}"
+ @}else{
+ value=""
+ @}
+ name="zc1" id="content5Num2" class="form-control newWidth" />
+ <br/>
+ <br/>
+ 小件物流活动打折：
+ <input type="text"
+ @if(isNotEmpty(item4)){
+ value="${item4.logistics}"
+ @}else{
+ value=""
+ @}
+ name="zc1" id="content5Num3" class="form-control newWidth" />
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row" id="content6" style="margin-left: 100px;">
+ <div class="col-sm-11">
+ <div class="form-group">
+ <div class="col-sm-10">
+ <input type="hidden"
+ @if(isNotEmpty(item5)){
+ value="${item5.redEnvelopeId}"
+ @}else{
+ value=""
+ @}
+ id="content6RedId">
+
+ <h1>红包活动奖励</h1>
+ <br/>
+ <br/>
+ 启用： <input type="checkbox"
+ @if(isNotEmpty(item5) && item5.enable==2){
+ checked=""
+ @}
+ id="content6Check" class="js-switch3">
+ <br/>
+ <br/>
+ <#button name="选择红包" icon="fa-plus" clickFun="UserActivityInfoDlg.toSelectRedOpt()"/>
+ <br/>
+ <br/>
+ 红包类型：
+
+
+ <input type="text"
+ @if(isNotEmpty(item5Red)){
+ value="${item5Red.type==1?'固定金额':'随机金额'}"
+ @}else{
+ value=""
+ @}
+ name="zc1" id="content6Num1" class="form-control newWidth" readonly/>
+ <br/>
+ <br/>
+ 总金额：
+
+
+ <input type="text"
+
+ @if(isNotEmpty(item5Red)){
+ value="${item5Red.totalMoney}"
+ @}else{
+ value=""
+ @}
+ name="zc1" id="content6Num2" class="form-control newWidth" readonly/>
+ <br/>
+ <br/>
+ 每个红包金额： <input type="text"
+ @if(isNotEmpty(item5Red)){
+ value="${item5Red.type==1?item5Red.money:item5Red.startMoney+'-'+item5Red.endMoney}"
+ @}else{
+ value=""
+ @}
+ name="zc1" id="content6Num3" class="form-control newWidth" readonly/>
+ <br/>
+ <br/>
+ 有效期：
+
+ <input type="text"
+
+ @if(isNotEmpty(item5Red)){
+ value="${item5Red.effective}"
+ @}else{
+ value=""
+ @}
+ name="zc1" id="content6Num4" class="form-control newWidth" readonly/> 天
+ 最高金额： <input type="text"
+ @if(isNotEmpty(item5)){
+ value="${item5.totalPrice}"
+ @}else{
+ value=""
+ @}
+ name="zc1" id="content6Num5" class="form-control newWidth" />
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <input type="hidden" id="type" value="1">
+ <#button btnCss="info" name="保存" id="ensure" icon="fa-check" clickFun="UserActivityInfoDlg.editSubmit()"/>
+ <#button btnCss="info" name="下一步" icon="fa-check" id="nextB" clickFun="nextContent()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/js/plugins/switchery/switchery.js"></script>
+<script src="${ctxPath}/static/modular/system/userActivity/userActivity_info.js"></script>
+<script>
+ var elem = document.querySelector('.js-switch');
+ var switchery = new Switchery(elem,{size:"large"});
+ var elem1 = document.querySelector('.js-switch1');
+ var switchery1 = new Switchery(elem1,{size:"large"});
+ var elem2 = document.querySelector('.js-switch2');
+ var switchery2 = new Switchery(elem2,{size:"large"});
+ var elem3 = document.querySelector('.js-switch3');
+ var switchery3 = new Switchery(elem3,{size:"large"});
+ var elem4 = document.querySelector('.js-switch4');
+ var switchery4 = new Switchery(elem4,{size:"large"});
+
+ laydate.render({
+ elem: '#startTime'
+ ,type: 'datetime'
+ ,range: true
+ ,min: 'new Date()' //最小值今天
+ });
+ $("#startTime").val("${startTime} - ${endTime}")
+ $(function(){
+ getContent(1);
+ });
+ function getContent(type){
+ //设置点击字体颜色效果
+ for(var i=1;i<7;i++){
+ document.getElementById("div"+i).style.color="#888888";//
+ document.getElementById("div"+i).style.backgroundColor ="";
+ $("#content"+i).hide();
+ }
+ //设置点击背景颜色效果
+ document.getElementById("div"+type).style.color="white";//
+ document.getElementById("div"+type).style.backgroundColor ="rgb(26, 179, 148)";
+ $("#type").val(type);
+ $("#content"+type).show();
+ if(type!=6){
+ $("#ensure").hide();
+ $("#nextB").show();
+ }else{
+ $("#ensure").show();
+ $("#nextB").hide();
+ }
+ }
+ function nextContent(){
+ var type = $("#type").val();
+ getContent(parseInt(type)+1);
+ if(parseInt(type)+1==6){
+ $("#ensure").show();
+ $("#nextB").hide();
+ }
+ }
+</script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_immediately.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_immediately.html
new file mode 100644
index 0000000..72c3304
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_immediately.html
@@ -0,0 +1,41 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="userActivityInfoForm">
+ <input type="hidden" id="id" name="id" value="${id}">
+ <div class="row">
+ <div class="col-sm-10">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">处理意见：</label>
+ <div class="col-sm-9" style="display: flex;align-items: center;">
+ <div class="radio radio-info radio-inline">
+ <input type="radio" id="state2" value="3" name="state" checked="" >
+ <label for="state2"> 同意 </label>
+ </div>
+ <div class="radio radio-success radio-inline">
+ <input type="radio" id="state3" value="2" name="state" >
+ <label for="state3"> 拒绝 </label>
+ </div>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">填写备注：</label>
+ <div class="col-sm-9">
+ <textarea type="text/plain" class="form-control" name="remark" id="remark" style="width:100%;height:150px;"></textarea>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="UserActivityInfoDlg.immediately()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="UserActivityInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/userActivity/userActivity_info.js"></script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userCouponRecord/userCouponRecord.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userCouponRecord/userCouponRecord.html
new file mode 100644
index 0000000..b0792f2
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userCouponRecord/userCouponRecord.html
@@ -0,0 +1,61 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <input type="hidden" id="activityType" value="${activityType}">
+ <input type="hidden" id="couponActivityId" value="${couponActivityId}">
+ <div class="row">
+ <div class="col-sm-3">
+ <#TimeCon id="createTime" name="领取时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="userName" name="领取人" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="userPhone" name="领取人电话" />
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="state" name="状态" >
+ <option value="">全部</option>
+ <option value="1">未使用</option>
+ <option value="2">已使用</option>
+ <option value="3">已过期</option>
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="UserCouponRecord.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="UserCouponRecord.resetSearch()" space="true"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="UserCouponRecordTableToolbar" role="group">
+ @if(shiro.hasPermission("/userCouponRecord/add")){
+ <#button name="添加" icon="fa-plus" clickFun="UserCouponRecord.openAddUserCouponRecord()"/>
+ @}
+ @if(shiro.hasPermission("/userCouponRecord/update")){
+ <#button name="修改" icon="fa-edit" clickFun="UserCouponRecord.openUserCouponRecordDetail()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/userCouponRecord/delete")){
+ <#button name="删除" icon="fa-remove" clickFun="UserCouponRecord.delete()" space="true"/>
+ @}
+ </div>
+ <#table id="UserCouponRecordTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/userCouponRecord/userCouponRecord.js"></script>
+<script>
+ laydate.render({
+ elem: '#createTime'
+ ,range: true
+ });
+</script>
+@}
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/web.xml b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 0000000..ee7c48d
--- /dev/null
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://xmlns.jcp.org/xml/ns/javaee" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd" version="3.1">
+ <display-name>guns-admin</display-name>
+ <welcome-file-list>
+ <welcome-file>index.html</welcome-file>
+ <welcome-file>index.htm</welcome-file>
+ <welcome-file>index.jsp</welcome-file>
+ <welcome-file>default.html</welcome-file>
+ <welcome-file>default.htm</welcome-file>
+ <welcome-file>default.jsp</welcome-file>
+ </welcome-file-list>
+</web-app>
\ No newline at end of file
--
Gitblit v1.7.1