页面部分header

pages/guarantee/detailshow/detailshow.wxml

@@ -1,4 +1,5 @@
 <!--pages/updataguaranteeno/updataguaranteeno.wxml-->
+
 <view class='twoitem'>
   <text>结账客户</text>
   <text class='item_value'>{{Customer_Name}}</text>
@@ -47,3 +48,4 @@
     </view>    
   </view>
 </view>
+

pages/guarantee/detailshow/detailshow.wxss

@@ -1,6 +1,7 @@
 /* pages/updataguaranteeno/updataguaranteeno.wxss */
 page {
   background: rgb(240, 239, 245);
+  height: 100%;
 }
 
 .twoitem{

pages/guarantee/guarantee.wxml

@@ -4,7 +4,7 @@
   <view class="swiper-tab-list {{currentTab==1 ? 'on' : ''}}" data-current="1" bindtap="swichNav">已审核</view>
 </view>
 
-<swiper current="{{currentTab}}" class="swiper-box" duration="300" style="height:{{winHeight - 31}}px" bindchange="bindChange">
+<swiper current="{{currentTab}}" class="swiper-box" duration="300" style="height:{{winHeight - 55}}px" bindchange="bindChange">
   <!-- 未审核 -->
   <swiper-item class="swiper-items">
     <scroll-view scroll-x="false" scroll-y="true" bindscrolltoupper="upperN" class='scroll-views'>

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 {

pages/guarantee/selectbill/selectbill.wxml

@@ -1,12 +1,12 @@
 
-<view class="swiper-tab">
-  <view class="swiper-tab-list {{currentTab==0 ? 'on' : ''}}" data-current="0" bindtap="swichNav">销售出库</view>
-  <view class="swiper-tab-list {{currentTab==1 ? 'on' : ''}}" data-current="1" bindtap="swichNav">客户验收</view>
-  <view class="swiper-tab-list {{currentTab==2 ? 'on' : ''}}" data-current="2" bindtap="swichNav">销售发票</view>
-</view>
+<!-- <view class="swiper-tab"> -->
+  <!-- <view class="swiper-tab-list {{currentTab==0 ? 'on' : ''}}" data-current="0" bindtap="swichNav">销售出库</view> -->
+  <!-- <view class="swiper-tab-list {{currentTab==1 ? 'on' : ''}}" data-current="1" bindtap="swichNav">客户验收</view>
+  <view class="swiper-tab-list {{currentTab==2 ? 'on' : ''}}" data-current="2" bindtap="swichNav">销售发票</view> -->
+<!-- </view> -->
 
 
-<swiper current="{{currentTab}}" class="swiper-box" duration="300" style="height:{{winHeight - 31}}px" bindchange="bindChange">
+<swiper current="{{currentTab}}" class="swiper-box" duration="300" style="height:{{winHeight}}px" bindchange="bindChange">
   <!-- 销售出库 -->
   <swiper-item class="swiper-items">
     <scroll-view scroll-x="false" scroll-y="true" class='scroll-views'>

pages/outStore/outStore.json

@@ -1,3 +1,5 @@
 {
+  "navigationBarBackgroundColor": "white",
+  "navigationBarTextStyle": "black",
   "navigationBarTitleText": "出库单"
 }

pages/outStore/outStore.wxml

@@ -1,4 +1,5 @@
 <!--pages/outStore/outStore.wxml-->
+
 <view class="swiper-tab">
   <view class="swiper-tab-list {{currentTab==0 ? 'on' : ''}}" data-current="0" bindtap="swichNav">未审核</view>
   <view class="swiper-tab-list {{currentTab==1 ? 'on' : ''}}" data-current="1" bindtap="swichNav">已审核</view>

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 {

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);
+  //   }
    
-  },
+  // },
 })

pages/saleForecastList/saleForecastList.json

@@ -1,3 +1,5 @@
 {
+  "navigationBarBackgroundColor": "white",
+  "navigationBarTextStyle": "black",
   "navigationBarTitleText": "销售预报"
 }

pages/saleForecastList/saleForecastList.wxml

@@ -3,7 +3,7 @@
   <view class="swiper-tab-list {{currentTab==1 ? 'on' : ''}}" data-current="1" bindtap="swichNav">已审核</view>
 </view>
 
-<swiper current="{{currentTab}}" class="swiper-box" style='height:{{winHeight -83}}px' duration="300" bindchange="bindChange">
+<swiper current="{{currentTab}}" class="swiper-box" style='height:{{winHeight -95}}px' duration="300" bindchange="bindChange">
   <!-- 未审核 -->
   <swiper-item class="swiper-items1">
     <scroll-view scroll-x="false" scroll-y="true" class='scroll-views'  bindscrolltolower="unCheckedScrollLower">

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;