|
@@ -31,30 +31,23 @@
|
|
|
"style": {
|
|
|
"navigationBarTitleText": "我的优惠卷"
|
|
|
}
|
|
|
-<<<<<<< HEAD
|
|
|
- }
|
|
|
- ],
|
|
|
-=======
|
|
|
- }
|
|
|
- ,{
|
|
|
- "path" : "pages/order/order",
|
|
|
- "style" : {
|
|
|
+ }, {
|
|
|
+ "path": "pages/order/order",
|
|
|
+ "style": {
|
|
|
"navigationBarTitleText": "我的订单"
|
|
|
}
|
|
|
- },{
|
|
|
- "path" : "pages/order/orderDetail",
|
|
|
- "style" : {
|
|
|
+ }, {
|
|
|
+ "path": "pages/order/orderDetail",
|
|
|
+ "style": {
|
|
|
"navigationBarTitleText": "订单详情"
|
|
|
}
|
|
|
- }
|
|
|
- ,{
|
|
|
- "path" : "pages/work/index/index",
|
|
|
- "style" : {
|
|
|
+ }, {
|
|
|
+ "path": "pages/work/index/index",
|
|
|
+ "style": {
|
|
|
"navigationBarTitleText": "洗车服务中"
|
|
|
}
|
|
|
- }
|
|
|
- ],
|
|
|
->>>>>>> 8ad555f7cab379dcc5a6f560e31b529281c89e26
|
|
|
+ }
|
|
|
+ ],
|
|
|
"globalStyle": {
|
|
|
"navigationBarTextStyle": "black",
|
|
|
"navigationBarTitleText": "uni-app",
|