diff --git a/yjyf-app/components/YjyfNavBar.vue b/yjyf-app/components/YjyfNavBar.vue index cea7611..7c9ade5 100644 --- a/yjyf-app/components/YjyfNavBar.vue +++ b/yjyf-app/components/YjyfNavBar.vue @@ -37,11 +37,11 @@ - ‹ + {{ backText }} - ⌂ + @@ -72,7 +72,7 @@ title: { type: String, default: '' }, theme: { type: String, - default: 'white', // 'white' 白底黑字 | 'orange' 橙金渐变白字 | 'transparent' 透明 + default: 'orange', // 统一默认为品牌主题色 'orange' validator: (v) => ['white', 'orange', 'transparent'].includes(v) }, customBackground: { type: String, default: '' }, @@ -93,7 +93,11 @@ 'pages/index/index', 'pages/order/list', 'pages/message/message', - 'pages/mine/mine' + 'pages/mine/mine', + 'pages/master/hall', + 'pages/master/orders', + 'pages/master/workbench', + 'pages/merchant/workbench' ]; // 安全区域与各尺寸响应式变量 @@ -328,6 +332,12 @@ line-height: 1; } + .back-svg-icon, .home-svg-icon { + width: 36rpx; + height: 36rpx; + flex-shrink: 0; + } + .back-text { font-size: 26rpx; margin-left: 4rpx; @@ -353,7 +363,7 @@ background: #FFFFFF; } .theme-white.has-border { - border-bottom: 1rpx solid #EFEFEF; + border-bottom: 1rpx solid #F0F0F2; } .icon-white { color: #1F1F1F; @@ -364,7 +374,8 @@ /* 2. 橙金渐变主题 (orange) */ .theme-orange { - background: linear-gradient(135deg, #FF9436 0%, #F0710D 100%); + background: linear-gradient(135deg, #FFA93F 0%, #F0710D 100%); + box-shadow: 0 4rpx 16rpx rgba(240, 113, 13, 0.12); } .icon-orange { color: #FFFFFF; diff --git a/yjyf-app/pages.json b/yjyf-app/pages.json index cad879f..e3c2402 100644 --- a/yjyf-app/pages.json +++ b/yjyf-app/pages.json @@ -1,5 +1,5 @@ { - "pages": [ //pages数组中第一项表示应用启动页 + "pages": [ { "path": "pages/index/index", "style": { @@ -16,23 +16,23 @@ }, { "path": "pages/service/list", - "style": { "navigationBarTitleText": "服务列表" } + "style": { "navigationStyle": "custom", "backgroundColor": "#F5F6F8" } }, { "path": "pages/service/detail", - "style": { "navigationBarTitleText": "服务详情" } + "style": { "navigationStyle": "custom", "backgroundColor": "#F5F6F8" } }, { "path": "pages/order/create", - "style": { "navigationBarTitleText": "确认订单" } + "style": { "navigationStyle": "custom", "backgroundColor": "#F5F6F8" } }, { "path": "pages/order/quick", - "style": { "navigationStyle": "custom", "backgroundColor": "#F6F7F9" } + "style": { "navigationStyle": "custom", "backgroundColor": "#F5F6F8" } }, { "path": "pages/category/category", - "style": { "navigationStyle": "custom", "backgroundColor": "#F6F7F9" } + "style": { "navigationStyle": "custom", "backgroundColor": "#F5F6F8" } }, { "path": "pages/order/list", @@ -65,31 +65,31 @@ }, { "path": "pages/master/apply", - "style": { "navigationBarTitleText": "师傅入驻" } + "style": { "navigationStyle": "custom", "backgroundColor": "#F5F6F8" } }, { "path": "pages/master/skills", - "style": { "navigationBarTitleText": "服务技能" } + "style": { "navigationStyle": "custom", "backgroundColor": "#F5F6F8" } }, { "path": "pages/master/workbench", - "style": { "navigationBarTitleText": "师傅工作台" } + "style": { "navigationStyle": "custom", "backgroundColor": "#F5F6F8" } }, { "path": "pages/master/hall", - "style": { "navigationBarTitleText": "订单大厅", "enablePullDownRefresh": false } + "style": { "navigationStyle": "custom", "backgroundColor": "#F5F6F8", "enablePullDownRefresh": false } }, { "path": "pages/master/quote", - "style": { "navigationBarTitleText": "报价管理" } + "style": { "navigationStyle": "custom", "backgroundColor": "#F5F6F8" } }, { "path": "pages/master/wallet", - "style": { "navigationBarTitleText": "我的钱包" } + "style": { "navigationStyle": "custom", "backgroundColor": "#F5F6F8" } }, { "path": "pages/master/credit", - "style": { "navigationBarTitleText": "信用与申诉" } + "style": { "navigationStyle": "custom", "backgroundColor": "#F5F6F8" } }, { "path": "pages/mine/mine", @@ -97,35 +97,36 @@ }, { "path": "pages/merchant/apply", - "style": { "navigationBarTitleText": "商家入驻" } + "style": { "navigationStyle": "custom", "backgroundColor": "#F5F6F8" } }, { "path": "pages/merchant/workbench", - "style": { "navigationBarTitleText": "商家工作台" } + "style": { "navigationStyle": "custom", "backgroundColor": "#F5F6F8" } }, { "path": "pages/merchant/orders", - "style": { "navigationBarTitleText": "企业订单" } + "style": { "navigationStyle": "custom", "backgroundColor": "#F5F6F8" } }, { "path": "pages/merchant/batch", - "style": { "navigationBarTitleText": "批量下单" } + "style": { "navigationStyle": "custom", "backgroundColor": "#F5F6F8" } }, { "path": "pages/merchant/invoice", - "style": { "navigationBarTitleText": "开具发票" } + "style": { "navigationStyle": "custom", "backgroundColor": "#F5F6F8" } }, { "path": "pages/master/orders", "style": { - "navigationBarTitleText": "接单管理", + "navigationStyle": "custom", + "backgroundColor": "#F5F6F8", "enablePullDownRefresh": true, "backgroundTextStyle": "dark" } }, { "path": "pages/master/detail", - "style": { "navigationStyle": "custom", "backgroundColor": "#F4F5F7" } + "style": { "navigationStyle": "custom", "backgroundColor": "#F5F6F8" } }, { "path": "pages/master/success", @@ -139,9 +140,9 @@ } }, "globalStyle": { - "navigationBarTextStyle": "black", + "navigationBarTextStyle": "white", "navigationBarTitleText": "优匠优服", - "navigationBarBackgroundColor": "#FFFFFF", + "navigationBarBackgroundColor": "#F0710D", "backgroundColor": "#F5F6F8" }, "uniIdRouter": {} diff --git a/yjyf-app/pages/address/list.vue b/yjyf-app/pages/address/list.vue index 04069b4..7a9916d 100644 --- a/yjyf-app/pages/address/list.vue +++ b/yjyf-app/pages/address/list.vue @@ -1,7 +1,7 @@