From 9f984a018e6a6e6ee0c70e02dd0cfd46a39d5a0a Mon Sep 17 00:00:00 2001
From: robin <3504557@qq.com>
Date: Tue, 6 Nov 2018 11:21:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/saleForecastList/Detail/Detail.wxml   | 18 ++++-----
 pages/saleForecastList/Detail/Detail.wxss   | 37 ++++++++++++++----
 pages/saleForecastList/newBill/newBill.wxml |  9 +++--
 pages/saleForecastList/newBill/newBill.wxss | 42 ++++++++++++++++-----
 4 files changed, 75 insertions(+), 31 deletions(-)

diff --git a/pages/saleForecastList/Detail/Detail.wxml b/pages/saleForecastList/Detail/Detail.wxml
index cb49fcf..d442b87 100644
--- a/pages/saleForecastList/Detail/Detail.wxml
+++ b/pages/saleForecastList/Detail/Detail.wxml
@@ -1,7 +1,7 @@
 <!--pages/orderinfo/orderinfo.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>
+  <view class="swiper-tab-list tab1 {{currentTab==0 ? 'on' : ''}}" data-current="0" bindtap="swichNav">基本信息</view>
+  <view class="swiper-tab-list tab2 {{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">
@@ -58,11 +58,7 @@
           {{saletype[saletypeIndex].Name}}
         </view>
       </view>
-
-
-
-
-
+ 
       <view class='baseitem'>
         <text class='baseitem_key'>送货地址</text>
         <input class='baseitem_value' bindinput='getAddrs' placeholder='请输入送货地址' placeholder-style='color:rgb(202, 202, 202)' value="{{addrs}}"></input>
@@ -72,8 +68,9 @@
         <text class='baseitem_key' space="emsp">摘  要</text>
         <input class='baseitem_value' bindinput='getRemark' placeholder='请输入摘要' placeholder-style='color:rgb(202, 202, 202)'></input>
       </view> -->
-
+      <button class='submit' catchtap='submitForm'>保存</button>
     </scroll-view>
+
     <view class="drawer_screen" bindtap="powerDrawer" data-item='{{which}}' data-statu="close" wx:if="{{showModalStatus}}"></view>
     <!--content-->
     <!--使用animation属性指定需要执行的动画-->
@@ -93,6 +90,7 @@
       <view class="btn_ok" bindtap="powerDrawer" data-statu="close">取消</view>
     </view>
   </swiper-item>
+
   <!-- 订单详细 -->
   <swiper-item class="swiper-items2">
     <scroll-view scroll-x="false" scroll-y="true" class='scroll-views'>
@@ -143,7 +141,7 @@
       <!-- <template name='fodder'>
         
       </template> -->
-      <button class='submit' catchtap='submitForm'>提交</button>
+      <button class='submit' catchtap='submitForm'>保存</button>
     </scroll-view>
 
     <view class="drawer_screen" bindtap="powerDrawer1" data-statu="close" wx:if="{{showModalStatus1}}"></view>
@@ -165,4 +163,4 @@
       <view class="btn_ok" bindtap="powerDrawer1" data-statu="close">取消</view>
     </view>
   </swiper-item>
-</swiper>
+</swiper>
\ No newline at end of file
diff --git a/pages/saleForecastList/Detail/Detail.wxss b/pages/saleForecastList/Detail/Detail.wxss
index d8de5f9..4ef2eed 100644
--- a/pages/saleForecastList/Detail/Detail.wxss
+++ b/pages/saleForecastList/Detail/Detail.wxss
@@ -8,23 +8,40 @@ page {
   width: 100%;
   text-align: center;
   line-height: 80rpx;
-  background: white;
   display: flex;
   flex-direction: row;
-  justify-content: space-around;
+  justify-content: center;
   border-bottom: 0.2rpx solid rgb(223, 218, 218);
 }
 
 .swiper-tab-list {
   font-size: 30rpx;
-  /* display: inline-block; */
-  width: 25%;
+  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 {
-  color: #2788f8;
-  border-bottom: 2rpx solid #2788f8;
+  background: #2788f8;
+  color: white;
 }
 
 .swiper-box {
@@ -145,8 +162,12 @@ page {
 }
 
 .submit {
-  margin-top: 50rpx;
-  margin-bottom: 30rpx;
+  margin-left: 5%;
+  margin-top: 10%;
+  width: 90%;
+  margin-right: 5%;
+  color: #fff;
+  background: linear-gradient(to right, #39c4fd, #539eef);
 }
 
 .drawer_screen {
diff --git a/pages/saleForecastList/newBill/newBill.wxml b/pages/saleForecastList/newBill/newBill.wxml
index 25f49f9..e3efa18 100644
--- a/pages/saleForecastList/newBill/newBill.wxml
+++ b/pages/saleForecastList/newBill/newBill.wxml
@@ -1,6 +1,6 @@
 <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 tab1 {{currentTab==0 ? 'on' : ''}}" data-current="0" bindtap="swichNav">基本信息</view>
+  <view class="swiper-tab-list tab2 {{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">
@@ -71,7 +71,7 @@
         <text class='baseitem_key' space="emsp">摘  要</text>
         <input class='baseitem_value' bindinput='getRemark' placeholder='请输入摘要' placeholder-style='color:rgb(202, 202, 202)'></input>
       </view> -->
-
+      <button class='submit' catchtap='submitForm'>提交</button>
     </scroll-view>
     <view class="drawer_screen" bindtap="powerDrawer" data-item='{{which}}' data-statu="close" wx:if="{{showModalStatus}}"></view>
     <!--content-->
@@ -92,6 +92,7 @@
       <view class="btn_ok" bindtap="powerDrawer" data-statu="close">取消</view>
     </view>
   </swiper-item>
+
   <!-- 订单详细 -->
   <swiper-item class="swiper-items2">
     <scroll-view scroll-x="false" scroll-y="true" class='scroll-views'>
@@ -164,4 +165,4 @@
       <view class="btn_ok" bindtap="powerDrawer1" data-statu="close">取消</view>
     </view>
   </swiper-item>
-</swiper>
+</swiper>
\ No newline at end of file
diff --git a/pages/saleForecastList/newBill/newBill.wxss b/pages/saleForecastList/newBill/newBill.wxss
index 9420370..04c9c45 100644
--- a/pages/saleForecastList/newBill/newBill.wxss
+++ b/pages/saleForecastList/newBill/newBill.wxss
@@ -4,22 +4,42 @@ page {
 
 .swiper-tab {
   width: 100%;
-  border-bottom: 2rpx solid #777;
   text-align: center;
   line-height: 80rpx;
-  background: white;
+  display: flex;
+  flex-direction: row;
+  justify-content: center;
+  border-bottom: 0.2rpx solid rgb(223, 218, 218);
 }
 
 .swiper-tab-list {
   font-size: 30rpx;
-  display: inline-block;
-  width: 50%;
+  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 {
-  color: #2788f8;
-  border-bottom: 2rpx solid #2788f8;
+  background: #2788f8;
+  color: white;
 }
 
 .swiper-box {
@@ -140,8 +160,12 @@ page {
 }
 
 .submit {
-  margin-top: 50rpx;
-  margin-bottom: 30rpx;
+  margin-left: 5%;
+  margin-top: 10%;
+  width: 90%;
+  margin-right: 5%;
+  color: #fff;
+  background: linear-gradient(to right, #39c4fd, #539eef);
 }
 
 .drawer_screen {
@@ -187,7 +211,7 @@ page {
   font: 20px "microsoft yahei";
   text-align: center;
   border-top: 1px solid #e8e8ea;
-  color: #2E8CF5;
+  color: #2e8cf5;
 }
 
 .top {