修改模版

client/pages/activity/add/add.js

@@ -25,11 +25,11 @@ Component({
     id: '',
     startTime: '',
     endTime: '',
-    <% for(var i = 0; i < activityConfigList.length; ++i) {%>
-    <%- !taskTypes.includes(activityConfigList[i].type) && activityConfigList[i].type !== 'label' ? `${activityConfigList[i].key}: ${activityConfigList[i].defaultValue || "''"},` : ''  %><% } %>
+    <% for(var i = 0; i < configList.length; ++i) {%>
+    <%- !taskKeys.includes(configList[i].key) && configList[i].type !== 'Labels' ? `${configList[i].key}: ${configList[i].defaultValue || "''"},` : ''  %><% } %>
     task:{
     <% for(var i = 0; i < activityConfigList.length; ++i) {%>
-    <%- taskTypes.includes(activityConfigList[i].type) ? `${activityConfigList[i].key}:  ${activityConfigList[i] || "{}"},` : {}  %><% } %>
+    <%- activityConfigList[i].parentSort == 'task' ? `${activityConfigList[i].key}:  ${activityConfigList[i] || "{}"},` : {}  %><% } %>
     },
     // tasks: {
     //   // 关注店铺
@@ -207,11 +207,11 @@ Component({
         endTime,
         tasks,
         <% for(var i = 0; i < configList.length; ++i) {%>
-        <%- !taskTypes.includes(configList[i].type) && configList[i].type !== 'label' ? configList[i].key + ',' : ''  %><% } %>
+        <%- !taskKeys.includes(configList[i].key) && configList[i].type !== 'Labels' ? configList[i].key + ',' : ''  %><% } %>
       } = params;
       let prizeList = []
       <% for(var i = 0; i < configList.length; ++i) {%>
-      <%- !taskTypes.includes(configList[i].type) && configList[i].sort !== 'prizePool' && `prizeList = [...prizeList,...${configList[i].key}]`  %><% } %>
+      <%- !taskKeys.includes(configList[i].key) && configList[i].sort !== 'prizePool' && `prizeList = [...prizeList,...${configList[i].key}]`  %><% } %>
       return {
         id,
         activityId,
@@ -221,7 +221,7 @@ Component({
         prizeList,
        // prizeInfoList: this.formatPrizeList(prizeInfoList),
         <% for(var i = 0; i < configList.length; ++i) {%>
-        <%- !taskTypes.includes(configList[i].type) && (configList[i].type !== 'label' && configList[i].sort != 'prizePool') ? configList[i].key + ',' : ''  %><% } %>
+        <%- !taskKeys.includes(configList[i].key) && (configList[i].type !== 'Labels' && configList[i].sort != 'prizePool') ? configList[i].key + ',' : ''  %><% } %>
       }
     },
     // 补足谢谢参与类型

client/pages/activity/add/validate.js

@@ -5,13 +5,13 @@ import { rankTableValidator, validateRangeNumber, rankTimeValidator, isNumber,va
 
 export const descriptor = {
   <% for(var i = 0; i < configList.length; ++i) {%>
-  <%- !taskTypes.includes(configList[i].type) && configList[i].validator ? configList[i].validator + ',' : ''  %><% } %>
+  <%- !taskKeys.includes(configList[i].key) && configList[i].validator ? configList[i].validator + ',' : ''  %><% } %>
   tasks: {
     type: 'object',
     required: false,
     fields: {
       <% for(var i = 0; i < configList.length; ++i) {%>
-      <%- taskTypes.includes(configList[i].type) && configList[i].validator ? configList[i].validator + ',' : ''  %><% } %>
+      <%- taskKeys.includes(configList[i].key) && configList[i].validator ? configList[i].validator + ',' : ''  %><% } %>
     }
   }
 }