From 05041b50a364d02d76bee0caea2648a157c687cc Mon Sep 17 00:00:00 2001 From: chenxuhui Date: Sat, 24 Nov 2018 17:11:13 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E9=83=A8=E5=88=86header?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/guarantee/detailshow/detailshow.wxml | 2 + pages/guarantee/detailshow/detailshow.wxss | 1 + pages/guarantee/guarantee.wxml | 2 +- pages/guarantee/guarantee.wxss | 39 +++++++++-------- pages/guarantee/selectbill/selectbill.wxml | 12 +++--- pages/outStore/outStore.json | 2 + pages/outStore/outStore.wxml | 1 + pages/outStore/outStore.wxss | 20 ++++----- pages/saleForecastList/saleForecastList.js | 20 ++++----- pages/saleForecastList/saleForecastList.json | 2 + pages/saleForecastList/saleForecastList.wxml | 2 +- pages/saleForecastList/saleForecastList.wxss | 44 ++++++++------------ 12 files changed, 76 insertions(+), 71 deletions(-) diff --git a/pages/guarantee/detailshow/detailshow.wxml b/pages/guarantee/detailshow/detailshow.wxml index 5c1c211..499cc51 100644 --- a/pages/guarantee/detailshow/detailshow.wxml +++ b/pages/guarantee/detailshow/detailshow.wxml @@ -1,4 +1,5 @@ + 结账客户 {{Customer_Name}} @@ -47,3 +48,4 @@ + diff --git a/pages/guarantee/detailshow/detailshow.wxss b/pages/guarantee/detailshow/detailshow.wxss index 4c67bc1..9e37942 100644 --- a/pages/guarantee/detailshow/detailshow.wxss +++ b/pages/guarantee/detailshow/detailshow.wxss @@ -1,6 +1,7 @@ /* pages/updataguaranteeno/updataguaranteeno.wxss */ page { background: rgb(240, 239, 245); + height: 100%; } .twoitem{ diff --git a/pages/guarantee/guarantee.wxml b/pages/guarantee/guarantee.wxml index 27cf5be..8107e85 100644 --- a/pages/guarantee/guarantee.wxml +++ b/pages/guarantee/guarantee.wxml @@ -4,7 +4,7 @@ 已审核 - + diff --git a/pages/guarantee/guarantee.wxss b/pages/guarantee/guarantee.wxss index ae299e1..89fa1c9 100644 --- a/pages/guarantee/guarantee.wxss +++ b/pages/guarantee/guarantee.wxss @@ -1,34 +1,40 @@ /* pages/guarantee/guarantee.wxss */ page { - background: rgb(240, 239, 245); -} - -.xinjian{ - width: 160rpx; - height: 160rpx; - position: fixed; - bottom: 60rpx; - right: 60rpx; + background:#EAF1F8; + height: calc(100%-10px); } .swiper-tab { - width: 100%; - border-bottom: 2rpx solid #777; + /* height: 30px; */ + margin: 10px 20px; text-align: center; - line-height: 80rpx; + line-height: 30px; background: white; + display: flex; + flex-direction: row; + border-radius: 5px; + border: 1px solid#2E8CF5; + overflow: hidden; } .swiper-tab-list { - font-size: 30rpx; - display: inline-block; + height: 100%; width: 50%; + font-size: 30rpx; color: #777; } .on { - color: #2788f8; - border-bottom: 2rpx solid #2788f8; + background-color:#2E8CF5 ; + color: white; +} + +.xinjian{ + width: 160rpx; + height: 160rpx; + position: fixed; + bottom: 60rpx; + right: 60rpx; } .swiper-box { @@ -40,7 +46,6 @@ page { .swiper-items { height: 100%; - padding-top: 3%; } .scroll-views { diff --git a/pages/guarantee/selectbill/selectbill.wxml b/pages/guarantee/selectbill/selectbill.wxml index 364bf95..2b0db2d 100644 --- a/pages/guarantee/selectbill/selectbill.wxml +++ b/pages/guarantee/selectbill/selectbill.wxml @@ -1,12 +1,12 @@ - - 销售出库 - 客户验收 - 销售发票 - + + + + - + diff --git a/pages/outStore/outStore.json b/pages/outStore/outStore.json index 0782d48..02f2a10 100644 --- a/pages/outStore/outStore.json +++ b/pages/outStore/outStore.json @@ -1,3 +1,5 @@ { + "navigationBarBackgroundColor": "white", + "navigationBarTextStyle": "black", "navigationBarTitleText": "出库单" } \ No newline at end of file diff --git a/pages/outStore/outStore.wxml b/pages/outStore/outStore.wxml index 55a3c5a..ebbc0ae 100644 --- a/pages/outStore/outStore.wxml +++ b/pages/outStore/outStore.wxml @@ -1,4 +1,5 @@ + 未审核 已审核 diff --git a/pages/outStore/outStore.wxss b/pages/outStore/outStore.wxss index 9eaa325..97b939e 100644 --- a/pages/outStore/outStore.wxss +++ b/pages/outStore/outStore.wxss @@ -3,29 +3,29 @@ page { background: rgb(240, 239, 245); } - .swiper-tab { - width: 100%; - /* border-bottom: 2rpx solid #777; */ + /* height: 30px; */ + margin: 10px 20px; text-align: center; - line-height: 80rpx; + line-height: 30px; background: white; display: flex; flex-direction: row; - justify-content: space-around; - border-bottom: 0.2rpx solid rgb(236, 231, 231); + border-radius: 5px; + border: 1px solid#2E8CF5; + overflow: hidden; } .swiper-tab-list { + height: 100%; + width: 50%; font-size: 30rpx; - /* display: inline-block; */ - width: 25%; color: #777; } .on { - color: #2788f8; - border-bottom: 1.5rpx solid #2E8CF5; + background-color:#2E8CF5 ; + color: white; } .swiper-box { diff --git a/pages/saleForecastList/saleForecastList.js b/pages/saleForecastList/saleForecastList.js index e829a97..e262dfd 100644 --- a/pages/saleForecastList/saleForecastList.js +++ b/pages/saleForecastList/saleForecastList.js @@ -194,15 +194,15 @@ Page({ /** * 页面上拉触底事件的处理函数 */ - onReachBottom: function () { - var that = this; - if (this.data.currentTab === 0) { - UnCheckPageIndex = UnCheckPageIndex + 1; - getUnCheckOrderList(that, UnCheckPageIndex, UnCheckPageSize); - } else { - CheckedPageIndex = CheckedPageIndex + 1; - getCheckedOrderList(that, CheckedPageIndex, CheckedPageSize); - } + // onReachBottom: function () { + // var that = this; + // if (this.data.currentTab === 0) { + // UnCheckPageIndex = UnCheckPageIndex + 1; + // getUnCheckOrderList(that, UnCheckPageIndex, UnCheckPageSize); + // } else { + // CheckedPageIndex = CheckedPageIndex + 1; + // getCheckedOrderList(that, CheckedPageIndex, CheckedPageSize); + // } - }, + // }, }) \ No newline at end of file diff --git a/pages/saleForecastList/saleForecastList.json b/pages/saleForecastList/saleForecastList.json index 292625b..573931e 100644 --- a/pages/saleForecastList/saleForecastList.json +++ b/pages/saleForecastList/saleForecastList.json @@ -1,3 +1,5 @@ { + "navigationBarBackgroundColor": "white", + "navigationBarTextStyle": "black", "navigationBarTitleText": "销售预报" } \ No newline at end of file diff --git a/pages/saleForecastList/saleForecastList.wxml b/pages/saleForecastList/saleForecastList.wxml index b2ec2dc..f2eea12 100644 --- a/pages/saleForecastList/saleForecastList.wxml +++ b/pages/saleForecastList/saleForecastList.wxml @@ -3,7 +3,7 @@ 已审核 - + diff --git a/pages/saleForecastList/saleForecastList.wxss b/pages/saleForecastList/saleForecastList.wxss index 7b67a09..50a722d 100644 --- a/pages/saleForecastList/saleForecastList.wxss +++ b/pages/saleForecastList/saleForecastList.wxss @@ -1,41 +1,40 @@ + +page { + background:#EAF1F8; + height: calc(100%-10px); +} + .swiper-tab { - width: 100%; - /* height: 40px; */ + /* height: 30px; */ + margin: 10px 20px; text-align: center; - line-height: 80rpx; + line-height: 30px; background: white; display: flex; flex-direction: row; - justify-content: space-around; - border-bottom: 0.2rpx solid rgb(236, 231, 231); + border-radius: 5px; + border: 1px solid#2E8CF5; + overflow: hidden; } .swiper-tab-list { + height: 100%; + width: 50%; font-size: 30rpx; - width: 25%; color: #777; } .on { - border-bottom: 1.5px solid #2E8CF5 ; - color: #2E8CF5; + background-color:#2E8CF5 ; + color: white; } .swiper-box { - margin-top: 3px; - display: block; width: 100%; + display: block; overflow: hidden; } -.swiper-items1 { - height: 100%; -} - -.swiper-items2 { - height: 100%; -} - .scroll-views { height: 100%; width: 100%; @@ -44,15 +43,13 @@ } .listItem{ - /* width: 100%; */ height: 100rpx; display: flex; flex-direction: column; background-color: #fff; - padding: 20rpx 20rpx 20rpx 20rpx; + padding: 20rpx 20rpx; border-bottom: 1rpx solid #ddd; background: white; - } .orderID{ @@ -89,11 +86,6 @@ color: #666; } -page{ - background-color: #F0EFF5; - height: 100%; -} - .xinjian{ width: 160rpx; height: 160rpx;