Merge branch 'master' of http://gitea.zianxin.com/zianxin-tec/biz-mobile-react-cloud

src/sheep/api/merchant.ts

@@ -1,22 +1,31 @@
-import request from "@/sheep/utils/request";
+import request from "@/sheep/utils/request"
 
 export default {
-  page: (params: any) =>
-    request({
-      url: "/wallet/mch-manage/app/page-join",
-      method: "GET",
-      params,
-      custom: {
-        showLoading: false,
-      },
-    }),
-  detail: (params: any) =>
-    request({
-      url: "/wallet/mch-manage/app/detail",
-      method: "GET",
-      params,
-      custom: {
-        showLoading: false,
-      },
-    }),
-};
+	page: (params: any) =>
+		request({
+			url: "/wallet/mch-manage/app/page-join",
+			method: "GET",
+			params,
+			custom: {
+				showLoading: false,
+			},
+		}),
+	childrenPage: (params: any) =>
+		request({
+			url: "/wallet/mch-manage/app/children-page-join",
+			method: "GET",
+			params,
+			custom: {
+				showLoading: false,
+			},
+		}),
+	detail: (params: any) =>
+		request({
+			url: "/wallet/mch-manage/app/detail",
+			method: "GET",
+			params,
+			custom: {
+				showLoading: false,
+			},
+		}),
+}

src/sheep/components/crud/crud-layout/crud-layout.vue

@@ -151,7 +151,7 @@ page {
 			flex: 1;
 			overflow: hidden;
 			padding: 0 30rpx;
-			// background: #ecf4f9;
+			background: #ecf4f9;
 		}
 
 		&_bottom {