From d3c95161ce9aa2d54aaf78ab87dee9a825a89d19 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 31 三月 2025 11:24:26 +0800
Subject: [PATCH] 放开专车模块代码
---
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_add.html | 8
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_add.html | 2
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOpenCity/tOpenCity_edit.html | 2
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponRecord/sysCouponRecord_add.html | 2
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_edit.html | 2
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_updateFranchisee.html | 2
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_edit.html | 8
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity_edit.html | 2
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tUser/tUser_userDetail.html | 2
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/addRegist.html | 2
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity_add.html | 2
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/platformEdit.html | 2
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCar/tCar_add.html | 2
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCar/tCar_edit.html | 2
ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSysReformistController.java | 102 ++++----
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSysReformist/tSysReformist.html | 79 +++---
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_add.html | 6
ManagementOKTravel/guns-admin/src/main/resources/application.yml | 28 +-
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/receiveRecord.html | 6
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_detail.html | 2
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponRecord/sysCouponRecord.html | 2
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_edit.html | 6
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity_detail.html | 2
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/home.html | 28 +-
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/receiveRecord.html | 2
/dev/null | 383 -------------------------------
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_addFranchisee.html | 2
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderEvaluate/tOrderEvaluate.html | 2
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_detailFranchisee.html | 2
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponActivity/sysCouponActivity.html | 2
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/report/operationalData.html | 4
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_detail.html | 6
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOpenCity/tOpenCity_add.html | 2
33 files changed, 162 insertions(+), 544 deletions(-)
diff --git a/ManagementOKTravel/guns-admin/sql/basepro2018011116.sql b/ManagementOKTravel/guns-admin/sql/basepro2018011116.sql
deleted file mode 100644
index ce57b0a..0000000
--- a/ManagementOKTravel/guns-admin/sql/basepro2018011116.sql
+++ /dev/null
@@ -1,383 +0,0 @@
-/*
-Navicat MySQL Data Transfer
-
-Source Server : localhost_3306(123456)
-Source Server Version : 50721
-Source Host : localhost:3306
-Source Database : basepro
-
-Target Server Type : MYSQL
-Target Server Version : 50721
-File Encoding : 65001
-
-Date: 2019-01-11 16:23:18
-*/
-
-SET FOREIGN_KEY_CHECKS=0;
-
--- ----------------------------
--- Table structure for sys_dept
--- ----------------------------
-DROP TABLE IF EXISTS `sys_dept`;
-CREATE TABLE `sys_dept` (
- `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键id',
- `num` int(11) DEFAULT NULL COMMENT '排序',
- `pid` int(11) DEFAULT NULL COMMENT '父部门id',
- `pids` varchar(255) DEFAULT NULL COMMENT '父级ids',
- `simplename` varchar(45) DEFAULT NULL COMMENT '简称',
- `fullname` varchar(255) DEFAULT NULL COMMENT '全称',
- `tips` varchar(255) DEFAULT NULL COMMENT '提示',
- `version` int(11) DEFAULT NULL COMMENT '版本（乐观锁保留字段）',
- PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=28 DEFAULT CHARSET=utf8 COMMENT='部门表';
-
--- ----------------------------
--- Records of sys_dept
--- ----------------------------
-INSERT INTO `sys_dept` VALUES ('24', '1', '0', '[0],', '总公司', '总公司', '', null);
-INSERT INTO `sys_dept` VALUES ('25', '2', '24', '[0],[24],', '开发部', '开发部', '', null);
-INSERT INTO `sys_dept` VALUES ('26', '3', '24', '[0],[24],', '运营部', '运营部', '', null);
-INSERT INTO `sys_dept` VALUES ('27', '4', '24', '[0],[24],', '战略部', '战略部', '', null);
-
--- ----------------------------
--- Table structure for sys_dict
--- ----------------------------
-DROP TABLE IF EXISTS `sys_dict`;
-CREATE TABLE `sys_dict` (
- `id` int(11) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键id',
- `num` int(11) DEFAULT NULL COMMENT '排序',
- `pid` int(11) DEFAULT NULL COMMENT '父级字典',
- `name` varchar(255) DEFAULT NULL COMMENT '名称',
- `tips` varchar(255) DEFAULT NULL COMMENT '提示',
- `code` varchar(255) DEFAULT NULL COMMENT '值',
- PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=60 DEFAULT CHARSET=utf8 COMMENT='字典表';
-
--- ----------------------------
--- Records of sys_dict
--- ----------------------------
-INSERT INTO `sys_dict` VALUES ('50', '0', '0', '性别', null, 'sys_sex');
-INSERT INTO `sys_dict` VALUES ('51', '1', '50', '男', null, '1');
-INSERT INTO `sys_dict` VALUES ('52', '2', '50', '女', null, '2');
-INSERT INTO `sys_dict` VALUES ('53', '0', '0', '状态', null, 'sys_state');
-INSERT INTO `sys_dict` VALUES ('54', '1', '53', '启用', null, '1');
-INSERT INTO `sys_dict` VALUES ('55', '2', '53', '禁用', null, '2');
-INSERT INTO `sys_dict` VALUES ('56', '0', '0', '账号状态', null, 'account_state');
-INSERT INTO `sys_dict` VALUES ('57', '1', '56', '启用', null, '1');
-INSERT INTO `sys_dict` VALUES ('58', '2', '56', '冻结', null, '2');
-INSERT INTO `sys_dict` VALUES ('59', '3', '56', '已删除', null, '3');
-
--- ----------------------------
--- Table structure for sys_expense
--- ----------------------------
-DROP TABLE IF EXISTS `sys_expense`;
-CREATE TABLE `sys_expense` (
- `id` int(11) NOT NULL AUTO_INCREMENT,
- `money` decimal(20,2) DEFAULT NULL COMMENT '报销金额',
- `desc` varchar(255) DEFAULT '' COMMENT '描述',
- `createtime` datetime DEFAULT NULL COMMENT '创建时间',
- `state` int(11) DEFAULT NULL COMMENT '状态: 1.待提交 2:待审核 3.审核通过 4:驳回',
- `userid` int(11) DEFAULT NULL COMMENT '用户id',
- `processId` varchar(255) DEFAULT NULL COMMENT '流程定义id',
- PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='报销表';
-
--- ----------------------------
--- Records of sys_expense
--- ----------------------------
-
--- ----------------------------
--- Table structure for sys_login_log
--- ----------------------------
-DROP TABLE IF EXISTS `sys_login_log`;
-CREATE TABLE `sys_login_log` (
- `id` int(65) NOT NULL AUTO_INCREMENT COMMENT '主键',
- `logname` varchar(255) DEFAULT NULL COMMENT '日志名称',
- `userid` int(65) DEFAULT NULL COMMENT '管理员id',
- `createtime` datetime DEFAULT NULL COMMENT '创建时间',
- `succeed` varchar(255) DEFAULT NULL COMMENT '是否执行成功',
- `message` text COMMENT '具体消息',
- `ip` varchar(255) DEFAULT NULL COMMENT '登录ip',
- PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=259 DEFAULT CHARSET=utf8 COMMENT='登录记录';
-
--- ----------------------------
--- Records of sys_login_log
--- ----------------------------
-
--- ----------------------------
--- Table structure for sys_menu
--- ----------------------------
-DROP TABLE IF EXISTS `sys_menu`;
-CREATE TABLE `sys_menu` (
- `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键id',
- `code` varchar(255) DEFAULT NULL COMMENT '菜单编号',
- `pcode` varchar(255) DEFAULT NULL COMMENT '菜单父编号',
- `pcodes` varchar(255) DEFAULT NULL COMMENT '当前菜单的所有父菜单编号',
- `name` varchar(255) DEFAULT NULL COMMENT '菜单名称',
- `icon` varchar(255) DEFAULT NULL COMMENT '菜单图标',
- `url` varchar(255) DEFAULT NULL COMMENT 'url地址',
- `num` int(65) DEFAULT NULL COMMENT '菜单排序号',
- `levels` int(65) DEFAULT NULL COMMENT '菜单层级',
- `ismenu` int(11) DEFAULT NULL COMMENT '是否是菜单（1：是 0：不是）',
- `tips` varchar(255) DEFAULT NULL COMMENT '备注',
- `status` int(65) DEFAULT NULL COMMENT '菜单状态 : 1:启用 0:不启用',
- `isopen` int(11) DEFAULT NULL COMMENT '是否打开: 1:打开 0:不打开',
- PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=561 DEFAULT CHARSET=utf8 COMMENT='菜单表';
-
--- ----------------------------
--- Records of sys_menu
--- ----------------------------
-INSERT INTO `sys_menu` VALUES ('1', 'code', '0', '[0],', '代码生成', 'fa-code', '/code', '1', '1', '1', null, '1', null);
-INSERT INTO `sys_menu` VALUES ('100', 'system', '0', '[0],', '系统管理', 'fa-user', '#', '100', '1', '1', null, '1', '1');
-INSERT INTO `sys_menu` VALUES ('101', 'mgr', 'system', '[0],[system],', '平台管理员', '', '/mgr', '101', '2', '1', null, '1', '0');
-INSERT INTO `sys_menu` VALUES ('102', 'mgr_list', 'mgr', '[0],[system],[mgr],', '用户列表', '', '/mgr/list', '102', '3', '0', null, '1', '0');
-INSERT INTO `sys_menu` VALUES ('103', 'mgr_add', 'mgr', '[0],[system],[mgr],', '添加用户', null, '/mgr/add', '103', '3', '0', null, '1', '0');
-INSERT INTO `sys_menu` VALUES ('104', 'mgr_edit', 'mgr', '[0],[system],[mgr],', '修改用户', null, '/mgr/edit', '104', '3', '0', null, '1', '0');
-INSERT INTO `sys_menu` VALUES ('105', 'mgr_delete', 'mgr', '[0],[system],[mgr],', '删除用户', null, '/mgr/delete', '105', '3', '0', null, '1', '0');
-INSERT INTO `sys_menu` VALUES ('106', 'mgr_reset', 'mgr', '[0],[system],[mgr],', '重置密码', null, '/mgr/reset', '106', '3', '0', null, '1', '0');
-INSERT INTO `sys_menu` VALUES ('107', 'mgr_freeze', 'mgr', '[0],[system],[mgr],', '冻结用户', null, '/mgr/freeze', '107', '3', '0', null, '1', '0');
-INSERT INTO `sys_menu` VALUES ('108', 'mgr_unfreeze', 'mgr', '[0],[system],[mgr],', '解除冻结用户', null, '/mgr/unfreeze', '108', '3', '0', null, '1', '0');
-INSERT INTO `sys_menu` VALUES ('109', 'mgr_setRole', 'mgr', '[0],[system],[mgr],', '分配角色', null, '/mgr/setRole', '109', '3', '0', null, '1', '0');
-INSERT INTO `sys_menu` VALUES ('110', 'to_assign_role', 'mgr', '[0],[system],[mgr],', '分配角色跳转', '', '/mgr/role_assign', '110', '3', '0', null, '1', null);
-INSERT INTO `sys_menu` VALUES ('111', 'to_user_edit', 'mgr', '[0],[system],[mgr],', '编辑用户跳转', '', '/mgr/user_edit', '111', '3', '0', null, '1', null);
-INSERT INTO `sys_menu` VALUES ('120', 'role', 'system', '[0],[system],', '角色管理', null, '/role', '120', '2', '1', null, '1', '0');
-INSERT INTO `sys_menu` VALUES ('121', 'role_list', 'role', '[0],[system],[role],', '角色列表', '', '/role/list', '121', '3', '0', null, '1', null);
-INSERT INTO `sys_menu` VALUES ('122', 'role_add', 'role', '[0],[system],[role],', '添加角色', null, '/role/add', '122', '3', '0', null, '1', '0');
-INSERT INTO `sys_menu` VALUES ('123', 'role_edit', 'role', '[0],[system],[role],', '修改角色', null, '/role/edit', '123', '3', '0', null, '1', '0');
-INSERT INTO `sys_menu` VALUES ('124', 'role_remove', 'role', '[0],[system],[role],', '删除角色', null, '/role/remove', '124', '3', '0', null, '1', '0');
-INSERT INTO `sys_menu` VALUES ('125', 'role_setAuthority', 'role', '[0],[system],[role],', '配置权限', null, '/role/setAuthority', '125', '3', '0', null, '1', '0');
-INSERT INTO `sys_menu` VALUES ('126', 'to_role_edit', 'role', '[0],[system],[role],', '修改角色跳转', '', '/role/role_edit', '126', '3', '0', null, '1', null);
-INSERT INTO `sys_menu` VALUES ('127', 'to_role_assign', 'role', '[0],[system],[role],', '角色分配跳转', '', '/role/role_assign', '127', '3', '0', null, '1', null);
-INSERT INTO `sys_menu` VALUES ('130', 'menu', 'system', '[0],[system],', '菜单管理', null, '/menu', '130', '2', '1', null, '1', '0');
-INSERT INTO `sys_menu` VALUES ('131', 'menu_list', 'menu', '[0],[system],[menu],', '菜单列表', '', '/menu/list', '131', '3', '0', null, '1', null);
-INSERT INTO `sys_menu` VALUES ('132', 'menu_add', 'menu', '[0],[system],[menu],', '添加菜单', null, '/menu/add', '132', '3', '0', null, '1', '0');
-INSERT INTO `sys_menu` VALUES ('133', 'menu_edit', 'menu', '[0],[system],[menu],', '修改菜单', null, '/menu/edit', '133', '3', '0', null, '1', '0');
-INSERT INTO `sys_menu` VALUES ('134', 'menu_remove', 'menu', '[0],[system],[menu],', '删除菜单', null, '/menu/remove', '134', '3', '0', null, '1', '0');
-INSERT INTO `sys_menu` VALUES ('135', 'to_menu_edit', 'menu', '[0],[system],[menu],', '菜单编辑跳转', '', '/menu/menu_edit', '135', '3', '0', null, '1', null);
-INSERT INTO `sys_menu` VALUES ('140', 'dept', 'system', '[0],[system],', '部门管理', null, '/dept', '140', '2', '1', null, '1', null);
-INSERT INTO `sys_menu` VALUES ('141', 'dept_list', 'dept', '[0],[system],[dept],', '部门列表', '', '/dept/list', '141', '3', '0', null, '1', null);
-INSERT INTO `sys_menu` VALUES ('142', 'dept_add', 'dept', '[0],[system],[dept],', '添加部门', null, '/dept/add', '142', '3', '0', null, '1', null);
-INSERT INTO `sys_menu` VALUES ('143', 'dept_update', 'dept', '[0],[system],[dept],', '修改部门', null, '/dept/update', '143', '3', '0', null, '1', null);
-INSERT INTO `sys_menu` VALUES ('144', 'dept_delete', 'dept', '[0],[system],[dept],', '删除部门', null, '/dept/delete', '144', '3', '0', null, '1', null);
-INSERT INTO `sys_menu` VALUES ('145', 'dept_detail', 'dept', '[0],[system],[dept],', '部门详情', '', '/dept/detail', '145', '3', '0', null, '1', null);
-INSERT INTO `sys_menu` VALUES ('146', 'to_dept_update', 'dept', '[0],[system],[dept],', '修改部门跳转', '', '/dept/dept_update', '146', '3', '0', null, '1', null);
-INSERT INTO `sys_menu` VALUES ('200', 'loginLog', 'system', '[0],[system],', '登录日志', null, '/loginLog', '200', '2', '1', null, '1', null);
-INSERT INTO `sys_menu` VALUES ('201', 'login_log_list', 'loginLog', '[0],[system],[loginLog],', '登录日志列表', '', '/loginLog/list', '201', '3', '0', null, '1', null);
-INSERT INTO `sys_menu` VALUES ('202', 'del_login_log', 'loginLog', '[0],[system],[loginLog],', '清空登录日志', '', '/loginLog/delLoginLog', '202', '3', '0', null, '1', null);
-INSERT INTO `sys_menu` VALUES ('210', 'log', 'system', '[0],[system],', '业务日志', null, '/log', '210', '2', '1', null, '1', '0');
-INSERT INTO `sys_menu` VALUES ('211', 'log_list', 'log', '[0],[system],[log],', '日志列表', '', '/log/list', '211', '3', '0', null, '1', null);
-INSERT INTO `sys_menu` VALUES ('212', 'log_detail', 'log', '[0],[system],[log],', '日志详情', '', '/log/detail', '212', '3', '0', null, '1', null);
-INSERT INTO `sys_menu` VALUES ('213', 'log_clean', 'log', '[0],[system],[log],', '清空日志', null, '/log/delLog', '213', '3', '0', null, '1', null);
-INSERT INTO `sys_menu` VALUES ('220', 'druid', 'system', '[0],[system],', '监控管理', null, '/druid', '220', '2', '1', null, '1', null);
-INSERT INTO `sys_menu` VALUES ('230', 'dict', 'system', '[0],[system],', '字典管理', null, '/dict', '230', '2', '1', null, '1', null);
-INSERT INTO `sys_menu` VALUES ('231', 'dict_list', 'dict', '[0],[system],[dict],', '字典列表', '', '/dict/list', '231', '3', '0', null, '1', null);
-INSERT INTO `sys_menu` VALUES ('232', 'dict_add', 'dict', '[0],[system],[dict],', '添加字典', null, '/dict/add', '232', '3', '0', null, '1', null);
-INSERT INTO `sys_menu` VALUES ('233', 'dict_update', 'dict', '[0],[system],[dict],', '修改字典', null, '/dict/update', '233', '3', '0', null, '1', null);
-INSERT INTO `sys_menu` VALUES ('234', 'dict_delete', 'dict', '[0],[system],[dict],', '删除字典', null, '/dict/delete', '234', '3', '0', null, '1', null);
-INSERT INTO `sys_menu` VALUES ('235', 'dict_detail', 'dict', '[0],[system],[dict],', '字典详情', '', '/dict/detail', '235', '3', '0', null, '1', null);
-INSERT INTO `sys_menu` VALUES ('236', 'to_dict_edit', 'dict', '[0],[system],[dict],', '修改菜单跳转', '', '/dict/dict_edit', '236', '3', '0', null, '1', null);
-INSERT INTO `sys_menu` VALUES ('240', 'notice', 'system', '[0],[system],', '通知管理', null, '/notice', '240', '2', '1', null, '1', null);
-INSERT INTO `sys_menu` VALUES ('242', 'notice_add', 'notice', '[0],[system],[notice],', '添加通知', null, '/notice/add', '242', '3', '0', null, '1', null);
-INSERT INTO `sys_menu` VALUES ('243', 'notice_update', 'notice', '[0],[system],[notice],', '修改通知', null, '/notice/update', '243', '3', '0', null, '1', null);
-INSERT INTO `sys_menu` VALUES ('244', 'notice_delete', 'notice', '[0],[system],[notice],', '删除通知', null, '/notice/delete', '244', '3', '0', null, '1', null);
-INSERT INTO `sys_menu` VALUES ('300', 'tUser_msg', '0', '[0],', '用户管理', 'fa-bars', '#', '300', '1', '1', null, '1', null);
-INSERT INTO `sys_menu` VALUES ('301', 'tUser_list', 'tUser_msg', '[0],[tUser_msg],', '用户列表', 'fa-bars', '/tUser', '301', '2', '1', null, '1', null);
-INSERT INTO `sys_menu` VALUES ('520', 'tNotice_mgt', '0', '[0],', '公告管理', 'fa-bars', '#', '520', '1', '1', null, '1', null);
-INSERT INTO `sys_menu` VALUES ('521', 'tNotice_list', 'tNotice_mgt', '[0],[tNotice_mgt],', '公告列表', 'fa-bars', '/tNotice', '521', '2', '1', null, '1', null);
-INSERT INTO `sys_menu` VALUES ('522', 'tNotice_add', 'tNotice_list', '[0],[tNotice_mgt],[tNotice_list],', '发布公告', 'fa-bars', '/tNotice/add', '522', '3', '0', null, '1', null);
-INSERT INTO `sys_menu` VALUES ('523', 'tNotice_update', 'tNotice_list', '[0],[tNotice_mgt],[tNotice_list],', '编辑公告', 'fa-bars', '/tNotice/update', '523', '3', '0', null, '1', null);
-INSERT INTO `sys_menu` VALUES ('524', 'tNotice_delete', 'tNotice_list', '[0],[tNotice_mgt],[tNotice_list],', '删除公告', 'fa-bars', '/tNotice/delete', '524', '3', '0', null, '1', null);
-INSERT INTO `sys_menu` VALUES ('530', 'tFeedback_mgt', '0', '[0],', '反馈管理', 'fa-bars', '#', '530', '1', '1', null, '1', null);
-INSERT INTO `sys_menu` VALUES ('531', 'tFeedback_list', 'tFeedback_mgt', '[0],[tFeedback_mgt],', '反馈管理', 'fa-bars', '/tFeedback', '531', '2', '1', null, '1', null);
-INSERT INTO `sys_menu` VALUES ('534', 'tFeedback_delete', 'tFeedback_list', '[0],[tFeedback_mgt],[tFeedback_list],', '删除反馈', 'fa-bars', '/tFeedback/delete', '534', '3', '0', null, '1', null);
-INSERT INTO `sys_menu` VALUES ('535', 'tFeedback_updateState', 'tFeedback_list', '[0],[tFeedback_mgt],[tFeedback_list],', '处理反馈', 'fa-bars', '/tFeedback/updateState', '535', '3', '0', null, '1', null);
-INSERT INTO `sys_menu` VALUES ('542', 'tBanner_list', 'tAppSet_mgt', '[0],[tAppSet_mgt],', 'Banner管理', 'fa-bars', '/tBanner', '542', '2', '1', null, '1', null);
-INSERT INTO `sys_menu` VALUES ('543', 'tBanner_add', 'tBanner_list', '[0],[tAppSet_mgt],[tBanner_list],', '添加Banner', 'fa-bars', '/tBanner/add', '543', '3', '0', null, '1', null);
-INSERT INTO `sys_menu` VALUES ('544', 'tBanner_update', 'tBanner_list', '[0],[tAppSet_mgt],[tBanner_list],', '编辑Banner', 'fa-bars', '/tBanner/update', '544', '3', '0', null, '1', null);
-INSERT INTO `sys_menu` VALUES ('545', 'tBanner_delete', 'tBanner_list', '[0],[tAppSet_mgt],[tBanner_list],', '删除Banner', 'fa-bars', '/tBanner/delete', '545', '3', '0', null, '1', null);
-INSERT INTO `sys_menu` VALUES ('550', 'tAppSet_mgt', '0', '[0],', 'APP管理', 'fa-bars', '#', '550', '1', '1', null, '1', null);
-INSERT INTO `sys_menu` VALUES ('551', 'tAppSet_html', 'tAppSet_mgt', '[0],[tAppSet_mgt],', '协议设置', 'fa-bars', '/tAppSet/html', '551', '2', '1', null, '1', null);
-INSERT INTO `sys_menu` VALUES ('560', 'tSystemSet_mgt', '0', '[0],', '系统设置', 'fa-bars', '/tSystemSet', '560', '1', '1', null, '1', null);
-
--- ----------------------------
--- Table structure for sys_notice
--- ----------------------------
-DROP TABLE IF EXISTS `sys_notice`;
-CREATE TABLE `sys_notice` (
- `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键',
- `title` varchar(255) DEFAULT NULL COMMENT '标题',
- `type` int(11) DEFAULT NULL COMMENT '类型',
- `content` text COMMENT '内容',
- `createtime` datetime DEFAULT NULL COMMENT '创建时间',
- `creater` int(11) DEFAULT NULL COMMENT '创建人',
- PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=9 DEFAULT CHARSET=utf8 COMMENT='通知表';
-
--- ----------------------------
--- Records of sys_notice
--- ----------------------------
-INSERT INTO `sys_notice` VALUES ('6', '世界', '10', '欢迎使用game管理系统', '2017-01-11 08:53:20', '1');
-INSERT INTO `sys_notice` VALUES ('8', '你好', null, '你好', '2017-05-10 19:28:57', '1');
-
--- ----------------------------
--- Table structure for sys_operation_log
--- ----------------------------
-DROP TABLE IF EXISTS `sys_operation_log`;
-CREATE TABLE `sys_operation_log` (
- `id` int(65) NOT NULL AUTO_INCREMENT COMMENT '主键',
- `logtype` varchar(255) DEFAULT NULL COMMENT '日志类型',
- `logname` varchar(255) DEFAULT NULL COMMENT '日志名称',
- `userid` int(65) DEFAULT NULL COMMENT '用户id',
- `classname` varchar(255) DEFAULT NULL COMMENT '类名称',
- `method` text COMMENT '方法名称',
- `createtime` datetime DEFAULT NULL COMMENT '创建时间',
- `succeed` varchar(255) DEFAULT NULL COMMENT '是否成功',
- `message` text COMMENT '备注',
- PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=597 DEFAULT CHARSET=utf8 COMMENT='操作日志';
-
--- ----------------------------
--- Records of sys_operation_log
--- ----------------------------
-
--- ----------------------------
--- Table structure for sys_relation
--- ----------------------------
-DROP TABLE IF EXISTS `sys_relation`;
-CREATE TABLE `sys_relation` (
- `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键',
- `menuid` bigint(11) DEFAULT NULL COMMENT '菜单id',
- `roleid` int(11) DEFAULT NULL COMMENT '角色id',
- PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=4871 DEFAULT CHARSET=utf8 COMMENT='角色和菜单关联表';
-
--- ----------------------------
--- Records of sys_relation
--- ----------------------------
-INSERT INTO `sys_relation` VALUES ('4661', null, '5');
-INSERT INTO `sys_relation` VALUES ('4800', '1', '1');
-INSERT INTO `sys_relation` VALUES ('4801', '100', '1');
-INSERT INTO `sys_relation` VALUES ('4802', '101', '1');
-INSERT INTO `sys_relation` VALUES ('4803', '102', '1');
-INSERT INTO `sys_relation` VALUES ('4804', '103', '1');
-INSERT INTO `sys_relation` VALUES ('4805', '104', '1');
-INSERT INTO `sys_relation` VALUES ('4806', '105', '1');
-INSERT INTO `sys_relation` VALUES ('4807', '106', '1');
-INSERT INTO `sys_relation` VALUES ('4808', '107', '1');
-INSERT INTO `sys_relation` VALUES ('4809', '108', '1');
-INSERT INTO `sys_relation` VALUES ('4810', '109', '1');
-INSERT INTO `sys_relation` VALUES ('4811', '110', '1');
-INSERT INTO `sys_relation` VALUES ('4812', '111', '1');
-INSERT INTO `sys_relation` VALUES ('4813', '120', '1');
-INSERT INTO `sys_relation` VALUES ('4814', '121', '1');
-INSERT INTO `sys_relation` VALUES ('4815', '122', '1');
-INSERT INTO `sys_relation` VALUES ('4816', '123', '1');
-INSERT INTO `sys_relation` VALUES ('4817', '124', '1');
-INSERT INTO `sys_relation` VALUES ('4818', '125', '1');
-INSERT INTO `sys_relation` VALUES ('4819', '126', '1');
-INSERT INTO `sys_relation` VALUES ('4820', '127', '1');
-INSERT INTO `sys_relation` VALUES ('4821', '130', '1');
-INSERT INTO `sys_relation` VALUES ('4822', '131', '1');
-INSERT INTO `sys_relation` VALUES ('4823', '132', '1');
-INSERT INTO `sys_relation` VALUES ('4824', '133', '1');
-INSERT INTO `sys_relation` VALUES ('4825', '134', '1');
-INSERT INTO `sys_relation` VALUES ('4826', '135', '1');
-INSERT INTO `sys_relation` VALUES ('4827', '140', '1');
-INSERT INTO `sys_relation` VALUES ('4828', '141', '1');
-INSERT INTO `sys_relation` VALUES ('4829', '142', '1');
-INSERT INTO `sys_relation` VALUES ('4830', '143', '1');
-INSERT INTO `sys_relation` VALUES ('4831', '144', '1');
-INSERT INTO `sys_relation` VALUES ('4832', '145', '1');
-INSERT INTO `sys_relation` VALUES ('4833', '146', '1');
-INSERT INTO `sys_relation` VALUES ('4834', '200', '1');
-INSERT INTO `sys_relation` VALUES ('4835', '201', '1');
-INSERT INTO `sys_relation` VALUES ('4836', '202', '1');
-INSERT INTO `sys_relation` VALUES ('4837', '210', '1');
-INSERT INTO `sys_relation` VALUES ('4838', '211', '1');
-INSERT INTO `sys_relation` VALUES ('4839', '212', '1');
-INSERT INTO `sys_relation` VALUES ('4840', '213', '1');
-INSERT INTO `sys_relation` VALUES ('4841', '220', '1');
-INSERT INTO `sys_relation` VALUES ('4842', '230', '1');
-INSERT INTO `sys_relation` VALUES ('4843', '231', '1');
-INSERT INTO `sys_relation` VALUES ('4844', '232', '1');
-INSERT INTO `sys_relation` VALUES ('4845', '233', '1');
-INSERT INTO `sys_relation` VALUES ('4846', '234', '1');
-INSERT INTO `sys_relation` VALUES ('4847', '235', '1');
-INSERT INTO `sys_relation` VALUES ('4848', '236', '1');
-INSERT INTO `sys_relation` VALUES ('4849', '240', '1');
-INSERT INTO `sys_relation` VALUES ('4850', '242', '1');
-INSERT INTO `sys_relation` VALUES ('4851', '243', '1');
-INSERT INTO `sys_relation` VALUES ('4852', '244', '1');
-INSERT INTO `sys_relation` VALUES ('4853', '300', '1');
-INSERT INTO `sys_relation` VALUES ('4854', '301', '1');
-INSERT INTO `sys_relation` VALUES ('4855', '520', '1');
-INSERT INTO `sys_relation` VALUES ('4856', '521', '1');
-INSERT INTO `sys_relation` VALUES ('4857', '522', '1');
-INSERT INTO `sys_relation` VALUES ('4858', '523', '1');
-INSERT INTO `sys_relation` VALUES ('4859', '524', '1');
-INSERT INTO `sys_relation` VALUES ('4860', '530', '1');
-INSERT INTO `sys_relation` VALUES ('4861', '531', '1');
-INSERT INTO `sys_relation` VALUES ('4862', '534', '1');
-INSERT INTO `sys_relation` VALUES ('4863', '535', '1');
-INSERT INTO `sys_relation` VALUES ('4864', '550', '1');
-INSERT INTO `sys_relation` VALUES ('4865', '542', '1');
-INSERT INTO `sys_relation` VALUES ('4866', '543', '1');
-INSERT INTO `sys_relation` VALUES ('4867', '544', '1');
-INSERT INTO `sys_relation` VALUES ('4868', '545', '1');
-INSERT INTO `sys_relation` VALUES ('4869', '551', '1');
-INSERT INTO `sys_relation` VALUES ('4870', '560', '1');
-
--- ----------------------------
--- Table structure for sys_role
--- ----------------------------
-DROP TABLE IF EXISTS `sys_role`;
-CREATE TABLE `sys_role` (
- `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键id',
- `num` int(11) DEFAULT NULL COMMENT '序号',
- `pid` int(11) DEFAULT NULL COMMENT '父角色id',
- `name` varchar(255) DEFAULT NULL COMMENT '角色名称',
- `deptid` int(11) DEFAULT NULL COMMENT '部门名称',
- `tips` varchar(255) DEFAULT NULL COMMENT '提示',
- `version` int(11) DEFAULT NULL COMMENT '保留字段(暂时没用）',
- PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8 COMMENT='角色表';
-
--- ----------------------------
--- Records of sys_role
--- ----------------------------
-INSERT INTO `sys_role` VALUES ('1', '1', '0', '超级管理员', '24', 'administrator', '1');
-INSERT INTO `sys_role` VALUES ('5', '2', '1', '临时', '26', 'temp', null);
-
--- ----------------------------
--- Table structure for sys_user
--- ----------------------------
-DROP TABLE IF EXISTS `sys_user`;
-CREATE TABLE `sys_user` (
- `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键id',
- `avatar` varchar(255) DEFAULT NULL COMMENT '头像',
- `account` varchar(45) DEFAULT NULL COMMENT '账号',
- `password` varchar(45) DEFAULT NULL COMMENT '密码',
- `salt` varchar(45) DEFAULT NULL COMMENT 'md5密码盐',
- `name` varchar(45) DEFAULT NULL COMMENT '名字',
- `birthday` datetime DEFAULT NULL COMMENT '生日',
- `sex` int(11) DEFAULT NULL COMMENT '性别（1：男 2：女）',
- `email` varchar(45) DEFAULT NULL COMMENT '电子邮件',
- `phone` varchar(45) DEFAULT NULL COMMENT '电话',
- `roleid` varchar(255) DEFAULT NULL COMMENT '角色id',
- `deptid` int(11) DEFAULT NULL COMMENT '部门id',
- `status` int(11) DEFAULT NULL COMMENT '状态(1：启用 2：冻结 3：删除）',
- `createtime` datetime DEFAULT NULL COMMENT '创建时间',
- `version` int(11) DEFAULT NULL COMMENT '保留字段',
- PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=47 DEFAULT CHARSET=utf8 COMMENT='管理员表';
-
--- ----------------------------
--- Records of sys_user
--- ----------------------------
-INSERT INTO `sys_user` VALUES ('1', 'girl.gif', 'admin', 'ecfadcde9305f8891bcfe5a1e28c253e', '8pgby', '张三', '2017-05-05 00:00:00', '2', 'sn93@qq.com', '18200000000', '1', '27', '1', '2016-01-29 08:49:53', '25');
-INSERT INTO `sys_user` VALUES ('44', null, 'test', '45abb7879f6a8268f1ef600e6038ac73', 'ssts3', 'test', '2017-05-01 00:00:00', '1', 'abc@123.com', '', '5', '26', '3', '2017-05-16 20:33:37', null);
-INSERT INTO `sys_user` VALUES ('45', null, 'boss', '71887a5ad666a18f709e1d4e693d5a35', '1f7bf', '老板', '2017-12-04 00:00:00', '1', '', '', '1', '24', '1', '2017-12-04 22:24:02', null);
-INSERT INTO `sys_user` VALUES ('46', null, 'manager', 'b53cac62e7175637d4beb3b16b2f7915', 'j3cs9', '经理', '2017-12-04 00:00:00', '1', '', '', '1', '24', '1', '2017-12-04 22:24:24', null);
-
diff --git a/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSysReformistController.java b/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSysReformistController.java
index e9fe3e2..53808b2 100644
--- a/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSysReformistController.java
+++ b/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSysReformistController.java
@@ -223,57 +223,57 @@
tSysPushOrderService.insert(zcThree);
}
- //出租车推单(第一轮)
- TSysPushOrder czcOne = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("pushType", 2).eq("type", 1));
- if (SinataUtil.isNotEmpty(czcOne)){
- czcOne.setPushDistance(czc1);
- czcOne.setPushTime(czc2);
- czcOne.setDriverProportion(czc3);
- tSysPushOrderService.updateById(czcOne);
- }else{
- czcOne = new TSysPushOrder();
- czcOne.setPushDistance(czc1);
- czcOne.setPushTime(czc2);
- czcOne.setDriverProportion(czc3);
- czcOne.setCompanyId(ShiroKit.getUser().getObjectId());
- czcOne.setPushType(2);
- czcOne.setType(1);
- tSysPushOrderService.insert(czcOne);
- }
- //出租车推单(第二轮)
- TSysPushOrder czcTwo = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("pushType", 2).eq("type", 2));
- if (SinataUtil.isNotEmpty(czcTwo)){
- czcTwo.setPushDistance(czc4);
- czcTwo.setPushTime(czc5);
- czcTwo.setDriverProportion(czc6);
- tSysPushOrderService.updateById(czcTwo);
- }else{
- czcTwo = new TSysPushOrder();
- czcTwo.setPushDistance(czc4);
- czcTwo.setPushTime(czc5);
- czcTwo.setDriverProportion(czc6);
- czcTwo.setCompanyId(ShiroKit.getUser().getObjectId());
- czcTwo.setPushType(2);
- czcTwo.setType(2);
- tSysPushOrderService.insert(czcTwo);
- }
- //出租车推单(第三轮)
- TSysPushOrder czcThree = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("pushType", 2).eq("type", 3));
- if (SinataUtil.isNotEmpty(czcThree)){
- czcThree.setPushDistance(czc7);
- czcThree.setPushTime(czc8);
- czcThree.setDriverProportion(czc9);
- tSysPushOrderService.updateById(czcThree);
- }else{
- czcThree = new TSysPushOrder();
- czcThree.setPushDistance(czc7);
- czcThree.setPushTime(czc8);
- czcThree.setDriverProportion(czc9);
- czcThree.setCompanyId(ShiroKit.getUser().getObjectId());
- czcThree.setPushType(2);
- czcThree.setType(3);
- tSysPushOrderService.insert(czcThree);
- }
+// //出租车推单(第一轮)
+// TSysPushOrder czcOne = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("pushType", 2).eq("type", 1));
+// if (SinataUtil.isNotEmpty(czcOne)){
+// czcOne.setPushDistance(czc1);
+// czcOne.setPushTime(czc2);
+// czcOne.setDriverProportion(czc3);
+// tSysPushOrderService.updateById(czcOne);
+// }else{
+// czcOne = new TSysPushOrder();
+// czcOne.setPushDistance(czc1);
+// czcOne.setPushTime(czc2);
+// czcOne.setDriverProportion(czc3);
+// czcOne.setCompanyId(ShiroKit.getUser().getObjectId());
+// czcOne.setPushType(2);
+// czcOne.setType(1);
+// tSysPushOrderService.insert(czcOne);
+// }
+// //出租车推单(第二轮)
+// TSysPushOrder czcTwo = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("pushType", 2).eq("type", 2));
+// if (SinataUtil.isNotEmpty(czcTwo)){
+// czcTwo.setPushDistance(czc4);
+// czcTwo.setPushTime(czc5);
+// czcTwo.setDriverProportion(czc6);
+// tSysPushOrderService.updateById(czcTwo);
+// }else{
+// czcTwo = new TSysPushOrder();
+// czcTwo.setPushDistance(czc4);
+// czcTwo.setPushTime(czc5);
+// czcTwo.setDriverProportion(czc6);
+// czcTwo.setCompanyId(ShiroKit.getUser().getObjectId());
+// czcTwo.setPushType(2);
+// czcTwo.setType(2);
+// tSysPushOrderService.insert(czcTwo);
+// }
+// //出租车推单(第三轮)
+// TSysPushOrder czcThree = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("pushType", 2).eq("type", 3));
+// if (SinataUtil.isNotEmpty(czcThree)){
+// czcThree.setPushDistance(czc7);
+// czcThree.setPushTime(czc8);
+// czcThree.setDriverProportion(czc9);
+// tSysPushOrderService.updateById(czcThree);
+// }else{
+// czcThree = new TSysPushOrder();
+// czcThree.setPushDistance(czc7);
+// czcThree.setPushTime(czc8);
+// czcThree.setDriverProportion(czc9);
+// czcThree.setCompanyId(ShiroKit.getUser().getObjectId());
+// czcThree.setPushType(2);
+// czcThree.setType(3);
+// tSysPushOrderService.insert(czcThree);
+// }
//普通取消设置(专车)
TSysCancleOrder ptCancelOne = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 1).eq("orderType", 1));
diff --git a/ManagementOKTravel/guns-admin/src/main/resources/application.yml b/ManagementOKTravel/guns-admin/src/main/resources/application.yml
index 8369d85..35e45a9 100644
--- a/ManagementOKTravel/guns-admin/src/main/resources/application.yml
+++ b/ManagementOKTravel/guns-admin/src/main/resources/application.yml
@@ -55,26 +55,26 @@
---
-spring:
- profiles: local
- datasource:
- url: jdbc:mysql://127.0.0.1:3306/oktravel?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
- username: oktravel
- password: Si8bnm5KPGSZkF3F
- db-name: guns #用来搜集数据库的所有表
- filters: wall,mergeStat
-
-
#spring:
# profiles: local
# datasource:
-# url: jdbc:mysql://127.0.0.1:3306/kytravel?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
-# username: root
-# password: 123456
-# db-name: oktravel #用来搜集数据库的所有表
+# url: jdbc:mysql://127.0.0.1:3306/oktravel?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
+# username: oktravel
+# password: Si8bnm5KPGSZkF3F
+# db-name: guns #用来搜集数据库的所有表
# filters: wall,mergeStat
+spring:
+ profiles: local
+ datasource:
+ url: jdbc:mysql://127.0.0.1:3306/kytravel?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
+ username: root
+ password: 123456
+ db-name: oktravel #用来搜集数据库的所有表
+ filters: wall,mergeStat
+
+
#多数据源情况的配置
guns:
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
index b0ef1ce..718d8cd 100644
--- a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/home.html
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/home.html
@@ -46,10 +46,10 @@
<h1 class="no-margins" id="newNetcardriver">0</h1>
<small>在线司机</small>
</div>
- <!--<div class="ibox-content">-->
- <!--<h1 class="no-margins" id="orderDetail1">0</h1>-->
- <!--<small>专车订单数</small>-->
- <!--</div>-->
+ <div class="ibox-content">
+ <h1 class="no-margins" id="orderDetail1">0</h1>
+ <small>专车订单数</small>
+ </div>
<!--<div class="ibox-content">-->
<!--<h1 class="no-margins" id="orderDetail2">0</h1>-->
<!--<small>出租车订单</small>-->
@@ -116,10 +116,10 @@
<h1 class="no-margins" id="netcarDriverSum1">0</h1>
<small>新增司机</small>
</div>
- <!--<div class="ibox-content">-->
- <!--<h1 class="no-margins" id="orderDetail11">0</h1>-->
- <!--<small>专车订单数</small>-->
- <!--</div>-->
+ <div class="ibox-content">
+ <h1 class="no-margins" id="orderDetail11">0</h1>
+ <small>专车订单数</small>
+ </div>
<!--<div class="ibox-content">-->
<!--<h1 class="no-margins" id="orderDetail21">0</h1>-->
<!--<small>出租车订单数</small>-->
@@ -164,12 +164,12 @@
</h1>
<small>用户注册趋势图</small>
</div>
- <!--<div class="ibox-content">-->
- <!--<h1 class="no-margins">-->
- <!--<span class="dynamicsparkline" id="orderDetail12">Loading..</span>-->
- <!--</h1>-->
- <!--<small>专车订单趋势图</small>-->
- <!--</div>-->
+ <div class="ibox-content">
+ <h1 class="no-margins">
+ <span class="dynamicsparkline" id="orderDetail12">Loading..</span>
+ </h1>
+ <small>专车订单趋势图</small>
+ </div>
<!--<div class="ibox-content">-->
<!--<h1 class="no-margins">-->
<!--<span class="dynamicsparkline" id="orderDetail22">Loading..</span>-->
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
index 9fa5caf..3c7c1a4 100644
--- 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
@@ -30,11 +30,11 @@
<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" /> 元
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
index 2ca369f..1e7c99c 100644
--- 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
@@ -40,7 +40,6 @@
<br/>
司机APP每天累计在线奖励
<br/>
- <!--
<br/>
专车累计在线 <input type="text" @if(isNotEmpty(online1)){
value="${online1.online}"
@@ -55,6 +54,7 @@
@}
name="zc7" class="form-control newWidth" readonly/> 元
<br/>
+ <!--
<br/>
出租车累计在线 <input type="text" @if(isNotEmpty(online2)){
value="${online2.online}"
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
index d53a914..aabf5dd 100644
--- 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
@@ -41,7 +41,6 @@
<br/>
司机APP每天累计在线奖励
<br/>
- <!--
<br/>
专车累计在线 <input type="text" @if(isNotEmpty(online1)){
value="${online1.online}"
@@ -56,6 +55,7 @@
@}
name="zc7" id="num5" class="form-control newWidth"/> 元
<br/>
+ <!--
<br/>
出租车累计在线 <input type="text" @if(isNotEmpty(online2)){
value="${online2.online}"
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
index b802d3d..22167af 100644
--- 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
@@ -121,7 +121,6 @@
<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">
@@ -134,6 +133,7 @@
<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">
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
index 0b6c878..9a34cb3 100644
--- 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
@@ -11,10 +11,8 @@
<div class="row">
<div class="col-sm-3">
<#SelectCon id="type" name="类别" >
- <!--
- <option value="2">出租车</option>
+ <!--<option value="2">出租车</option>-->
<option value="1">专车</option>
- -->
<option value="3">跨城</option>
<option value="4">小件物流</option>
</#SelectCon>
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
index 29f475f..280a70b 100644
--- 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
@@ -16,7 +16,7 @@
<#SelectCon id="couponUseType" name="优惠券类型" >
<option value="">全部</option>
<option value="0">通用券</option>
- <!--<option value="1">专车券</option>-->
+ <option value="1">专车券</option>
<!--<option value="2">出租车券</option>-->
<option value="3">跨城出行券</option>
</#SelectCon>
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
index a0b4e56..55c5085 100644
--- 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
@@ -16,7 +16,7 @@
<#SelectCon id="couponUseType" name="优惠券类型" >
<option value="">全部</option>
<option value="0">通用券</option>
- <!--<option value="1">专车券</option>-->
+ <option value="1">专车券</option>
<!--<option value="2">出租车券</option>-->
<option value="3">跨城出行券</option>
</#SelectCon>
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
index 843c4ce..ceb3b05 100644
--- 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
@@ -18,7 +18,7 @@
</div>
</div>
<#select id="couponUseType" name="服务类型" underline="true">
- <!--<option value="1">专车券</option>-->
+ <option value="1">专车券</option>
<!--<option value="2">出租车券</option>-->
<option value="3">跨城出行券</option>
<option value="0">通用券</option>
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
index d29ba9a..cdf04fa 100644
--- 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
@@ -45,11 +45,11 @@
<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" value="1" onclick="TCarInfoDlg.zcServerClick()">
<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>
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
index 72dbe51..e95f831 100644
--- 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
@@ -47,11 +47,11 @@
<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" value="1" ${2 == one ? 'checked=checked' : ''} onclick="TCarInfoDlg.zcServerClick()">
<label for="serverBox1"> 专车 </label>
</div>
+ <!--
<div class="checkbox checkbox-success checkbox-inline">
<input type="checkbox" name="serverBox" id="serverBox2" value="2" ${2 == two ? 'checked=checked' : ''}>
<label for="serverBox2"> 出租车 </label>
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
index ce7c2bc..35eaee2 100644
--- 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
@@ -47,7 +47,6 @@
<label class="col-sm-2 control-label">经营业务：</label>
<div class="col-sm-10">
<fieldset>
- <!--
<div class="checkbox checkbox-success">
<input name="checkbox" id="checkbox1" type="checkbox" value="1" ${1 == item.isSpe ? 'checked=checked' : ''} onclick="TCompanyInfoDlg.checkbox1()">
<label for="checkbox1">
@@ -88,6 +87,7 @@
</div>
</fieldset>
</div>
+ <!--
<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">
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
index 39c626b..07e9bee 100644
--- 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
@@ -47,7 +47,6 @@
<label class="col-sm-2 control-label">经营业务：</label>
<div class="col-sm-10">
<fieldset>
- <!--
<div class="checkbox checkbox-success">
<input name="checkbox" id="checkbox1" type="checkbox" value="1" onclick="TCompanyInfoDlg.checkbox1()">
<label for="checkbox1">
@@ -80,6 +79,7 @@
</div>
</fieldset>
</div>
+ <!--
<div class="checkbox checkbox-primary">
<input name="checkbox" id="checkbox2" type="checkbox" value="2" onclick="TCompanyInfoDlg.checkbox2()">
<label for="checkbox2">
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
index 2edf2da..a22b388 100644
--- 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
@@ -28,7 +28,6 @@
<label class="col-sm-3 control-label">经营业务：</label>
<div class="col-sm-9">
<fieldset>
- <!--
<div class="checkbox checkbox-success">
<input name="checkbox" id="checkbox1" type="checkbox" value="1" onclick="FranchiseeInfoDlg.checkbox1()">
<label for="checkbox1">
@@ -61,6 +60,7 @@
</div>
</fieldset>
</div>
+ <!--
<div class="checkbox checkbox-primary">
<input name="checkbox" id="checkbox2" type="checkbox" value="2" onclick="FranchiseeInfoDlg.checkbox2()">
<label for="checkbox2">
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
index 5b63100..4df24cd 100644
--- 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
@@ -88,7 +88,6 @@
<label class="col-sm-2 control-label">经营业务：</label>
<div class="col-sm-10">
<fieldset>
- <!--
<div class="checkbox checkbox-success">
<input name="checkbox" id="checkbox1" type="checkbox" disabled value="1" ${1 == item.isSpe ? 'checked=checked' : ''} >
<label for="checkbox1">
@@ -129,6 +128,7 @@
</div>
</fieldset>
</div>
+ <!--
<div class="checkbox checkbox-primary">
<input name="checkbox" id="checkbox2" type="checkbox" disabled value="2" ${1 == item.isTaxi ? 'checked=checked' : ''} >
<label for="checkbox2">
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
index 83a17b2..e211668 100644
--- 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
@@ -20,7 +20,6 @@
<label class="col-sm-3 control-label">经营业务：</label>
<div class="col-sm-9">
<fieldset>
- <!--
<div class="checkbox checkbox-success">
<input name="checkbox" id="checkbox1" disabled type="checkbox" value="1" ${1 == item.isSpe ? 'checked=checked' : ''} >
<label for="checkbox1">
@@ -61,6 +60,7 @@
</div>
</fieldset>
</div>
+ <!--
<div class="checkbox checkbox-primary">
<input name="checkbox" id="checkbox2" type="checkbox" disabled value="2" ${1 == item.isTaxi ? 'checked=checked' : ''}>
<label for="checkbox2">
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
index 97cb9a7..e121a5e 100644
--- 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
@@ -47,7 +47,6 @@
<label class="col-sm-2 control-label">经营业务：</label>
<div class="col-sm-10">
<fieldset>
- <!--
<div class="checkbox checkbox-success">
<input name="checkbox" id="checkbox1" type="checkbox" value="1" ${1 == item.isSpe ? 'checked=checked' : ''} onclick="TCompanyInfoDlg.checkbox1()">
<label for="checkbox1">
@@ -88,6 +87,7 @@
</div>
</fieldset>
</div>
+ <!--
<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">
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
index 46236e2..805be8c 100644
--- 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
@@ -28,7 +28,6 @@
<label class="col-sm-3 control-label">经营业务：</label>
<div class="col-sm-9">
<fieldset>
- <!--
<div class="checkbox checkbox-success">
<input name="checkbox" id="checkbox1" type="checkbox" value="1" ${1 == item.isSpe ? 'checked=checked' : ''} onclick="FranchiseeInfoDlg.checkbox1()">
<label for="checkbox1">
@@ -69,6 +68,7 @@
</div>
</fieldset>
</div>
+ <!--
<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">
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
index 2cc42a8..75dcb8b 100644
--- 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
@@ -70,10 +70,10 @@
<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" value="1">-->
- <!--<label for="serverBox1"> 专车 </label>-->
- <!--</div>-->
+ <div class="checkbox checkbox-success checkbox-inline">
+ <input type="checkbox" name="serverBox" id="serverBox1" 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>-->
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
index ae82362..0031567 100644
--- 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
@@ -73,10 +73,10 @@
<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" value="1" ${2 == one ? 'checked=checked' : ''}>-->
- <!--<label for="serverBox1"> 专车 </label>-->
- <!--</div>-->
+ <div class="checkbox checkbox-success checkbox-inline">
+ <input type="checkbox" name="serverBox" id="serverBox1" value="1" ${2 == one ? 'checked=checked' : ''}>
+ <label for="serverBox1"> 专车 </label>
+ </div>
<!--<div class="checkbox checkbox-success checkbox-inline">-->
<!--<input type="checkbox" name="serverBox" id="serverBox2" value="2" ${2 == two ? 'checked=checked' : ''}>-->
<!--<label for="serverBox2"> 出租车 </label>-->
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
index 26f3d1e..7007f07 100644
--- 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
@@ -26,7 +26,7 @@
<div class="col-sm-3">
<select class="form-control" id="businessType">
<option value="">选择经营业务</option>
- <!--<option value="1">专车</option>-->
+ <option value="1">专车</option>
<!--<option value="2">出租车</option>-->
<option value="3">跨城出行</option>
<option value="4">跨城小件物流</option>
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
index fd5ca3c..ddd646d 100644
--- 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
@@ -33,7 +33,7 @@
<div class="col-sm-3">
<select class="form-control" id="businessType">
<option value="">选择经营业务</option>
- <!--<option value="1">专车</option>-->
+ <option value="1">专车</option>
<!--<option value="2">出租车</option>-->
<option value="3">跨城出行</option>
<option value="4">跨城小件物流</option>
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
index eaf356a..b4e133f 100644
--- 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
@@ -30,8 +30,8 @@
<div class="col-sm-3">
<#SelectCon id="orderType" name="订单类型" >
<option value="">全部</option>
- <!--
<option value="1">专车</option>
+ <!--
<option value="2">出租车</option>
-->
<option value="3">跨城出行</option>
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
index 0f682b5..56ce808 100644
--- 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
@@ -67,8 +67,6 @@
</div>
</div>
</div>
-
- <!--
<div class="form-group">
<label class="col-sm-2 control-label">专车改派：</label>
<div class="col-sm-10">
@@ -84,6 +82,7 @@
</div>
</div>
+ <!--
<div class="form-group">
<label class="col-sm-2 control-label">出租车改派：</label>
<div class="col-sm-10">
@@ -250,6 +249,7 @@
<br/>
</div>
</div>
+ -->
<div class="form-group">
<label class="col-sm-2 control-label">取消设置：</label>
<div class="col-sm-10">
@@ -268,6 +268,7 @@
@}
name="ptCancel2" id="ptCancel2" class="form-control newWidth" /> 元取消费用；
<br/>
+ <!--
<br/>
出租车订单取消规则：出租车订单在司机接单 <input type="text" oninput="checkIsInt(this)"
@if(isNotEmpty(ptCancel2)){
@@ -284,6 +285,7 @@
@}
name="ptCancel4" id="ptCancel4" class="form-control newWidth" /> 元取消费用；
<br/>
+ -->
</div>
</div>
<div class="form-group">
@@ -304,6 +306,7 @@
@}
name="yyCancel2" id="yyCancel2" class="form-control newWidth" /> 元取消费用；
<br/>
+ <!--
<br/>
出租车订单取消规则：出租车订单在司机接单 <input type="text" oninput="checkIsInt(this)"
@if(isNotEmpty(yyCancel2)){
@@ -320,9 +323,9 @@
@}
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">
@@ -440,37 +443,37 @@
var zc8 = $("#zc8").val().trim();
var zc9 = $("#zc9").val().trim();
- 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 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 ptCancel1 = $("#ptCancel1").val().trim();
var ptCancel2 = $("#ptCancel2").val().trim();
- var ptCancel3 = $("#ptCancel3").val().trim();
- var ptCancel4 = $("#ptCancel4").val().trim();
+ // var ptCancel3 = $("#ptCancel3").val().trim();
+ // var ptCancel4 = $("#ptCancel4").val().trim();
// var ptCancel5 = $("#ptCancel5").val().trim();
// var ptCancel6 = $("#ptCancel6").val().trim();
var yyCancel1 = $("#yyCancel1").val().trim();
var yyCancel2 = $("#yyCancel2").val().trim();
- var yyCancel3 = $("#yyCancel3").val().trim();
- var yyCancel4 = $("#yyCancel4").val().trim();
+ // var yyCancel3 = $("#yyCancel3").val().trim();
+ // var yyCancel4 = $("#yyCancel4").val().trim();
var phone1 = $("#phone1").val().trim();
var phone2 = $("#phone2").val().trim();
- var phone3 = $("#phone3").val().trim();
+ // var phone3 = $("#phone3").val().trim();
if ("" == one || "" == two || "" == three
|| "" == zc1 || "" == zc2 || "" == zc3 || "" == zc4 || "" == zc5 || "" == zc6 || "" == zc7 || "" == zc8 || "" == zc9
- || "" == czc1 || "" == czc2 || "" == czc3 || "" == czc4 || "" == czc5 || "" == czc6 || "" == czc7 || "" == czc8 || "" == czc9
- || "" == ptCancel1 || "" == ptCancel2 || "" == ptCancel3 || "" == ptCancel4 /*|| "" == ptCancel5 || "" == ptCancel6*/
- || "" == yyCancel1 || "" == yyCancel2 || "" == yyCancel3 || "" == yyCancel4
+ /*|| "" == czc1 || "" == czc2 || "" == czc3 || "" == czc4 || "" == czc5 || "" == czc6 || "" == czc7 || "" == czc8 || "" == czc9*/
+ || "" == ptCancel1 || "" == ptCancel2 /*|| "" == ptCancel3 || "" == ptCancel4 || "" == ptCancel5 || "" == ptCancel6*/
+ || "" == yyCancel1 || "" == yyCancel2 /*|| "" == yyCancel3 || "" == yyCancel4*/
|| "" == phone1 || "" == phone2 ) {
Feng.info("输入框不能为空!");
return;
@@ -488,12 +491,12 @@
|| !regDouble.test(zc4) || !regInt.test(zc5) || !regDouble.test(zc6)
|| !regDouble.test(zc7) || !regInt.test(zc8) || !regDouble.test(zc9)
- || !regDouble.test(czc1) || !regInt.test(czc2) || !regDouble.test(czc3)
+ /*|| !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)
+ || !regDouble.test(czc7) || !regInt.test(czc8) || !regDouble.test(czc9)*/
- || !regInt.test(ptCancel1) || !regDouble.test(ptCancel2) || !regInt.test(ptCancel3) || !regDouble.test(ptCancel4) /*|| !regInt.test(ptCancel5) || !regDouble.test(ptCancel6)*/
- || !regInt.test(yyCancel1) || !regDouble.test(yyCancel2) || !regInt.test(yyCancel3) || !regDouble.test(yyCancel4)) {
+ || !regInt.test(ptCancel1) || !regDouble.test(ptCancel2) /*|| !regInt.test(ptCancel3) || !regDouble.test(ptCancel4) || !regInt.test(ptCancel5) || !regDouble.test(ptCancel6)*/
+ || !regInt.test(yyCancel1) || !regDouble.test(yyCancel2) /*|| !regInt.test(yyCancel3) || !regDouble.test(yyCancel4)*/) {
Feng.info("格式不正确!");
return ;
}
@@ -527,31 +530,31 @@
ajax.set("zc8", zc8);
ajax.set("zc9", zc9);
- 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("czc1", 0);
+ ajax.set("czc2", 0);
+ ajax.set("czc3", 0);
+ ajax.set("czc4", 0);
+ ajax.set("czc5", 0);
+ ajax.set("czc6", 0);
+ ajax.set("czc7", 0);
+ ajax.set("czc8", 0);
+ ajax.set("czc9", 0);
ajax.set("ptCancel1", ptCancel1);
ajax.set("ptCancel2", ptCancel2);
- ajax.set("ptCancel3", ptCancel3);
- ajax.set("ptCancel4", ptCancel4);
+ ajax.set("ptCancel3", 0);
+ ajax.set("ptCancel4", 0);
ajax.set("ptCancel5", 0);
ajax.set("ptCancel6", 0);
ajax.set("yyCancel1", yyCancel1);
ajax.set("yyCancel2", yyCancel2);
- ajax.set("yyCancel3", yyCancel3);
- ajax.set("yyCancel4", yyCancel4);
+ ajax.set("yyCancel3", 0);
+ ajax.set("yyCancel4", 0);
ajax.set("phone1", phone1);
ajax.set("phone2", phone2);
- ajax.set("phone3", phone3);
+ ajax.set("phone3", 0);
ajax.start();
}
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
index f39243b..16fc2fd 100644
--- 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
@@ -83,8 +83,8 @@
</div>
<div class="row">
<div class="col-sm-6">
- <!--
<#label id="zcNum" name="专车" value="${item.zcNum}"/>
+ <!--
<#label id="czNum" name="出租车" value="${item.czNum}"/>
-->
<#label id="consumptionStr" name="历史消费" value="¥${item.consumptionNum}"/>
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
index 91c94db..c41a9ec 100644
--- 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
@@ -36,12 +36,12 @@
<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" /> 张
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
index 8506b0e..b9e0eb1 100644
--- 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
@@ -274,9 +274,9 @@
{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: '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'},
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
index 1770f84..637c77b 100644
--- 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
@@ -155,8 +155,8 @@
<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: 300px;">专车券金额</th>
+ <th style="width: 300px;">专车券数量</th>
<!--<th style="width: 400px;">出租车券金额</th>-->
<!--<th style="width: 400px;">出租车券数量</th>-->
<th style="width: 300px;">城际金额</th>
@@ -182,12 +182,12 @@
<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/>
出租车活动打折：
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
index bad7c75..7331388 100644
--- 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
@@ -266,8 +266,8 @@
<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: 300px;">专车券金额</th>
+ <th style="width: 300px;">专车券数量</th>
<!--<th style="width: 400px;">出租车券金额</th>-->
<!--<th style="width: 400px;">出租车券数量</th>-->
<th style="width: 300px;">城际金额</th>
@@ -313,7 +313,6 @@
@}
type="checkbox" id="content5Check" class="js-switch2">
<br/>
- <!--
<br/>
专车活动打折：
@@ -325,6 +324,7 @@
@}
name="zc1" id="content5Num1" class="form-control newWidth" readonly/>
<br/>
+ <!--
<br/>
出租车活动打折：
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
index e78adc1..ba96d35 100644
--- 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
@@ -274,8 +274,8 @@
<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: 300px;">专车券金额</th>
+ <th style="width: 300px;">专车券数量</th>
<!--<th style="width: 400px;">出租车券金额</th>-->
<!--<th style="width: 400px;">出租车券数量</th>-->
<th style="width: 300px;">城际金额</th>
@@ -323,7 +323,6 @@
@}
type="checkbox" id="content5Check" class="js-switch2">
<br/>
- <!--
<br/>
专车活动打折：
@@ -335,6 +334,7 @@
@}
name="zc1" id="content5Num1" class="form-control newWidth" />
<br/>
+ <!--
<br/>
出租车活动打折：
--
Gitblit v1.7.1