Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
T
taobao-mini-template
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
2
Issues
2
List
Board
Labels
Milestones
Merge Requests
1
Merge Requests
1
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
qinhaitao
taobao-mini-template
Commits
fa786feb
Commit
fa786feb
authored
Aug 24, 2020
by
李硕
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
去除注释
parent
55edd1ef
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
4 additions
and
5 deletions
+4
-5
prize-dialog.axml
client/components/dialog/prize-dialog/prize-dialog.axml
+0
-1
prize-dialog.js
client/components/dialog/prize-dialog/prize-dialog.js
+2
-2
rank-table.js
client/components/rank/rank-table/rank-table.js
+1
-1
validate.js
client/pages/activity/addBackup/validate.js
+1
-1
No files found.
client/components/dialog/prize-dialog/prize-dialog.axml
View file @
fa786feb
...
@@ -19,7 +19,6 @@
...
@@ -19,7 +19,6 @@
</form-item>
</form-item>
<form-item a:if="{{prizeInitData.type == EQUITY_TYPE}}" validateState="{{choosePrizeTips.status}}" style="width:100%" size="large" help="{{choosePrizeTips.content}}" class="probablity-prize-content-formItem probablity-prize-content-formItem-choosePrize" label="选择奖品" required>
<form-item a:if="{{prizeInitData.type == EQUITY_TYPE}}" validateState="{{choosePrizeTips.status}}" style="width:100%" size="large" help="{{choosePrizeTips.content}}" class="probablity-prize-content-formItem probablity-prize-content-formItem-choosePrize" label="选择奖品" required>
<view class="probablity-prize-content-formitem-choosePrize-wrap">
<view class="probablity-prize-content-formitem-choosePrize-wrap">
<!-- 20200824LS prizeInitData.name > prizeInitData.ename -->
<input a:if="{{prizeInitData.ename}}" disabled="true" class="probablity-prize-content-input" style="margin-right:10px" onChange="changeInput" maxLength="10" value="{{prizeInitData.name}}" hasLimitHint="true" name="活动名称" defaultValue="{{prizeDialogEdit ? prizeDialogData.record.name : prizeInitData.name}}" placeholder="请选择奖品"/>
<input a:if="{{prizeInitData.ename}}" disabled="true" class="probablity-prize-content-input" style="margin-right:10px" onChange="changeInput" maxLength="10" value="{{prizeInitData.name}}" hasLimitHint="true" name="活动名称" defaultValue="{{prizeDialogEdit ? prizeDialogData.record.name : prizeInitData.name}}" placeholder="请选择奖品"/>
<view class="probablity-prize-content-formitem-goequity" onTap="navigateToPlugin" type="primary">{{prizeInitData.ename ? '重新选择' : '选择奖品'}}</view>
<view class="probablity-prize-content-formitem-goequity" onTap="navigateToPlugin" type="primary">{{prizeInitData.ename ? '重新选择' : '选择奖品'}}</view>
</view>
</view>
...
...
client/components/dialog/prize-dialog/prize-dialog.js
View file @
fa786feb
...
@@ -122,7 +122,7 @@ Component({
...
@@ -122,7 +122,7 @@ Component({
const
{
success
,
data
,
message
}
=
await
queryBenefitByEname
({
ename
});
const
{
success
,
data
,
message
}
=
await
queryBenefitByEname
({
ename
});
const
{
benefitName
,
rightTypeId
,
startTime
,
endTime
,
stock
}
=
data
[
0
];
const
{
benefitName
,
rightTypeId
,
startTime
,
endTime
,
stock
}
=
data
[
0
];
if
(
success
)
{
if
(
success
)
{
//
20200824LS
切换不同优惠券内容置空
//切换不同优惠券内容置空
if
(
ename
==
that
.
data
.
prizeInitData
.
ename
)
{
if
(
ename
==
that
.
data
.
prizeInitData
.
ename
)
{
that
.
setData
({
that
.
setData
({
prizeInitData
:
{
prizeInitData
:
{
...
@@ -149,7 +149,7 @@ Component({
...
@@ -149,7 +149,7 @@ Component({
},
},
});
});
}
}
//
20200824LS先去判断优惠券是否更换
//
先去判断优惠券是否更换,再赋值ename
that
.
setData
({
that
.
setData
({
prizeInitData
:
{
prizeInitData
:
{
...
that
.
data
.
prizeInitData
,
...
that
.
data
.
prizeInitData
,
...
...
client/components/rank/rank-table/rank-table.js
View file @
fa786feb
...
@@ -26,7 +26,7 @@ Component({
...
@@ -26,7 +26,7 @@ Component({
handleDeleteClick
(
e
)
{
handleDeleteClick
(
e
)
{
const
{
index
}
=
e
.
target
.
dataset
.
x
;
const
{
index
}
=
e
.
target
.
dataset
.
x
;
const
{
onChange
,
dataName
,
list
}
=
this
.
props
;
const
{
onChange
,
dataName
,
list
}
=
this
.
props
;
//
20200824LS,
删除排行榜奖品时删除奖品类型
//删除排行榜奖品时删除奖品类型
onChange
&&
onChange
(
list
.
filter
(((
i
,
k
)
=>
k
!==
index
)),
dataName
)
onChange
&&
onChange
(
list
.
filter
(((
i
,
k
)
=>
k
!==
index
)),
dataName
)
},
},
addPrize
()
{
addPrize
()
{
...
...
client/pages/activity/addBackup/validate.js
View file @
fa786feb
...
@@ -26,7 +26,7 @@ export const descriptor = {
...
@@ -26,7 +26,7 @@ export const descriptor = {
required
:
true
,
required
:
true
,
validator
:
rankTableValidator
validator
:
rankTableValidator
},
},
//
20200824LS
活动的开始时间和结束时间校验判断
//活动的开始时间和结束时间校验判断
timeRange
:
{
timeRange
:
{
required
:
true
,
required
:
true
,
validator
:
(
rule
,
value
)
=>
{
validator
:
(
rule
,
value
)
=>
{
...
...
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