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

# Conflicts:
#	.env

src/pages.json

@@ -17,14 +17,14 @@
 			}
 		},
 		{
-			"path": "pages/tabbar/shop",
+			"path": "pages/tabbar/selfMerchant",
 			"style": {
-				"navigationBarTitleText": "超市",
+				"navigationBarTitleText": "自营商家",
 				"disableScroll": true
 			}
 		},
 		{
-			"path": "pages/tabbar/coopShop",
+			"path": "pages/tabbar/coopMerchant",
 			"style": {
 				"navigationBarTitleText": "合作商家",
 				"disableScroll": true
@@ -74,6 +74,13 @@
 						"disableScroll": true
 					}
 				},
+				{
+					"path": "brandDetail",
+					"style": {
+						"navigationBarTitleText": "",
+						"disableScroll": true
+					}
+				},
 				{
 					"path": "product-detail",
 					"style": {
@@ -278,6 +285,18 @@
 				}
 			]
 		},
+		{
+			"root": "pages/user",
+			"pages": [
+				{
+					"path": "userRole",
+					"style": {
+						"navigationBarTitleText": "用户身份",
+						"disableScroll": true
+					}
+				}
+			]
+		},
 		{
 			"root": "pages/pay",
 			"pages": [
@@ -287,6 +306,20 @@
 						"navigationBarTitleText": "支付",
 						"disableScroll": true
 					}
+				},
+				{
+					"path": "payComplete",
+					"style": {
+						"navigationBarTitleText": "支付完成",
+						"disableScroll": true
+					}
+				},
+				{
+					"path": "transferMoney",
+					"style": {
+						"navigationBarTitleText": "转账",
+						"disableScroll": true
+					}
 				}
 			]
 		},
@@ -318,13 +351,13 @@
 				"selectedIconPath": ""
 			},
 			{
-				"pagePath": "pages/tabbar/shop",
+				"pagePath": "pages/tabbar/selfMerchant",
 				"text": "",
 				"iconPath": "",
 				"selectedIconPath": ""
 			},
 			{
-				"pagePath": "pages/tabbar/coopShop",
+				"pagePath": "pages/tabbar/coopMerchant",
 				"text": "",
 				"iconPath": "",
 				"selectedIconPath": ""
@@ -353,7 +386,6 @@
 				"iconPath": "",
 				"selectedIconPath": ""
 			}
-
 			// {
 			// 	"pagePath": "pages/tabbar/canteen",
 			// 	"text": "食堂",
@@ -361,16 +393,16 @@
 			// 	"selectedIconPath": "static/tabbar/canteen-select.png"
 			// },
 			// {
-			// 	"pagePath": "pages/tabbar/shop",
-			// 	"text": "超市",
-			// 	"iconPath": "static/tabbar/shop.png",
-			// 	"selectedIconPath": "static/tabbar/shop-select.png"
+			// 	"pagePath": "pages/tabbar/selfMerchant",
+			// 	"text": "自营商家",
+			// 	"iconPath": "static/tabbar/selfMerchant.png",
+			// 	"selectedIconPath": "static/tabbar/selfMerchant-select.png"
 			// },
 			// {
-			// 	pagePath: "pages/tabbar/coopShop",
+			// 	pagePath: "pages/tabbar/coopMerchant",
 			// 	text: "合作商家",
-			// 	iconPath: "static/tabbar/coopShop.png",
-			// 	selectedIconPath: "static/tabbar/coopShop-select.png",
+			// 	iconPath: "static/tabbar/coopMerchant.png",
+			// 	selectedIconPath: "static/tabbar/coopMerchant-select.png",
 			// },
 			// {
 			// 	"pagePath": "pages/tabbar/order",
@@ -378,21 +410,18 @@
 			// 	"iconPath": "static/tabbar/order.png",
 			// 	"selectedIconPath": "static/tabbar/order-select.png"
 			// },
-
 			// {
 			// 	"pagePath": "pages/tabbar/flowStatistics",
 			// 	"text": "流水统计",
 			// 	"iconPath": "static/tabbar/order.png",
 			// 	"selectedIconPath": "static/tabbar/order-select.png"
 			// },
-
 			// {
 			// 	"pagePath": "pages/tabbar/individualOrder",
 			// 	"text": "订单",
 			// 	"iconPath": "static/tabbar/order.png",
 			// 	"selectedIconPath": "static/tabbar/order-select.png"
 			// },
-
 			// {
 			// 	"pagePath": "pages/tabbar/my",
 			// 	"text": "我的",