diff --git a/packages/localLife/index/index.css b/packages/localLife/index/index.css index c5fd18af..bf37a75e 100644 --- a/packages/localLife/index/index.css +++ b/packages/localLife/index/index.css @@ -3,7 +3,7 @@ page { } .container{ - padding-top: 100rpx; + /* padding-top: 100rpx; */ } .local { diff --git a/packages/workOrderDashboard/detail/index.css b/packages/workOrderDashboard/detail/index.css index 41b50639..32a46d7e 100644 --- a/packages/workOrderDashboard/detail/index.css +++ b/packages/workOrderDashboard/detail/index.css @@ -141,9 +141,17 @@ page { display: flex; justify-content: center; } -.btn_view > .btn { +.btn_view_btn { + margin: 40rpx 20rpx; width: 300rpx; height: 90rpx; + line-height: 90rpx; + text-align: center; + background: linear-gradient( 91deg, #FF7658 0%, #FF370B 100%); + border-radius: 100rpx 100rpx 100rpx 100rpx; + font-size: 36rpx; + color: #FFFFFF; + font-weight: 600; } .btn { margin: 40rpx auto 60rpx; diff --git a/packages/workOrderDashboard/detail/index.vue b/packages/workOrderDashboard/detail/index.vue index 8f00b0ee..59f18cf1 100644 --- a/packages/workOrderDashboard/detail/index.vue +++ b/packages/workOrderDashboard/detail/index.vue @@ -183,15 +183,16 @@ - - 派单 - - - - 接单 + + + 派单 + + + 接单 + - 接单 + {{ type === "edit" ? "确定" : "编辑" }} diff --git a/pages.json b/pages.json index 975ffe49..ff065b93 100644 --- a/pages.json +++ b/pages.json @@ -484,11 +484,8 @@ { "path": "index/index", "style": { - "navigationBarBackgroundColor": "#fff", - "navigationStyle": "custom", - "usingComponents": { - "nav-footer": "/components/nav/nav" - } + "navigationBarTitleText": "", + "navigationBarBackgroundColor": "#fff" } }, { diff --git a/pages/index/index.css b/pages/index/index.css index 68f49eee..2addac54 100644 --- a/pages/index/index.css +++ b/pages/index/index.css @@ -280,6 +280,7 @@ page { font-weight: normal; font-size: 26rpx; color: #FFFFFF; + margin-left: 15rpx; } .serverList { diff --git a/pages/index/index.vue b/pages/index/index.vue index 7a385417..6bfa1c60 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -98,7 +98,7 @@ - + @@ -107,7 +107,7 @@ - {{ item.title }} @@ -115,8 +115,8 @@ - + {{ item.title }} @@ -158,47 +158,6 @@ -
@@ -520,8 +479,17 @@ export default { }); }, + headerServerClick2(e) { + const cate_id = this.categoryList.find(item => item.cate_name == e.title)?.id; + if (cate_id) { this.switchCategory(cate_id) } + return + }, + headerServerClick(e) { - console.log('当前点击内容', e); + // const cate_id = this.categoryList.find(item => item.cate_name == e.title).id; + // this.switchCategory(cate_id) + // return + if (!e.link_url) { this.NotOpen(); return @@ -700,17 +668,20 @@ export default { page_size: 10 }, { silent: false }); if (res.rows.length) { + // let firstItem = res.rows[0]; + // firstItem.pic_src = picUrl + firstItem.pic_src; + // rightList.push(firstItem); let filterRes = this.filterShowList(res?.rows, 1); filterRes.forEach(item => { item.pic_src = picUrl + item.pic_src }) rightList.push(...filterRes) - }else{ + } else { rightList.push({ ad_position: i, pic_src: '' }) - } + } } return rightList },