diff --git a/pages/guarantee/guarantee.json b/pages/guarantee/guarantee.json index 1c5038f..23e858a 100644 --- a/pages/guarantee/guarantee.json +++ b/pages/guarantee/guarantee.json @@ -1,4 +1,6 @@ { + "navigationBarBackgroundColor": "white", + "navigationBarTextStyle": "black", "navigationBarTitleText": "业务担保", "enablePullDownRefresh": true } \ No newline at end of file diff --git a/pages/guarantee/newbill/newbill.wxss b/pages/guarantee/newbill/newbill.wxss index 774ccf1..9ec6aa7 100644 --- a/pages/guarantee/newbill/newbill.wxss +++ b/pages/guarantee/newbill/newbill.wxss @@ -96,14 +96,6 @@ page { } - - - - - - - - .drawer_screen { width: 100%; height: 100%; @@ -116,28 +108,9 @@ page { overflow: hidden; } -.drawer_box { - width: 650rpx; - overflow: hidden; - position: fixed; - top: 50%; - left: 0; - z-index: 1001; - background: #fafafa; - margin: -150px 50rpx 0 50rpx; - border-radius: 3px; -} - - -.top { - height: 20%; - justify-content: center; - align-items: center; -} - .sousuo { - margin-right: 10%; - margin-left: 10%; + /* margin-right: 10%; + margin-left: 10%; */ text-align: center; background: #d6d8da; height: 40px; @@ -149,24 +122,43 @@ page { overflow-y: scroll; /*超出父盒子高度可滚动*/ } +.drawer_box { + width: 650rpx; + overflow: hidden; + position: fixed; + top: 50%; + left: 0; + z-index: 1001; + background: #fafafa; + margin: -150px 50rpx 0 50rpx; + border-radius: 3px; +} .btn_ok { padding: 10px; font: 20px "microsoft yahei"; text-align: center; border-top: 1px solid #e8e8ea; - color: #2E8CF5; + color: #2788f8; } +.top { + height: 20%; + justify-content: center; + align-items: center; +} .grid1 { width: 100%; border-bottom: 1px solid #c3c3c3; - padding-top: 5px; - padding-bottom: 10px; + /* padding-top: 5px; + padding-bottom: 10px; */ + padding-top: 16rpx; + padding-bottom: 16rpx; + text-align: center; } .text3 { font-size: 18px; color: rgb(48, 48, 48); -} \ No newline at end of file +} diff --git a/pages/order/detail/detail.json b/pages/order/detail/detail.json index 54d98bb..cb031fe 100644 --- a/pages/order/detail/detail.json +++ b/pages/order/detail/detail.json @@ -1,2 +1,5 @@ -{"navigationBarTitleText": "订单详细" +{ + "navigationBarBackgroundColor": "white", + "navigationBarTextStyle": "black", + "navigationBarTitleText": "订单详细" } \ No newline at end of file diff --git a/pages/order/detail/detail.wxml b/pages/order/detail/detail.wxml index 4189edf..9de0046 100644 --- a/pages/order/detail/detail.wxml +++ b/pages/order/detail/detail.wxml @@ -1,10 +1,11 @@ + - 基本信息 - 订单详细 + 基本信息 + 订单明细 - + @@ -60,14 +61,13 @@ - - - 送货地址 - + + + - 基本信息 - 订单详细 + 基本信息 + 订单明细 - + @@ -72,7 +72,9 @@ 摘 要 --> - + + + diff --git a/pages/order/newBill/newBill.wxss b/pages/order/newBill/newBill.wxss index 04afcdd..81cc92a 100644 --- a/pages/order/newBill/newBill.wxss +++ b/pages/order/newBill/newBill.wxss @@ -1,46 +1,32 @@ /* pages/saleforecast/saleforecast.wxss */ page { - background: rgb(240, 239, 245); + background:#EAF1F8; + height: calc(100%-10px); } .swiper-tab { - width: 100%; + /* height: 30px; */ + margin: 10px 20px; text-align: center; - line-height: 80rpx; + line-height: 30px; + background: white; display: flex; flex-direction: row; - justify-content: center; - border-bottom: 0.2rpx solid rgb(223, 218, 218); + border-radius: 5px; + border: 1px solid#2E8CF5; + overflow: hidden; } .swiper-tab-list { + height: 100%; + width: 50%; font-size: 30rpx; - width: 40%; color: #777; - margin-top: 5rpx; - height: 60rpx; - line-height: 60rpx; -} - -.tab1 { - border-top: 2rpx solid #999; - border-bottom: 2rpx solid #999; - border-left: 2rpx solid #999; - border-radius: 20rpx 0rpx 0rpx 20rpx; - background: white; -} - -.tab2 { - border-top: 2rpx solid #999; - border-bottom: 2rpx solid #999; - border-right: 2rpx solid #999; - border-radius: 0rpx 20rpx 20rpx 0rpx; - background: white; } .on { - background: #2788f8; + background-color:#2E8CF5 ; color: white; } @@ -73,49 +59,49 @@ page { align-items: center; padding-top: 20rpx; padding-bottom: 20rpx; -} - -.twogroup { - display: flex; - flex-direction: row; + font-size: 30rpx; } .baseitem_key { - color: black; - width: 20%; - margin-left: 5%; + color: #666; + width: 40%; + margin-left: 20rpx; } .baseitem_value { - margin-left: 5%; - width: 70%; color: rgb(48, 48, 48); + margin-left: 20rpx; + margin-right: 20rpx; + width: 160%; + text-align: right; } .baseitem_key2 { - color: black; - width: 20%; - font-size: 30rpx; - margin-left: 10rpx; + color: #666; + width: 40%; + margin-left: 20rpx; } .baseitem_value2 { color: rgb(48, 48, 48); - font-size: 30rpx; + margin-left: 20rpx; + margin-right: 20rpx; + width: 160%; + text-align: right; } .baseitem_key1 { - color: black; - width: 40%; - font-size: 30rpx; - margin-left: 10rpx; + color: #666; + width: 100%; + margin-left: 20rpx; } .baseitem_value1 { color: rgb(48, 48, 48); - font-size: 30rpx; margin-left: 20rpx; - width: 60%; + margin-right: 20rpx; + width: 100%; + text-align: right; } ::-webkit-scrollbar { @@ -183,8 +169,8 @@ page { } .sousuo { - margin-right: 10%; - margin-left: 10%; + /* margin-right: 10%; + margin-left: 10%; */ text-align: center; background: #d6d8da; height: 40px; @@ -213,7 +199,7 @@ page { font: 20px "microsoft yahei"; text-align: center; border-top: 1px solid #e8e8ea; - color: #2E8CF5; + color: #2788f8; } .top { @@ -225,8 +211,11 @@ page { .grid1 { width: 100%; border-bottom: 1px solid #c3c3c3; - padding-top: 5px; - padding-bottom: 10px; + /* padding-top: 5px; + padding-bottom: 10px; */ + padding-top: 16rpx; + padding-bottom: 16rpx; + text-align: center; } .text3 { diff --git a/pages/order/query/query.wxss b/pages/order/query/query.wxss index 797205a..75fab2f 100644 --- a/pages/order/query/query.wxss +++ b/pages/order/query/query.wxss @@ -38,28 +38,9 @@ page { overflow: hidden; } -.drawer_box { - width: 650rpx; - overflow: hidden; - position: fixed; - top: 50%; - left: 0; - z-index: 1001; - background: #fafafa; - margin: -150px 50rpx 0 50rpx; - border-radius: 3px; -} - - -.top { - height: 20%; - justify-content: center; - align-items: center; -} - .sousuo { - margin-right: 10%; - margin-left: 10%; + /* margin-right: 10%; + margin-left: 10%; */ text-align: center; background: #d6d8da; height: 40px; @@ -71,24 +52,43 @@ page { overflow-y: scroll; /*超出父盒子高度可滚动*/ } +.drawer_box { + width: 650rpx; + overflow: hidden; + position: fixed; + top: 50%; + left: 0; + z-index: 1001; + background: #fafafa; + margin: -150px 50rpx 0 50rpx; + border-radius: 3px; +} .btn_ok { padding: 10px; font: 20px "microsoft yahei"; text-align: center; border-top: 1px solid #e8e8ea; - color: #2E8CF5; + color: #2788f8; } +.top { + height: 20%; + justify-content: center; + align-items: center; +} .grid1 { width: 100%; border-bottom: 1px solid #c3c3c3; - padding-top: 5px; - padding-bottom: 10px; + /* padding-top: 5px; + padding-bottom: 10px; */ + padding-top: 16rpx; + padding-bottom: 16rpx; + text-align: center; } .text3 { font-size: 18px; color: rgb(48, 48, 48); -} \ No newline at end of file +} diff --git a/pages/saleForecastList/Detail/Detail.json b/pages/saleForecastList/Detail/Detail.json index 603eeda..3ee66ef 100644 --- a/pages/saleForecastList/Detail/Detail.json +++ b/pages/saleForecastList/Detail/Detail.json @@ -1,3 +1,5 @@ { + "navigationBarBackgroundColor": "white", + "navigationBarTextStyle": "black", "navigationBarTitleText": "预报详情" } \ No newline at end of file