日历

46257d7b · sunchao · 95a02660 · 46257d7b · 46257d7b · 46257d7b
Commit 46257d7b authored Sep 07, 2020 by sunchao
16 changed files
--- a/angular.json
+++ b/angular.json
@@ -29,6 +29,7 @@
            "styles": [ // 引入全局样式，构建时会打包进来，常用于第三方库引入的样式
              "src/assets/font/iconfont.css",
              "src/assets/weui/weui.css",
+              "node_modules/ng-zorro-antd-mobile/src/ng-zorro-antd-mobile.min.css",
              "src/styles.scss"
            ],
            "scripts": [], // 引入全局脚步，构建时会打包进来，常用于第三方库引入的脚本

--- a/package-lock.json
+++ b/package-lock.json
@@ -129,6 +129,23 @@
        "tslib": "^1.9.0"
      }
    },
+    "@angular/cdk": {
+      "version": "7.3.7",
+      "resolved": "https://registry.npm.taobao.org/@angular/cdk/download/@angular/cdk-7.3.7.tgz",
+      "integrity": "sha1-zhrVO6BL65yOlQrMVpHqAUN1N2Q=",
+      "requires": {
+        "parse5": "^5.0.0",
+        "tslib": "^1.7.1"
+      },
+      "dependencies": {
+        "parse5": {
+          "version": "5.1.1",
+          "resolved": "https://registry.npm.taobao.org/parse5/download/parse5-5.1.1.tgz?cache=0&sync_timestamp=1595849246963&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fparse5%2Fdownload%2Fparse5-5.1.1.tgz",
+          "integrity": "sha1-9o5OW6GFKsLK3AD0VV//bCq7YXg=",
+          "optional": true
+        }
+      }
+    },
    "@angular/cli": {
      "version": "7.3.9",
      "resolved": "https://registry.npm.taobao.org/@angular/cli/download/@angular/cli-7.3.9.tgz?cache=0&sync_timestamp=1581037644954&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40angular%2Fcli%2Fdownload%2F%40angular%2Fcli-7.3.9.tgz",
@@ -506,6 +523,15 @@
        "tslib": "^1.9.0"
      }
    },
+    "@ant-design/icons-angular": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npm.taobao.org/@ant-design/icons-angular/download/@ant-design/icons-angular-2.0.5.tgz?cache=0&sync_timestamp=1593139067221&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40ant-design%2Ficons-angular%2Fdownload%2F%40ant-design%2Ficons-angular-2.0.5.tgz",
+      "integrity": "sha1-zWUy0wKfSVzpAy+O/IXMXvH4yIc=",
+      "requires": {
+        "ant-design-palettes": "^1.1.3",
+        "tslib": "^1.9.0"
+      }
+    },
    "@babel/code-frame": {
      "version": "7.8.3",
      "resolved": "https://registry.npm.taobao.org/@babel/code-frame/download/@babel/code-frame-7.8.3.tgz",
@@ -1085,6 +1111,14 @@
        "color-convert": "^1.9.0"
      }
    },
+    "ant-design-palettes": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npm.taobao.org/ant-design-palettes/download/ant-design-palettes-1.1.3.tgz",
+      "integrity": "sha1-hBGbGk2GNjrcUqONWH5lM2oKJ90=",
+      "requires": {
+        "tinycolor2": "^1.4.1"
+      }
+    },
    "anymatch": {
      "version": "2.0.0",
      "resolved": "https://registry.npm.taobao.org/anymatch/download/anymatch-2.0.0.tgz",
@@ -1121,6 +1155,7 @@
      "resolved": "https://registry.npm.taobao.org/are-we-there-yet/download/are-we-there-yet-1.1.5.tgz",
      "integrity": "sha1-SzXClE8GKov82mZBB2A1D+nd/CE=",
      "dev": true,
+      "optional": true,
      "requires": {
        "delegates": "^1.0.0",
        "readable-stream": "^2.0.6"
@@ -2336,7 +2371,8 @@
      "version": "1.1.0",
      "resolved": "https://registry.npm.taobao.org/console-control-strings/download/console-control-strings-1.1.0.tgz",
      "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
-      "dev": true
+      "dev": true,
+      "optional": true
    },
    "constants-browserify": {
      "version": "1.0.0",
@@ -2754,7 +2790,8 @@
      "version": "1.0.0",
      "resolved": "https://registry.npm.taobao.org/delegates/download/delegates-1.0.0.tgz",
      "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
-      "dev": true
+      "dev": true,
+      "optional": true
    },
    "depd": {
      "version": "1.1.2",
@@ -3751,7 +3788,8 @@
        "ansi-regex": {
          "version": "2.1.1",
          "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
        },
        "aproba": {
          "version": "1.2.0",
@@ -3772,12 +3810,14 @@
        "balanced-match": {
          "version": "1.0.0",
          "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
        },
        "brace-expansion": {
          "version": "1.1.11",
          "bundled": true,
          "dev": true,
+          "optional": true,
          "requires": {
            "balanced-match": "^1.0.0",
            "concat-map": "0.0.1"
@@ -3792,17 +3832,20 @@
        "code-point-at": {
          "version": "1.1.0",
          "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
        },
        "concat-map": {
          "version": "0.0.1",
          "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
        },
        "console-control-strings": {
          "version": "1.1.0",
          "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
        },
        "core-util-is": {
          "version": "1.0.2",
@@ -3919,7 +3962,8 @@
        "inherits": {
          "version": "2.0.4",
          "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
        },
        "ini": {
          "version": "1.3.5",
@@ -3931,6 +3975,7 @@
          "version": "1.0.0",
          "bundled": true,
          "dev": true,
+          "optional": true,
          "requires": {
            "number-is-nan": "^1.0.0"
          }
@@ -3945,6 +3990,7 @@
          "version": "3.0.4",
          "bundled": true,
          "dev": true,
+          "optional": true,
          "requires": {
            "brace-expansion": "^1.1.7"
          }
@@ -3952,12 +3998,14 @@
        "minimist": {
          "version": "0.0.8",
          "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
        },
        "minipass": {
          "version": "2.9.0",
          "bundled": true,
          "dev": true,
+          "optional": true,
          "requires": {
            "safe-buffer": "^5.1.2",
            "yallist": "^3.0.0"
@@ -3976,6 +4024,7 @@
          "version": "0.5.1",
          "bundled": true,
          "dev": true,
+          "optional": true,
          "requires": {
            "minimist": "0.0.8"
          }
@@ -4065,7 +4114,8 @@
        "number-is-nan": {
          "version": "1.0.1",
          "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
        },
        "object-assign": {
          "version": "4.1.1",
@@ -4077,6 +4127,7 @@
          "version": "1.4.0",
          "bundled": true,
          "dev": true,
+          "optional": true,
          "requires": {
            "wrappy": "1"
          }
@@ -4162,7 +4213,8 @@
        "safe-buffer": {
          "version": "5.1.2",
          "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
        },
        "safer-buffer": {
          "version": "2.1.2",
@@ -4198,6 +4250,7 @@
          "version": "1.0.2",
          "bundled": true,
          "dev": true,
+          "optional": true,
          "requires": {
            "code-point-at": "^1.0.0",
            "is-fullwidth-code-point": "^1.0.0",
@@ -4217,6 +4270,7 @@
          "version": "3.0.1",
          "bundled": true,
          "dev": true,
+          "optional": true,
          "requires": {
            "ansi-regex": "^2.0.0"
          }
@@ -4260,12 +4314,14 @@
        "wrappy": {
          "version": "1.0.2",
          "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
        },
        "yallist": {
          "version": "3.1.1",
          "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
        }
      }
    },
@@ -4274,6 +4330,7 @@
      "resolved": "https://registry.npm.taobao.org/fstream/download/fstream-1.0.12.tgz",
      "integrity": "sha1-Touo7i1Ivk99DeUFRVVI6uWTIEU=",
      "dev": true,
+      "optional": true,
      "requires": {
        "graceful-fs": "^4.1.2",
        "inherits": "~2.0.0",
@@ -4292,6 +4349,7 @@
      "resolved": "https://registry.npm.taobao.org/gauge/download/gauge-2.7.4.tgz",
      "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
      "dev": true,
+      "optional": true,
      "requires": {
        "aproba": "^1.0.3",
        "console-control-strings": "^1.0.0",
@@ -4329,7 +4387,8 @@
      "version": "4.0.1",
      "resolved": "https://registry.npm.taobao.org/get-stdin/download/get-stdin-4.0.1.tgz",
      "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=",
-      "dev": true
+      "dev": true,
+      "optional": true
    },
    "get-stream": {
      "version": "3.0.0",
@@ -4504,7 +4563,8 @@
      "version": "2.0.1",
      "resolved": "https://registry.npm.taobao.org/has-unicode/download/has-unicode-2.0.1.tgz",
      "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=",
-      "dev": true
+      "dev": true,
+      "optional": true
    },
    "has-value": {
      "version": "1.0.0",
@@ -5293,7 +5353,8 @@
      "version": "0.2.1",
      "resolved": "https://registry.npm.taobao.org/is-utf8/download/is-utf8-0.2.1.tgz",
      "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=",
-      "dev": true
+      "dev": true,
+      "optional": true
    },
    "is-windows": {
      "version": "1.0.2",
@@ -5922,6 +5983,7 @@
      "resolved": "https://registry.npm.taobao.org/load-json-file/download/load-json-file-1.1.0.tgz",
      "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
      "dev": true,
+      "optional": true,
      "requires": {
        "graceful-fs": "^4.1.2",
        "parse-json": "^2.2.0",
@@ -5934,7 +5996,8 @@
          "version": "2.3.0",
          "resolved": "https://registry.npm.taobao.org/pify/download/pify-2.3.0.tgz",
          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-          "dev": true
+          "dev": true,
+          "optional": true
        }
      }
    },
@@ -6207,7 +6270,8 @@
      "version": "1.0.1",
      "resolved": "https://registry.npm.taobao.org/map-obj/download/map-obj-1.0.1.tgz",
      "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
-      "dev": true
+      "dev": true,
+      "optional": true
    },
    "map-visit": {
      "version": "1.0.0",
@@ -6564,6 +6628,17 @@
      "integrity": "sha1-rCetpmFn+ohJpq3dg39rGJrSCBw=",
      "dev": true
    },
+    "ng-zorro-antd-mobile": {
+      "version": "0.12.5",
+      "resolved": "https://registry.npm.taobao.org/ng-zorro-antd-mobile/download/ng-zorro-antd-mobile-0.12.5.tgz",
+      "integrity": "sha1-WTTkSvEU6FRa40TKAzkrs2uGbJc=",
+      "requires": {
+        "@angular/animations": "^7.1.0",
+        "@angular/cdk": "^7.2.0",
+        "@ant-design/icons-angular": "~2.0.1",
+        "tslib": "^1.9.0"
+      }
+    },
    "nice-try": {
      "version": "1.0.5",
      "resolved": "https://registry.npm.taobao.org/nice-try/download/nice-try-1.0.5.tgz",
@@ -6871,6 +6946,7 @@
      "resolved": "https://registry.npm.taobao.org/npmlog/download/npmlog-4.1.2.tgz",
      "integrity": "sha1-CKfyqL9zRgR3mp76StXMcXq7lUs=",
      "dev": true,
+      "optional": true,
      "requires": {
        "are-we-there-yet": "~1.1.2",
        "console-control-strings": "~1.1.0",
@@ -7358,6 +7434,7 @@
      "resolved": "https://registry.npm.taobao.org/parse-json/download/parse-json-2.2.0.tgz",
      "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
      "dev": true,
+      "optional": true,
      "requires": {
        "error-ex": "^1.2.0"
      }
@@ -7945,6 +8022,7 @@
      "resolved": "https://registry.npm.taobao.org/read-pkg/download/read-pkg-1.1.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fread-pkg%2Fdownload%2Fread-pkg-1.1.0.tgz",
      "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
      "dev": true,
+      "optional": true,
      "requires": {
        "load-json-file": "^1.0.0",
        "normalize-package-data": "^2.3.2",
@@ -7956,6 +8034,7 @@
          "resolved": "https://registry.npm.taobao.org/path-type/download/path-type-1.1.0.tgz",
          "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
          "dev": true,
+          "optional": true,
          "requires": {
            "graceful-fs": "^4.1.2",
            "pify": "^2.0.0",
@@ -7966,7 +8045,8 @@
          "version": "2.3.0",
          "resolved": "https://registry.npm.taobao.org/pify/download/pify-2.3.0.tgz",
          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-          "dev": true
+          "dev": true,
+          "optional": true
        }
      }
    },
@@ -7975,6 +8055,7 @@
      "resolved": "https://registry.npm.taobao.org/read-pkg-up/download/read-pkg-up-1.0.1.tgz?cache=0&sync_timestamp=1575620499078&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fread-pkg-up%2Fdownload%2Fread-pkg-up-1.0.1.tgz",
      "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
      "dev": true,
+      "optional": true,
      "requires": {
        "find-up": "^1.0.0",
        "read-pkg": "^1.0.0"
@@ -7985,6 +8066,7 @@
          "resolved": "https://registry.npm.taobao.org/find-up/download/find-up-1.1.2.tgz",
          "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
          "dev": true,
+          "optional": true,
          "requires": {
            "path-exists": "^2.0.0",
            "pinkie-promise": "^2.0.0"
@@ -7995,6 +8077,7 @@
          "resolved": "https://registry.npm.taobao.org/path-exists/download/path-exists-2.1.0.tgz",
          "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
          "dev": true,
+          "optional": true,
          "requires": {
            "pinkie-promise": "^2.0.0"
          }
@@ -9354,6 +9437,7 @@
      "resolved": "https://registry.npm.taobao.org/strip-bom/download/strip-bom-2.0.0.tgz",
      "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
      "dev": true,
+      "optional": true,
      "requires": {
        "is-utf8": "^0.2.0"
      }
@@ -9708,6 +9792,11 @@
        "setimmediate": "^1.0.4"
      }
    },
+    "tinycolor2": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npm.taobao.org/tinycolor2/download/tinycolor2-1.4.1.tgz",
+      "integrity": "sha1-9PrTM0R7wLB9TcjpIJ2POaisd+g="
+    },
    "tmp": {
      "version": "0.0.33",
      "resolved": "https://registry.npm.taobao.org/tmp/download/tmp-0.0.33.tgz",
@@ -10672,6 +10761,7 @@
      "resolved": "https://registry.npm.taobao.org/wide-align/download/wide-align-1.1.3.tgz",
      "integrity": "sha1-rgdOa9wMFKQx6ATmJFScYzsABFc=",
      "dev": true,
+      "optional": true,
      "requires": {
        "string-width": "^1.0.2 || 2"
      }

--- a/package.json
+++ b/package.json
@@ -24,6 +24,7 @@
    "buffer": "^5.4.3",
    "core-js": "^2.5.4",
    "html2canvas": "^1.0.0-rc.5",
+    "ng-zorro-antd-mobile": "^0.12.5",
    "rxjs": "~6.3.3",
    "tslib": "^1.9.0",
    "uuid": "^3.3.3",
@@ -50,4 +51,4 @@
    "tslint": "~5.11.0",
    "typescript": "~3.2.2"
  }
-}
\ No newline at end of file
+}
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -13,6 +13,7 @@ import { DatePipe } from "@angular/common";
 import { SafeHtmlPipe } from './safe-html.pipe';
 import { LocalStorage } from './domain/local.storage';
 import { BrowserAnimationsModule } from "@angular/platform-browser/animations";
+import { NgZorroAntdMobileModule } from 'ng-zorro-antd-mobile';

 @NgModule({
  declarations: [
@@ -27,7 +28,8 @@ import { BrowserAnimationsModule } from "@angular/platform-browser/animations";
    LifeCommonModule,
    HttpClientModule,
    AppRoutingModule,
-    BrowserAnimationsModule
+    BrowserAnimationsModule,
+    NgZorroAntdMobileModule
  ],
  providers: [DatePipe, httpInterceptorProviders, LocalStorage],
  bootstrap: [AppComponent]

--- a/src/app/common/life-common.service.ts
+++ b/src/app/common/life-common.service.ts
@@ -9,10 +9,11 @@ declare var wx: any;
 export class LifeCommonService {
  private shareStatusSource = new Subject<string>();
  shareStatus$ = this.shareStatusSource.asObservable();
-
+  weekArr: Array<any>;
  constructor(private datePipe: DatePipe,
    private titleService: Title,
    private metaService: Meta) {
+    this.weekArr = [{ week: '', day: '' }, { week: '', day: '' }, { week: '', day: '' }, { week: '', day: '' }, { week: '', day: '' }, { week: '', day: '' }, { week: '', day: '' }]
  }

  // 向订阅者发布分享结果
@@ -229,4 +230,61 @@ export class LifeCommonService {
    const newStr = str.substr(0, 4) + '年' + str.substr(4, 2) + '月';
    return newStr;
  }
+
+  //获取本周日期
+  makeDate() {
+    var date = new Date();
+    var month = date.getMonth();
+    var week = date.getDay();
+    var month = month + 1;
+    var day = date.getDate();
+    // 本周内今天的前几天的数量
+    var leftNum = week - 1;
+    // 本周内今天的后几天的数量
+    var rightNum = 7 - week;
+    // 本周内今天的前几天
+    for (var i = 0; i < leftNum; i++) {
+      this.weekArr[i].week = week - (week - i) + 1;
+      if (i == 0) {
+        this.weekArr[i].day = day - week;
+      } else {
+        this.weekArr[i].day = day - (week - i) + 1;
+      }
+    }
+    // 本周内今天的后几天
+    for (var i = 0; i < rightNum; i++) {
+      this.weekArr[i + week].week = week + i + 1;
+      this.weekArr[i + week].day = day + i + 1;
+    }
+    // 今天
+    this.weekArr[week - 1].week = week;
+    this.weekArr[week - 1].day = day;
+    this.weekArr[week - 1].selected = true;
+    return this.weekArr;
+  }
+
+  //获取星期
+  getWeek(str){
+    if(str==1){
+      return '周一';
+    }
+    if(str ==2){
+      return '周二';
+    }
+    if(str ==3){
+      return '周三';
+    }
+    if(str==4){
+      return '周四';
+    }
+    if(str ==5){
+      return '周五';
+    }
+    if(str==6){
+      return '周六';
+    }
+    if(str ==7){
+      return '周日';
+    }
+  }
 }
--- a/src/app/my/my-center-home/my-center-home.component.html
+++ b/src/app/my/my-center-home/my-center-home.component.html
@@ -36,8 +36,9 @@
          <li *ngFor="let item of performanceList" (click)="rank(item.time,1,2);rank(item.time,2,2)"
            [ngClass]="{selected:performanceSelectedFlag==item.time}">
            <div style="position: relative;">
-              <h3>{{item.name}}
-                <i class="line" *ngIf="performanceSelectedFlag==item.time" [ngStyle]="{'left':leftWidth}"></i>
+              <h3>
+                <span>{{item.name}}</span>
+                <!-- <i class="line" *ngIf="performanceSelectedFlag==item.time" [ngStyle]="{'left':leftWidth}"></i> -->
              </h3>
            </div>
          </li>
@@ -97,7 +98,7 @@
          </ul>
        </div>
      </div>
-      <div class="part2_item todo">
+      <div class="part2_item todo" routerLink="todo">
        <div>
          <span>今日任务</span>
          <img style="width: 50%;" src="assets/images/todo_icon.png">
@@ -109,7 +110,6 @@
      </div>
    </div>
  </div>
-
  <!--body-->
  <div class="weui-panel__bd">
    <div class="tool_wrapper" *ngFor="let menuItem of menuLists;">

--- a/src/app/my/my-center-home/my-center-home.component.scss
+++ b/src/app/my/my-center-home/my-center-home.component.scss
@@ -137,15 +137,20 @@ ul,ol{
          li.selected{
            h3{
              font-weight: bold;
+              font-size: 20px;
+              span{
+                border-bottom: 2px #fff solid;
+                padding-bottom: 3px;
+              }
            }
-            .line{
-              width: 20px;
-              height: 3px;
-              display: inline-block;
-              position: absolute;
-              bottom: 2px;
-              background: #ff002a;
-            }
+            // .line{
+            //   width: 20px;
+            //   height: 3px;
+            //   display: inline-block;
+            //   position: absolute;
+            //   bottom: 2px;
+            //   background: #ff002a;
+            // }
          }
        }
        .detail{
@@ -199,7 +204,7 @@ ul,ol{
    }
    .part2{
      display: flex;
-      margin-bottom: 20px;
+      margin-bottom: 10px;
      .part2_item{
        width: 48%;
        display: flex;

--- a/src/app/my/my-center-home/my-center-home.component.ts
+++ b/src/app/my/my-center-home/my-center-home.component.ts
@@ -51,8 +51,8 @@ export class MyCenterHomeComponent implements OnInit, AfterViewInit {
    this.lifeCustomerInfo = JSON.parse(localStorage.getItem('lifeCustomerInfo')) ? JSON.parse(localStorage.getItem('lifeCustomerInfo')) : null;
    this.announcementQuery();
    this.performanceList = [
-      { name: '本月', time: 1 },
-      { name: '季度', time: 3 },
+      { name: `${this.lifeCommonService.dateFormat(new Date, ('M'))}月`, time: 1 },
+      { name: `${this.getQuarter(this.lifeCommonService.dateFormat(new Date, ('M')))}`, time: 3 },
      { name: '本年度', time: 2 }
    ]
    //初始化调本月线上 保费+ 本月线下保费
@@ -316,4 +316,19 @@ export class MyCenterHomeComponent implements OnInit, AfterViewInit {
    })
  }

+  //获取季度
+  getQuarter(quarter) {
+    if (quarter == '1' || quarter == '2' || quarter == '3') {
+      return '第一季度';
+    }
+    if (quarter == '4' || quarter == '5' || quarter == '6') {
+      return '第二季度';
+    }
+    if (quarter == '7' || quarter == '8' || quarter == '9') {
+      return '第三季度';
+    }
+    if (quarter == '10' || quarter == '11' || quarter == '12') {
+      return '第四季度';
+    }
+  }
 }
--- a/src/app/my/my-routing.module.ts
+++ b/src/app/my/my-routing.module.ts
@@ -25,6 +25,8 @@ import { ScoreDetailsComponent } from './score-details/score-details.component';
 import { BusinessCardComponent } from "./business-card/business-card.component";
 import { OrderDetailComponent } from './order-detail/order-detail.component';
 import { SalaryComponent } from './salary/salary.component';
+import { TodoListComponent } from './todo-list/todo-list.component';
+
 const myRoutes: Routes = [
  { path: '', component: MyCenterHomeComponent, canActivate: [AuthGuard], data: [{ title: '银盾保险经纪 - 工作台' }] },
  { path: 'material', component: MkMaterialComponent, canActivate: [AuthGuard] },
@@ -50,7 +52,8 @@ const myRoutes: Routes = [
  { path: 'scoreDeatil', component: ScoreDetailsComponent, canActivate: [AuthGuard] },
  { path: 'businessCard', component: BusinessCardComponent, canActivate: [AuthGuard] },
  { path: 'orderDetail', component: OrderDetailComponent, canActivate: [AuthGuard] },
-  { path: 'salary', component: SalaryComponent, canActivate: [AuthGuard] }
+  { path: 'salary', component: SalaryComponent, canActivate: [AuthGuard] },
+  { path: 'todo', component: TodoListComponent, canActivate: [AuthGuard] }

 ];


--- a/src/app/my/my.module.ts
+++ b/src/app/my/my.module.ts
@@ -30,9 +30,10 @@ import { ScoreDetailsComponent } from './score-details/score-details.component';
 import { BusinessCardComponent } from './business-card/business-card.component';
 import { OrderDetailComponent } from './order-detail/order-detail.component';
 import { SalaryComponent } from './salary/salary.component';
+import { TodoListComponent } from './todo-list/todo-list.component';

 @NgModule({
-  declarations: [MyCenterHomeComponent, MkMaterialComponent, MkMaterialDetailComponent, FileUploadComponent, ImportantAnnouncementComponent, SalesDetailComponent, AnnouncementDetailComponent, MyBusinessComponent, MyBusinessDetailComponent, PickerComponent, ToastComponent, SalesRankComponent, TeamRankComponent, RecruitingComponent, RecruitingDetailComponent, ThanksComponent, MySettingComponent, MySettingDetailComponent, MyNewsComponent, MyTargetComponent, TeamPanelComponent, SwitchNumberPipe, TeamSalesScoreComponent, ScoreDetailsComponent, BusinessCardComponent, OrderDetailComponent, SalaryComponent],
+  declarations: [MyCenterHomeComponent, MkMaterialComponent, MkMaterialDetailComponent, FileUploadComponent, ImportantAnnouncementComponent, SalesDetailComponent, AnnouncementDetailComponent, MyBusinessComponent, MyBusinessDetailComponent, PickerComponent, ToastComponent, SalesRankComponent, TeamRankComponent, RecruitingComponent, RecruitingDetailComponent, ThanksComponent, MySettingComponent, MySettingDetailComponent, MyNewsComponent, MyTargetComponent, TeamPanelComponent, SwitchNumberPipe, TeamSalesScoreComponent, ScoreDetailsComponent, BusinessCardComponent, OrderDetailComponent, SalaryComponent, TodoListComponent],
  imports: [
    CommonModule,
    LifeCommonModule,

--- a/src/app/my/todo-list/todo-list.component.html
+++ b/src/app/my/todo-list/todo-list.component.html
+<div class="todo_wrapper">
+  <div class="top">
+    <div class="head">
+      <h3 (click)="goBack()">&lt;</h3>
+      <h3>今日任务</h3>
+      <div>日历</div>
+    </div>
+    <ul class="week">
+      <li *ngFor="let weekItem of weekArr;index as i;"  [ngClass]="{'selected':weekItem.selected}" (click)="selectDay(weekItem)">
+        <div>{{weekItem.day}}</div>
+        <span>{{lifeCommonService.getWeek(i+1)}}</span>
+      </li>
+    </ul>
+  </div>
+  <div class="todoList">
+    <img style="max-width: 80%;" src="assets/images/noListBg.png" >
+    <div class="addBtn">
+      <i class="iconfont icon-jiahao" ></i>
+    </div>
+  </div>
+  <!-- <Calendar [(ngModel)]="this.state.date"
+                [locale]="this.state.en ? 'enUS' : 'zhCN'"
+                [enterDirection]="this.state.enterDirection"
+                [visible]="this.state.show"
+                [getDateExtra]="this.state.getDateExtra"
+                [defaultDate]="this.state.now"
+                [minDate]="this.state.minDate"
+                [maxDate]="this.state.maxDate"
+                [pickTime]="this.state.pickTime"
+                [type]="this.state.type"
+                [rowSize]="this.state.rowSize"
+                [showShortcut]="this.state.showShortcut"
+                [infinite]="this.state.infinite"
+                [defaultValue]="this.state.defaultValue"
+                [onSelect]="this.state.onSelect"
+                (onCancel)="triggerCancel()"
+                (onConfirm)="triggerConfirm($event)"
+                (onSelectHasDisableDate)="triggerSelectHasDisableDate($event)"
+      ></Calendar> -->
+</div>
\ No newline at end of file
--- a/src/app/my/todo-list/todo-list.component.scss
+++ b/src/app/my/todo-list/todo-list.component.scss
+ul,ol{
+    list-style: none;
+}
+.todo_wrapper{
+    .top{
+        .head{
+            display: flex;
+            height: 50px;
+            justify-content: space-between;
+            align-items: center;
+            padding: 0 8px;
+            border-bottom: 1px #eeeeee solid;
+            margin-bottom: 10px;
+        }
+        .week{
+            display: flex;
+            justify-content: space-around;
+            align-items: center;
+            li{
+                width: 11%;
+                text-align: center;
+                height: 50px;
+                font-size: 18px;
+                font-weight: bold;
+                span{
+                    font-size: 10px;
+                    font-weight: normal;
+                    display: block;  
+                    color: #7d7d7d;  
+                }
+            }
+            li.selected{
+                border-radius: 5px;
+                background: #1b5b99;
+                color: #fff;
+                span{
+                    color: #fff;
+                }
+            }
+        }
+    }
+    .todoList{
+        margin-top: 15%;
+        font-size: 20px;
+        color: #9a9fb4;
+        position: relative;
+        margin: 0 auto;
+        .addtips{
+            text-align: center;
+        }
+        .addBtn{
+            position: absolute;
+            width: 50px;
+            height: 50px;
+            border-radius: 50%;
+            background: #eb6100;
+            color: #fff;
+            text-align: center;
+            line-height: 55px;
+            bottom: 0;
+            right: 35px;
+            .iconfont{
+                font-size: 30px;
+            }
+        }
+    }
+}
\ No newline at end of file
--- a/src/app/my/todo-list/todo-list.component.spec.ts
+++ b/src/app/my/todo-list/todo-list.component.spec.ts
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { TodoListComponent } from './todo-list.component';
+
+describe('TodoListComponent', () => {
+  let component: TodoListComponent;
+  let fixture: ComponentFixture<TodoListComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ TodoListComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(TodoListComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
--- a/src/app/my/todo-list/todo-list.component.ts
+++ b/src/app/my/todo-list/todo-list.component.ts
+import { Component, OnInit } from '@angular/core';
+import { LifeCommonService } from '../../common/life-common.service';
+const extra = {
+  '2017/07/15': { info: 'Disable', disable: true }
+};
+
+const now = new Date();
+extra[+new Date(now.getFullYear(), now.getMonth(), now.getDate() + 5)] = { info: 'Disable', disable: true };
+extra[+new Date(now.getFullYear(), now.getMonth(), now.getDate() + 6)] = { info: 'Disable', disable: true };
+extra[+new Date(now.getFullYear(), now.getMonth(), now.getDate() + 7)] = { info: 'Disable', disable: true };
+extra[+new Date(now.getFullYear(), now.getMonth(), now.getDate() + 8)] = { info: 'Disable', disable: true };
+
+for (let key in extra) {
+  if (extra.hasOwnProperty(key)) {
+    let info = extra[key];
+    const date = new Date(key);
+    if (!Number.isNaN(+date) && !extra[+date]) {
+      extra[+date] = info;
+    }
+  }
+}
+@Component({
+  selector: 'ydlife-todo-list',
+  templateUrl: './todo-list.component.html',
+  styleUrls: ['./todo-list.component.scss']
+})
+export class TodoListComponent implements OnInit {
+  weekArr: Array<any>;
+  state: any = {
+    en: false,
+    date: null,
+    show: false,
+    pickTime: false,
+    now: new Date(),
+    type: 'range',
+    enterDirection: '',
+    rowSize: 'normal',
+    showShortcut: false,
+    infinite: true,
+    defaultValue: undefined,
+    minDate: new Date(+now - 5184000000),
+    maxDate: new Date(+now + 31536000000),
+    onSelect: undefined,
+  }
+  constructor(private lifeCommonService: LifeCommonService) { }
+  
+  ngOnInit() {
+    this.weekArr = this.lifeCommonService.makeDate();
+  }
+
+  goBack(){
+    history.go(-1)
+  }
+
+  selectDay(weekItem){
+    weekItem.selected = true;
+  }
+  
+}
--- a/src/assets/images/noListBg.png
+++ b/src/assets/images/noListBg.png
--- a/src/assets/images/toward.png
+++ b/src/assets/images/toward.png