Merge branch 'master' of github.com:chowa/ejyy

.gitattributes

@@ -1 +1,2 @@
 *.js linguist-language=TypeScript
+*.css linguist-language=less

.gitignore

@@ -1,11 +1,5 @@
 *.log
 npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-pids
-*.pid
-*.seed
-*.pid.lock
 node_modules/
 .npm
 dist

README.MD

@@ -1,4 +1,4 @@
-![logo](readme/logo.jpg)
+![logo](docs/images/logo.jpg)
 
 ## 项目介绍
 
@@ -8,39 +8,39 @@
 
 ### web中台
 
-![web1](readme/web1.png)
-![web2](readme/web2.jpg)
-![web3](readme/web3.jpg)
-![web4](readme/web4.jpg)
-![web5](readme/web5.jpg)
-![web6](readme/web6.jpg)
-![web7](readme/web7.jpg)
-![web8](readme/web8.jpg)
-![web9](readme/web9.jpg)
-![web10](readme/web10.jpg)
-![web11](readme/web11.jpg)
+![web1](docs/images/web1.png)
+![web2](docs/images/web2.jpg)
+![web3](docs/images/web3.jpg)
+![web4](docs/images/web4.jpg)
+![web5](docs/images/web5.jpg)
+![web6](docs/images/web6.jpg)
+![web7](docs/images/web7.jpg)
+![web8](docs/images/web8.jpg)
+![web9](docs/images/web9.jpg)
+![web10](docs/images/web10.jpg)
+![web11](docs/images/web11.jpg)
 
 ### 业主端小程序
 
 <p align="center" >
-<img src="readme/ower1.jpg" width="320"/>
-<img src="readme/ower2.jpg" width="320"/>
-<img src="readme/ower3.jpg" width="320"/>
-<img src="readme/ower4.jpg" width="320"/>
-<img src="readme/ower5.jpg" width="320"/>
-<img src="readme/ower6.jpg" width="320"/>
-<img src="readme/ower7.jpg" width="320"/>
-<img src="readme/ower8.jpg" width="320"/>
+<img src="docs/images/ower1.jpg" width="320"/>
+<img src="docs/images/ower2.jpg" width="320"/>
+<img src="docs/images/ower3.jpg" width="320"/>
+<img src="docs/images/ower4.jpg" width="320"/>
+<img src="docs/images/ower5.jpg" width="320"/>
+<img src="docs/images/ower6.jpg" width="320"/>
+<img src="docs/images/ower7.jpg" width="320"/>
+<img src="docs/images/ower8.jpg" width="320"/>
 </p>
 
 ### 员工端小程序
 
 <p align="center" >
-<img src="readme/pc1.jpg" width="320"/>
-<img src="readme/pc2.jpg" width="320"/>
-<img src="readme/pc3.jpg" width="320"/>
-<img src="readme/pc4.jpg" width="320"/>
-<img src="readme/pc5.jpg" width="320"/>
+<img src="docs/images/pc1.jpg" width="320"/>
+<img src="docs/images/pc2.jpg" width="320"/>
+<img src="docs/images/pc3.jpg" width="320"/>
+<img src="docs/images/pc4.jpg" width="320"/>
+<img src="docs/images/pc5.jpg" width="320"/>
 </p>
 
 ## 技术亮点
@@ -57,9 +57,9 @@
 
 ## 使用手册
 
-- [web中台使用手册](resource/manual_web.pdf)
-- [业主小程序使用手册](resource/manual_ower.pdf)
-- [物业员工小程序使用手册](resource/manual_employee.pdf)
+- [web中台使用手册](docs/resource/manual_web.pdf)
+- [业主小程序使用手册](docs/resource/manual_ower.pdf)
+- [物业员工小程序使用手册](docs/resource/manual_employee.pdf)
 
 ## 系统演示
 
@@ -73,7 +73,7 @@
 
 如果你想有一个自己的账号体验系统、给别人演示，登录后可以在【协同办公】->【人力资源】-> 【员工入职】中自己开通一个，开通后，你就可以通过自己的微信扫码登录中台了~也可以用自己的微信访问【物业员工小程序】了。
 
-<img src="readme/chowa-qrcode.jpg" width="215"/>
+<img src="docs/images/chowa-qrcode.jpg" width="215"/>
 
 | :warning: 注意                |
 | --------------------------- |
@@ -82,24 +82,24 @@
 | 不要在体验环境中发垃圾信息！尤其是一串随意敲打的英文和数字！！！   |
 | 请勿在环境中添加、发布不良信息！发布不良信息会封IP |
 
-> 如果无法访问，请查看是否被封了IP，[封禁IP列表](readme/ip.MD)
+> 如果无法访问，请查看是否被封了IP，[封禁IP列表](docs/ip.MD)
 
 
 ### 业主小程序
 
-<img src="readme/ump-qrcode.jpg" width="215"/>
+<img src="docs/images/ump-qrcode.jpg" width="215"/>
 
 ### 物业员工小程序
 
 > 访问员工小程序需要将自己的微信和账号关联的。登录web中台后在【协同办公】->【人力资源】-> 【员工入职】中自己开通一个账号即可体验。
 
-<img src="readme/pmp-qrcode.jpg" width="215"/>
+<img src="docs/images/pmp-qrcode.jpg" width="215"/>
 
 ### 微信公众号
 
 > 对于业主主要是为了群发和单点通知；对于物业公司员工是为了提供工单、流程通知
 
-<img src="readme/oa-qrcode.jpg" width="215"/>
+<img src="docs/images/oa-qrcode.jpg" width="215"/>
 
 ## 如何部署
 
@@ -114,14 +114,14 @@
 
 > 认真仔细看文档，会少走很多弯路
 
-- [部署前的准备](resource/README.MD)
+- [部署前的准备](docs/README.MD)
 - [服务端部署](server/README.MD)
 - [web端部署](web/README.MD)
 - [业主端小程序](ower-mp/README.MD)
 - [员工端小程序](employee-mp/README.MD)
-- [公众号模板消息](oa/README.MD)
-- [短信消息模板](sms/README.MD)
-- [小区硬件接入](iot/README.MD)
+- [公众号模板消息](docs/oa.MD)
+- [短信消息模板](docs/sms.MD)
+- [小区硬件接入](docs/iot.MD)
 
 ## 交流
 
@@ -131,15 +131,15 @@
 
 ### QQ交流群
 <p align="center" >
-    <img src="readme/qq.jpg" width="320"/>
+    <img src="docs/images/qq.jpg" width="320"/>
 </p>
 
 ### 微信交流群
 
 > 由于微信群二维码有时效性，所以请添加这个小号微信，小号会拉你入群，添加时请备注“e家宜业”。
 
 <p align="center" >
-    <img src="readme/wechat-group.jpg" width="215"/>
+    <img src="docs/images/wechat-group.jpg" width="215"/>
 </p>
 
 ## 参与开发
@@ -154,4 +154,4 @@
 
 ## License
 
-![AGPL](readme/agplv3.png)
+![AGPL](docs/images/agplv3.png)

resource/README.MD → docs/README.MD

@@ -1,7 +1,7 @@
 
 ## 前言
 
-我们开源的目的是为了交流和学习。希望你能够认真阅读本文档后在决定用不用！
+这是一整套涉及到前后端知识、微信生态以及物联网应用的系统应用！我们开源的目的是为了交流和学习。希望你能够认真阅读本文档后在决定用不用！
 
 如果你连开源都不知道是什么，我建议你还是不要看了，关了文档打会游戏去吧！
 
@@ -41,11 +41,11 @@
 
 ### 资产导入excel
 
-将本目录下`固定资产导入模板.xlsx`上传至对象存储`template`目录中
+将本目录下`resource/固定资产导入模板.xlsx`上传至对象存储`template`目录中
 
 ### 用户默认头像
 
-将本目录下`default.png`上传至对象存储`avatar`目录中
+将本目录下`resource/default.png`上传至对象存储`avatar`目录中
 
 ### OSS配置
 
@@ -56,4 +56,4 @@
 
 ## 导入数据库
 
-将本目录下的`db.sql`导入`mysql`数据库
+将本目录下的`resource/db.sql`导入`mysql`数据库

iot/README.MD → docs/iot.MD

@@ -1,6 +1,6 @@
 ## 「e家宜业」物联网服务端
 
-> 代码整理中，敬请期待
+> 物联网硬件对接没有统一标准，此部分仅作参考，有能力的同学和企业可自行拆分、对接开发。
 
 ### 智能门禁
 

employee-mp/package.json

@@ -2,7 +2,7 @@
   "name": "ejyy-employee-mp",
   "version": "1.0.0",
   "description": "员工端小程序",
-  "author": "jixuecong@chowa.cn",
+  "author": "concat@chowa.cn",
   "scripts": {
     "lint": "prettier --write src/*.js src/* src/**/* src/**/**/* src/**/**/**/* src/**/**/**/**/*"
   }

employee-mp/project.config.json

@@ -42,7 +42,7 @@
   },
   "compileType": "miniprogram",
   "libVersion": "2.16.0",
-  "appid": "wx66c9783ee867a8cb",
+  "appid": "",
   "projectname": "employee-mp@by ejyy",
   "debugOptions": {
     "hidedInDevtools": []

employee-mp/src/app.js

@@ -2,11 +2,11 @@
  * +----------------------------------------------------------------------
  * | 「e家宜业」 —— 助力物业服务升级，用心服务万千业主
  * +----------------------------------------------------------------------
- * | Copyright (c) 2020~2021 https://www.chowa.com All rights reserved.
+ * | Copyright (c) 2020-2022 https://www.chowa.cn All rights reserved.
  * +----------------------------------------------------------------------
  * | Licensed 未经许可不能去掉「e家宜业」和「卓瓦科技」相关版权
  * +----------------------------------------------------------------------
- * | Author: jixuecong@chowa.cn
+ * | Author: concat@chowa.cn
  * +----------------------------------------------------------------------
  */
 

employee-mp/src/components/action-sheet/index.js

@@ -2,11 +2,11 @@
  * +----------------------------------------------------------------------
  * | 「e家宜业」 —— 助力物业服务升级，用心服务万千业主
  * +----------------------------------------------------------------------
- * | Copyright (c) 2020~2021 https://www.chowa.com All rights reserved.
+ * | Copyright (c) 2020-2022 https://www.chowa.cn All rights reserved.
  * +----------------------------------------------------------------------
  * | Licensed 未经许可不能去掉「e家宜业」和「卓瓦科技」相关版权
  * +----------------------------------------------------------------------
- * | Author: jixuecong@chowa.cn
+ * | Author: concat@chowa.cn
  * +----------------------------------------------------------------------
  */
 

employee-mp/src/components/button/index.js

@@ -2,11 +2,11 @@
  * +----------------------------------------------------------------------
  * | 「e家宜业」 —— 助力物业服务升级，用心服务万千业主
  * +----------------------------------------------------------------------
- * | Copyright (c) 2020~2021 https://www.chowa.com All rights reserved.
+ * | Copyright (c) 2020-2022 https://www.chowa.cn All rights reserved.
  * +----------------------------------------------------------------------
  * | Licensed 未经许可不能去掉「e家宜业」和「卓瓦科技」相关版权
  * +----------------------------------------------------------------------
- * | Author: jixuecong@chowa.cn
+ * | Author: concat@chowa.cn
  * +----------------------------------------------------------------------
  */
 

employee-mp/src/components/calendar/components/header/index.js

@@ -2,11 +2,11 @@
  * +----------------------------------------------------------------------
  * | 「e家宜业」 —— 助力物业服务升级，用心服务万千业主
  * +----------------------------------------------------------------------
- * | Copyright (c) 2020~2021 https://www.chowa.com All rights reserved.
+ * | Copyright (c) 2020-2022 https://www.chowa.cn All rights reserved.
  * +----------------------------------------------------------------------
  * | Licensed 未经许可不能去掉「e家宜业」和「卓瓦科技」相关版权
  * +----------------------------------------------------------------------
- * | Author: jixuecong@chowa.cn
+ * | Author: concat@chowa.cn
  * +----------------------------------------------------------------------
  */
 

employee-mp/src/components/calendar/components/month/index.js

@@ -2,11 +2,11 @@
  * +----------------------------------------------------------------------
  * | 「e家宜业」 —— 助力物业服务升级，用心服务万千业主
  * +----------------------------------------------------------------------
- * | Copyright (c) 2020~2021 https://www.chowa.com All rights reserved.
+ * | Copyright (c) 2020-2022 https://www.chowa.cn All rights reserved.
  * +----------------------------------------------------------------------
  * | Licensed 未经许可不能去掉「e家宜业」和「卓瓦科技」相关版权
  * +----------------------------------------------------------------------
- * | Author: jixuecong@chowa.cn
+ * | Author: concat@chowa.cn
  * +----------------------------------------------------------------------
  */
 

employee-mp/src/components/calendar/index.js

@@ -2,11 +2,11 @@
  * +----------------------------------------------------------------------
  * | 「e家宜业」 —— 助力物业服务升级，用心服务万千业主
  * +----------------------------------------------------------------------
- * | Copyright (c) 2020~2021 https://www.chowa.com All rights reserved.
+ * | Copyright (c) 2020-2022 https://www.chowa.cn All rights reserved.
  * +----------------------------------------------------------------------
  * | Licensed 未经许可不能去掉「e家宜业」和「卓瓦科技」相关版权
  * +----------------------------------------------------------------------
- * | Author: jixuecong@chowa.cn
+ * | Author: concat@chowa.cn
  * +----------------------------------------------------------------------
  */
 

employee-mp/src/components/calendar/utils.js

@@ -2,11 +2,11 @@
  * +----------------------------------------------------------------------
  * | 「e家宜业」 —— 助力物业服务升级，用心服务万千业主
  * +----------------------------------------------------------------------
- * | Copyright (c) 2020~2021 https://www.chowa.com All rights reserved.
+ * | Copyright (c) 2020-2022 https://www.chowa.cn All rights reserved.
  * +----------------------------------------------------------------------
  * | Licensed 未经许可不能去掉「e家宜业」和「卓瓦科技」相关版权
  * +----------------------------------------------------------------------
- * | Author: jixuecong@chowa.cn
+ * | Author: concat@chowa.cn
  * +----------------------------------------------------------------------
  */
 

employee-mp/src/components/car-number/index.js

@@ -2,11 +2,11 @@
  * +----------------------------------------------------------------------
  * | 「e家宜业」 —— 助力物业服务升级，用心服务万千业主
  * +----------------------------------------------------------------------
- * | Copyright (c) 2020~2021 https://www.chowa.com All rights reserved.
+ * | Copyright (c) 2020-2022 https://www.chowa.cn All rights reserved.
  * +----------------------------------------------------------------------
  * | Licensed 未经许可不能去掉「e家宜业」和「卓瓦科技」相关版权
  * +----------------------------------------------------------------------
- * | Author: jixuecong@chowa.cn
+ * | Author: concat@chowa.cn
  * +----------------------------------------------------------------------
  */
 

employee-mp/src/components/card/index.js

@@ -2,11 +2,11 @@
  * +----------------------------------------------------------------------
  * | 「e家宜业」 —— 助力物业服务升级，用心服务万千业主
  * +----------------------------------------------------------------------
- * | Copyright (c) 2020~2021 https://www.chowa.com All rights reserved.
+ * | Copyright (c) 2020-2022 https://www.chowa.cn All rights reserved.
  * +----------------------------------------------------------------------
  * | Licensed 未经许可不能去掉「e家宜业」和「卓瓦科技」相关版权
  * +----------------------------------------------------------------------
- * | Author: jixuecong@chowa.cn
+ * | Author: concat@chowa.cn
  * +----------------------------------------------------------------------
  */
 

employee-mp/src/components/cell-group/index.js

@@ -2,11 +2,11 @@
  * +----------------------------------------------------------------------
  * | 「e家宜业」 —— 助力物业服务升级，用心服务万千业主
  * +----------------------------------------------------------------------
- * | Copyright (c) 2020~2021 https://www.chowa.com All rights reserved.
+ * | Copyright (c) 2020-2022 https://www.chowa.cn All rights reserved.
  * +----------------------------------------------------------------------
  * | Licensed 未经许可不能去掉「e家宜业」和「卓瓦科技」相关版权
  * +----------------------------------------------------------------------
- * | Author: jixuecong@chowa.cn
+ * | Author: concat@chowa.cn
  * +----------------------------------------------------------------------
  */
 

employee-mp/src/components/cell/index.js

@@ -2,11 +2,11 @@
  * +----------------------------------------------------------------------
  * | 「e家宜业」 —— 助力物业服务升级，用心服务万千业主
  * +----------------------------------------------------------------------
- * | Copyright (c) 2020~2021 https://www.chowa.com All rights reserved.
+ * | Copyright (c) 2020-2022 https://www.chowa.cn All rights reserved.
  * +----------------------------------------------------------------------
  * | Licensed 未经许可不能去掉「e家宜业」和「卓瓦科技」相关版权
  * +----------------------------------------------------------------------
- * | Author: jixuecong@chowa.cn
+ * | Author: concat@chowa.cn
  * +----------------------------------------------------------------------
  */