fix

client/components/dialog/rank-dialog/rank-dialog.js

@@ -104,10 +104,10 @@ Component({
         ...this.data.searchInfo,
         activityId: this.props.selectedItem.activityId
       };
-      <%- winnersFilterData.includes('timeRange') &&
+      <%- winnersFilterData.includes('timeRange') ?
       `params.startTime = new Date(params.timeRange[0]).getTime();
       params.endTime = new Date(params.timeRange[1]).getTime();
-      delete params.timeRange;`%>
+      delete params.timeRange;` : ''%>
 
       console.log('搜索参数', params);
 
@@ -162,9 +162,9 @@ Component({
       }
       const { activityId, title } = this.props.selectedItem;
       let params = { ...this.data.searchInfo, activityId, title };
-      <%- winnersFilterData.includes('timeRange') &&
+      <%- winnersFilterData.includes('timeRange') ?
       `params.startTime = new Date(params.timeRange[0]).getTime();
-      params.endTime = new Date(params.timeRange[1]).getTime();` %>
+      params.endTime = new Date(params.timeRange[1]).getTime();` : '' %>
       
       params.pageNo = 1;
       params.pageSize = 500;

server/duibats/src/controller/awards.controller.ts

@@ -133,19 +133,19 @@ export default class BaseController {
         if (v.type == PRIZE_TYPE.THANK) prizeType = '谢谢参与'
       }
       xlsxData.push([
-        <%- `${winnersExportData.includes('奖品编号') && 'v._id,'}`%>
-        <%- `${winnersExportData.includes('用户id') && 'v.userNick,'}`%>
-        <%- `${winnersExportData.includes('中奖时间') && "v.createTime ? formatTime(new Date(v.createTime + EIGHT_HOURS)) : '',"}`%>
-        <%- `${winnersExportData.includes('地址填写时间') && "v.type == 3 ? (v.receiveTime ? formatTime(new Date(v.receiveTime + EIGHT_HOURS)) : '暂未填写') : '/',"}`%>
-        <%- `${winnersExportData.includes('奖品类型') && 'prizeType,'}`%>
-        <%- `${winnersExportData.includes('发奖来源') && 'prizeDataType,'}`%>
-        <%- `${winnersExportData.includes('奖品名称') && "v.type == 2 ? `${v.credits || 0}积分` : v.name || '',"}`%>
-        <%- `${winnersExportData.includes('收货人') && "v.type == 3 ? v.receiveName || '' : '/',"}`%>
-        <%- `${winnersExportData.includes('联系方式') && "v.type == 3 ? (v.phone ? v.phone + '' : '暂未填写') : '/',"}`%>
-        <%- `${winnersExportData.includes('收货地址') && "v.type == 3 ? v.province + v.city + v.area + v.streetName + v.addressDetail || '暂未填写' : '/',"}`%>
-        <%- `${winnersExportData.includes('发货地址') && 'shipTxt,'}`%>
-        <%- `${winnersExportData.includes('物流公司') && "v.type == 3 ? v.shipCompany || '' : '/',"}`%>
-        <%- `${winnersExportData.includes('物流单号') && "v.type == 3 ? (v.shipNum ? v.shipNum + '' : '') : '/'"}`%>
+        <%- `${winnersExportData.includes('奖品编号') ? 'v._id,' : ''}`%>
+        <%- `${winnersExportData.includes('用户id') ? 'v.userNick,' : ''}`%>
+        <%- `${winnersExportData.includes('中奖时间') ? "v.createTime ? formatTime(new Date(v.createTime + EIGHT_HOURS)) : ''," : ""}`%>
+        <%- `${winnersExportData.includes('地址填写时间') ? "v.type == 3 ? (v.receiveTime ? formatTime(new Date(v.receiveTime + EIGHT_HOURS)) : '暂未填写') : '/'," : ""}`%>
+        <%- `${winnersExportData.includes('奖品类型') ? 'prizeType,' : ''}`%>
+        <%- `${winnersExportData.includes('发奖来源') ? 'prizeDataType,' : ''}`%>
+        <%- `${winnersExportData.includes('奖品名称') ? "v.type == 2 ? `${v.credits || 0}积分` : v.name || ''," : ""}`%>
+        <%- `${winnersExportData.includes('收货人') ? "v.type == 3 ? v.receiveName || '' : '/'," : ""}`%>
+        <%- `${winnersExportData.includes('联系方式') ? "v.type == 3 ? (v.phone ? v.phone + '' : '暂未填写') : '/'," : ""}`%>
+        <%- `${winnersExportData.includes('收货地址') ? "v.type == 3 ? v.province + v.city + v.area + v.streetName + v.addressDetail || '暂未填写' : '/'," : ""}`%>
+        <%- `${winnersExportData.includes('发货地址') ? 'shipTxt,' : ''}`%>
+        <%- `${winnersExportData.includes('物流公司') ? "v.type == 3 ? v.shipCompany || '' : '/'," : ""}`%>
+        <%- `${winnersExportData.includes('物流单号') ? "v.type == 3 ? (v.shipNum ? v.shipNum + '' : '') : '/'" : ""}`%>
       ])
     })
     let buffer = xlsx.build([