main
尕宋 2024-06-08 19:03:22 +08:00
parent 42a0f771cb
commit d870b63731
1 changed files with 55 additions and 81 deletions

View File

@ -7,14 +7,7 @@
"^u-([^-].*)": "uview-plus/components/u-$1/u-$1.vue" "^u-([^-].*)": "uview-plus/components/u-$1/u-$1.vue"
} }
}, },
<<<<<<< HEAD "pages": [{
=======
>>>>>>> 7e91066419318ef278bdfb774de71fe10f912b5d
"pages": [
{
"path": "pages/index", "path": "pages/index",
"style": { "style": {
"navigationBarTitleText": "若依移动端框架", "navigationBarTitleText": "若依移动端框架",
@ -23,20 +16,18 @@
} }
}, },
{ {
<<<<<<< HEAD
"path": "pages/Friend/Interactivemessage", "path": "pages/Friend/Interactivemessage",
"style": { "style": {
"navigationBarTitleText": "互动消息", "navigationBarTitleText": "互动消息",
"navigationStyle": "custom" "navigationStyle": "custom"
======= }
"path": "pages/Friend/violationreporting" },
},
{ {
"path" : "pages/post/postInfo/postInfo", "path": "pages/post/postInfo/postInfo",
"style" : "style": {
{ "navigationBarTitleText": "话题详情"
"navigationBarTitleText" : "话题详情"
>>>>>>> 7e91066419318ef278bdfb774de71fe10f912b5d
} }
}, },
{ {
@ -47,7 +38,6 @@
} }
}, },
{ {
<<<<<<< HEAD
"path": "pages/communication/addfriends", "path": "pages/communication/addfriends",
"style": { "style": {
"navigationBarTitleText": "添加好友", "navigationBarTitleText": "添加好友",
@ -63,10 +53,8 @@
}, },
{ {
"path": "pages/Friend/violationreporting", "path": "pages/Friend/violationreporting",
=======
"path": "pages/signln/harvestaddress", "path": "pages/signln/harvestaddress",
>>>>>>> 7e91066419318ef278bdfb774de71fe10f912b5d
"style": { "style": {
"navigationBarTitleText": "违规举报", "navigationBarTitleText": "违规举报",
"navigationStyle": "custom" "navigationStyle": "custom"
@ -108,17 +96,15 @@
"navigationStyle": "custom" "navigationStyle": "custom"
} }
}, },
<<<<<<< HEAD
=======
// {
// "path": "pages/signln/harvestaddress",
// "style": {
// "navigationBarTitleText": "收货地址",
// "navigationStyle": "custom"
// }
// },
>>>>>>> 7e91066419318ef278bdfb774de71fe10f912b5d {
"path": "pages/signln/harvestaddress",
"style": {
"navigationBarTitleText": "收货地址",
"navigationStyle": "custom"
}
},
{ {
"path": "pages/signln/successfulexchange", "path": "pages/signln/successfulexchange",
"style": { "style": {
@ -126,10 +112,6 @@
"navigationStyle": "custom" "navigationStyle": "custom"
} }
}, },
<<<<<<< HEAD
=======
>>>>>>> 7e91066419318ef278bdfb774de71fe10f912b5d
{ {
"path": "pages/signln/signiddetails", "path": "pages/signln/signiddetails",
"style": { "style": {
@ -194,7 +176,7 @@
"navigationStyle": "custom", "navigationStyle": "custom",
"navigationBarTextStyle": "white", "navigationBarTextStyle": "white",
"enablePullDownRefresh": true, "enablePullDownRefresh": true,
"onReachBottomDistance": 100 "onReachBottomDistance": 100
} }
}, },
{ {
@ -299,25 +281,19 @@
"navigationBarTitleText": "消息通知", "navigationBarTitleText": "消息通知",
"navigationStyle": "custom" "navigationStyle": "custom"
} }
} },
<<<<<<< HEAD
=======
,
{ {
"path": "pages/takeaway/index", "path": "pages/takeaway/index",
"style": { "style": {
"navigationBarTitleText": "外卖" "navigationBarTitleText": "外卖"
} }
} },
,
{ {
"path": "pages/partJob/index", "path": "pages/partJob/index",
"style": { "style": {
"navigationBarTitleText": "兼职" "navigationBarTitleText": "兼职"
} }
} }
>>>>>>> 7e91066419318ef278bdfb774de71fe10f912b5d
], ],
"tabBar": { "tabBar": {
"color": "#000000", "color": "#000000",
@ -325,49 +301,47 @@
"borderStyle": "white", "borderStyle": "white",
"backgroundColor": "#ffffff", "backgroundColor": "#ffffff",
"list": [{ "list": [{
"pagePath": "pages/index", "pagePath": "pages/index",
"iconPath": "static/images/tabbar/tu1-2.png", "iconPath": "static/images/tabbar/tu1-2.png",
"selectedIconPath": "static/images/tabbar/tu1-1.png", "selectedIconPath": "static/images/tabbar/tu1-1.png",
"text": "首页" "text": "首页"
}, { }, {
"pagePath": "pages/activity/index", "pagePath": "pages/activity/index",
"iconPath": "static/images/tabbar/tu1-4.png", "iconPath": "static/images/tabbar/tu1-4.png",
"selectedIconPath": "static/images/tabbar/tu1-3.png", "selectedIconPath": "static/images/tabbar/tu1-3.png",
"text": "活动" "text": "活动"
} }
// , { // , {
// "pagePath": "pages/work/index", // "pagePath": "pages/work/index",
// "iconPath": "static/images/tabbar/work.png", // "iconPath": "static/images/tabbar/work.png",
// "selectedIconPath": "static/images/tabbar/work_.png", // "selectedIconPath": "static/images/tabbar/work_.png",
// "text": "工作台" // "text": "工作台"
// } // }
,{ , {
"pagePath": "pages/partJob/index", "pagePath": "pages/partJob/index",
"iconPath": "static/images/tabbar/tu1-6.png", "iconPath": "static/images/tabbar/tu1-6.png",
"selectedIconPath": "static/images/tabbar/tu1-5.png", "selectedIconPath": "static/images/tabbar/tu1-5.png",
"text": "兼职" "text": "兼职"
} }, {
,{ "pagePath": "pages/takeaway/index",
"pagePath": "pages/takeaway/index", "iconPath": "static/images/tabbar/tu1-8.png",
"iconPath": "static/images/tabbar/tu1-8.png", "selectedIconPath": "static/images/tabbar/tu1-7.png",
"selectedIconPath": "static/images/tabbar/tu1-7.png", "text": "外卖"
"text": "外卖" }, {
} "pagePath": "pages/mine/index",
, { "iconPath": "static/images/tabbar/tu1-10.png",
"pagePath": "pages/mine/index", "selectedIconPath": "static/images/tabbar/tu1-9.png",
"iconPath": "static/images/tabbar/tu1-10.png", "text": "我的"
"selectedIconPath": "static/images/tabbar/tu1-9.png", }
"text": "我的" ]
}]
}, },
"globalStyle": { "globalStyle": {
"navigationBarTextStyle": "black", "navigationBarTextStyle": "black",
"navigationBarTitleText": "RuoYi", "navigationBarTitleText": "RuoYi",
"navigationBarBackgroundColor": "#FFFFFF" "navigationBarBackgroundColor": "#FFFFFF"
} }
<<<<<<< HEAD
}
=======
} }
>>>>>>> 7e91066419318ef278bdfb774de71fe10f912b5d
}