Merge branch 'feature/feature-b' into develop

# Conflicts:
#	miniprogram/pages/home/home.ts

miniprogram/pages/home/home.ts

@@ -246,7 +246,7 @@ Page({
     }>
   ) {
     const { careList, allExpanded } = this.data;
-    console.log(careList, "careList-a")
+    console.log(careList, "careList")
     let newDisplayList: any[] =
       allExpanded || careList.length <= 4 ? careList : careList.slice(0, 4);