Showing
12 changed files
with
136 additions
and
101 deletions
| @@ -533,10 +533,10 @@ Page({ | @@ -533,10 +533,10 @@ Page({ | ||
| 533 | let d = data.ddate_solt; | 533 | let d = data.ddate_solt; |
| 534 | let date1 = util.unixtoTime(data.ddate, 'MM月DD日'); | 534 | let date1 = util.unixtoTime(data.ddate, 'MM月DD日'); |
| 535 | let date2 = util.unixtoTime(data.ddate, 'MM/DD'); | 535 | let date2 = util.unixtoTime(data.ddate, 'MM/DD'); |
| 536 | - let week = ' ' + util.unixtoTime(data.ddate, '周WW'); | ||
| 537 | - let timeSlot1 = ' ' + (d == '1' ? '早上' : d == '2' ? '中午' : d == '3' ? '晚上' : ''); | ||
| 538 | - let timeSlot2 = ' ' + (d == '1' ? '早餐' : d == '2' ? '午餐' : d == '3' ? '晚餐' : ''); | ||
| 539 | - let time = this.data.temp_ddate ? ' ' + this.data.temp_ddate : ' ' + util.unixtoTime(data.ddate, 'HH:II') | 536 | + let week = ' ' + util.unixtoTime(data.ddate, '周WW'); |
| 537 | + let timeSlot1 = ' ' + (d == '1' ? '早上' : d == '2' ? '中午' : d == '3' ? '晚上' : ''); | ||
| 538 | + let timeSlot2 = ' ' + (d == '1' ? '早餐' : d == '2' ? '午餐' : d == '3' ? '晚餐' : ''); | ||
| 539 | + let time = this.data.temp_ddate ? ' ' + this.data.temp_ddate : ' ' + util.unixtoTime(data.ddate, 'HH:II') | ||
| 540 | time = timeStr ? timeStr : time; | 540 | time = timeStr ? timeStr : time; |
| 541 | let [day1, day2] = [...util.unixtoTime(data.ddate, '周WW')] | 541 | let [day1, day2] = [...util.unixtoTime(data.ddate, '周WW')] |
| 542 | let section = '' | 542 | let section = '' |
| @@ -727,6 +727,7 @@ Page({ | @@ -727,6 +727,7 @@ Page({ | ||
| 727 | } | 727 | } |
| 728 | // 获取转发客人卡片设置 | 728 | // 获取转发客人卡片设置 |
| 729 | let detailInfo = this.data.detail; | 729 | let detailInfo = this.data.detail; |
| 730 | + data.lite_style = data.lite_style || '3'; | ||
| 730 | let liteStyle = data.lite_style.split('-'); | 731 | let liteStyle = data.lite_style.split('-'); |
| 731 | if (liteStyle[0] == '0') { | 732 | if (liteStyle[0] == '0') { |
| 732 | this.setData({ | 733 | this.setData({ |
| @@ -1234,13 +1235,15 @@ Page({ | @@ -1234,13 +1235,15 @@ Page({ | ||
| 1234 | temp_ddate: times, | 1235 | temp_ddate: times, |
| 1235 | }).then(res => { | 1236 | }).then(res => { |
| 1236 | if (res.ret == 200) { | 1237 | if (res.ret == 200) { |
| 1237 | - let style =this.data.lite_style.split('-'); | 1238 | + let lite_style = this.data.lite_style |
| 1239 | + lite_style = lite_style || '3'; | ||
| 1240 | + let style =lite_style.split('-'); | ||
| 1238 | let type1 =style[0]; | 1241 | let type1 =style[0]; |
| 1239 | let type2 =style[1]; | 1242 | let type2 =style[1]; |
| 1240 | if((type1=='2' && !type2) || (type2 && (type2 == '1' || type2 == '3'))){ | 1243 | if((type1=='2' && !type2) || (type2 && (type2 == '1' || type2 == '3'))){ |
| 1241 | let time = temp_ddate || this.data.timeList[index] | 1244 | let time = temp_ddate || this.data.timeList[index] |
| 1242 | this.painterBtn( | 1245 | this.painterBtn( |
| 1243 | - this.data.lite_style, | 1246 | + lite_style, |
| 1244 | time | 1247 | time |
| 1245 | ); | 1248 | ); |
| 1246 | } | 1249 | } |
| @@ -546,10 +546,10 @@ Page({ | @@ -546,10 +546,10 @@ Page({ | ||
| 546 | let d = data.ddate_solt; | 546 | let d = data.ddate_solt; |
| 547 | let date1 = util.unixtoTime(data.ddate, 'MM月DD日'); | 547 | let date1 = util.unixtoTime(data.ddate, 'MM月DD日'); |
| 548 | let date2 = util.unixtoTime(data.ddate, 'MM/DD'); | 548 | let date2 = util.unixtoTime(data.ddate, 'MM/DD'); |
| 549 | - let week = ' ' + util.unixtoTime(data.ddate, '周WW'); | ||
| 550 | - let timeSlot1 = ' ' + (d == '1' ? '早上' : d == '2' ? '中午' : d == '3' ? '晚上' : ''); | ||
| 551 | - let timeSlot2 = ' ' + (d == '1' ? '早餐' : d == '2' ? '午餐' : d == '3' ? '晚餐' : ''); | ||
| 552 | - let time = this.data.temp_ddate ? ' ' + this.data.temp_ddate : ' ' + util.unixtoTime(data.ddate, 'HH:II') | 549 | + let week = ' ' + util.unixtoTime(data.ddate, '周WW'); |
| 550 | + let timeSlot1 = ' ' + (d == '1' ? '早上' : d == '2' ? '中午' : d == '3' ? '晚上' : ''); | ||
| 551 | + let timeSlot2 = ' ' + (d == '1' ? '早餐' : d == '2' ? '午餐' : d == '3' ? '晚餐' : ''); | ||
| 552 | + let time = this.data.temp_ddate ? ' ' + this.data.temp_ddate : ' ' + util.unixtoTime(data.ddate, 'HH:II') | ||
| 553 | time = timeStr ? timeStr : time; | 553 | time = timeStr ? timeStr : time; |
| 554 | let [day1, day2] = [...util.unixtoTime(data.ddate, '周WW')] | 554 | let [day1, day2] = [...util.unixtoTime(data.ddate, '周WW')] |
| 555 | let section = '' | 555 | let section = '' |
| @@ -747,6 +747,7 @@ Page({ | @@ -747,6 +747,7 @@ Page({ | ||
| 747 | } | 747 | } |
| 748 | // 获取转发客人卡片设置 | 748 | // 获取转发客人卡片设置 |
| 749 | let detailInfo = this.data.detail; | 749 | let detailInfo = this.data.detail; |
| 750 | + data.lite_style = data.lite_style || '3'; | ||
| 750 | let liteStyle = data.lite_style.split('-'); | 751 | let liteStyle = data.lite_style.split('-'); |
| 751 | if (liteStyle[0] == '0') { | 752 | if (liteStyle[0] == '0') { |
| 752 | this.setData({ | 753 | this.setData({ |
| @@ -1303,13 +1304,15 @@ Page({ | @@ -1303,13 +1304,15 @@ Page({ | ||
| 1303 | temp_ddate: times, | 1304 | temp_ddate: times, |
| 1304 | }).then(res => { | 1305 | }).then(res => { |
| 1305 | if (res.ret == 200) { | 1306 | if (res.ret == 200) { |
| 1306 | - let style =this.data.lite_style.split('-'); | 1307 | + let lite_style = this.data.lite_style |
| 1308 | + lite_style = lite_style || '3'; | ||
| 1309 | + let style =lite_style.split('-'); | ||
| 1307 | let type1 =style[0]; | 1310 | let type1 =style[0]; |
| 1308 | let type2 =style[1]; | 1311 | let type2 =style[1]; |
| 1309 | if((type1=='2' && !type2) || (type2 && (type2 == '1' || type2 == '3'))){ | 1312 | if((type1=='2' && !type2) || (type2 && (type2 == '1' || type2 == '3'))){ |
| 1310 | let time = temp_ddate || this.data.timeList[index] | 1313 | let time = temp_ddate || this.data.timeList[index] |
| 1311 | this.painterBtn( | 1314 | this.painterBtn( |
| 1312 | - this.data.lite_style, | 1315 | + lite_style, |
| 1313 | time | 1316 | time |
| 1314 | ); | 1317 | ); |
| 1315 | } | 1318 | } |
| @@ -561,10 +561,10 @@ Page({ | @@ -561,10 +561,10 @@ Page({ | ||
| 561 | let d = data.ddate_solt; | 561 | let d = data.ddate_solt; |
| 562 | let date1 = util.unixtoTime(data.ddate, 'MM月DD日'); | 562 | let date1 = util.unixtoTime(data.ddate, 'MM月DD日'); |
| 563 | let date2 = util.unixtoTime(data.ddate, 'MM/DD'); | 563 | let date2 = util.unixtoTime(data.ddate, 'MM/DD'); |
| 564 | - let week = ' ' + util.unixtoTime(data.ddate, '周WW'); | ||
| 565 | - let timeSlot1 = ' ' + (d == '1' ? '早上' : d == '2' ? '中午' : d == '3' ? '晚上' : ''); | ||
| 566 | - let timeSlot2 = ' ' + (d == '1' ? '早餐' : d == '2' ? '午餐' : d == '3' ? '晚餐' : ''); | ||
| 567 | - let time = this.data.temp_ddate ? ' ' + this.data.temp_ddate : ' ' + util.unixtoTime(data.ddate, 'HH:II') | 564 | + let week = ' ' + util.unixtoTime(data.ddate, '周WW'); |
| 565 | + let timeSlot1 = ' ' + (d == '1' ? '早上' : d == '2' ? '中午' : d == '3' ? '晚上' : ''); | ||
| 566 | + let timeSlot2 = ' ' + (d == '1' ? '早餐' : d == '2' ? '午餐' : d == '3' ? '晚餐' : ''); | ||
| 567 | + let time = this.data.temp_ddate ? ' ' + this.data.temp_ddate : ' ' + util.unixtoTime(data.ddate, 'HH:II') | ||
| 568 | time = timeStr ? timeStr : time; | 568 | time = timeStr ? timeStr : time; |
| 569 | let [day1, day2] = [...util.unixtoTime(data.ddate, '周WW')] | 569 | let [day1, day2] = [...util.unixtoTime(data.ddate, '周WW')] |
| 570 | let section = '' | 570 | let section = '' |
| @@ -762,6 +762,7 @@ Page({ | @@ -762,6 +762,7 @@ Page({ | ||
| 762 | } | 762 | } |
| 763 | // 获取转发客人卡片设置 | 763 | // 获取转发客人卡片设置 |
| 764 | let detailInfo = this.data.detail; | 764 | let detailInfo = this.data.detail; |
| 765 | + data.lite_style = data.lite_style || '3'; | ||
| 765 | let liteStyle = data.lite_style.split('-'); | 766 | let liteStyle = data.lite_style.split('-'); |
| 766 | if (liteStyle[0] == '0') { | 767 | if (liteStyle[0] == '0') { |
| 767 | this.setData({ | 768 | this.setData({ |
| @@ -1318,13 +1319,15 @@ Page({ | @@ -1318,13 +1319,15 @@ Page({ | ||
| 1318 | temp_ddate: times, | 1319 | temp_ddate: times, |
| 1319 | }).then(res => { | 1320 | }).then(res => { |
| 1320 | if (res.ret == 200) { | 1321 | if (res.ret == 200) { |
| 1321 | - let style =this.data.lite_style.split('-'); | 1322 | + let lite_style = this.data.lite_style |
| 1323 | + lite_style = lite_style || '3'; | ||
| 1324 | + let style =lite_style.split('-'); | ||
| 1322 | let type1 =style[0]; | 1325 | let type1 =style[0]; |
| 1323 | let type2 =style[1]; | 1326 | let type2 =style[1]; |
| 1324 | if((type1=='2' && !type2) || (type2 && (type2 == '1' || type2 == '3'))){ | 1327 | if((type1=='2' && !type2) || (type2 && (type2 == '1' || type2 == '3'))){ |
| 1325 | let time = temp_ddate || this.data.timeList[index] | 1328 | let time = temp_ddate || this.data.timeList[index] |
| 1326 | this.painterBtn( | 1329 | this.painterBtn( |
| 1327 | - this.data.lite_style, | 1330 | + lite_style, |
| 1328 | time | 1331 | time |
| 1329 | ); | 1332 | ); |
| 1330 | } | 1333 | } |
| @@ -518,10 +518,10 @@ Page({ | @@ -518,10 +518,10 @@ Page({ | ||
| 518 | let d = data.ddate_solt; | 518 | let d = data.ddate_solt; |
| 519 | let date1 = util.unixtoTime(data.ddate, 'MM月DD日'); | 519 | let date1 = util.unixtoTime(data.ddate, 'MM月DD日'); |
| 520 | let date2 = util.unixtoTime(data.ddate, 'MM/DD'); | 520 | let date2 = util.unixtoTime(data.ddate, 'MM/DD'); |
| 521 | - let week = ' ' + util.unixtoTime(data.ddate, '周WW'); | ||
| 522 | - let timeSlot1 = ' ' + (d == '1' ? '早上' : d == '2' ? '中午' : d == '3' ? '晚上' : ''); | ||
| 523 | - let timeSlot2 = ' ' + (d == '1' ? '早餐' : d == '2' ? '午餐' : d == '3' ? '晚餐' : ''); | ||
| 524 | - let time = this.data.temp_ddate ? ' ' + this.data.temp_ddate : ' ' + util.unixtoTime(data.ddate, 'HH:II') | 521 | + let week = ' ' + util.unixtoTime(data.ddate, '周WW'); |
| 522 | + let timeSlot1 = ' ' + (d == '1' ? '早上' : d == '2' ? '中午' : d == '3' ? '晚上' : ''); | ||
| 523 | + let timeSlot2 = ' ' + (d == '1' ? '早餐' : d == '2' ? '午餐' : d == '3' ? '晚餐' : ''); | ||
| 524 | + let time = this.data.temp_ddate ? ' ' + this.data.temp_ddate : ' ' + util.unixtoTime(data.ddate, 'HH:II') | ||
| 525 | time = timeStr ? timeStr : time; | 525 | time = timeStr ? timeStr : time; |
| 526 | let [day1, day2] = [...util.unixtoTime(data.ddate, '周WW')] | 526 | let [day1, day2] = [...util.unixtoTime(data.ddate, '周WW')] |
| 527 | let section = '' | 527 | let section = '' |
| @@ -757,6 +757,7 @@ Page({ | @@ -757,6 +757,7 @@ Page({ | ||
| 757 | } | 757 | } |
| 758 | // 获取转发客人卡片设置 | 758 | // 获取转发客人卡片设置 |
| 759 | let detailInfo = this.data.detail; | 759 | let detailInfo = this.data.detail; |
| 760 | + data.lite_style = data.lite_style || '3'; | ||
| 760 | let liteStyle = data.lite_style.split('-'); | 761 | let liteStyle = data.lite_style.split('-'); |
| 761 | if (liteStyle[0] == '0') { | 762 | if (liteStyle[0] == '0') { |
| 762 | this.setData({ | 763 | this.setData({ |
| @@ -1206,13 +1207,15 @@ Page({ | @@ -1206,13 +1207,15 @@ Page({ | ||
| 1206 | temp_ddate:times, | 1207 | temp_ddate:times, |
| 1207 | }).then(res => { | 1208 | }).then(res => { |
| 1208 | if (res.ret == 200) { | 1209 | if (res.ret == 200) { |
| 1209 | - let style =this.data.lite_style.split('-'); | 1210 | + let lite_style = this.data.lite_style |
| 1211 | + lite_style = lite_style || '3'; | ||
| 1212 | + let style =lite_style.split('-'); | ||
| 1210 | let type1 =style[0]; | 1213 | let type1 =style[0]; |
| 1211 | let type2 =style[1]; | 1214 | let type2 =style[1]; |
| 1212 | if((type1=='2' && !type2) || (type2 && (type2 == '1' || type2 == '3'))){ | 1215 | if((type1=='2' && !type2) || (type2 && (type2 == '1' || type2 == '3'))){ |
| 1213 | let time = temp_ddate || this.data.timeList[index] | 1216 | let time = temp_ddate || this.data.timeList[index] |
| 1214 | this.painterBtn( | 1217 | this.painterBtn( |
| 1215 | - this.data.lite_style, | 1218 | + lite_style, |
| 1216 | time | 1219 | time |
| 1217 | ); | 1220 | ); |
| 1218 | } | 1221 | } |
| @@ -518,10 +518,10 @@ Page({ | @@ -518,10 +518,10 @@ Page({ | ||
| 518 | let d = data.ddate_solt; | 518 | let d = data.ddate_solt; |
| 519 | let date1 = util.unixtoTime(data.ddate, 'MM月DD日'); | 519 | let date1 = util.unixtoTime(data.ddate, 'MM月DD日'); |
| 520 | let date2 = util.unixtoTime(data.ddate, 'MM/DD'); | 520 | let date2 = util.unixtoTime(data.ddate, 'MM/DD'); |
| 521 | - let week = ' ' + util.unixtoTime(data.ddate, '周WW'); | ||
| 522 | - let timeSlot1 = ' ' + (d == '1' ? '早上' : d == '2' ? '中午' : d == '3' ? '晚上' : ''); | ||
| 523 | - let timeSlot2 = ' ' + (d == '1' ? '早餐' : d == '2' ? '午餐' : d == '3' ? '晚餐' : ''); | ||
| 524 | - let time = this.data.temp_ddate ? ' ' + this.data.temp_ddate : ' ' + util.unixtoTime(data.ddate, 'HH:II') | 521 | + let week = ' ' + util.unixtoTime(data.ddate, '周WW'); |
| 522 | + let timeSlot1 = ' ' + (d == '1' ? '早上' : d == '2' ? '中午' : d == '3' ? '晚上' : ''); | ||
| 523 | + let timeSlot2 = ' ' + (d == '1' ? '早餐' : d == '2' ? '午餐' : d == '3' ? '晚餐' : ''); | ||
| 524 | + let time = this.data.temp_ddate ? ' ' + this.data.temp_ddate : ' ' + util.unixtoTime(data.ddate, 'HH:II') | ||
| 525 | time = timeStr ? timeStr : time; | 525 | time = timeStr ? timeStr : time; |
| 526 | let [day1, day2] = [...util.unixtoTime(data.ddate, '周WW')] | 526 | let [day1, day2] = [...util.unixtoTime(data.ddate, '周WW')] |
| 527 | let section = '' | 527 | let section = '' |
| @@ -712,6 +712,7 @@ Page({ | @@ -712,6 +712,7 @@ Page({ | ||
| 712 | } | 712 | } |
| 713 | // 获取转发客人卡片设置 | 713 | // 获取转发客人卡片设置 |
| 714 | let detailInfo = this.data.detail; | 714 | let detailInfo = this.data.detail; |
| 715 | + data.lite_style = data.lite_style || '3'; | ||
| 715 | let liteStyle = data.lite_style.split('-'); | 716 | let liteStyle = data.lite_style.split('-'); |
| 716 | if (liteStyle[0] == '0') { | 717 | if (liteStyle[0] == '0') { |
| 717 | this.setData({ | 718 | this.setData({ |
| @@ -1161,13 +1162,15 @@ Page({ | @@ -1161,13 +1162,15 @@ Page({ | ||
| 1161 | temp_ddate:times, | 1162 | temp_ddate:times, |
| 1162 | }).then(res => { | 1163 | }).then(res => { |
| 1163 | if (res.ret == 200) { | 1164 | if (res.ret == 200) { |
| 1164 | - let style =this.data.lite_style.split('-'); | 1165 | + let lite_style = this.data.lite_style |
| 1166 | + lite_style = lite_style || '3'; | ||
| 1167 | + let style =lite_style.split('-'); | ||
| 1165 | let type1 =style[0]; | 1168 | let type1 =style[0]; |
| 1166 | let type2 =style[1]; | 1169 | let type2 =style[1]; |
| 1167 | if((type1=='2' && !type2) || (type2 && (type2 == '1' || type2 == '3'))){ | 1170 | if((type1=='2' && !type2) || (type2 && (type2 == '1' || type2 == '3'))){ |
| 1168 | let time = temp_ddate || this.data.timeList[index] | 1171 | let time = temp_ddate || this.data.timeList[index] |
| 1169 | this.painterBtn( | 1172 | this.painterBtn( |
| 1170 | - this.data.lite_style, | 1173 | + lite_style, |
| 1171 | time | 1174 | time |
| 1172 | ); | 1175 | ); |
| 1173 | } | 1176 | } |
| @@ -518,10 +518,10 @@ Page({ | @@ -518,10 +518,10 @@ Page({ | ||
| 518 | let d = data.ddate_solt; | 518 | let d = data.ddate_solt; |
| 519 | let date1 = util.unixtoTime(data.ddate, 'MM月DD日'); | 519 | let date1 = util.unixtoTime(data.ddate, 'MM月DD日'); |
| 520 | let date2 = util.unixtoTime(data.ddate, 'MM/DD'); | 520 | let date2 = util.unixtoTime(data.ddate, 'MM/DD'); |
| 521 | - let week = ' ' + util.unixtoTime(data.ddate, '周WW'); | ||
| 522 | - let timeSlot1 = ' ' + (d == '1' ? '早上' : d == '2' ? '中午' : d == '3' ? '晚上' : ''); | ||
| 523 | - let timeSlot2 = ' ' + (d == '1' ? '早餐' : d == '2' ? '午餐' : d == '3' ? '晚餐' : ''); | ||
| 524 | - let time = this.data.temp_ddate ? ' ' + this.data.temp_ddate : ' ' + util.unixtoTime(data.ddate, 'HH:II') | 521 | + let week = ' ' + util.unixtoTime(data.ddate, '周WW'); |
| 522 | + let timeSlot1 = ' ' + (d == '1' ? '早上' : d == '2' ? '中午' : d == '3' ? '晚上' : ''); | ||
| 523 | + let timeSlot2 = ' ' + (d == '1' ? '早餐' : d == '2' ? '午餐' : d == '3' ? '晚餐' : ''); | ||
| 524 | + let time = this.data.temp_ddate ? ' ' + this.data.temp_ddate : ' ' + util.unixtoTime(data.ddate, 'HH:II') | ||
| 525 | time = timeStr ? timeStr : time; | 525 | time = timeStr ? timeStr : time; |
| 526 | let [day1, day2] = [...util.unixtoTime(data.ddate, '周WW')] | 526 | let [day1, day2] = [...util.unixtoTime(data.ddate, '周WW')] |
| 527 | let section = '' | 527 | let section = '' |
| @@ -712,6 +712,7 @@ Page({ | @@ -712,6 +712,7 @@ Page({ | ||
| 712 | } | 712 | } |
| 713 | // 获取转发客人卡片设置 | 713 | // 获取转发客人卡片设置 |
| 714 | let detailInfo = this.data.detail; | 714 | let detailInfo = this.data.detail; |
| 715 | + data.lite_style = data.lite_style || '3'; | ||
| 715 | let liteStyle = data.lite_style.split('-'); | 716 | let liteStyle = data.lite_style.split('-'); |
| 716 | if (liteStyle[0] == '0') { | 717 | if (liteStyle[0] == '0') { |
| 717 | this.setData({ | 718 | this.setData({ |
| @@ -1162,13 +1163,15 @@ Page({ | @@ -1162,13 +1163,15 @@ Page({ | ||
| 1162 | temp_ddate:times, | 1163 | temp_ddate:times, |
| 1163 | }).then(res => { | 1164 | }).then(res => { |
| 1164 | if (res.ret == 200) { | 1165 | if (res.ret == 200) { |
| 1165 | - let style =this.data.lite_style.split('-'); | 1166 | + let lite_style = this.data.lite_style |
| 1167 | + lite_style = lite_style || '3'; | ||
| 1168 | + let style =lite_style.split('-'); | ||
| 1166 | let type1 =style[0]; | 1169 | let type1 =style[0]; |
| 1167 | let type2 =style[1]; | 1170 | let type2 =style[1]; |
| 1168 | if((type1=='2' && !type2) || (type2 && (type2 == '1' || type2 == '3'))){ | 1171 | if((type1=='2' && !type2) || (type2 && (type2 == '1' || type2 == '3'))){ |
| 1169 | let time = temp_ddate || this.data.timeList[index] | 1172 | let time = temp_ddate || this.data.timeList[index] |
| 1170 | this.painterBtn( | 1173 | this.painterBtn( |
| 1171 | - this.data.lite_style, | 1174 | + lite_style, |
| 1172 | time | 1175 | time |
| 1173 | ); | 1176 | ); |
| 1174 | } | 1177 | } |
| @@ -517,10 +517,10 @@ Page({ | @@ -517,10 +517,10 @@ Page({ | ||
| 517 | let d = data.ddate_solt; | 517 | let d = data.ddate_solt; |
| 518 | let date1 = util.unixtoTime(data.ddate, 'MM月DD日'); | 518 | let date1 = util.unixtoTime(data.ddate, 'MM月DD日'); |
| 519 | let date2 = util.unixtoTime(data.ddate, 'MM/DD'); | 519 | let date2 = util.unixtoTime(data.ddate, 'MM/DD'); |
| 520 | - let week = ' ' + util.unixtoTime(data.ddate, '周WW'); | ||
| 521 | - let timeSlot1 = ' ' + (d == '1' ? '早上' : d == '2' ? '中午' : d == '3' ? '晚上' : ''); | ||
| 522 | - let timeSlot2 = ' ' + (d == '1' ? '早餐' : d == '2' ? '午餐' : d == '3' ? '晚餐' : ''); | ||
| 523 | - let time = this.data.temp_ddate ? ' ' + this.data.temp_ddate : ' ' + util.unixtoTime(data.ddate, 'HH:II') | 520 | + let week = ' ' + util.unixtoTime(data.ddate, '周WW'); |
| 521 | + let timeSlot1 = ' ' + (d == '1' ? '早上' : d == '2' ? '中午' : d == '3' ? '晚上' : ''); | ||
| 522 | + let timeSlot2 = ' ' + (d == '1' ? '早餐' : d == '2' ? '午餐' : d == '3' ? '晚餐' : ''); | ||
| 523 | + let time = this.data.temp_ddate ? ' ' + this.data.temp_ddate : ' ' + util.unixtoTime(data.ddate, 'HH:II') | ||
| 524 | time = timeStr ? timeStr : time; | 524 | time = timeStr ? timeStr : time; |
| 525 | let [day1, day2] = [...util.unixtoTime(data.ddate, '周WW')] | 525 | let [day1, day2] = [...util.unixtoTime(data.ddate, '周WW')] |
| 526 | let section = '' | 526 | let section = '' |
| @@ -711,6 +711,7 @@ Page({ | @@ -711,6 +711,7 @@ Page({ | ||
| 711 | } | 711 | } |
| 712 | // 获取转发客人卡片设置 | 712 | // 获取转发客人卡片设置 |
| 713 | let detailInfo = this.data.detail; | 713 | let detailInfo = this.data.detail; |
| 714 | + data.lite_style = data.lite_style || '3'; | ||
| 714 | let liteStyle = data.lite_style.split('-'); | 715 | let liteStyle = data.lite_style.split('-'); |
| 715 | if (liteStyle[0] == '0') { | 716 | if (liteStyle[0] == '0') { |
| 716 | this.setData({ | 717 | this.setData({ |
| @@ -1160,13 +1161,15 @@ Page({ | @@ -1160,13 +1161,15 @@ Page({ | ||
| 1160 | temp_ddate:times, | 1161 | temp_ddate:times, |
| 1161 | }).then(res => { | 1162 | }).then(res => { |
| 1162 | if (res.ret == 200) { | 1163 | if (res.ret == 200) { |
| 1163 | - let style =this.data.lite_style.split('-'); | 1164 | + let lite_style = this.data.lite_style |
| 1165 | + lite_style = lite_style || '3'; | ||
| 1166 | + let style =lite_style.split('-'); | ||
| 1164 | let type1 =style[0]; | 1167 | let type1 =style[0]; |
| 1165 | let type2 =style[1]; | 1168 | let type2 =style[1]; |
| 1166 | if((type1=='2' && !type2) || (type2 && (type2 == '1' || type2 == '3'))){ | 1169 | if((type1=='2' && !type2) || (type2 && (type2 == '1' || type2 == '3'))){ |
| 1167 | let time = temp_ddate || this.data.timeList[index] | 1170 | let time = temp_ddate || this.data.timeList[index] |
| 1168 | this.painterBtn( | 1171 | this.painterBtn( |
| 1169 | - this.data.lite_style, | 1172 | + lite_style, |
| 1170 | time | 1173 | time |
| 1171 | ); | 1174 | ); |
| 1172 | } | 1175 | } |
| @@ -470,10 +470,10 @@ Page({ | @@ -470,10 +470,10 @@ Page({ | ||
| 470 | let d = data.ddate_solt; | 470 | let d = data.ddate_solt; |
| 471 | let date1 = util.unixtoTime(data.ddate, 'MM月DD日'); | 471 | let date1 = util.unixtoTime(data.ddate, 'MM月DD日'); |
| 472 | let date2 = util.unixtoTime(data.ddate, 'MM/DD'); | 472 | let date2 = util.unixtoTime(data.ddate, 'MM/DD'); |
| 473 | - let week = ' ' + util.unixtoTime(data.ddate, '周WW'); | ||
| 474 | - let timeSlot1 = ' ' + (d == '1' ? '早上' : d == '2' ? '中午' : d == '3' ? '晚上' : ''); | ||
| 475 | - let timeSlot2 = ' ' + (d == '1' ? '早餐' : d == '2' ? '午餐' : d == '3' ? '晚餐' : ''); | ||
| 476 | - let time = this.data.temp_ddate ? ' ' + this.data.temp_ddate : ' ' + util.unixtoTime(data.ddate, 'HH:II') | 473 | + let week = ' ' + util.unixtoTime(data.ddate, '周WW'); |
| 474 | + let timeSlot1 = ' ' + (d == '1' ? '早上' : d == '2' ? '中午' : d == '3' ? '晚上' : ''); | ||
| 475 | + let timeSlot2 = ' ' + (d == '1' ? '早餐' : d == '2' ? '午餐' : d == '3' ? '晚餐' : ''); | ||
| 476 | + let time = this.data.temp_ddate ? ' ' + this.data.temp_ddate : ' ' + util.unixtoTime(data.ddate, 'HH:II') | ||
| 477 | time = timeStr ? timeStr : time; | 477 | time = timeStr ? timeStr : time; |
| 478 | let [day1, day2] = [...util.unixtoTime(data.ddate, '周WW')] | 478 | let [day1, day2] = [...util.unixtoTime(data.ddate, '周WW')] |
| 479 | let section = '' | 479 | let section = '' |
| @@ -668,6 +668,7 @@ Page({ | @@ -668,6 +668,7 @@ Page({ | ||
| 668 | } | 668 | } |
| 669 | // 获取转发客人卡片设置 | 669 | // 获取转发客人卡片设置 |
| 670 | let detailInfo = this.data.detail; | 670 | let detailInfo = this.data.detail; |
| 671 | + data.lite_style = data.lite_style || '3'; | ||
| 671 | let liteStyle = data.lite_style.split('-'); | 672 | let liteStyle = data.lite_style.split('-'); |
| 672 | if (liteStyle[0] == '0') { | 673 | if (liteStyle[0] == '0') { |
| 673 | this.setData({ | 674 | this.setData({ |
| @@ -1117,13 +1118,15 @@ Page({ | @@ -1117,13 +1118,15 @@ Page({ | ||
| 1117 | temp_ddate:times, | 1118 | temp_ddate:times, |
| 1118 | }).then(res => { | 1119 | }).then(res => { |
| 1119 | if (res.ret == 200) { | 1120 | if (res.ret == 200) { |
| 1120 | - let style =this.data.lite_style.split('-'); | 1121 | + let lite_style = this.data.lite_style |
| 1122 | + lite_style = lite_style || '3'; | ||
| 1123 | + let style =lite_style.split('-'); | ||
| 1121 | let type1 =style[0]; | 1124 | let type1 =style[0]; |
| 1122 | let type2 =style[1]; | 1125 | let type2 =style[1]; |
| 1123 | if((type1=='2' && !type2) || (type2 && (type2 == '1' || type2 == '3'))){ | 1126 | if((type1=='2' && !type2) || (type2 && (type2 == '1' || type2 == '3'))){ |
| 1124 | let time = temp_ddate || this.data.timeList[index] | 1127 | let time = temp_ddate || this.data.timeList[index] |
| 1125 | this.painterBtn( | 1128 | this.painterBtn( |
| 1126 | - this.data.lite_style, | 1129 | + lite_style, |
| 1127 | time | 1130 | time |
| 1128 | ); | 1131 | ); |
| 1129 | } | 1132 | } |
| @@ -518,10 +518,10 @@ Page({ | @@ -518,10 +518,10 @@ Page({ | ||
| 518 | let d = data.ddate_solt; | 518 | let d = data.ddate_solt; |
| 519 | let date1 = util.unixtoTime(data.ddate, 'MM月DD日'); | 519 | let date1 = util.unixtoTime(data.ddate, 'MM月DD日'); |
| 520 | let date2 = util.unixtoTime(data.ddate, 'MM/DD'); | 520 | let date2 = util.unixtoTime(data.ddate, 'MM/DD'); |
| 521 | - let week = ' ' + util.unixtoTime(data.ddate, '周WW'); | ||
| 522 | - let timeSlot1 = ' ' + (d == '1' ? '早上' : d == '2' ? '中午' : d == '3' ? '晚上' : ''); | ||
| 523 | - let timeSlot2 = ' ' + (d == '1' ? '早餐' : d == '2' ? '午餐' : d == '3' ? '晚餐' : ''); | ||
| 524 | - let time = this.data.temp_ddate ? ' ' + this.data.temp_ddate : ' ' + util.unixtoTime(data.ddate, 'HH:II') | 521 | + let week = ' ' + util.unixtoTime(data.ddate, '周WW'); |
| 522 | + let timeSlot1 = ' ' + (d == '1' ? '早上' : d == '2' ? '中午' : d == '3' ? '晚上' : ''); | ||
| 523 | + let timeSlot2 = ' ' + (d == '1' ? '早餐' : d == '2' ? '午餐' : d == '3' ? '晚餐' : ''); | ||
| 524 | + let time = this.data.temp_ddate ? ' ' + this.data.temp_ddate : ' ' + util.unixtoTime(data.ddate, 'HH:II') | ||
| 525 | time = timeStr ? timeStr : time; | 525 | time = timeStr ? timeStr : time; |
| 526 | let [day1, day2] = [...util.unixtoTime(data.ddate, '周WW')] | 526 | let [day1, day2] = [...util.unixtoTime(data.ddate, '周WW')] |
| 527 | let section = '' | 527 | let section = '' |
| @@ -712,6 +712,7 @@ Page({ | @@ -712,6 +712,7 @@ Page({ | ||
| 712 | } | 712 | } |
| 713 | // 获取转发客人卡片设置 | 713 | // 获取转发客人卡片设置 |
| 714 | let detailInfo = this.data.detail; | 714 | let detailInfo = this.data.detail; |
| 715 | + data.lite_style = data.lite_style || '3'; | ||
| 715 | let liteStyle = data.lite_style.split('-'); | 716 | let liteStyle = data.lite_style.split('-'); |
| 716 | if (liteStyle[0] == '0') { | 717 | if (liteStyle[0] == '0') { |
| 717 | this.setData({ | 718 | this.setData({ |
| @@ -1161,13 +1162,15 @@ Page({ | @@ -1161,13 +1162,15 @@ Page({ | ||
| 1161 | temp_ddate:times, | 1162 | temp_ddate:times, |
| 1162 | }).then(res => { | 1163 | }).then(res => { |
| 1163 | if (res.ret == 200) { | 1164 | if (res.ret == 200) { |
| 1164 | - let style =this.data.lite_style.split('-'); | 1165 | + let lite_style = this.data.lite_style |
| 1166 | + lite_style = lite_style || '3'; | ||
| 1167 | + let style =lite_style.split('-'); | ||
| 1165 | let type1 =style[0]; | 1168 | let type1 =style[0]; |
| 1166 | let type2 =style[1]; | 1169 | let type2 =style[1]; |
| 1167 | if((type1=='2' && !type2) || (type2 && (type2 == '1' || type2 == '3'))){ | 1170 | if((type1=='2' && !type2) || (type2 && (type2 == '1' || type2 == '3'))){ |
| 1168 | let time = temp_ddate || this.data.timeList[index] | 1171 | let time = temp_ddate || this.data.timeList[index] |
| 1169 | this.painterBtn( | 1172 | this.painterBtn( |
| 1170 | - this.data.lite_style, | 1173 | + lite_style, |
| 1171 | time | 1174 | time |
| 1172 | ); | 1175 | ); |
| 1173 | } | 1176 | } |
| @@ -517,10 +517,10 @@ Page({ | @@ -517,10 +517,10 @@ Page({ | ||
| 517 | let d = data.ddate_solt; | 517 | let d = data.ddate_solt; |
| 518 | let date1 = util.unixtoTime(data.ddate, 'MM月DD日'); | 518 | let date1 = util.unixtoTime(data.ddate, 'MM月DD日'); |
| 519 | let date2 = util.unixtoTime(data.ddate, 'MM/DD'); | 519 | let date2 = util.unixtoTime(data.ddate, 'MM/DD'); |
| 520 | - let week = ' ' + util.unixtoTime(data.ddate, '周WW'); | ||
| 521 | - let timeSlot1 = ' ' + (d == '1' ? '早上' : d == '2' ? '中午' : d == '3' ? '晚上' : ''); | ||
| 522 | - let timeSlot2 = ' ' + (d == '1' ? '早餐' : d == '2' ? '午餐' : d == '3' ? '晚餐' : ''); | ||
| 523 | - let time = this.data.temp_ddate ? ' ' + this.data.temp_ddate : ' ' + util.unixtoTime(data.ddate, 'HH:II') | 520 | + let week = ' ' + util.unixtoTime(data.ddate, '周WW'); |
| 521 | + let timeSlot1 = ' ' + (d == '1' ? '早上' : d == '2' ? '中午' : d == '3' ? '晚上' : ''); | ||
| 522 | + let timeSlot2 = ' ' + (d == '1' ? '早餐' : d == '2' ? '午餐' : d == '3' ? '晚餐' : ''); | ||
| 523 | + let time = this.data.temp_ddate ? ' ' + this.data.temp_ddate : ' ' + util.unixtoTime(data.ddate, 'HH:II') | ||
| 524 | time = timeStr ? timeStr : time; | 524 | time = timeStr ? timeStr : time; |
| 525 | let [day1, day2] = [...util.unixtoTime(data.ddate, '周WW')] | 525 | let [day1, day2] = [...util.unixtoTime(data.ddate, '周WW')] |
| 526 | let section = '' | 526 | let section = '' |
| @@ -711,6 +711,7 @@ Page({ | @@ -711,6 +711,7 @@ Page({ | ||
| 711 | } | 711 | } |
| 712 | // 获取转发客人卡片设置 | 712 | // 获取转发客人卡片设置 |
| 713 | let detailInfo = this.data.detail; | 713 | let detailInfo = this.data.detail; |
| 714 | + data.lite_style = data.lite_style || '3'; | ||
| 714 | let liteStyle = data.lite_style.split('-'); | 715 | let liteStyle = data.lite_style.split('-'); |
| 715 | if (liteStyle[0] == '0') { | 716 | if (liteStyle[0] == '0') { |
| 716 | this.setData({ | 717 | this.setData({ |
| @@ -1160,13 +1161,15 @@ Page({ | @@ -1160,13 +1161,15 @@ Page({ | ||
| 1160 | temp_ddate:times, | 1161 | temp_ddate:times, |
| 1161 | }).then(res => { | 1162 | }).then(res => { |
| 1162 | if (res.ret == 200) { | 1163 | if (res.ret == 200) { |
| 1163 | - let style =this.data.lite_style.split('-'); | 1164 | + let lite_style = this.data.lite_style |
| 1165 | + lite_style = lite_style || '3'; | ||
| 1166 | + let style =lite_style.split('-'); | ||
| 1164 | let type1 =style[0]; | 1167 | let type1 =style[0]; |
| 1165 | let type2 =style[1]; | 1168 | let type2 =style[1]; |
| 1166 | if((type1=='2' && !type2) || (type2 && (type2 == '1' || type2 == '3'))){ | 1169 | if((type1=='2' && !type2) || (type2 && (type2 == '1' || type2 == '3'))){ |
| 1167 | let time = temp_ddate || this.data.timeList[index] | 1170 | let time = temp_ddate || this.data.timeList[index] |
| 1168 | this.painterBtn( | 1171 | this.painterBtn( |
| 1169 | - this.data.lite_style, | 1172 | + lite_style, |
| 1170 | time | 1173 | time |
| 1171 | ); | 1174 | ); |
| 1172 | } | 1175 | } |
| @@ -537,10 +537,10 @@ Page({ | @@ -537,10 +537,10 @@ Page({ | ||
| 537 | let d = data.ddate_solt; | 537 | let d = data.ddate_solt; |
| 538 | let date1 = util.unixtoTime(data.ddate, 'MM月DD日'); | 538 | let date1 = util.unixtoTime(data.ddate, 'MM月DD日'); |
| 539 | let date2 = util.unixtoTime(data.ddate, 'MM/DD'); | 539 | let date2 = util.unixtoTime(data.ddate, 'MM/DD'); |
| 540 | - let week = ' ' + util.unixtoTime(data.ddate, '周WW'); | ||
| 541 | - let timeSlot1 = ' ' + (d == '1' ? '早上' : d == '2' ? '中午' : d == '3' ? '晚上' : ''); | ||
| 542 | - let timeSlot2 = ' ' + (d == '1' ? '早餐' : d == '2' ? '午餐' : d == '3' ? '晚餐' : ''); | ||
| 543 | - let time = this.data.temp_ddate ? ' ' + this.data.temp_ddate : ' ' + util.unixtoTime(data.ddate, 'HH:II') | 540 | + let week = ' ' + util.unixtoTime(data.ddate, '周WW'); |
| 541 | + let timeSlot1 = ' ' + (d == '1' ? '早上' : d == '2' ? '中午' : d == '3' ? '晚上' : ''); | ||
| 542 | + let timeSlot2 = ' ' + (d == '1' ? '早餐' : d == '2' ? '午餐' : d == '3' ? '晚餐' : ''); | ||
| 543 | + let time = this.data.temp_ddate ? ' ' + this.data.temp_ddate : ' ' + util.unixtoTime(data.ddate, 'HH:II') | ||
| 544 | time = timeStr ? timeStr : time; | 544 | time = timeStr ? timeStr : time; |
| 545 | let [day1, day2] = [...util.unixtoTime(data.ddate, '周WW')] | 545 | let [day1, day2] = [...util.unixtoTime(data.ddate, '周WW')] |
| 546 | let section = '' | 546 | let section = '' |
| @@ -745,6 +745,7 @@ Page({ | @@ -745,6 +745,7 @@ Page({ | ||
| 745 | } | 745 | } |
| 746 | // 获取转发客人卡片设置 | 746 | // 获取转发客人卡片设置 |
| 747 | let detailInfo = this.data.detail; | 747 | let detailInfo = this.data.detail; |
| 748 | + data.lite_style = data.lite_style || '3'; | ||
| 748 | let liteStyle = data.lite_style.split('-'); | 749 | let liteStyle = data.lite_style.split('-'); |
| 749 | if (liteStyle[0] == '0') { | 750 | if (liteStyle[0] == '0') { |
| 750 | this.setData({ | 751 | this.setData({ |
| @@ -1194,13 +1195,15 @@ Page({ | @@ -1194,13 +1195,15 @@ Page({ | ||
| 1194 | temp_ddate:times, | 1195 | temp_ddate:times, |
| 1195 | }).then(res => { | 1196 | }).then(res => { |
| 1196 | if (res.ret == 200) { | 1197 | if (res.ret == 200) { |
| 1197 | - let style =this.data.lite_style.split('-'); | 1198 | + let lite_style = this.data.lite_style |
| 1199 | + lite_style = lite_style || '3'; | ||
| 1200 | + let style =lite_style.split('-'); | ||
| 1198 | let type1 =style[0]; | 1201 | let type1 =style[0]; |
| 1199 | let type2 =style[1]; | 1202 | let type2 =style[1]; |
| 1200 | if((type1=='2' && !type2) || (type2 && (type2 == '1' || type2 == '3'))){ | 1203 | if((type1=='2' && !type2) || (type2 && (type2 == '1' || type2 == '3'))){ |
| 1201 | let time = temp_ddate || this.data.timeList[index] | 1204 | let time = temp_ddate || this.data.timeList[index] |
| 1202 | this.painterBtn( | 1205 | this.painterBtn( |
| 1203 | - this.data.lite_style, | 1206 | + lite_style, |
| 1204 | time | 1207 | time |
| 1205 | ); | 1208 | ); |
| 1206 | } | 1209 | } |
| @@ -48,9 +48,9 @@ module.exports = data => { | @@ -48,9 +48,9 @@ module.exports = data => { | ||
| 48 | "color": "#FFEFC5", | 48 | "color": "#FFEFC5", |
| 49 | "width": "210px", | 49 | "width": "210px", |
| 50 | "height": "168px", | 50 | "height": "168px", |
| 51 | - "top": "70px", | 51 | + "top": "60px", |
| 52 | "borderColor": "#000000", | 52 | "borderColor": "#000000", |
| 53 | - "fontSize": "20px", | 53 | + "fontSize": "36px", |
| 54 | "fontWeight": "bold", | 54 | "fontWeight": "bold", |
| 55 | "maxLines": "3", | 55 | "maxLines": "3", |
| 56 | "textStyle": "fill", | 56 | "textStyle": "fill", |
| @@ -65,7 +65,7 @@ module.exports = data => { | @@ -65,7 +65,7 @@ module.exports = data => { | ||
| 65 | "color": "#FFEFC5", | 65 | "color": "#FFEFC5", |
| 66 | "width": "210px", | 66 | "width": "210px", |
| 67 | "height": "168px", | 67 | "height": "168px", |
| 68 | - "top": "100px", | 68 | + "top": "110px", |
| 69 | "borderColor": "#000000", | 69 | "borderColor": "#000000", |
| 70 | "fontSize": "18px", | 70 | "fontSize": "18px", |
| 71 | "fontWeight": "bold", | 71 | "fontWeight": "bold", |
| @@ -109,7 +109,7 @@ module.exports = data => { | @@ -109,7 +109,7 @@ module.exports = data => { | ||
| 109 | "left": "10px", | 109 | "left": "10px", |
| 110 | "right": "10px", | 110 | "right": "10px", |
| 111 | "borderColor": "#000000", | 111 | "borderColor": "#000000", |
| 112 | - "fontSize": "12px", | 112 | + "fontSize": "16px", |
| 113 | "fontWeight": "normal", | 113 | "fontWeight": "normal", |
| 114 | "maxLines": "2", | 114 | "maxLines": "2", |
| 115 | "textStyle": "fill", | 115 | "textStyle": "fill", |
| @@ -126,7 +126,7 @@ module.exports = data => { | @@ -126,7 +126,7 @@ module.exports = data => { | ||
| 126 | "height": "168px", | 126 | "height": "168px", |
| 127 | "top": "146px", | 127 | "top": "146px", |
| 128 | "borderColor": "#000000", | 128 | "borderColor": "#000000", |
| 129 | - "fontSize": "12px", | 129 | + "fontSize": "16px", |
| 130 | "fontWeight": "bold", | 130 | "fontWeight": "bold", |
| 131 | "maxLines": "1", | 131 | "maxLines": "1", |
| 132 | "textStyle": "fill", | 132 | "textStyle": "fill", |
| @@ -158,7 +158,7 @@ module.exports = data => { | @@ -158,7 +158,7 @@ module.exports = data => { | ||
| 158 | "left": "10px", | 158 | "left": "10px", |
| 159 | "right": "10px", | 159 | "right": "10px", |
| 160 | "borderColor": "#000000", | 160 | "borderColor": "#000000", |
| 161 | - "fontSize": "12px", | 161 | + "fontSize": "16px", |
| 162 | "fontWeight": "normal", | 162 | "fontWeight": "normal", |
| 163 | "maxLines": "2", | 163 | "maxLines": "2", |
| 164 | "textStyle": "fill", | 164 | "textStyle": "fill", |
| @@ -172,11 +172,11 @@ module.exports = data => { | @@ -172,11 +172,11 @@ module.exports = data => { | ||
| 172 | "css": { | 172 | "css": { |
| 173 | "color": "#FFEFC5", | 173 | "color": "#FFEFC5", |
| 174 | "width": "190px", | 174 | "width": "190px", |
| 175 | - "top": "80px", | 175 | + "top": "65px", |
| 176 | "left": "10px", | 176 | "left": "10px", |
| 177 | "right": "10px", | 177 | "right": "10px", |
| 178 | "borderColor": "#000000", | 178 | "borderColor": "#000000", |
| 179 | - "fontSize": "24px", | 179 | + "fontSize": "36px", |
| 180 | "fontWeight": "normal", | 180 | "fontWeight": "normal", |
| 181 | "maxLines": "1", | 181 | "maxLines": "1", |
| 182 | "textStyle": "fill", | 182 | "textStyle": "fill", |
| @@ -193,7 +193,7 @@ module.exports = data => { | @@ -193,7 +193,7 @@ module.exports = data => { | ||
| 193 | "height": "168px", | 193 | "height": "168px", |
| 194 | "top": "118px", | 194 | "top": "118px", |
| 195 | "borderColor": "#000000", | 195 | "borderColor": "#000000", |
| 196 | - "fontSize": "12px", | 196 | + "fontSize": "16px", |
| 197 | "fontWeight": "bold", | 197 | "fontWeight": "bold", |
| 198 | "maxLines": "1", | 198 | "maxLines": "1", |
| 199 | "textStyle": "fill", | 199 | "textStyle": "fill", |
| @@ -225,7 +225,7 @@ module.exports = data => { | @@ -225,7 +225,7 @@ module.exports = data => { | ||
| 225 | "left": "12px", | 225 | "left": "12px", |
| 226 | "right": "12px", | 226 | "right": "12px", |
| 227 | "borderColor": "#000000", | 227 | "borderColor": "#000000", |
| 228 | - "fontSize": "12px", | 228 | + "fontSize": "16px", |
| 229 | "fontWeight": "normal", | 229 | "fontWeight": "normal", |
| 230 | "maxLines": "2", | 230 | "maxLines": "2", |
| 231 | "textStyle": "fill", | 231 | "textStyle": "fill", |
| @@ -237,12 +237,12 @@ module.exports = data => { | @@ -237,12 +237,12 @@ module.exports = data => { | ||
| 237 | "text": data.date2, | 237 | "text": data.date2, |
| 238 | "css": { | 238 | "css": { |
| 239 | "color": "#FFEFC5", | 239 | "color": "#FFEFC5", |
| 240 | - "width": "85px", | ||
| 241 | - "top": "97px", | 240 | + "width": "130px", |
| 241 | + "top": "85px", | ||
| 242 | "left": "40px", | 242 | "left": "40px", |
| 243 | "right": "10px", | 243 | "right": "10px", |
| 244 | "borderColor": "#000000", | 244 | "borderColor": "#000000", |
| 245 | - "fontSize": "24px", | 245 | + "fontSize": "40px", |
| 246 | "fontWeight": "normal", | 246 | "fontWeight": "normal", |
| 247 | "maxLines": "2", | 247 | "maxLines": "2", |
| 248 | "textStyle": "fill", | 248 | "textStyle": "fill", |
| @@ -255,11 +255,11 @@ module.exports = data => { | @@ -255,11 +255,11 @@ module.exports = data => { | ||
| 255 | "css": { | 255 | "css": { |
| 256 | "color": "#FFEFC5", | 256 | "color": "#FFEFC5", |
| 257 | "width": "10px", | 257 | "width": "10px", |
| 258 | - "top": "97px", | 258 | + "top": "88px", |
| 259 | "left": "60px", | 259 | "left": "60px", |
| 260 | "right": "10px", | 260 | "right": "10px", |
| 261 | "borderColor": "#000000", | 261 | "borderColor": "#000000", |
| 262 | - "fontSize": "12px", | 262 | + "fontSize": "16px", |
| 263 | "fontWeight": "normal", | 263 | "fontWeight": "normal", |
| 264 | "maxLines": "2", | 264 | "maxLines": "2", |
| 265 | "textStyle": "fill", | 265 | "textStyle": "fill", |
| @@ -272,11 +272,11 @@ module.exports = data => { | @@ -272,11 +272,11 @@ module.exports = data => { | ||
| 272 | "css": { | 272 | "css": { |
| 273 | "color": "#FFEFC5", | 273 | "color": "#FFEFC5", |
| 274 | "width": "10px", | 274 | "width": "10px", |
| 275 | - "top": "110px", | 275 | + "top": "105px", |
| 276 | "left": "60px", | 276 | "left": "60px", |
| 277 | "right": "10px", | 277 | "right": "10px", |
| 278 | "borderColor": "#000000", | 278 | "borderColor": "#000000", |
| 279 | - "fontSize": "12px", | 279 | + "fontSize": "16px", |
| 280 | "fontWeight": "normal", | 280 | "fontWeight": "normal", |
| 281 | "maxLines": "2", | 281 | "maxLines": "2", |
| 282 | "textStyle": "fill", | 282 | "textStyle": "fill", |
| @@ -289,13 +289,13 @@ module.exports = data => { | @@ -289,13 +289,13 @@ module.exports = data => { | ||
| 289 | "css": { | 289 | "css": { |
| 290 | "color": "#FFEFC5", | 290 | "color": "#FFEFC5", |
| 291 | "minWidth": "90px", | 291 | "minWidth": "90px", |
| 292 | - "top": "133px", | ||
| 293 | - "lineHeight": "16px", | 292 | + "top": "140px", |
| 293 | + "lineHeight": "20px", | ||
| 294 | "right": "18px", | 294 | "right": "18px", |
| 295 | "padding": "2px 6px", | 295 | "padding": "2px 6px", |
| 296 | "borderColor": "#000000", | 296 | "borderColor": "#000000", |
| 297 | "borderRadius": "3px", | 297 | "borderRadius": "3px", |
| 298 | - "fontSize": "12px", | 298 | + "fontSize": "16px", |
| 299 | "maxLines": "1", | 299 | "maxLines": "1", |
| 300 | "textStyle": "fill", | 300 | "textStyle": "fill", |
| 301 | "textDecoration": "none", | 301 | "textDecoration": "none", |
| @@ -313,8 +313,8 @@ module.exports = data => { | @@ -313,8 +313,8 @@ module.exports = data => { | ||
| 313 | "url": 'https://qn.colorcun.com/rectangleBj2.png', | 313 | "url": 'https://qn.colorcun.com/rectangleBj2.png', |
| 314 | "css": { | 314 | "css": { |
| 315 | "width": "210px", | 315 | "width": "210px", |
| 316 | - "height": "44px", | ||
| 317 | - "top": "124px", | 316 | + "height": "56px", |
| 317 | + "top": "112px", | ||
| 318 | "left": "0px", | 318 | "left": "0px", |
| 319 | "mode": "aspectFill" | 319 | "mode": "aspectFill" |
| 320 | } | 320 | } |
| @@ -323,27 +323,29 @@ module.exports = data => { | @@ -323,27 +323,29 @@ module.exports = data => { | ||
| 323 | "text": data.info.sellerName, | 323 | "text": data.info.sellerName, |
| 324 | "css": { | 324 | "css": { |
| 325 | "color": "#FFEFC5", | 325 | "color": "#FFEFC5", |
| 326 | - "width": "124px", | ||
| 327 | - "top": "140px", | 326 | + "width": "190px", |
| 327 | + "top": "114px", | ||
| 328 | "left": "8px", | 328 | "left": "8px", |
| 329 | + "right": "8px", | ||
| 329 | "borderColor": "#000000", | 330 | "borderColor": "#000000", |
| 330 | - "fontSize": "12px", | 331 | + "fontSize": "16px", |
| 331 | "fontWeight": "normal", | 332 | "fontWeight": "normal", |
| 332 | - "maxLines": "2", | 333 | + "maxLines": "1", |
| 333 | "textStyle": "fill", | 334 | "textStyle": "fill", |
| 334 | "textDecoration": "none", | 335 | "textDecoration": "none", |
| 335 | "fontFamily": "PingFang SC", | 336 | "fontFamily": "PingFang SC", |
| 337 | + "textAlign": "center", | ||
| 336 | } | 338 | } |
| 337 | }, { | 339 | }, { |
| 338 | "type": "text", | 340 | "type": "text", |
| 339 | "text": data.date2 + data.week, | 341 | "text": data.date2 + data.week, |
| 340 | "css": { | 342 | "css": { |
| 341 | "color": "#FFEFC5", | 343 | "color": "#FFEFC5", |
| 342 | - "width": "60px", | ||
| 343 | - "top": "130px", | ||
| 344 | - "right": "14px", | 344 | + "width": "180px", |
| 345 | + "top": "140px", | ||
| 346 | + "left": "14px", | ||
| 345 | "borderColor": "#000000", | 347 | "borderColor": "#000000", |
| 346 | - "fontSize": "10px", | 348 | + "fontSize": "16px", |
| 347 | "fontWeight": "normal", | 349 | "fontWeight": "normal", |
| 348 | "maxLines": "1", | 350 | "maxLines": "1", |
| 349 | "textStyle": "fill", | 351 | "textStyle": "fill", |
| @@ -355,14 +357,14 @@ module.exports = data => { | @@ -355,14 +357,14 @@ module.exports = data => { | ||
| 355 | "text": data.info.time, | 357 | "text": data.info.time, |
| 356 | "css": { | 358 | "css": { |
| 357 | "color": "#FFEFC5", | 359 | "color": "#FFEFC5", |
| 358 | - "width": "60px", | ||
| 359 | - "top": "146px", | ||
| 360 | - "lineHeight": "14px", | ||
| 361 | - "right": "18px", | 360 | + "width": "90px", |
| 361 | + "top": "142px", | ||
| 362 | + "lineHeight": "20px", | ||
| 363 | + "right": "14px", | ||
| 362 | "padding": "1px 2px", | 364 | "padding": "1px 2px", |
| 363 | "borderColor": "#000000", | 365 | "borderColor": "#000000", |
| 364 | "borderRadius": "3px", | 366 | "borderRadius": "3px", |
| 365 | - "fontSize": "10px", | 367 | + "fontSize": "16px", |
| 366 | "maxLines": "1", | 368 | "maxLines": "1", |
| 367 | "textStyle": "fill", | 369 | "textStyle": "fill", |
| 368 | "textDecoration": "none", | 370 | "textDecoration": "none", |
-
Please register or login to post a comment