记得上下班打卡 | git大法好，push需谨慎

Skip to content

L
liquidnet-bus-v1
Commit 60bacbea authored by 胡佳晨's avatar 胡佳晨
Browse files
Options

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

parents c0df20d6 6ffd4e5c
Show whitespace changes
Inline Side-by-side
Showing with 184 additions and 102 deletions
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/field/applyDetail.html
View file @ 60bacbea
...@@ -14,62 +14,96 @@ ...@@ -14,62 +14,96 @@
.form-btns{ .form-btns{
padding-bottom: 20px; padding-bottom: 20px;
} }
.form-dis{ .field-detail-content{
display: none; display: flex;
} }
</style> </style>
</head> </head>
<body class="white-bg"> <body class="white-bg">
<form class="form-horizontal m-t" id="signupForm"> <div class="field-detail">
<div class="field-detail-content row">
<form class="form-horizontal col-md-6" id="signupForm">
<div class="form-group"> <div class="form-group">
<label class="col-sm-2 control-label">场地名称：</label> <label class="col-md-3 control-label">场地名称：</label>
<div class="form-control-static" th:text="${fieldApplyInfo.name}"></div> <div class="form-control-static col-md-9" th:text="${fieldApplyInfo.name}"></div>
<label class="col-sm-2 control-label">场地logo：</label> <label class="col-md-3 control-label">场地logo：</label>
<div class="form-control-static"> <div class="form-control-static col-md-9">
<img class="field-detail-avatar" th:src="${fieldApplyInfo.logo}" alt=""> <img class="field-detail-avatar" th:src="${fieldApplyInfo.logo}" alt="">
</div> </div>
<label class="col-sm-2 control-label">场地背景图：</label> <label class="col-md-3 control-label">场地背景图：</label>
<div class="form-control-static"> <div class="form-control-static col-md-9">
<img class="field-detail-avatar" th:src="${fieldApplyInfo.background}" alt=""> <img class="field-detail-avatar" th:src="${fieldApplyInfo.background}" alt="">
</div> </div>
<label class="col-sm-2 control-label">场地创建时间：</label> <label class="col-md-3 control-label">场地创建时间：</label>
<div class="form-control-static" th:text="${fieldApplyInfo.builtDate}"></div> <div class="form-control-static col-md-9" th:text="${fieldApplyInfo.builtDate}"></div>
<label class="col-sm-2 control-label">地区：</label> <label class="col-md-3 control-label">地区：</label>
<div class="form-control-static" th:text="${fieldApplyInfo.provinceName + fieldApplyInfo.cityName + fieldApplyInfo.districtName}"></div> <div class="form-control-static col-md-9" th:text="${fieldApplyInfo.provinceName + fieldApplyInfo.cityName + fieldApplyInfo.districtName}"></div>
<label class="col-sm-2 control-label">坐标：</label> <label class="col-md-3 control-label">坐标：</label>
<div class="form-control-static" th:text="${fieldApplyInfo.longitude + ',' + fieldApplyInfo.latitude}"></div> <div class="form-control-static col-md-9" th:text="${fieldApplyInfo.longitude + ',' + fieldApplyInfo.latitude}"></div>
<label class="col-sm-2 control-label">地址详情：</label> <label class="col-md-3 control-label">地址详情：</label>
<div class="form-control-static" th:text="${fieldApplyInfo.address}"></div> <div class="form-control-static col-md-9" th:text="${fieldApplyInfo.address}"></div>
<label class="col-sm-2 control-label">介绍：</label> <label class="col-md-3 control-label">介绍：</label>
<div class="form-control-static" th:text="${fieldApplyInfo.description}"></div> <div class="form-control-static col-md-9" th:text="${fieldApplyInfo.description}"></div>
<label class="col-sm-2 control-label">场地负责人姓名：</label> <label class="col-md-3 control-label">场地负责人姓名：</label>
<div class="form-control-static" th:text="${fieldApplyInfo.contactName}"></div> <div class="form-control-static col-md-9" th:text="${fieldApplyInfo.contactName}"></div>
<label class="col-sm-2 control-label">联系方式：</label> <label class="col-md-3 control-label">联系方式：</label>
<div class="form-control-static" th:text="${fieldApplyInfo.contactEmail}"></div> <div class="form-control-static col-md-9" th:text="${fieldApplyInfo.contactEmail}"></div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-2 control-label">企业名称：</label> <label class="col-md-3 control-label">企业名称：</label>
<div class="form-control-static" th:text="${fieldApplyInfo.companyName}"></div> <div class="form-control-static col-md-9" th:text="${fieldApplyInfo.companyName}"></div>
<label class="col-sm-2 control-label">营业执照编号：</label> <label class="col-md-3 control-label">营业执照编号：</label>
<div class="form-control-static" th:text="${fieldApplyInfo.licenseCode}"></div> <div class="form-control-static col-md-9" th:text="${fieldApplyInfo.licenseCode}"></div>
<label class="col-sm-2 control-label">营业执照：</label> <label class="col-md-3 control-label">营业执照：</label>
<div class="form-control-static" > <div class="form-control-static col-md-9" >
<img class="field-detail-avatar-certificates" th:src="${fieldApplyInfo.licenseImg}" alt=""> <img class="field-detail-avatar-certificates" th:src="${fieldApplyInfo.licenseImg}" alt="">
</div> </div>
<label class="col-sm-2 control-label">法人代表名称：</label> <label class="col-md-3 control-label">法人代表名称：</label>
<div class="form-control-static" th:text="${fieldApplyInfo.legalName}"></div> <div class="form-control-static col-md-9" th:text="${fieldApplyInfo.legalName}"></div>
<label class="col-sm-2 control-label">法人代表身份证号：</label> <label class="col-md-3 control-label">法人代表身份证号：</label>
<div class="form-control-static" th:text="${fieldApplyInfo.legalIdentity}"></div> <div class="form-control-static col-md-9" th:text="${fieldApplyInfo.legalIdentity}"></div>
<label class="col-sm-2 control-label">法人证件正面照：</label> <label class="col-md-3 control-label">法人证件正面照：</label>
<div class="form-control-static"> <div class="form-control-static col-md-9">
<img class="field-detail-avatar-certificates" th:src="${fieldApplyInfo.legalIdentityObverse}" alt=""> <img class="field-detail-avatar-certificates" th:src="${fieldApplyInfo.legalIdentityObverse}" alt="">
</div> </div>
<label class="col-sm-2 control-label">法人证件反面照：</label> <label class="col-md-3 control-label">法人证件反面照：</label>
<div class="form-control-static"> <div class="form-control-static col-md-9">
<img class="field-detail-avatar-certificates" th:src="${fieldApplyInfo.legalIdentityReverse}" alt=""> <img class="field-detail-avatar-certificates" th:src="${fieldApplyInfo.legalIdentityReverse}" alt="">
</div> </div>
</div> </div>
<div class="form-group form-btns" th:class="${fieldApplyInfo.applyStatus == 0? '' : 'form-dis'}"> </form>
<form class="form-horizontal col-md-6" th:if="${fieldApplyInfo.applyType == 'claim'}">
<div class="form-group">
<label class="col-md-3 control-label">场地名称：</label>
<div class="form-control-static col-md-9" th:text="${fieldApplyInfo.fieldVo.name}"></div>
<label class="col-md-3 control-label">场地logo：</label>
<div class="form-control-static col-md-9">
<img class="field-detail-avatar" th:src="${fieldApplyInfo.fieldVo.logo}" alt="">
</div>
<label class="col-md-3 control-label">场地背景图：</label>
<div class="form-control-static col-md-9">
<img class="field-detail-avatar" th:src="${fieldApplyInfo.fieldVo.background}" alt="">
</div>
<label class="col-md-3 control-label">场地创建时间：</label>
<div class="form-control-static col-md-9" th:text="${fieldApplyInfo.fieldVo.builtDate}"></div>
<label class="col-md-3 control-label">地区：</label>
<div class="form-control-static col-md-9" th:text="${fieldApplyInfo.fieldVo.provinceName + fieldApplyInfo.fieldVo.cityName + fieldApplyInfo.fieldVo.districtName}"></div>
<label class="col-md-3 control-label">坐标：</label>
<div class="form-control-static col-md-9" th:text="${fieldApplyInfo.fieldVo.longitude + ',' + fieldApplyInfo.fieldVo.latitude}"></div>
<label class="col-md-3 control-label">地址详情：</label>
<div class="form-control-static col-md-9" th:text="${fieldApplyInfo.fieldVo.address}"></div>
<label class="col-md-3 control-label">介绍：</label>
<div class="form-control-static col-md-9" th:text="${fieldApplyInfo.fieldVo.description}"></div>
<label class="col-md-3 control-label">场地负责人姓名：</label>
<div class="form-control-static col-md-9" th:text="${fieldApplyInfo.fieldVo.contactName}"></div>
<label class="col-md-3 control-label">联系方式：</label>
<div class="form-control-static col-md-9" th:text="${fieldApplyInfo.fieldVo.contactEmail}"></div>
</div>
</form>
</div>
<div class="field-detail-btn">
<div class="form-group form-btns" th:if="${fieldApplyInfo.applyStatus == 0}">
<div class="col-sm-offset-2 col-sm-10"> <div class="col-sm-offset-2 col-sm-10">
<button type="button" class="btn btn-sm btn-primary" onclick="AdoptSubmit()">审核通过</button>&nbsp; <button type="button" class="btn btn-sm btn-primary" onclick="AdoptSubmit()">审核通过</button>&nbsp;
<a class="btn btn-sm btn-danger" href="#field-reject-form" data-toggle="modal"> <a class="btn btn-sm btn-danger" href="#field-reject-form" data-toggle="modal">
...@@ -98,7 +132,9 @@ ...@@ -98,7 +132,9 @@
</div> </div>
</div> </div>
</div> </div>
</form> </div>
</div>
</body> </body>
<th:block th:include="include :: footer" /> <th:block th:include="include :: footer" />
<script th:inline="javascript"> <script th:inline="javascript">
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/field/detail.html
View file @ 60bacbea
...@@ -14,9 +14,6 @@ ...@@ -14,9 +14,6 @@
.form-btns{ .form-btns{
padding-bottom: 20px; padding-bottom: 20px;
} }
.form-dis{
display: none;
}
</style> </style>
</head> </head>
<body class="white-bg"> <body class="white-bg">
...@@ -47,26 +44,26 @@ ...@@ -47,26 +44,26 @@
<label class="col-sm-2 control-label">联系方式：</label> <label class="col-sm-2 control-label">联系方式：</label>
<div class="form-control-static col-sm-9" th:text="${fieldInfo.contactEmail}"></div> <div class="form-control-static col-sm-9" th:text="${fieldInfo.contactEmail}"></div>
</div> </div>
<div class="form-group" th:class="${fieldInfo.companiesVo != null ? '' : 'form-dis'}"> <div class="form-group" th:if="${fieldInfo.companiesVo != null}">
<label class="col-sm-2 control-label">企业名称：</label> <label class="col-sm-2 control-label">企业名称：</label>
<div class="form-control-static col-sm-9" th:text="${fieldInfo.companiesVo == null ? '' : fieldInfo.companiesVo.name}"></div> <div class="form-control-static col-sm-9" th:text="${fieldInfo.companiesVo.name}"></div>
<label class="col-sm-2 control-label">营业执照编号：</label> <label class="col-sm-2 control-label">营业执照编号：</label>
<div class="form-control-static col-sm-9" th:text="${fieldInfo.companiesVo == null ? '' : fieldInfo.companiesVo.licenseCode}"></div> <div class="form-control-static col-sm-9" th:text="${fieldInfo.companiesVo.licenseCode}"></div>
<label class="col-sm-2 control-label">营业执照：</label> <label class="col-sm-2 control-label">营业执照：</label>
<div class="form-control-static col-sm-9" > <div class="form-control-static col-sm-9" >
<img class="field-detail-avatar-certificates" th:src="${fieldInfo.companiesVo == null ? '' : fieldInfo.companiesVo.licenseImg}" alt=""> <img class="field-detail-avatar-certificates" th:src="${fieldInfo.companiesVo.licenseImg}" alt="">
</div> </div>
<label class="col-sm-2 control-label">法人代表名称：</label> <label class="col-sm-2 control-label">法人代表名称：</label>
<div class="form-control-static col-sm-9" th:text="${fieldInfo.companiesVo == null ? '' : fieldInfo.companiesVo.legalName}"></div> <div class="form-control-static col-sm-9" th:text="${fieldInfo.companiesVo.legalName}"></div>
<label class="col-sm-2 control-label">法人代表身份证号：</label> <label class="col-sm-2 control-label">法人代表身份证号：</label>
<div class="form-control-static col-sm-9" th:text="${fieldInfo.companiesVo == null ? '' : fieldInfo.companiesVo.legalIdentity}"></div> <div class="form-control-static col-sm-9" th:text="${fieldInfo.companiesVo.legalIdentity}"></div>
<label class="col-sm-2 control-label">法人证件正面照：</label> <label class="col-sm-2 control-label">法人证件正面照：</label>
<div class="form-control-static col-sm-9"> <div class="form-control-static col-sm-9">
<img class="field-detail-avatar-certificates" th:src="${fieldInfo.companiesVo == null ? '' : fieldInfo.companiesVo.legalIdentityObverse}" alt=""> <img class="field-detail-avatar-certificates" th:src="${fieldInfo.companiesVo.legalIdentityObverse}" alt="">
</div> </div>
<label class="col-sm-2 control-label">法人证件反面照：</label> <label class="col-sm-2 control-label">法人证件反面照：</label>
<div class="form-control-static col-sm-9"> <div class="form-control-static col-sm-9">
<img class="field-detail-avatar-certificates" th:src="${fieldInfo.companiesVo == null ? '' : fieldInfo.companiesVo.legalIdentityReverse}" alt=""> <img class="field-detail-avatar-certificates" th:src="${fieldInfo.companiesVo.legalIdentityReverse}" alt="">
</div> </div>
</div> </div>
</form> </form>
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/sponsor/detail.html
View file @ 60bacbea
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="zh" xmlns:th="http://www.thymeleaf.org">
<head> <head>
<meta charset="UTF-8"> <th:block th:include="include :: header('主办详情')"/>
<title>Title</title> <style>
.field-detail-avatar{
width: 146px;
height: 146px;
}
.field-detail-avatar-certificates{
width: 300px;
height: 200px;
}
.form-btns{
padding-bottom: 20px;
}
.form-dis{
display: none;
}
</style>
</head> </head>
<body> <body class="white-bg">
<form class="form-horizontal m-t" id="signupForm">
<div class="form-group">
<label class="col-sm-2 control-label">主办名称：</label>
<div class="form-control-static" th:text="${sponsorInfo.name}"></div>
<label class="col-sm-2 control-label">主办logo：</label>
<div class="form-control-static">
<img class="field-detail-avatar" th:src="${sponsorInfo.logo}" alt="">
</div>
<label class="col-sm-2 control-label">主办背景图：</label>
<div class="form-control-static">
<img class="field-detail-avatar" th:src="${sponsorInfo.background}" alt="">
</div>
<label class="col-sm-2 control-label">介绍：</label>
<div class="form-control-static" th:text="${sponsorInfo.description}"></div>
<label class="col-sm-2 control-label">姓名：</label>
<div class="form-control-static" th:text="${sponsorInfo.contactName}"></div>
<label class="col-sm-2 control-label">身份证号：</label>
<div class="form-control-static" th:text="${sponsorInfo.contactIdentity}"></div>
<label class="col-sm-2 control-label">证件正面照：</label>
<div class="form-control-static">
<img class="field-detail-avatar-certificates" th:src="${sponsorInfo.contactIdentityObverse}" alt="">
</div>
<label class="col-sm-2 control-label">证件反面照：</label>
<div class="form-control-static">
<img class="field-detail-avatar-certificates" th:src="${sponsorInfo.contactIdentityReverse}" alt="">
</div>
<label class="col-sm-2 control-label">联系方式：</label>
<div class="form-control-static" th:text="${sponsorInfo.contactEmail}"></div>
</div>
</form>
</body> </body>
<th:block th:include="include :: footer" />
<script th:inline="javascript">
</script>
</html> </html>
\ No newline at end of file
liquidnet-bus-service/liquidnet-service-merchant/liquidnet-service-merchant-impl/docu/db_merchant.sql
View file @ 60bacbea
...@@ -33,9 +33,9 @@ create table merchant_fields ...@@ -33,9 +33,9 @@ create table merchant_fields
updated_at timestamp null updated_at timestamp null
) engine=InnoDB default charset=utf8mb4 collate=utf8mb4_unicode_ci comment '场地表'; ) engine=InnoDB default charset=utf8mb4 collate=utf8mb4_unicode_ci comment '场地表';
create index company_id_index on merchant_fields (company_id); create unique index field_id_index on merchant_fields (field_id);
create index field_id_index on merchant_fields (field_id);
create index uid_index on merchant_fields (uid); create index uid_index on merchant_fields (uid);
create index company_id_index on merchant_fields (company_id);
-- >>------------------------------------------------------------------------------------ -- >>------------------------------------------------------------------------------------
...@@ -54,10 +54,10 @@ create table merchant_field_checkers ...@@ -54,10 +54,10 @@ create table merchant_field_checkers
updated_at timestamp null updated_at timestamp null
) engine=InnoDB default charset=utf8mb4 collate=utf8mb4_unicode_ci comment '场地默认验票员表'; ) engine=InnoDB default charset=utf8mb4 collate=utf8mb4_unicode_ci comment '场地默认验票员表';
create index cuid_index on merchant_field_checkers (cuid); create unique index field_checker_id_index on merchant_field_checkers (field_checker_id);
create index field_apply_id_index on merchant_field_checkers (field_checker_id);
create index field_id_index on merchant_field_checkers (field_id); create index field_id_index on merchant_field_checkers (field_id);
create index uid_index on merchant_field_checkers (uid); create index uid_index on merchant_field_checkers (uid);
create index cuid_index on merchant_field_checkers (cuid);
-- >>------------------------------------------------------------------------------------ -- >>------------------------------------------------------------------------------------
...@@ -102,7 +102,7 @@ create table merchant_field_applies ...@@ -102,7 +102,7 @@ create table merchant_field_applies
updated_at timestamp null updated_at timestamp null
) engine=InnoDB default charset=utf8mb4 collate=utf8mb4_unicode_ci comment '场地申请表'; ) engine=InnoDB default charset=utf8mb4 collate=utf8mb4_unicode_ci comment '场地申请表';
create index field_apply_id_index on merchant_field_applies (field_apply_id); create unique index field_apply_id_index on merchant_field_applies (field_apply_id);
create index field_id_index on merchant_field_applies (field_id); create index field_id_index on merchant_field_applies (field_id);
create index uid_index on merchant_field_applies (uid); create index uid_index on merchant_field_applies (uid);
...@@ -129,9 +129,9 @@ create table merchant_sponsors ...@@ -129,9 +129,9 @@ create table merchant_sponsors
updated_at timestamp null updated_at timestamp null
) engine=InnoDB default charset=utf8mb4 collate=utf8mb4_unicode_ci comment '主办表'; ) engine=InnoDB default charset=utf8mb4 collate=utf8mb4_unicode_ci comment '主办表';
create index company_id_index on merchant_sponsors (company_id); create unique index sponsor_id_index on merchant_sponsors (sponsor_id);
create index sponsor_id_index on merchant_sponsors (sponsor_id);
create index uid_index on merchant_sponsors (uid); create index uid_index on merchant_sponsors (uid);
create index company_id_index on merchant_sponsors (company_id);
-- >>------------------------------------------------------------------------------------ -- >>------------------------------------------------------------------------------------
...@@ -169,7 +169,7 @@ create table merchant_sponsor_applies ...@@ -169,7 +169,7 @@ create table merchant_sponsor_applies
updated_at timestamp null updated_at timestamp null
) engine=InnoDB default charset=utf8mb4 collate=utf8mb4_unicode_ci comment '主办申请表'; ) engine=InnoDB default charset=utf8mb4 collate=utf8mb4_unicode_ci comment '主办申请表';
create index sponsor_apply_id_index on merchant_sponsor_applies (sponsor_apply_id); create unique index sponsor_apply_id_index on merchant_sponsor_applies (sponsor_apply_id);
create index sponsor_id_index on merchant_sponsor_applies (sponsor_id); create index sponsor_id_index on merchant_sponsor_applies (sponsor_id);
create index uid_index on merchant_sponsor_applies (uid); create index uid_index on merchant_sponsor_applies (uid);
...@@ -191,7 +191,7 @@ create table merchant_companies ...@@ -191,7 +191,7 @@ create table merchant_companies
updated_at timestamp null updated_at timestamp null
) engine=InnoDB default charset=utf8mb4 collate=utf8mb4_unicode_ci comment '公司表'; ) engine=InnoDB default charset=utf8mb4 collate=utf8mb4_unicode_ci comment '公司表';
create index company_id_index on merchant_companies (company_id); create unique index company_id_index on merchant_companies (company_id);
-- >>------------------------------------------------------------------------------------ -- >>------------------------------------------------------------------------------------
...@@ -212,10 +212,10 @@ create table merchant_authorization_records ...@@ -212,10 +212,10 @@ create table merchant_authorization_records
updated_at timestamp null updated_at timestamp null
) engine=InnoDB default charset=utf8mb4 collate=utf8mb4_unicode_ci comment '演出授权记录表'; ) engine=InnoDB default charset=utf8mb4 collate=utf8mb4_unicode_ci comment '演出授权记录表';
create index authorization_record_id_index on merchant_authorization_records (authorization_record_id); create unique index authorization_record_id_index on merchant_authorization_records (authorization_record_id);
create index performance_id_index on merchant_authorization_records (performance_id);
create index cuid_index on merchant_authorization_records (cuid); create index cuid_index on merchant_authorization_records (cuid);
create index cuid_role_index on merchant_authorization_records (cuid_role); create index cuid_role_index on merchant_authorization_records (cuid_role);
create index performance_id_index on merchant_authorization_records (performance_id);
create index uid_index on merchant_authorization_records (uid); create index uid_index on merchant_authorization_records (uid);
create index uid_role_index on merchant_authorization_records (uid_role); create index uid_role_index on merchant_authorization_records (uid_role);
...@@ -231,7 +231,7 @@ create table merchant_permissions ...@@ -231,7 +231,7 @@ create table merchant_permissions
updated_at timestamp null updated_at timestamp null
) engine=InnoDB default charset=utf8mb4 collate=utf8mb4_unicode_ci comment '演出权限表'; ) engine=InnoDB default charset=utf8mb4 collate=utf8mb4_unicode_ci comment '演出权限表';
create index permission_id_index on merchant_permissions (permission_id); create unique index permission_id_index on merchant_permissions (permission_id);
-- >>------------------------------------------------------------------------------------ -- >>------------------------------------------------------------------------------------
...@@ -248,7 +248,7 @@ create table merchant_authorization_permissions ...@@ -248,7 +248,7 @@ create table merchant_authorization_permissions
updated_at timestamp null updated_at timestamp null
) engine=InnoDB default charset=utf8mb4 collate=utf8mb4_unicode_ci comment '演出授权关联权限表'; ) engine=InnoDB default charset=utf8mb4 collate=utf8mb4_unicode_ci comment '演出授权关联权限表';
create index authorization_permission_id_index on merchant_authorization_permissions (authorization_permission_id); create unique index authorization_permission_id_index on merchant_authorization_permissions (authorization_permission_id);
create index authorization_record_id_index on merchant_authorization_permissions (authorization_record_id); create index authorization_record_id_index on merchant_authorization_permissions (authorization_record_id);
create index permission_id_index on merchant_authorization_permissions (permission_id); create index permission_id_index on merchant_authorization_permissions (permission_id);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment