Commit 6ebe554b authored by zhaofei's avatar zhaofei

修改模板

parent 8c4c9406
...@@ -6,7 +6,7 @@ export default { ...@@ -6,7 +6,7 @@ export default {
env: "test", // online 线上 test 测试 env: "test", // online 线上 test 测试
// 默认云函数名称 // 默认云函数名称
cloudFnName: 'duiba', cloudFnName: 'duibats',
// 小程序appId // 小程序appId
appId: "<%=appId%>", appId: "<%=appId%>",
......
...@@ -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 + ',' : '' %><% } %>
} }
}, },
// 补足谢谢参与类型 // 补足谢谢参与类型
......
...@@ -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
} }
......
...@@ -437,7 +437,7 @@ export default class ActivityConfigService { ...@@ -437,7 +437,7 @@ export default class ActivityConfigService {
}) })
} }
} }
})
return prizeData return prizeData
} }
// 概率奖品配置 properiodfrom properiodto // 概率奖品配置 properiodfrom properiodto
......
/** @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 {
......
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