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

src/pages.json

@@ -320,6 +320,7 @@
 			]
 		},
 		{
+<<<<<<< HEAD
 			"root": "pages/cabinet",
 			"pages": [
 				{
@@ -327,6 +328,14 @@
 					"style": {
 						"navigationBarTitleText": "选择支付方式",
 						"disableScroll": true
+=======
+			"root": "pages/integrated",
+			"pages": [
+				{
+					"path": "feedback/index",
+					"style": {
+						"navigationBarTitleText": "意见反馈"
+>>>>>>> 57f67b8212491fe7372d697bc1c9475040ed45d8
 					}
 				}
 			]