Commit 08e5aa5cc64ffea5e4e3a27fc2895a9dad068472

Authored by vking
2 parents a46a97a8 b67b4f26

Merge remote-tracking branch 'origin/master'

@@ -33,7 +33,7 @@ Component({ @@ -33,7 +33,7 @@ Component({
33 getspeciallist(){ 33 getspeciallist(){
34 let speciallist = [ 34 let speciallist = [
35 {date: util.unixtoTime(date/1000, 'YYYY-MM-DD'), background: '', text: '今'}, 35 {date: util.unixtoTime(date/1000, 'YYYY-MM-DD'), background: '', text: '今'},
36 - {date: util.unixtoTime(date + 86400, 'YYYY-MM-DD'), background: '', text: '明'} 36 + {date: util.unixtoTime(date/1000 + 86400, 'YYYY-MM-DD'), background: '', text: '明'}
37 ]; 37 ];
38 this.setData({ 38 this.setData({
39 speciallist:speciallist 39 speciallist:speciallist
@@ -45,7 +45,7 @@ @@ -45,7 +45,7 @@
45 "list": [] 45 "list": []
46 }, 46 },
47 "miniprogram": { 47 "miniprogram": {
48 - "current": 39, 48 + "current": 56,
49 "list": [ 49 "list": [
50 { 50 {
51 "id": 0, 51 "id": 0,