diff --git a/imgs/blueBtn.png b/imgs/blueBtn.png
new file mode 100644
index 0000000..7c2da0b
Binary files /dev/null and b/imgs/blueBtn.png differ
diff --git a/imgs/longBlueBtn.png b/imgs/longBlueBtn.png
new file mode 100644
index 0000000..e01a83a
Binary files /dev/null and b/imgs/longBlueBtn.png differ
diff --git a/imgs/longWhiteBtn.png b/imgs/longWhiteBtn.png
new file mode 100644
index 0000000..c88764d
Binary files /dev/null and b/imgs/longWhiteBtn.png differ
diff --git a/pages/login/login.js b/pages/login/login.js
index e78fc7b..e9ebbbe 100644
--- a/pages/login/login.js
+++ b/pages/login/login.js
@@ -57,7 +57,8 @@ function IsBindWeixinMP(phone) {
   network.requestLoading(method, params, function (res) {
     // res.result = false;
     // 取消获取当前用户的ID值
-    // setCurrentCustomerID();
+    setCurrentCustomerID();
+  
     if (res.result == true) {
       wx.switchTab({
         url: '/pages/homePage/homePage',
diff --git a/pages/order/newBill/newBill.js b/pages/order/newBill/newBill.js
index 2abfac0..44fd4ae 100644
--- a/pages/order/newBill/newBill.js
+++ b/pages/order/newBill/newBill.js
@@ -73,9 +73,11 @@ function GetGoodsInfo(that, dmo, detail) {
 }
 
 function GetCustomerInfo(that, dmo) {
-  var params = [dmo.Customer_ID, ["Department_ID", "Department_Name", "Employee_ID", "Employee_Name", "AccountingUnit_ID", "AccountingUnit_Name", "TakeGoods_Type", "Address"]]
+  var params = [app.globalData.userID, ["Department_ID", "Department_Name", "Employee_ID", "Employee_Name", "AccountingUnit_ID", "AccountingUnit_Name", "TakeGoods_Type", "Address"]]
   network.transfer_request(getCustomerInfo, params, function (res) {
     var obj = JSON.parse(res.result);
+    dmo.Customer_ID = app.globalData.userID;
+    dmo.Customer_Name = obj.Name;
     dmo.Department_ID = obj.Department_ID;
     dmo.Department_Name = obj.Department_Name;
     dmo.Employee_ID = obj.Employee_ID;
@@ -110,13 +112,17 @@ Page({
 
   onLoad: function (options) {
     var that = this;
+    var dmo = this.data.dmo;
     setTime(that);
-    this.getUserPrifile();
+    this.getUserPrifile(function(res){
+      GetCustomerInfo(that, dmo);
+    });
   },
 
-  getUserPrifile: function () {
+  getUserPrifile: function (succession) {
     var that = this;
     network.transfer_request(getUserPrifile, [], function (res) {
+      succession();
       that.data.dmo.SaleKind_ID = res.result.Order_SaleKind_ID;
       that.data.dmo.SaleKind_Name = res.result.Order_SaleKind_Name;
       that.data.dmo.Store_ID = res.result.Order_Store_ID;
diff --git a/pages/order/newBill/newBill.wxml b/pages/order/newBill/newBill.wxml
index b0c070e..2dd235b 100644
--- a/pages/order/newBill/newBill.wxml
+++ b/pages/order/newBill/newBill.wxml
@@ -12,8 +12,8 @@
       <view class='main-body'>
         <view class='baseitem'>
           <text class='baseitem_key'>购货客户</text>
-          <view class='baseitem_value' bindtap="powerDrawer" data-x='购货客户'>
-            {{dmo.Customer_Name?dmo.Customer_Name:"请选择客户"}}
+          <view class='baseitem_value'>
+            {{dmo.Customer_Name}}
           </view>
         </view>
         <view class='horizontallineView'></view>
diff --git a/pages/order/order.js b/pages/order/order.js
index b741457..bec0c2a 100644
--- a/pages/order/order.js
+++ b/pages/order/order.js
@@ -16,7 +16,7 @@ function getUnCheckOrderList(that, UnCheckPageIndex, UnCheckPageSize, successact
     "BillState": 0,
     "StartLoadTime": app.globalData.selectStartDate,
     "EndLoadTime": app.globalData.selectEndDate,
-    "Customer_ID": app.globalData.selectCustomer_ID,
+    "Customer_ID": app.globalData.userID,
     "PageIndex": UnCheckPageIndex,
     "PageSize": PageSize,
   }];
@@ -57,7 +57,7 @@ function getCheckedOrderList(that, CheckedPageIndex, CheckedPageSize) {
     "BillState": 20,
     "StartLoadTime": app.globalData.selectStartDate,
     "EndLoadTime": app.globalData.selectEndDate,
-    "Customer_ID": app.globalData.selectCustomer_ID,
+    "Customer_ID": app.globalData.userID,
     "PageIndex": CheckedPageIndex,
     "PageSize": PageSize,
   }];
diff --git a/pages/order/order.wxml b/pages/order/order.wxml
index b35bc3c..fdfad69 100644
--- a/pages/order/order.wxml
+++ b/pages/order/order.wxml
@@ -9,7 +9,7 @@
   <!-- 未审核 -->
   <swiper-item class="swiper-items1">
 
-    <scroll-view scroll-y="true" class='scroll-views' style='height:{{winHeight -43}}px' bindscrolltolower="unCheckedScrollLower">
+    <scroll-view scroll-y="true" class='scroll-views' style='height:{{winHeight -95}}px' bindscrolltolower="unCheckedScrollLower">
       <view class="custmer_list_view_main" wx:for="{{unCheckDataArr}}" wx:key="item">
         <view class='custmer_list_view' catchtap='itemclick' bindlongpress="longPressDelete" data-orderid='{{item.orderID}}'>
           <view class='phone_h'>
diff --git a/pages/order/order.wxss b/pages/order/order.wxss
index bc58ad1..0f192e0 100644
--- a/pages/order/order.wxss
+++ b/pages/order/order.wxss
@@ -42,7 +42,6 @@ page {
 
 .scroll-views { 
   width: 100%;
-  height: 100%;
   display: flex;
   flex-direction: column;
 }
diff --git a/pages/order/query/query.wxml b/pages/order/query/query.wxml
index 58a8595..aaebb2f 100644
--- a/pages/order/query/query.wxml
+++ b/pages/order/query/query.wxml
@@ -1,8 +1,8 @@
 <!--pages/orderSearch/orderSearch.wxml-->
-<view class='twoitem'>
+<!-- <view class='twoitem'>
   <text>购货客户</text>
   <text class='item_value' bindtap="powerDrawer" data-statu="open" data-x='购货客户' data-item='{{which}}'>{{customer[customerIndex].Name}}</text>
-</view>
+</view> -->
 
 
 <view class='twoitem'>