Merge remote-tracking branch 'origin/main' into main

pages.json

@@ -7,12 +7,7 @@
 			"^u-([^-].*)": "uview-plus/components/u-$1/u-$1.vue"
 		}
 	},
-
-
-
-
-	"pages": [
-		{
+	"pages": [{
 			"path": "pages/index",
 			"style": {
 				"navigationBarTitleText": "若依移动端框架",
@@ -21,12 +16,20 @@
 			}
 		},
 		{
+
 			"path": "pages/Friend/Interactivemessage",
 			"style": {
 				"navigationBarTitleText": "互动消息",
 				"navigationStyle": "custom"
-				}},
+			}
+		},
 
+		{
+			"path": "pages/post/postInfo/postInfo",
+			"style": {
+				"navigationBarTitleText": "话题详情"
+			}
+		},
 		{
 			"path": "pages/Friend/addfruebd",
 			"style": {
@@ -35,6 +38,21 @@
 			}
 		},
 		{
+			"path": "pages/communication/addfriends",
+			"style": {
+				"navigationBarTitleText": "添加好友",
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/signln/signid",
+			"style": {
+				"navigationBarTitleText": "签到任务",
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/Friend/violationreporting",
 			"path": "pages/signln/harvestaddress",
 
 			"style": {
@@ -42,13 +60,13 @@
 				"navigationStyle": "custom"
 			}
 		},
-		// {
-		// 	"path": "pages/signln/harvestaddress",
-		// 	"style": {
-		// 		"navigationBarTitleText": "地址",
-		// 		"navigationStyle": "custom"
-		// 	}
-		// },
+		{
+			"path": "pages/signln/harvestaddress",
+			"style": {
+				"navigationBarTitleText": "地址",
+				"navigationStyle": "custom"
+			}
+		},
 		{
 			"path": "pages/post/postInfo/postInfo",
 			"style": {
@@ -79,6 +97,13 @@
 			}
 		},
 
+		{
+			"path": "pages/signln/harvestaddress",
+			"style": {
+				"navigationBarTitleText": "收货地址",
+				"navigationStyle": "custom"
+			}
+		},
 
 		{
 			"path": "pages/signln/successfulexchange",
@@ -87,7 +112,6 @@
 				"navigationStyle": "custom"
 			}
 		},
-
 		{
 			"path": "pages/signln/signiddetails",
 			"style": {
@@ -257,22 +281,19 @@
 				"navigationBarTitleText": "消息通知",
 				"navigationStyle": "custom"
 			}
-		}
-		,
+		},
 		{
 			"path": "pages/takeaway/index",
 			"style": {
 				"navigationBarTitleText": "外卖"
 			}
-		}
-		,
+		},
 		{
 			"path": "pages/partJob/index",
 			"style": {
 				"navigationBarTitleText": "兼职"
 			}
 		}
-
 	],
 	"tabBar": {
 		"color": "#000000",
@@ -290,25 +311,29 @@
 				"selectedIconPath": "static/images/tabbar/tu1-3.png",
 				"text": "活动"
 			}
-
-		,{
+			// , {
+			// 	"pagePath": "pages/work/index",
+			// 	"iconPath": "static/images/tabbar/work.png",
+			// 	"selectedIconPath": "static/images/tabbar/work_.png",
+			// 	"text": "工作台"
+			// }
+			, {
 				"pagePath": "pages/partJob/index",
 				"iconPath": "static/images/tabbar/tu1-6.png",
 				"selectedIconPath": "static/images/tabbar/tu1-5.png",
 				"text": "兼职"
-		}
-		,{
+			}, {
 				"pagePath": "pages/takeaway/index",
 				"iconPath": "static/images/tabbar/tu1-8.png",
 				"selectedIconPath": "static/images/tabbar/tu1-7.png",
 				"text": "外卖"
-		}
-		, {
+			}, {
 				"pagePath": "pages/mine/index",
 				"iconPath": "static/images/tabbar/tu1-10.png",
 				"selectedIconPath": "static/images/tabbar/tu1-9.png",
 				"text": "我的"
-		}]
+			}
+		]
 	},
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
@@ -317,6 +342,4 @@
 	}
 
 }
-
-
-
+}