From 1f3eb30cda4db58dd84f10976347e36dbdd4cd2f Mon Sep 17 00:00:00 2001
From: chenxuhui <qwehui12@163.com>
Date: Wed, 21 Nov 2018 21:14:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AD=98=E8=B4=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                                        |  2 +-
 .../goodaNameChooseTemplate.js                | 11 ++-
 .../goodaNameChooseTemplate.wxml              | 17 ++---
 .../goodaNameChooseTemplate.wxss              | 69 +++++++++++++------
 pages/homePage/homePage.js                    |  3 +-
 pages/saleForecastList/newBill/newBill.js     |  6 --
 pages/saleForecastList/newBill/newBill.wxml   |  2 +-
 7 files changed, 69 insertions(+), 41 deletions(-)

diff --git a/app.js b/app.js
index bbd4a73..51fd058 100644
--- a/app.js
+++ b/app.js
@@ -13,7 +13,7 @@ App({
     DecryptCookie: '',
     UserInfo: null,
     BaseUrl: "https://miniprogram.food988.com/Rest.aspx",
-    TransferUrl: 'https://miniprogram.food988.com/RequestTransfer.aspx',
+    TranferBaseUrl: 'https://miniprogram.food988.com/RequestTransfer.aspx',
     globalCustomerID: 0,
     SelectCustomer_ID: null,
     SelectStartDate: null,
diff --git a/pages/goodaNameChooseTemplate/goodaNameChooseTemplate.js b/pages/goodaNameChooseTemplate/goodaNameChooseTemplate.js
index 74e5255..5c71778 100644
--- a/pages/goodaNameChooseTemplate/goodaNameChooseTemplate.js
+++ b/pages/goodaNameChooseTemplate/goodaNameChooseTemplate.js
@@ -8,6 +8,7 @@ Page({
     currentTab: 0,
     winHeight: 0,
     winWidth: 0,
+    unCheckDataArr:[1,2,3,4,5,6,7,8,9,1],
   },
   /**
      * 滑动切换tab
@@ -36,7 +37,15 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-
+    var that = this;
+    wx.getSystemInfo({
+      success: function (res) {
+        that.setData({
+          winWidth: res.windowWidth,
+          winHeight: res.windowHeight
+        });
+      }
+    });
   },
 
   /**
diff --git a/pages/goodaNameChooseTemplate/goodaNameChooseTemplate.wxml b/pages/goodaNameChooseTemplate/goodaNameChooseTemplate.wxml
index ffc4a84..eea9bc2 100644
--- a/pages/goodaNameChooseTemplate/goodaNameChooseTemplate.wxml
+++ b/pages/goodaNameChooseTemplate/goodaNameChooseTemplate.wxml
@@ -5,20 +5,20 @@
   <view class="swiper-tab-list {{currentTab==1 ? 'on' : ''}}" data-current="1" bindtap="swichNav">收藏夹</view>
 </view>
 
-<view class='searchView'>
-  <input class='imput_goodsName' bindinput='getGoodsName' type='text' placeholder='请输入存货名称' placeholder-style='color:rgb(202, 202, 202)'></input>
-  <view class='storageView'>收藏</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 - 50}}px' duration="300" bindchange="bindChange">
   <!-- 全部 -->
   <swiper-item class="swiper-items1">
+    <view class='searchView'>
+      <input class='imput_goodsName' bindinput='getGoodsName' type='text' placeholder='请输入存货名称' placeholder-style='color:rgb(202, 202, 202)'></input>
+      <view class='storageView'>收藏</view>
+    </view>
     <scroll-view scroll-x="false" scroll-y="true" class='scroll-views' bindscrolltoupper="unCheckedScrollUpper" bindscrolltolower="unCheckedScrollLower">
       <block wx:for="{{unCheckDataArr}}" wx:for-item="item">
         <template is="outStoreOrderTemplate" data="{{item}}" />
       </block>
     </scroll-view>
+    <view class='addGoodsName' catchtap='addGoodsName'>添加存货明细</view>
+
   </swiper-item>
   <!-- 收藏夹 -->
   <swiper-item class="swiper-items2">
@@ -30,9 +30,6 @@
   </swiper-item>
 </swiper>
 
-<image class='xinjian' bindtap="createNew" src="/imgs/create.png"></image>
-
-<button class='chose' catchtap='chose'>筛选</button>
 
 <template name="outStoreOrderTemplate">
   <view class='listItem' catchtap='transToOrderDetail' data-detailitemid='{{item.orderID}}' data-detailitemstate='{{item.orderState}}'>
diff --git a/pages/goodaNameChooseTemplate/goodaNameChooseTemplate.wxss b/pages/goodaNameChooseTemplate/goodaNameChooseTemplate.wxss
index 4f65ee3..b737f13 100644
--- a/pages/goodaNameChooseTemplate/goodaNameChooseTemplate.wxss
+++ b/pages/goodaNameChooseTemplate/goodaNameChooseTemplate.wxss
@@ -1,13 +1,20 @@
 /* pages/goodaNameChooseTemplate/goodaNameChooseTemplate.wxss */
+page{
+  background:#EAF1F8;
+  height: 100%;
+}
 
 .swiper-tab {
   width: 100%;
+  height: 45px;
+  top: 0;
   text-align: center;
-  line-height: 80rpx;
+  line-height: 45px;
   background: white;
   display: flex;
   flex-direction: row;
   justify-content: space-around;
+  border-top: 2rpx solid #ece7e7;
   border-bottom: 0.2rpx solid rgb(236, 231, 231);
 }
 
@@ -22,44 +29,64 @@
   color: #2E8CF5;
 }
 
-.searchView{
-  margin: 20px 20px;
-  height: 60rpx;
-  display: flex;
-  flex-direction: row;
+.swiper-box {
+  margin-top: 3px;
+  display: block;
+  width: 100%;
+  height: 100%;
+  overflow: hidden;
 }
 
-.imput_goodsName{
+.swiper-items1 {
   height: 100%;
-  width: 80%;
 }
 
-.storageView{
+.swiper-items2 {
   height: 100%;
-  width: 20%;
-  color: orange;
-  text-align: center;
-  justify-content: center;
 }
 
-.swiper-box {
-  margin-top: 3px;
-  display: block;
-  width: 100%;
-  overflow: hidden;
+.searchView{
+  margin: 10rpx 10rpx;
+  height: 30px;
+  display: flex;
+  flex-direction: row;
 }
 
-.swiper-items1 {
+.imput_goodsName{
+  border: 1rpx solid rgb(236, 231, 231);
   height: 100%;
+  width: 85%;
+  border-radius: 10rpx;
+  background-color: #fff;  
+  text-align: center;
+  padding-top: 5rpx;
 }
 
-.swiper-items2 {
+.storageView{
   height: 100%;
+  padding-top: 10rpx;
+  width: 15%;
+  color: orange;
+  text-align: center;
+  justify-content: center;
+  font-size: 20px;
 }
 
 .scroll-views {
-  height: 100%;
+  height: calc(100% - 80px);
   width: 100%;
   display: flex;
   flex-direction: column;
 }
+
+.addGoodsName{
+  height: 45px;
+  width: 100%;
+  background-color: #fff;
+  color: #2E8CF5;
+  font-size: 20px;
+  text-align: center;
+  line-height: 45px;
+  position: fixed;
+  bottom: 0rpx;
+}
\ No newline at end of file
diff --git a/pages/homePage/homePage.js b/pages/homePage/homePage.js
index 7723332..f906aea 100644
--- a/pages/homePage/homePage.js
+++ b/pages/homePage/homePage.js
@@ -24,7 +24,8 @@ Page({
     switch (btnID) {
       // 销售预报
       case "1":
-        transferURL = '/pages/saleForecastList/saleForecastList';
+        // transferURL = '/pages/saleForecastList/saleForecastList';
+        transferURL = '/pages/goodaNameChooseTemplate/goodaNameChooseTemplate';
         break;
       // 销售订单
       case "2":
diff --git a/pages/saleForecastList/newBill/newBill.js b/pages/saleForecastList/newBill/newBill.js
index 4aa1216..1bc0850 100644
--- a/pages/saleForecastList/newBill/newBill.js
+++ b/pages/saleForecastList/newBill/newBill.js
@@ -29,12 +29,6 @@ function GetAccountingUnit(that, inputValue) {
   })
 }
 
-function choiceCustomer(){
-  wx.navigateTo({
-    url: '../../../goodaNameChooseTemplate/goodaNameChooseTemplate',
-  })
-}
-
 function GetCustomer(that, inputValue) {
   let method = getCustomer;
   let params = [{
diff --git a/pages/saleForecastList/newBill/newBill.wxml b/pages/saleForecastList/newBill/newBill.wxml
index 92ee6d2..c0324ee 100644
--- a/pages/saleForecastList/newBill/newBill.wxml
+++ b/pages/saleForecastList/newBill/newBill.wxml
@@ -10,7 +10,7 @@
       <view class='baseitem'>
         <text class='baseitem_key'>购货客户</text>
       
-        <view class='baseitem_value' bindtap="choiceCustomer" data-statu="open" data-x='购货客户' data-item='{{which}}'>
+        <view class='baseitem_value' bindtap="powerDrawer" data-statu="open" data-x='购货客户' data-item='{{which}}'>
           {{customer[customerIndex].Name}}
         </view>
       </view>