Skip to content

Y
ydLife
Commit 5b8afa93 by sunchao
Options

关联商机页面

parent 27ed7020
Showing with 610 additions and 123 deletions
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": [], // 引入全局脚步，构建时会打包进来，常用于第三方库引入的脚本
......
package-lock.json
......@@ -65,14 +65,6 @@
"webpack-merge": "4.2.1",
"webpack-sources": "1.3.0",
"webpack-subresource-integrity": "1.1.0-rc.6"
},
"dependencies": {
"parse5": {
"version": "4.0.0",
"resolved": "https://registry.npm.taobao.org/parse5/download/parse5-4.0.0.tgz?cache=0&sync_timestamp=1595849246963&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fparse5%2Fdownload%2Fparse5-4.0.0.tgz",
"integrity": "sha1-bXhlbj2o14tOwLkG98CO8d/j9gg=",
"dev": true
}
}
},
"@angular-devkit/build-optimizer": {
......@@ -152,6 +144,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",
......@@ -426,7 +435,7 @@
},
"yargs": {
"version": "13.1.0",
"resolved": "https://registry.npm.taobao.org/yargs/download/yargs-13.1.0.tgz?cache=0&sync_timestamp=1599536638903&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fyargs%2Fdownload%2Fyargs-13.1.0.tgz",
"resolved": "https://registry.npm.taobao.org/yargs/download/yargs-13.1.0.tgz?cache=0&sync_timestamp=1599709346664&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fyargs%2Fdownload%2Fyargs-13.1.0.tgz",
"integrity": "sha1-snKc5L/AxYSTlxlRQJnYqRatIwE=",
"dev": true,
"requires": {
......@@ -445,7 +454,7 @@
},
"yargs-parser": {
"version": "13.1.2",
"resolved": "https://registry.npm.taobao.org/yargs-parser/download/yargs-parser-13.1.2.tgz?cache=0&sync_timestamp=1598505090936&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fyargs-parser%2Fdownload%2Fyargs-parser-13.1.2.tgz",
"resolved": "https://registry.npm.taobao.org/yargs-parser/download/yargs-parser-13.1.2.tgz?cache=0&sync_timestamp=1599672404544&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fyargs-parser%2Fdownload%2Fyargs-parser-13.1.2.tgz",
"integrity": "sha1-Ew8JcC667vJlDVTObj5XBvek+zg=",
"dev": true,
"requires": {
......@@ -457,7 +466,7 @@
},
"@angular/core": {
"version": "7.2.16",
"resolved": "https://registry.npm.taobao.org/@angular/core/download/@angular/core-7.2.16.tgz",
"resolved": "https://registry.npm.taobao.org/@angular/core/download/@angular/core-7.2.16.tgz?cache=0&sync_timestamp=1599682303566&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40angular%2Fcore%2Fdownload%2F%40angular%2Fcore-7.2.16.tgz",
"integrity": "sha1-MX9we8dcpakLpHDDTknmrbcCboU=",
"requires": {
"tslib": "^1.9.0"
......@@ -501,6 +510,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.10.4",
"resolved": "https://registry.npm.taobao.org/@babel/code-frame/download/@babel/code-frame-7.10.4.tgz",
......@@ -752,7 +770,7 @@
},
"@types/node": {
"version": "8.9.5",
"resolved": "https://registry.npm.taobao.org/@types/node/download/@types/node-8.9.5.tgz?cache=0&sync_timestamp=1599169585298&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40types%2Fnode%2Fdownload%2F%40types%2Fnode-8.9.5.tgz",
"resolved": "https://registry.npm.taobao.org/@types/node/download/@types/node-8.9.5.tgz?cache=0&sync_timestamp=1599568905640&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40types%2Fnode%2Fdownload%2F%40types%2Fnode-8.9.5.tgz",
"integrity": "sha1-FiuGS8cL4Hfm2yErMidUkXkp6XY=",
"dev": true
},
......@@ -1115,6 +1133,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",
......@@ -1858,15 +1884,15 @@
}
},
"browserslist": {
"version": "4.14.1",
"resolved": "https://registry.npm.taobao.org/browserslist/download/browserslist-4.14.1.tgz?cache=0&sync_timestamp=1599249187124&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbrowserslist%2Fdownload%2Fbrowserslist-4.14.1.tgz",
"integrity": "sha1-yytJC6iB1F3DA5B4x+0EQR6vP6M=",
"version": "4.14.2",
"resolved": "https://registry.npm.taobao.org/browserslist/download/browserslist-4.14.2.tgz?cache=0&sync_timestamp=1599675930923&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbrowserslist%2Fdownload%2Fbrowserslist-4.14.2.tgz",
"integrity": "sha1-GzzsRYobqHWIzF6b5i8ZttSIE84=",
"dev": true,
"requires": {
"caniuse-lite": "^1.0.30001124",
"electron-to-chromium": "^1.3.562",
"caniuse-lite": "^1.0.30001125",
"electron-to-chromium": "^1.3.564",
"escalade": "^3.0.2",
"node-releases": "^1.1.60"
"node-releases": "^1.1.61"
}
},
"browserstack": {
......@@ -2056,9 +2082,9 @@
}
},
"caniuse-lite": {
"version": "1.0.30001124",
"resolved": "https://registry.npm.taobao.org/caniuse-lite/download/caniuse-lite-1.0.30001124.tgz?cache=0&sync_timestamp=1599195849112&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcaniuse-lite%2Fdownload%2Fcaniuse-lite-1.0.30001124.tgz",
"integrity": "sha1-XZmYGQJY4RYw1nT8UOqOV5rgztI=",
"version": "1.0.30001125",
"resolved": "https://registry.npm.taobao.org/caniuse-lite/download/caniuse-lite-1.0.30001125.tgz?cache=0&sync_timestamp=1599631505038&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcaniuse-lite%2Fdownload%2Fcaniuse-lite-1.0.30001125.tgz",
"integrity": "sha1-KhpR7gRaCiIHR0sIb2KMNHJemXs=",
"dev": true
},
"canonical-path": {
......@@ -3046,9 +3072,9 @@
"dev": true
},
"electron-to-chromium": {
"version": "1.3.563",
"resolved": "https://registry.npm.taobao.org/electron-to-chromium/download/electron-to-chromium-1.3.563.tgz?cache=0&sync_timestamp=1599536029048&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Felectron-to-chromium%2Fdownload%2Felectron-to-chromium-1.3.563.tgz",
"integrity": "sha1-naTk8NdsSyIXhMycqBqEZOgYBAg=",
"version": "1.3.564",
"resolved": "https://registry.npm.taobao.org/electron-to-chromium/download/electron-to-chromium-1.3.564.tgz?cache=0&sync_timestamp=1599566575026&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Felectron-to-chromium%2Fdownload%2Felectron-to-chromium-1.3.564.tgz",
"integrity": "sha1-6cMZrkN7Pri78+O65L6tWiGUWWE=",
"dev": true
},
"elliptic": {
......@@ -3190,7 +3216,7 @@
},
"engine.io-parser": {
"version": "2.1.3",
"resolved": "https://registry.npm.taobao.org/engine.io-parser/download/engine.io-parser-2.1.3.tgz",
"resolved": "https://registry.npm.taobao.org/engine.io-parser/download/engine.io-parser-2.1.3.tgz?cache=0&sync_timestamp=1599598097393&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fengine.io-parser%2Fdownload%2Fengine.io-parser-2.1.3.tgz",
"integrity": "sha1-dXq5cPvy37Mse3SwMyFtVznveaY=",
"dev": true,
"requires": {
......@@ -4737,9 +4763,9 @@
"dev": true
},
"is-callable": {
"version": "1.2.0",
"resolved": "https://registry.npm.taobao.org/is-callable/download/is-callable-1.2.0.tgz",
"integrity": "sha1-gzNlYLVKOONeOi33r9BFTWkUaLs=",
"version": "1.2.1",
"resolved": "https://registry.npm.taobao.org/is-callable/download/is-callable-1.2.1.tgz?cache=0&sync_timestamp=1599691525045&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fis-callable%2Fdownload%2Fis-callable-1.2.1.tgz",
"integrity": "sha1-TR4hpPQ3UJ0lzlX4GENQdxQhyW0=",
"dev": true
},
"is-data-descriptor": {
......@@ -4875,7 +4901,7 @@
},
"is-plain-object": {
"version": "2.0.4",
"resolved": "https://registry.npm.taobao.org/is-plain-object/download/is-plain-object-2.0.4.tgz",
"resolved": "https://registry.npm.taobao.org/is-plain-object/download/is-plain-object-2.0.4.tgz?cache=0&sync_timestamp=1599667247216&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fis-plain-object%2Fdownload%2Fis-plain-object-2.0.4.tgz",
"integrity": "sha1-LBY7P6+xtgbZ0Xko8FwqHDjgdnc=",
"dev": true,
"requires": {
......@@ -5316,7 +5342,7 @@
},
"karma": {
"version": "4.0.1",
"resolved": "https://registry.npm.taobao.org/karma/download/karma-4.0.1.tgz",
"resolved": "https://registry.npm.taobao.org/karma/download/karma-4.0.1.tgz?cache=0&sync_timestamp=1599580264329&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fkarma%2Fdownload%2Fkarma-4.0.1.tgz",
"integrity": "sha1-JYHWyqDUzSi2UTFWG0e61tVHh3M=",
"dev": true,
"requires": {
......@@ -5882,7 +5908,7 @@
},
"mini-css-extract-plugin": {
"version": "0.5.0",
"resolved": "https://registry.npm.taobao.org/mini-css-extract-plugin/download/mini-css-extract-plugin-0.5.0.tgz",
"resolved": "https://registry.npm.taobao.org/mini-css-extract-plugin/download/mini-css-extract-plugin-0.5.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fmini-css-extract-plugin%2Fdownload%2Fmini-css-extract-plugin-0.5.0.tgz",
"integrity": "sha1-rABZsCuWklFaY3EVsMyf7To1x7A=",
"dev": true,
"requires": {
......@@ -6083,6 +6109,17 @@
"integrity": "sha1-tKr7k+OustgXTKU88WOrfXMIMF8=",
"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",
......@@ -6187,9 +6224,9 @@
}
},
"node-releases": {
"version": "1.1.60",
"resolved": "https://registry.npm.taobao.org/node-releases/download/node-releases-1.1.60.tgz?cache=0&sync_timestamp=1595485372345&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fnode-releases%2Fdownload%2Fnode-releases-1.1.60.tgz",
"integrity": "sha1-aUi9/OgobwtdDlqI6DhOlU3+cIQ=",
"version": "1.1.61",
"resolved": "https://registry.npm.taobao.org/node-releases/download/node-releases-1.1.61.tgz?cache=0&sync_timestamp=1599612931857&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fnode-releases%2Fdownload%2Fnode-releases-1.1.61.tgz",
"integrity": "sha1-cHsPypzk4ReDYSukovy6CQR68W4=",
"dev": true
},
"node-sass": {
......@@ -6806,6 +6843,12 @@
"error-ex": "^1.2.0"
}
},
"parse5": {
"version": "4.0.0",
"resolved": "https://registry.npm.taobao.org/parse5/download/parse5-4.0.0.tgz?cache=0&sync_timestamp=1595849246963&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fparse5%2Fdownload%2Fparse5-4.0.0.tgz",
"integrity": "sha1-bXhlbj2o14tOwLkG98CO8d/j9gg=",
"dev": true
},
"parseqs": {
"version": "0.0.5",
"resolved": "https://registry.npm.taobao.org/parseqs/download/parseqs-0.0.5.tgz",
......@@ -7034,7 +7077,7 @@
},
"postcss-loader": {
"version": "3.0.0",
"resolved": "https://registry.npm.taobao.org/postcss-loader/download/postcss-loader-3.0.0.tgz?cache=0&sync_timestamp=1599497508507&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpostcss-loader%2Fdownload%2Fpostcss-loader-3.0.0.tgz",
"resolved": "https://registry.npm.taobao.org/postcss-loader/download/postcss-loader-3.0.0.tgz?cache=0&sync_timestamp=1599584305116&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpostcss-loader%2Fdownload%2Fpostcss-loader-3.0.0.tgz",
"integrity": "sha1-a5eUPkfHLYRfqeA/Jzdz1OjdbC0=",
"dev": true,
"requires": {
......@@ -7346,7 +7389,7 @@
},
"yargs": {
"version": "12.0.5",
"resolved": "https://registry.npm.taobao.org/yargs/download/yargs-12.0.5.tgz?cache=0&sync_timestamp=1599536638903&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fyargs%2Fdownload%2Fyargs-12.0.5.tgz",
"resolved": "https://registry.npm.taobao.org/yargs/download/yargs-12.0.5.tgz?cache=0&sync_timestamp=1599709346664&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fyargs%2Fdownload%2Fyargs-12.0.5.tgz",
"integrity": "sha1-BfWZe2CWR7ZPZrgeO0sQo2jnrRM=",
"dev": true,
"requires": {
......@@ -7366,7 +7409,7 @@
},
"yargs-parser": {
"version": "11.1.1",
"resolved": "https://registry.npm.taobao.org/yargs-parser/download/yargs-parser-11.1.1.tgz?cache=0&sync_timestamp=1598505090936&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fyargs-parser%2Fdownload%2Fyargs-parser-11.1.1.tgz",
"resolved": "https://registry.npm.taobao.org/yargs-parser/download/yargs-parser-11.1.1.tgz?cache=0&sync_timestamp=1599672404544&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fyargs-parser%2Fdownload%2Fyargs-parser-11.1.1.tgz",
"integrity": "sha1-h5oIZZc7yp9rq1y987HGfsfTvPQ=",
"dev": true,
"requires": {
......@@ -8089,7 +8132,7 @@
},
"serialize-javascript": {
"version": "2.1.2",
"resolved": "https://registry.npm.taobao.org/serialize-javascript/download/serialize-javascript-2.1.2.tgz?cache=0&sync_timestamp=1591623621018&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fserialize-javascript%2Fdownload%2Fserialize-javascript-2.1.2.tgz",
"resolved": "https://registry.npm.taobao.org/serialize-javascript/download/serialize-javascript-2.1.2.tgz?cache=0&sync_timestamp=1599654937199&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fserialize-javascript%2Fdownload%2Fserialize-javascript-2.1.2.tgz",
"integrity": "sha1-7OxTsOAxe9yV73arcHS3OEeF+mE=",
"dev": true
},
......@@ -8541,7 +8584,7 @@
},
"socks": {
"version": "2.3.3",
"resolved": "https://registry.npm.taobao.org/socks/download/socks-2.3.3.tgz",
"resolved": "https://registry.npm.taobao.org/socks/download/socks-2.3.3.tgz?cache=0&sync_timestamp=1599605546684&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsocks%2Fdownload%2Fsocks-2.3.3.tgz",
"integrity": "sha1-ARKfCl1TTSuJdxLtis6rfuZdeOM=",
"dev": true,
"requires": {
......@@ -9167,6 +9210,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",
......@@ -9370,7 +9418,7 @@
},
"typescript": {
"version": "3.2.4",
"resolved": "https://registry.npm.taobao.org/typescript/download/typescript-3.2.4.tgz?cache=0&sync_timestamp=1599548285163&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ftypescript%2Fdownload%2Ftypescript-3.2.4.tgz",
"resolved": "https://registry.npm.taobao.org/typescript/download/typescript-3.2.4.tgz?cache=0&sync_timestamp=1599635785127&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ftypescript%2Fdownload%2Ftypescript-3.2.4.tgz",
"integrity": "sha1-xYXLlSkSJj2RW0YnJs4kS6UQ7z0=",
"dev": true
},
......@@ -10128,7 +10176,7 @@
},
"yargs": {
"version": "12.0.2",
"resolved": "https://registry.npm.taobao.org/yargs/download/yargs-12.0.2.tgz?cache=0&sync_timestamp=1599536638903&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fyargs%2Fdownload%2Fyargs-12.0.2.tgz",
"resolved": "https://registry.npm.taobao.org/yargs/download/yargs-12.0.2.tgz?cache=0&sync_timestamp=1599709346664&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fyargs%2Fdownload%2Fyargs-12.0.2.tgz",
"integrity": "sha1-/lgjQ2k5KvM+y+9TgZFx7/D1qtw=",
"dev": true,
"requires": {
......@@ -10148,7 +10196,7 @@
},
"yargs-parser": {
"version": "10.1.0",
"resolved": "https://registry.npm.taobao.org/yargs-parser/download/yargs-parser-10.1.0.tgz?cache=0&sync_timestamp=1598505090936&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fyargs-parser%2Fdownload%2Fyargs-parser-10.1.0.tgz",
"resolved": "https://registry.npm.taobao.org/yargs-parser/download/yargs-parser-10.1.0.tgz?cache=0&sync_timestamp=1599672404544&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fyargs-parser%2Fdownload%2Fyargs-parser-10.1.0.tgz",
"integrity": "sha1-cgImW4n36eny5XZeD+c1qQXtuqg=",
"dev": true,
"requires": {
......@@ -10169,7 +10217,7 @@
},
"webpack-merge": {
"version": "4.2.1",
"resolved": "https://registry.npm.taobao.org/webpack-merge/download/webpack-merge-4.2.1.tgz?cache=0&sync_timestamp=1598768710532&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fwebpack-merge%2Fdownload%2Fwebpack-merge-4.2.1.tgz",
"resolved": "https://registry.npm.taobao.org/webpack-merge/download/webpack-merge-4.2.1.tgz?cache=0&sync_timestamp=1599634637519&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fwebpack-merge%2Fdownload%2Fwebpack-merge-4.2.1.tgz",
"integrity": "sha1-XpI8+ALqKs5P1a8dMkc2imM0ibQ=",
"dev": true,
"requires": {
......@@ -10350,7 +10398,7 @@
},
"yargs": {
"version": "7.1.1",
"resolved": "https://registry.npm.taobao.org/yargs/download/yargs-7.1.1.tgz?cache=0&sync_timestamp=1599536638903&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fyargs%2Fdownload%2Fyargs-7.1.1.tgz",
"resolved": "https://registry.npm.taobao.org/yargs/download/yargs-7.1.1.tgz?cache=0&sync_timestamp=1599709346664&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fyargs%2Fdownload%2Fyargs-7.1.1.tgz",
"integrity": "sha1-Z/DvUuIo1O4NYxGs7eiFD1NGTfY=",
"dev": true,
"optional": true,
......@@ -10388,7 +10436,7 @@
},
"yargs-parser": {
"version": "5.0.0-security.0",
"resolved": "https://registry.npm.taobao.org/yargs-parser/download/yargs-parser-5.0.0-security.0.tgz?cache=0&sync_timestamp=1598505090936&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fyargs-parser%2Fdownload%2Fyargs-parser-5.0.0-security.0.tgz",
"resolved": "https://registry.npm.taobao.org/yargs-parser/download/yargs-parser-5.0.0-security.0.tgz?cache=0&sync_timestamp=1599672404544&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fyargs-parser%2Fdownload%2Fyargs-parser-5.0.0-security.0.tgz",
"integrity": "sha1-T/cnHSX5CsFWQ7hgdqKrSZ7J7iQ=",
"dev": true,
"optional": true,
......
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",
......
src/app/common/toast/toast.component.ts
......@@ -6,7 +6,7 @@ import { Router } from "@angular/router";
templateUrl: './toast.component.html',
styleUrls: ['./toast.component.scss']
})
export class ToastComponent implements OnInit {
export class MyToastComponent implements OnInit {
@Input() toastInfo: any;
@Input() routerLink: any;
toastHidden: boolean;
......
src/app/my/add-task/add-task.component.html
......@@ -3,33 +3,100 @@
<div class="head">
<h3 (click)="goBack()">&lt;</h3>
<h3>新建日程</h3>
<div>日历</div>
<div class="am-demo-page">
<List className="calendar-list" style="backgroundColor: 'white'">
<ListItem [arrow]="'horizontal'" (onClick)="onClick_0()">
{{this.state.en ? '日历' : '日历'}}
</ListItem>
<ListItem *ngIf="this.state.startDate">
Time1: {{this.state.startDate.toLocaleString()}}
</ListItem>
<ListItem *ngIf="this.state.endDate">
Time2: {{this.state.endDate.toLocaleString()}}
</ListItem>
</List>
<ng-template #_switch>
<Switch className="right" [checked]="!this.state.en" (onChange)="this.changeLanguage()"></Switch>
</ng-template>
<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>
</div>
<ul class="nav">
<li *ngFor="let tabItem of tabList;index as i;" [ngClass]="{'selected':tabItem.code === tabType}" (click)="selectTab(tabItem.code)">
<li *ngFor="let tabItem of tabList;index as i;" [ngClass]="{'selected':tabItem.code === tabType}" (click)="selectTab(tabItem.code,tabItem.taskType)">
<span> {{tabItem.name}} </span>
</li>
</ul>
</div>
<div class="task_content_wrapper">
<div class="part1_wrapper">
<ul>
<li *ngFor="let salesActivityItem of salesActivityList">
<div class="part_wrapper part1">
<ul class="part1_list">
<li *ngFor="let salesActivityItem of salesActivityList" [ngClass]="{'selected':mdDropOptionId==salesActivityItem.id}" (click)="selectTask(salesActivityItem.id);">
{{salesActivityItem.dropOptionName}}
</li>
</ul>
<div class="important_mark"> <span [ngClass]="{'circle':taskImportantTag==true}" (click)="taskImportantTag=!taskImportantTag"></span> <div>重要标签</div> </div>
</div>
<div class="part1_wrapper">
<div>选择任务需要的时间</div>
<div class="part_wrapper part2">
<div style="font-size: 18px;">选择任务需要的时间</div>
<div class="timeContent">
<div class="picker_list">
<PickerView [data]="seasons" [cascade]="false" [(ngModel)]="taskTimeFrom" (ngModelChange)="onChange($event,1)"></PickerView>
</div>
<div style="color: #d9dadc;">到</div>
<div style="color: #d9dadc;width: 10%;text-align: center;">到</div>
<div class="picker_list">
<PickerView [data]="seasons" [cascade]="false" [(ngModel)]="taskTimeEnd" (ngModelChange)="onChange($event,2)"></PickerView>
</div>
</div>
</div>
<div class="part_wrapper part3">
<div style="margin-bottom: 10px;">任务长期固定在：</div>
<ul class="part3_list">
<li *ngFor="let longTermItem of longTermList" [ngClass]="{'selectedLongTerm':longTermItem.isLongTermTask == true}" (click)="longTermItem.isLongTermTask=!longTermItem.isLongTermTask">
<span></span>
<div>{{longTermItem.name}}</div>
</li>
</ul>
</div>
<div class="part_wrapper part4" style="margin-bottom: 60px;">
<div style="font-size: 18px;margin-bottom: 10px;">添加备注</div>
<textarea style="border:0;border-radius:5px;background:#f6f6f6;width: 355px;height: 100px;padding: 10px;resize: none;" [(ngModel)]="notice"></textarea>
</div>
</div>
<div class="footer">添加任务</div>
</div>
<div class="link_totast_wrapper" *ngIf="linkToastFlag">
<div class="link_mask"></div>
<div class="link_totast_content_wrapper">
<div class="link_content">
<div class="close" (click)="linkToastFlag=false;">X</div>
<div class="link_body">
<div class="title">
是否联系到{{totastTitle}}
</div>
<div class="sub_title"></div>
</div>
<div class="link_footer">
<div style="border-right: 1px #d1d1d1 solid;" (click)="linkToastFlag=false;">否</div>
<div style="color: #f8002e;" (click)="jumpToLink()">是</div>
</div>
</div>
</div>
</div>
src/app/my/add-task/add-task.component.scss
......@@ -5,7 +5,6 @@ ul,ol{
.todo_wrapper{
background: #fff;
.top{
margin-bottom: 20px;
.head{
display: flex;
height: 50px;
......@@ -41,13 +40,16 @@ ul,ol{
}
}
.task_content_wrapper{
.part1_wrapper{
.part_wrapper{
margin-top: 20px;
position: relative;
padding: 0 2%;
ul{
display: flex;
flex-wrap: wrap;
justify-content: space-between;
}
ul.part1_list{
li{
width: 31%;
text-align: center;
......@@ -62,6 +64,7 @@ ul,ol{
color: #fff;
}
}
.important_mark{
position: absolute;
right: 3%;
......@@ -83,6 +86,114 @@ ul,ol{
border: none;
}
}
.timeContent{
display: flex;
justify-content: space-evenly;
align-items: center;
.picker_list{
width: 35%;
}
}
ul.part3_list{
li{
width: 25%;
text-align: center;
display: flex;
align-items: center;
span{
width: 15px;
height: 15px;
border: 1px #787e9e solid;
margin-right: 10%;
}
}
li.selectedLongTerm{
span{
background: #1b5b99;
}
}
}
}
}
.footer{
width: 100%;
height: 55px;
line-height: 55px;
background: #1b5b99;
color: #fff;
text-align: center;
position: fixed;
bottom: 0;
font-size: 20px;
font-weight: bold;
}
}
.link_totast_wrapper{
.link_mask{
position: fixed;
top: 0;
right: 0;
left: 0;
bottom: 0;
height: 100%;
z-index: 2001;
background-color: rgba(0,0,0,.4);
}
.link_totast_content_wrapper{
position: fixed;
overflow: auto;
top: 0;
right: 0;
bottom: 0;
left: 0;
height: 100%;
z-index: 2001;
-webkit-overflow-scrolling: touch;
outline: 0;
display: -webkit-flex;
display: flex;
-webkit-align-items: center;
align-items: center;
-webkit-justify-content: center;
justify-content: center;
-webkit-transform: translateZ(1px);
transform: translateZ(1px);
.link_content{
width: 270px;
position: relative;
background-color: #fff;
border: 0;
background-clip: padding-box;
text-align: center;
height: auto;
overflow: hidden;
border-radius: 7px;
padding-top: 15px;
.close{
background: transparent;
filter: alpha(opacity=100);
opacity: 1;
top: -15px;
right: 5px;
position: relative;
}
.link_body{
.title{
padding: 10px 15px 20px 15px;
}
}
.link_footer{
display: flex;
height: 50px;
line-height: 50px;
border-top: 1px #d1d1d1 solid;
justify-content: space-around;
div{
font-size: 14px;
width: 50%;
}
}
}
}
}
\ No newline at end of file
src/app/my/add-task/add-task.component.ts
import { Component, OnInit } from '@angular/core';
import {MyService} from '../my.service';
import { ModalService, ToastService } from 'ng-zorro-antd-mobile';
import { Router } from "@angular/router";
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-add-task',
templateUrl: './add-task.component.html',
styleUrls: ['./add-task.component.scss']
styleUrls: ['./add-task.component.scss'],
})
export class AddTaskComponent implements OnInit {
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,
getDateExtra: date => {
return extra[+date];
}
}
tabList:Array<any>;
tabType:string;
salesActivityList:Array<any>;
taskImportantTag:boolean = false;
constructor(private myService:MyService) { }
seasons:Array<any>;
taskTimeFrom:Array<any>=[];
taskTimeEnd:Array<any> = [];
longTermList:Array<any>;
taskType:number;
mdDropOptionId:any;
notice:string;
linkToastFlag:boolean = false;
totastTitle:string;
constructor(private myService:MyService,private router: Router) {
this.seasons = [
{label: '8:00',id:1},
{label: '8:30',id:2},
{label: '9:00',id:3},
{label: '9:30', id:4},
{label: '10:00',id:5},
{label: '10:30',id:6},
{label: '11:00',id:7},
{label: '11:30',id:8},
{label: '12:00',id:9},
{label: '12:30',id:10},
{label: '13:00',id:11},
{label: '13:30',id:12},
{label: '14:00',id:13},
{label: '14:30',id:14},
{label: '15:00',id:15},
{label: '15:30',id:16},
{label: '16:00',id:17},
{label: '16:30',id:18},
{label: '17:00',id:19},
{label: '17:30',id:20},
{label: '18:00',id:21},
{label: '18:30',id:22},
{label: '18:00',id:23},
{label: '19:30',id:24},
{label: '17:30',id:25},
{label: '18:00',id:26},
{label: '18:30',id:27},
{label: '18:00',id:28},
{label: '19:30',id:29},
];
this.longTermList = [
{name:'周一',isLongTermTask:false},
{name:'周二',isLongTermTask:false},
{name:'周三',isLongTermTask:false},
{name:'周四',isLongTermTask:false},
{name:'周五',isLongTermTask:false},
{name:'周六',isLongTermTask:false},
{name:'周日',isLongTermTask:false}
];
}
initPara() {
this.state = {
...this.state,
...{
show: false,
date: null,
pickTime: false,
now: new Date(),
type: 'range',
rowSize: 'normal',
infinite: true,
enterDirection: '',
onSelect: undefined,
showShortcut: false,
defaultValue: undefined,
minDate: new Date(+now - 5184000000),
maxDate: new Date(+now + 31536000000),
getDateExtra: date => {
return extra[+date];
}
}
};
}
ngOnInit() {
this.tabList = [{code:'bizchance_promotion_action',name:'营销'},{code:'team_building_source',name:'增员'},{code:'pep_schedule_task_others',name:'其他'}];
this.tabList = [{code:'bizchance_promotion_action',name:'营销',taskType:1},{code:'team_building_track',name:'增员',taskType:2},{code:'pep_schedule_task_others',name:'其他',taskType:3}];
this.tabType = 'bizchance_promotion_action';
this.dropOptionsQuery(this.tabType)
}
......@@ -22,16 +138,65 @@ export class AddTaskComponent implements OnInit {
history.go(-1);
}
selectTab(code){
selectTab(code,taskType){
this.tabType = code;
this.taskType = taskType;
this.dropOptionsQuery(this.tabType);
}
dropOptionsQuery(code){
this.myService.dropOptionsQuery({code:code}).subscribe((res)=>{
if(res['success']){
this.salesActivityList = res['data']['dropMasterInfoList'][0]['dropOptionsInfoList'];
console.log(this.salesActivityList)
}
})
}
onChange(result,type) {
if(type===1){
this.taskTimeFrom = result;
console.log(this.taskTimeFrom);
}
if(type===2){
console.log(this.taskTimeEnd)
this.taskTimeEnd=result;
}
}
selectTask(id){
this.mdDropOptionId=id;
if(this.tabType == 'bizchance_promotion_action' ){
this.linkToastFlag = true;
this.totastTitle = '商机';
}
if(this.tabType == 'team_building_track'){
this.linkToastFlag = true;
this.totastTitle = '增员';
}
}
getValue(result) {
let value = [];
let temp = '';
result.forEach(item => {
value.push(item.label || item);
temp += item.label || item;
});
return value;
}
onClick_0() {
this.initPara();
this.state.show = true;
this.state.type = 'one';
this.state.date = new Date();
}
triggerCancel() {
this.state.show = false;
}
jumpToLink(){
if(this.tabType == 'bizchance_promotion_action'){
this.router.navigate(['/linkbusiness'])
}
}
}
src/app/my/my-business/my-business.component.html
<div class="salesWrapper">
<div class="salesContent">
<div class="search_wrapper" *ngIf="pageType=='linkbusiness'">
<div class="am-demo-page">
<div class="am-demo-bd" >
<SearchBar [placeholder]="'搜索你的商机'" [maxLength]="8"
(onChange)="change($event)"
></SearchBar>
</div>
</div>
</div>
<div class="salesContent" [ngStyle]="{'padding-bottom':pageType=='business'?'0px':'50px'}">
<div style="text-align: center;margin: 20px auto;font-size: 20px;" *ngIf="businessList?.length==0">暂无商机</div>
<!-- <div class="line" *ngFor="let businessItem of businessList" [queryParams]="{orderId:businessItem.orderId}">
<div></div>
......@@ -7,13 +16,15 @@
<div>商机来源：{{businessItem.opportunityFrom}}</div>
<div></div>
</div> -->
<div class="salesItem" *ngFor="let businessItem of businessList"
[routerLink]="['/business',businessItem.opportunityId]"
[queryParams]="{orderId:businessItem.orderId,leadsAssignedId:businessItem.leadsAssignedId}">
<div class="icon_bolck" [ngStyle]="{'background':businessItem.expertType=='1'? '#ddd' : 'none'}">
<div class="salesItem" *ngFor="let businessItem of showBusinessList"
(click)="isJumpToDetail(businessItem.opportunityId,businessItem.orderId,businessItem.leadsAssignedId)">
<div *ngIf="pageType=='business'" class="icon_bolck" [ngStyle]="{'background':businessItem.expertType=='1'? '#ddd' : 'none'}">
<span class="iconfont icon-xiansuo1" *ngIf="businessItem.expertType=='0'"></span>
<span class="iconfont icon-zhuanjia" style="color: #093d9b;" *ngIf="businessItem.expertType=='1'"></span>
</div>
<div *ngIf="pageType=='linkbusiness'" class="linkbusinessRadius">
<span class='circlebtn'></span>
</div>
<div class="line">
<div>姓名：{{businessItem.name}}</div>
<span class="iconfont icon-ar-r" style="font-size: 10px;position: relative; right: -2px;"></span>
......@@ -28,7 +39,10 @@
</div>
</div>
</div>
<div class="add">
<div class="footer">
确认
</div>
<div class="add" *ngIf="pageType=='business'">
<i class="iconfont icon-jiahao" (click)="addBussiness()"></i>
</div>
</div>
\ No newline at end of file
src/app/my/my-business/my-business.component.scss
......@@ -2,7 +2,15 @@
width: 100%;
height: 100%;
overflow: auto;
// background:#f7f7f2;
background:#fff;
.search_wrapper{
.am-demo-page .am-demo-bd .am-search{
background: #fff;
.am-search-input .am-search-synthetic-ph{
height: 35px;
}
}
}
.salesContent{
.salesItem{
border-bottom: 1px #dcdcdc solid;
......@@ -27,7 +35,20 @@
top: 1px;
}
}
.linkbusinessRadius{
position: absolute;
top: 35%;
left: 10px;
width: 25px;
height: 25px;
.circlebtn{
display: inline-block;
width: 25px;
height: 25px;
border: 1px #707070 solid;
border-radius: 50%;
}
}
.line{
display: flex;
justify-content: space-between;
......@@ -65,4 +86,15 @@
left: 42%;
}
}
.footer{
width: 100%;
height: 50px;
line-height: 50px;
background: #1b5b99;
color: #fff;
font-size: 18px;
position: fixed;
bottom: 0;
text-align: center;
}
}
\ No newline at end of file
src/app/my/my-business/my-business.component.ts
import { Component, OnInit } from '@angular/core';
import { MyService } from '../my.service';
import { LifeCommonService } from '../../common/life-common.service';
import { Router } from "@angular/router";
import { Router , ActivatedRoute} from "@angular/router";
@Component({
selector: 'ydlife-my-business',
templateUrl: './my-business.component.html',
styleUrls: ['./my-business.component.scss']
styleUrls: ['./my-business.component.scss'],
styles: [
`.am-demo-bd div{
border-bottom: none;
}
`]
})
export class MyBusinessComponent implements OnInit {
businessList: Array<any>;
constructor(private myService: MyService, public lifeCommonService: LifeCommonService, private router: Router) { }
isTaskCome:boolean = false;
pageType:any;
showBusinessList: Array<any>;
isSelectFlag:boolean;
constructor(private myService: MyService, public lifeCommonService: LifeCommonService, private router: Router,private activatedRoute: ActivatedRoute) {
this.pageType = this.activatedRoute.snapshot.data[0]['type'];
}
ngOnInit() {
this.ownOpportunityQuery()
this.ownOpportunityQuery();
}
ownOpportunityQuery() {
......@@ -21,8 +32,9 @@ export class MyBusinessComponent implements OnInit {
this.myService.ownOpportunityQuery({ customerId: brokerCustomerId, practitionerId: brokerPractitionerId }).subscribe((res) => {
if (res['data']['ownOpportunityInfos']) {
this.businessList = res['data']['ownOpportunityInfos'];
this.showBusinessList = res['data']['ownOpportunityInfos'];
} else {
this.businessList = []
this.businessList = [];
}
})
}
......@@ -30,4 +42,18 @@ export class MyBusinessComponent implements OnInit {
addBussiness() {
this.router.navigate(['/business/0']);
}
isJumpToDetail(opportunityId,orderId,leadsAssignedId){
if(this.pageType == 'business'){
this.router.navigate([`/business/${opportunityId}`], { queryParams: { orderId: orderId, leadsAssignedId: leadsAssignedId } });
}else{
return;
}
}
change(event){
this.showBusinessList = this.businessList.filter((item)=>{
return item.name.indexOf(event) !=-1;
})
}
}
src/app/my/my-routing.module.ts
......@@ -37,7 +37,8 @@ const myRoutes: Routes = [
{ path: 'importantAnnouncement', component: ImportantAnnouncementComponent, canActivate: [AuthGuard] },
{ path: 'salesDetail', component: SalesDetailComponent, canActivate: [AuthGuard] },
{ path: 'importantAnnouncement/:id', component: AnnouncementDetailComponent, canActivate: [AuthGuard] },
{ path: 'business', component: MyBusinessComponent, canActivate: [AuthGuard] },
{ path: 'business', component: MyBusinessComponent, canActivate: [AuthGuard],data:[{type:'business'}] },
{ path: 'linkbusiness', component: MyBusinessComponent, canActivate: [AuthGuard],data:[{type:'linkbusiness'}] },
{ path: 'business/:id', component: MyBusinessDetailComponent, canActivate: [AuthGuard] },
{ path: 'rank', component: SalesRankComponent, canActivate: [AuthGuard] },
{ path: 'teamRank', component: TeamRankComponent, canActivate: [AuthGuard] },
......
src/app/my/my.module.ts
......@@ -13,7 +13,7 @@ import { AnnouncementDetailComponent } from './announcement-detail/announcement-
import { MyBusinessComponent } from './my-business/my-business.component';
import { MyBusinessDetailComponent } from './my-business-detail/my-business-detail.component';
import { PickerComponent } from '../common/picker/picker.component';
import { ToastComponent } from '../common/toast/toast.component';
import { MyToastComponent } from '../common/toast/toast.component';
import { SalesRankComponent } from './sales-rank/sales-rank.component';
import { TeamRankComponent } from './team-rank/team-rank.component';
import { RecruitingComponent } from './recruiting/recruiting.component';
......@@ -32,14 +32,17 @@ import { OrderDetailComponent } from './order-detail/order-detail.component';
import { SalaryComponent } from './salary/salary.component';
import { TodoListComponent } from './todo-list/todo-list.component';
import { AddTaskComponent } from './add-task/add-task.component';
import { NgZorroAntdMobileModule, ModalServiceComponent, ToastComponent } from 'ng-zorro-antd-mobile';
@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, TodoListComponent, AddTaskComponent],
declarations: [MyCenterHomeComponent, MkMaterialComponent, MkMaterialDetailComponent, FileUploadComponent, ImportantAnnouncementComponent, SalesDetailComponent, AnnouncementDetailComponent, MyBusinessComponent, MyBusinessDetailComponent, PickerComponent, MyToastComponent, SalesRankComponent, TeamRankComponent, RecruitingComponent, RecruitingDetailComponent, ThanksComponent, MySettingComponent, MySettingDetailComponent, MyNewsComponent, MyTargetComponent, TeamPanelComponent, SwitchNumberPipe, TeamSalesScoreComponent, ScoreDetailsComponent, BusinessCardComponent, OrderDetailComponent, SalaryComponent, TodoListComponent, AddTaskComponent],
imports: [
CommonModule,
LifeCommonModule,
MyRoutingModule,
NgZorroAntdMobileModule
],
entryComponents: [ModalServiceComponent, ToastComponent],
providers: [
DatePipe
]
......
src/app/my/my.service.ts
import { Injectable } from '@angular/core';
import { HttpClient } from '@angular/common/http';
import { environment } from '../../environments/environment';
import { parse } from 'querystring';
@Injectable({
providedIn: 'root'
......@@ -337,4 +338,11 @@ export class MyService {
return this.http
.post(url, JSON.stringify(param));
}
//日程跟进查询
queryScheduleTrackList(param){
const url = this.ydapi + '/practitioner/queryScheduleTrackList';
return this.http
.post(url, JSON.stringify(param));
}
}
src/app/my/todo-list/todo-list.component.html
......@@ -24,12 +24,15 @@
</ul>
</div>
<div class="taskContent">
<div class="title">任务数量（3）</div>
<div class="title">任务数量（{{taskList.length}}）</div>
<ul>
<li *ngFor="let taskItem of taskList">
<span>{{taskItem.time}}</span>
<div>(重要){{taskItem.taskTitle}}</div>
<div>{{taskItem.taskContent}}</div>
<span>{{taskItem.taskTimeFrom}} - {{taskItem.taskTimeEnd}}</span>
<div class="todo_title">
<span *ngIf="taskItem.taskImportantTag">(重要)</span>
{{taskItem.mdDropOptionName}}
</div>
<div class="notice">{{taskItem.notice}}</div>
</li>
</ul>
</div>
......
src/app/my/todo-list/todo-list.component.scss
......@@ -73,8 +73,8 @@ ul,ol{
margin-top: 15px;
li{
color: #8a8a8a;
height: 35px;
line-height: 35px;
height: 40px;
line-height: 40px;
text-align: center;
}
......@@ -94,9 +94,18 @@ ul,ol{
margin-top: 15px;
li{
background: #fff;
padding: 10px 18px;
padding: 8px 12px;
border-radius: 10px;
margin-bottom: 10px;
.todo_title{
font-size: 16px;
color: #000;
font-weight: bold;
margin: 3px auto;
}
.notice{
color: #a0a0a0;
}
}
}
......
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 }
};
import {MyService} from '../my.service';
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',
......@@ -28,23 +11,7 @@ export class TodoListComponent implements OnInit {
weekArr: Array<any>;
taskList:Array<any> = [];
taskTimeList: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) {
constructor(public lifeCommonService: LifeCommonService,private myService:MyService) {
this.taskTimeList = [
{id:1,time:'8:00'},
{id:2,time:'9:00'},
......@@ -63,6 +30,7 @@ export class TodoListComponent implements OnInit {
ngOnInit() {
this.weekArr = this.lifeCommonService.makeDate();
this.queryScheduleTrackList();
}
goBack(){
......@@ -79,6 +47,15 @@ export class TodoListComponent implements OnInit {
}
addTask(){
this.taskList.push({time:'8:00-9:00',isImportant:true,taskTitle:'今天要完成的计划1',taskContent:'app界面和网页界面的设计'});
// this.taskList.push({time:'8:00-9:00',isImportant:true,taskTitle:'今天要完成的计划1',taskContent:'app界面和网页界面的设计'});
}
queryScheduleTrackList(){
this.myService.queryScheduleTrackList({practitionerId:'1',trackDate:'2020-09-11'}).subscribe((res)=>{
console.log(res)
if(res['success']){
this.taskList = res['data'];
}
})
}
}
src/styles.scss
......@@ -107,13 +107,31 @@ input::placeholder {
top: -8px;
}
.timeContent{
// .am-picker-col{
// height: 102px;
// .am-picker-col-mask{
// background-size: 100% 34px!important;
// }
// }
}
.search_wrapper{
.am-demo-page .am-demo-bd .am-search{
background: #fff;
.am-search-input{
background: #F1F1F1FF;
border-radius: 30px;
}
}
}
@keyframes slowUp {
0% {
-webkit-transform: translateY(100%);
transform: translateY(100%)
}
100% {
-webkit-transform: translateY(0);
transform: translateY(0)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment