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
6ebe554b
Commit
6ebe554b
authored
Nov 11, 2020
by
zhaofei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改模板
parent
8c4c9406
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
8 additions
and
8 deletions
+8
-8
config.js
client/config.js
+1
-1
add.js
client/pages/activity/add/add.js
+2
-1
save.controller.ts
server/duibats/src/controller/save.controller.ts
+2
-4
activityconfig.service.ts
server/duibats/src/service/activityconfig.service.ts
+1
-1
activity.d.ts
server/duibats/src/typings/activity.d.ts
+2
-1
No files found.
client/config.js
View file @
6ebe554b
...
@@ -6,7 +6,7 @@ export default {
...
@@ -6,7 +6,7 @@ export default {
env
:
"test"
,
// online 线上 test 测试
env
:
"test"
,
// online 线上 test 测试
// 默认云函数名称
// 默认云函数名称
cloudFnName
:
'duiba'
,
cloudFnName
:
'duiba
ts
'
,
// 小程序appId
// 小程序appId
appId
:
"<%=appId%>"
,
appId
:
"<%=appId%>"
,
...
...
client/pages/activity/add/add.js
View file @
6ebe554b
...
@@ -220,9 +220,10 @@ Component({
...
@@ -220,9 +220,10 @@ Component({
startTime
:
new
Date
(
startTime
).
getTime
(),
startTime
:
new
Date
(
startTime
).
getTime
(),
endTime
:
new
Date
(
endTime
).
getTime
(),
endTime
:
new
Date
(
endTime
).
getTime
(),
tasks
,
tasks
,
prizeList
,
// prizeInfoList: this.formatPrizeList(prizeInfoList),
// prizeInfoList: this.formatPrizeList(prizeInfoList),
<%
for
(
var
i
=
0
;
i
<
configList
.
length
;
++
i
)
{
%>
<%
for
(
var
i
=
0
;
i
<
configList
.
length
;
++
i
)
{
%>
<%-
!
taskKeys
.
includes
(
configList
[
i
].
key
)
&&
configList
[
i
].
key
!==
'label'
?
configList
[
i
].
key
+
','
:
''
%><%
}
%>
<%-
!
taskKeys
.
includes
(
configList
[
i
].
key
)
&&
(
configList
[
i
].
key
!==
'label'
&&
configList
[
i
].
sort
!=
'prizePool'
)
?
configList
[
i
].
key
+
','
:
''
%><%
}
%>
}
}
},
},
// 补足谢谢参与类型
// 补足谢谢参与类型
...
...
server/duibats/src/controller/save.controller.ts
View file @
6ebe554b
...
@@ -34,8 +34,7 @@ export default class ActivitSaveController {
...
@@ -34,8 +34,7 @@ export default class ActivitSaveController {
startTime
,
endTime
,
startTime
,
endTime
,
tasks
=
{},
rule
,
tasks
=
{},
rule
,
prizeList
,
prizeList
,
<%
for
(
var
i
=
0
;
i
<
configList
.
length
;
++
i
)
{
%>
...
data
<%-
!
taskKeys
.
includes
(
configList
[
i
].
key
)
&&
configList
[
i
].
key
!==
'label'
?
configList
[
i
].
key
+
','
:
''
%><%
}
%>
}
=
context
.
data
}
=
context
.
data
const
{
openId
}
=
context
const
{
openId
}
=
context
...
@@ -47,8 +46,7 @@ export default class ActivitSaveController {
...
@@ -47,8 +46,7 @@ export default class ActivitSaveController {
rule
,
rule
,
openId
,
openId
,
tasks
,
tasks
,
<%
for
(
var
i
=
0
;
i
<
configList
.
length
;
++
i
)
{
%>
...
data
,
<%-
!
taskKeys
.
includes
(
configList
[
i
].
key
)
&&
configList
[
i
].
key
!==
'label'
?
configList
[
i
].
key
+
','
:
''
%><%
}
%>
// 奖品过期时间, 根据需求领奖是否有过期时间
// 奖品过期时间, 根据需求领奖是否有过期时间
awardReceiveExpiredTime
:
endTime
+
_48_HOURS
awardReceiveExpiredTime
:
endTime
+
_48_HOURS
}
}
...
...
server/duibats/src/service/activityconfig.service.ts
View file @
6ebe554b
...
@@ -437,7 +437,7 @@ export default class ActivityConfigService {
...
@@ -437,7 +437,7 @@ export default class ActivityConfigService {
})
})
}
}
}
}
})
return
prizeData
return
prizeData
}
}
// 概率奖品配置 properiodfrom properiodto
// 概率奖品配置 properiodfrom properiodto
...
...
server/duibats/src/typings/activity.d.ts
View file @
6ebe554b
/** @format */
/** @format */
interface
IActivityBaseInfo
{
interface
IActivityBaseInfo
<
T
>
{
_id
?:
string
_id
?:
string
activityId
?:
string
activityId
?:
string
openId
?:
string
openId
?:
string
...
@@ -14,6 +14,7 @@ interface IActivityBaseInfo {
...
@@ -14,6 +14,7 @@ interface IActivityBaseInfo {
updateTime
?:
number
updateTime
?:
number
awardReceiveExpiredTime
?:
number
awardReceiveExpiredTime
?:
number
tasks
?:
ITasks
tasks
?:
ITasks
data
?:
T
}
}
interface
IActivityPrize
{
interface
IActivityPrize
{
...
...
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