记得上下班打卡 | git大法好,push需谨慎
Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
liquidnet-bus-v1
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
董敬伟
liquidnet-bus-v1
Commits
537dad98
Commit
537dad98
authored
Sep 09, 2021
by
张国柄
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
填充页面数据
parent
ffa8849e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
68 additions
and
40 deletions
+68
-40
AdamMemberAdminController.java
...b/controller/zhengzai/adam/AdamMemberAdminController.java
+4
-1
info.html
...c/main/resources/templates/zhengzai/adam/member/info.html
+64
-39
No files found.
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/adam/AdamMemberAdminController.java
View file @
537dad98
...
...
@@ -34,6 +34,7 @@ import org.springframework.web.bind.annotation.*;
import
java.math.BigDecimal
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.stream.Collectors
;
@Api
(
tags
=
"登登登会员"
)
...
...
@@ -114,7 +115,9 @@ public class AdamMemberAdminController extends BaseController {
List
<
CandyMgtCouponMemberDto
>
couponMemberDtoList
=
candyMgtCouponAdminService
.
listForMgtCouponMemberDto
(
mrightsIdList
);
mmap
.
put
(
"couponMemberDtoList"
,
couponMemberDtoList
);
Map
<
String
,
List
<
CandyMgtCouponMemberDto
>>
couponMemberDtoListMap
=
couponMemberDtoList
.
stream
().
collect
(
Collectors
.
groupingBy
(
CandyMgtCouponMemberDto:
:
getMcouponId
));
mmap
.
put
(
"couponMemberDtoListMap"
,
couponMemberDtoListMap
);
}
AdamMemberPrice
memberPrice
=
adamMemberPriceAdminService
.
getOne
(
Wrappers
.
lambdaQuery
(
AdamMemberPrice
.
class
)
...
...
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/adam/member/info.html
View file @
537dad98
...
...
@@ -2,7 +2,6 @@
<html
lang=
"zh"
xmlns:th=
"http://www.thymeleaf.org"
>
<head>
<th:block
th:include=
"include :: header('会员设置')"
/>
<style
type=
"text/css"
>
.user-info-head
{
position
:
relative
;
display
:
inline-block
;}
.user-info-head
:hover:after
{
content
:
'\f030'
;
position
:
absolute
;
left
:
0
;
right
:
0
;
top
:
0
;
bottom
:
0
;
color
:
#eee
;
background
:
rgba
(
0
,
0
,
0
,
0.5
);
font-family
:
FontAwesome
;
font-size
:
24px
;
font-style
:
normal
;
-webkit-font-smoothing
:
antialiased
;
-moz-osx-font-smoothing
:
grayscale
;
cursor
:
pointer
;
line-height
:
110px
;
border-radius
:
50%
;}
</style>
</head>
<style>
.avatar_img
{
...
...
@@ -145,70 +144,88 @@
<label
class=
"col-sm-2 control-label"
>
会员价格:
</label>
<div
class=
"col-sm-10"
>
<label>
原价(元)
</label>
<input
type=
"text"
class=
"form-control"
name=
"price"
placeholder=
"请输入原价"
/>
<input
type=
"text"
class=
"form-control"
name=
"price"
placeholder=
"请输入原价"
th:value=
"${memberPrice.price}"
/>
</div>
<div
class=
"col-sm-10"
>
<label>
购买价格(元)
</label>
<input
type=
"text"
class=
"form-control"
name=
"buyPrice"
placeholder=
"请输入购买价格"
/>
<input
type=
"text"
class=
"form-control"
name=
"buyPrice"
placeholder=
"请输入购买价格"
th:value=
"${memberPrice.priceFixed}"
/>
</div>
<div
class=
"col-sm-10"
>
<label>
首年优惠(元)
</label>
<input
type=
"text"
class=
"form-control"
name=
"discount"
placeholder=
"请输入优惠价格"
/>
<input
type=
"text"
class=
"form-control"
name=
"discount"
placeholder=
"请输入优惠价格"
th:value=
"${memberPrice.priceSpecial}"
/>
</div>
<div
class=
"col-sm-10"
>
<label>
有效时间(天)
</label>
<input
type=
"text"
class=
"form-control"
name=
"validityTime"
placeholder=
"请输入有效时间"
/>
<input
type=
"text"
class=
"form-control"
name=
"validityTime"
placeholder=
"请输入有效时间"
th:value=
"${memberPrice.days}"
/>
</div>
</div>
<div
class=
"interests_column"
>
<div
class=
"form-group interests_item"
>
<label>
权益描述:
</label>
<div
class=
"text-center"
>
<p
class=
"user-info-head avatar_img"
onclick=
"icon(this)"
>
<img
class=
"img-circle img-lg interestsIcon"
/>
</p>
<input
type=
"text"
class=
"form-control"
name=
"interestsTitle"
placeholder=
"请输入标题"
/>
<input
type=
"text"
class=
"form-control"
name=
"interestsSubTitle"
placeholder=
"请输入副标题"
/>
<textarea
class=
"form-control"
name=
"interestsDesc"
placeholder=
"详情内容"
></textarea>
<div
class=
"member-coupes-item"
>
<div
class=
"member-coupes-inner"
>
<div
class=
"member-coupes-detail"
>
<span
class=
"member-coupes-title"
></span>
<span
class=
"member-coupes-coupesType"
></span>
<span
class=
"member-coupes-type"
></span>
<span
class=
"member-coupes-num"
></span>
<span
class=
"member-coupes-time"
></span>
</div>
<div
class=
"member-coupes-bth"
>
<span
onclick=
"editCoupes(this)"
>
编辑
</span>
<span
onclick=
"delCoupes(this)"
>
删除
</span>
</div>
<label>
权益描述:
</label>
<ul
th:each=
"mr:${memberRightsList}"
>
<div
class=
"form-group interests_item"
>
<div
class=
"text-center"
>
<p
class=
"user-info-head avatar_img"
onclick=
"icon(this)"
>
<img
class=
"img-circle img-lg interestsIcon"
th:src=
"${mr.cover}"
/>
</p>
<input
type=
"text"
class=
"form-control"
name=
"interestsTitle"
placeholder=
"请输入标题"
th:value=
"${mr.title}"
/>
<input
type=
"text"
class=
"form-control"
name=
"interestsSubTitle"
placeholder=
"请输入副标题"
th:value=
"${mr.subTitle}"
/>
<textarea
class=
"form-control"
name=
"interestsDesc"
placeholder=
"详情内容"
th:value=
"${mr.detail}"
></textarea>
<div
class=
"member-coupes-item"
>
<ul
th:each=
"mrc:${couponMemberDtoListMap.get(mr.mrightsId)}"
>
<div
class=
"member-coupes-inner"
>
<div
class=
"member-coupes-detail"
>
<span
class=
"member-coupes-mcouponId"
th:text=
"${mrc.mcouponId}"
hidden
></span>
<span
class=
"member-coupes-busiType"
th:if=
"${mrc.busiType == 0}"
>
全场
</span>
<span
class=
"member-coupes-busiType"
th:if=
"${mrc.busiType == 1}"
>
演出
</span>
<span
class=
"member-coupes-busiType"
th:if=
"${mrc.busiType == 2}"
>
商品
</span>
<span
class=
"member-coupes-busiType"
th:if=
"${mrc.busiType == 3}"
>
优先购
</span>
<span
class=
"member-coupes-type"
th:if=
"${mrc.couType == 1}"
>
代金券
</span>
<span
class=
"member-coupes-type"
th:if=
"${mrc.couType == 2}"
>
满减券
</span>
<span
class=
"member-coupes-type"
th:if=
"${mrc.couType == 101}"
>
优先券
</span>
<span
class=
"member-coupes-title"
th:text=
"${mrc.title}"
></span>
<span
class=
"member-coupes-mark"
>
通用
</span>
<span
class=
"member-coupes-num"
th:text=
"${mrc.eventAmt} + '张'"
></span>
<span
class=
"member-coupes-time"
th:text=
"${memberPrice.days} + '天'"
></span>
</div>
<div
class=
"member-coupes-bth"
>
<span
onclick=
"editCoupes(this)"
>
编辑
</span>
<span
onclick=
"delCoupes(this)"
>
删除
</span>
</div>
</div>
</ul>
</div>
<div
class=
"member-coupes"
onclick=
"addCoupes(this)"
>
+添加券
<br/>
*全场券不需要重复添加
</div>
<div
class=
"go-member-item"
onclick=
"addColumn(this)"
>
继续添加
</div>
</div>
<div
class=
"member-coupes"
onclick=
"addCoupes(this)"
>
+添加券
<br/>
*全场券不需要重复添加
</div>
<div
class=
"go-member-item"
onclick=
"addColumn(this)"
>
继续添加
</div>
</div>
</
div
>
</
ul
>
</div>
<div
class=
"form-group"
>
<label
class=
"col-sm-2 control-label"
>
双倍积分:
</label>
<div
class=
"col-sm-10"
>
<div
class=
"radio-box"
>
<input
type=
"radio"
id=
"integral1"
name=
"integral"
value=
"
0
"
/>
<input
type=
"radio"
id=
"integral1"
name=
"integral"
value=
"
1"
th:attr=
"checked=${member.integralRate == 1}
"
/>
<label
for=
"radio1"
>
否
</label>
</div>
<div
class=
"radio-box"
>
<input
type=
"radio"
id=
"integral2"
name=
"integral"
value=
"
1
"
/>
<input
type=
"radio"
id=
"integral2"
name=
"integral"
value=
"
2"
th:attr=
"checked=${member.integralRate == 2}
"
/>
<label
for=
"radio2"
>
是
</label>
</div>
</div>
</div>
<div
class=
"form-group"
>
<div
class=
"col-sm-offset-2 col-sm-10"
>
<button
type=
"button"
class=
"btn btn-sm btn-primary"
onclick=
"submitMemberShip()"
><i
class=
"fa fa-check"
></i>
保 存
</button>
<button
type=
"button"
class=
"btn btn-sm btn-danger"
onclick=
"closeItem()"
><i
class=
"fa fa-reply-all"
></i>
关 闭
</button
>
</div
>
</div
>
<!-- <div class="form-group">--
>
<!-- <div class="col-sm-offset-2 col-sm-10">--
>
<!-- <button type="button" class="btn btn-sm btn-primary" onclick="submitMemberShip()"><i class="fa fa-check"></i>保 存</button> -->
<!-- <button type="button" class="btn btn-sm btn-danger" onclick="closeItem()"><i class="fa fa-reply-all"></i>关 闭 </button>--
>
<!-- </div>--
>
<!-- </div>--
>
</form>
</div>
...
...
@@ -229,7 +246,15 @@
<th:block
th:include=
"include :: footer"
/>
<th:block
th:include=
"include :: bootstrap-fileinput-js"
/>
<th:block
th:include=
"include :: bootstrap-fileinput-css"
/>
<script>
<script
th:inline=
"javascript"
>
var
member
=
[[
$
{
member
}]];
console
.
log
(
member
);
var
memberRightsList
=
[[
$
{
memberRightsList
}]];
console
.
log
(
memberRightsList
);
var
couponMemberDtoListMap
=
[[
$
{
couponMemberDtoListMap
}]];
console
.
log
(
couponMemberDtoListMap
);
var
memberPrice
=
[[
$
{
memberPrice
}]];
console
.
log
(
member
);
// var platformUrl = "[[${platformUrl}]]";
function
icon
(
obj
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment