From 75eb0e05206dd2a672c44e9209b10ecf7d249e8e Mon Sep 17 00:00:00 2001
From: chenxuhui <qwehui12@163.com>
Date: Tue, 27 Nov 2018 09:13:16 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=B9=E4=BB=B7=E7=94=B3=E8=AF=B7=E5=8D=95?=
 =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E6=9C=89=E6=97=A0=E6=95=B0=E6=8D=AE=E5=8A=A8?=
 =?UTF-8?q?=E6=80=81=E5=8F=98=E6=9B=B4=E5=85=83=E7=B4=A0=E6=89=80=E5=A4=84?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/login/login.wxml                        | 12 --------
 .../creatNewSpecialOrder.wxml                 | 23 +++++----------
 .../creatNewSpecialOrder.wxss                 | 29 +++++++++++++++++++
 3 files changed, 36 insertions(+), 28 deletions(-)

diff --git a/pages/login/login.wxml b/pages/login/login.wxml
index 170589e..0a17aa7 100644
--- a/pages/login/login.wxml
+++ b/pages/login/login.wxml
@@ -21,18 +21,6 @@
 
 </view>
 
-<!-- <view class="but_login">
-  <button class='btn_btn' open-type="getUserInfo" bindgetuserinfo="getUserInfo">绑定</button>
-</view> -->
-
   <button class='btn_btn' plain="true" style='border:none' open-type="getUserInfo" bindgetuserinfo="getUserInfo"><image class='currentImage'  src="/imgs/bindImage.png" mode='widthFix'></image></button>
 
-<!-- <view class='imageView' open-type="getUserInfo" catchtap='getUserInfo'>
-  <image class='currentImage' src="/imgs/blueBtn.png">
-    <view class='btnTextView'>
-      <text class='btnText'>确认绑定</text>
-    </view>
-  </image>
-</view> -->
-
 <official-account class="wxmp"></official-account>
\ No newline at end of file
diff --git a/pages/specialOrderApplication/creatNewSpecialOrder/creatNewSpecialOrder.wxml b/pages/specialOrderApplication/creatNewSpecialOrder/creatNewSpecialOrder.wxml
index 0228f7d..42f00e0 100644
--- a/pages/specialOrderApplication/creatNewSpecialOrder/creatNewSpecialOrder.wxml
+++ b/pages/specialOrderApplication/creatNewSpecialOrder/creatNewSpecialOrder.wxml
@@ -10,15 +10,6 @@
   <swiper-item class="swiper-items1">
     <view class='backGroundContainer'>
 
-      <!-- <view class='baseitem'>
-        <text class='baseitem_key'>购货客户</text>
-        <view class='baseitem_value' bindtap="powerDrawer" data-statu="open" data-x='购货客户' data-item='{{which}}'>
-          {{customer[customerIndex].Name}}
-        </view>
-      </view>
-      <view class='horizontallineView'></view> -->
-
-
       <view class='baseitem'>
         <text class='baseitem_key'>发货时间</text>
         <picker class='baseitem_value' mode="multiSelector" value="{{dateTime}}" bindchange="changeDateTime" range="{{dateTimeArray}}">
@@ -32,7 +23,7 @@
 
       <view class='baseitem'>
         <text class='baseitem_key'>会计单位</text>
-        <view class='baseitem_value' bindtap="powerDrawer" data-statu="open" data-x='会计部门' data-item='{{which}}'>
+        <view class="baseitem_value {{unit.length <=1 ? 'viewPlaceHolder' : 'viewSelected'}}" bindtap="powerDrawer" data-statu="open" data-x='会计部门' data-item='{{which}}'>
           {{unit[isUnit].Name}}
         </view>
       </view>
@@ -41,7 +32,7 @@
 
       <view class='baseitem'>
         <text class='baseitem_key'>销售部门</text>
-        <view class='baseitem_value' bindtap="powerDrawer" data-statu="open" data-x='部门' data-item='{{which}}'>
+        <view class="baseitem_value {{department.length <=1 ? 'viewPlaceHolder' : 'viewSelected'}}" bindtap="powerDrawer" data-statu="open" data-x='部门' data-item='{{which}}'>
           {{department[departmentIndex].Name}}
         </view>
       </view>
@@ -50,7 +41,7 @@
 
       <view class='baseitem'>
         <text class='baseitem_key'>销售类型</text>
-        <view class='baseitem_value' bindtap="powerDrawer" data-statu="open" data-x='销售类型' data-item='{{which}}'>
+        <view class="baseitem_value {{saletype.length <=1 ? 'viewPlaceHolder' : 'viewSelected'}}" bindtap="powerDrawer" data-statu="open" data-x='销售类型' data-item='{{which}}'>
           {{saletype[saletypeIndex].Name}}
         </view>
       </view>
@@ -89,12 +80,12 @@
   <!-- 客户明细 -->
   <swiper-item class="swiper-items2">
     <scroll-view scroll-x="false" scroll-y="true" class='scroll-views'>
-      <view class='detaileListContainer'>
+      <view class="detaileListContainer {{customerArr.length > 0 ? '' : 'customerImageToTopFar'}}">
         <block wx:for="{{customerArr}}" wx:key="item" wx:for-index="idx">
           <template is="customerInfoTemplate" data="{{item,idx}}" />
         </block>
       </view>
-      <view class='imageView' catchtap='addCustomer'>
+      <view class="imageView" catchtap='addCustomer'>
         <image class='currentImage' src="/imgs/longBlueBtn.png">
           <view class='btnTextView'>
             <text class='btnText'>添加客户</text>
@@ -108,7 +99,7 @@
   <swiper-item class="swiper-items3">
     <scroll-view scroll-x="false" scroll-y="true" class='scroll-views'>
 
-      <view class='detaileListContainer'>
+      <view class="detaileListContainer {{goodsNameArr.length > 0 ? '' : 'goodsNameImageToTopFar'}}">
         <block wx:for="{{goodsNameArr}}" wx:for-item="item" wx:key="item" wx:for-index="idx">
           <template is="goodsInfoTemplate" data="{{item,idx}}" />
         </block>
@@ -122,7 +113,7 @@
         </image>
       </view>
 
-      <view class='imageView' catchtap='creatNewSpecialOrder'>
+      <view class='imageViewNoMargin' catchtap='creatNewSpecialOrder'>
         <image class='currentImage' src="/imgs/longBlueBtn.png">
           <view class='btnTextView'>
             <text class='btnText'>保存</text>
diff --git a/pages/specialOrderApplication/creatNewSpecialOrder/creatNewSpecialOrder.wxss b/pages/specialOrderApplication/creatNewSpecialOrder/creatNewSpecialOrder.wxss
index 17559f2..4c4a6f9 100644
--- a/pages/specialOrderApplication/creatNewSpecialOrder/creatNewSpecialOrder.wxss
+++ b/pages/specialOrderApplication/creatNewSpecialOrder/creatNewSpecialOrder.wxss
@@ -67,6 +67,14 @@ page {
   text-align: right;
 }
 
+.viewPlaceHolder{
+  color:rgb(202, 202, 202);
+}
+
+.viewSelected{
+  color:rgb(48, 48, 48);
+}
+
 .horizontallineView {
   height: 1rpx;
   background-color: #dbdbdb;
@@ -151,6 +159,17 @@ page {
   background-color: #fff;
 }
 
+.customerImageToTopFar{
+  height: calc(100% - 100px);
+  background:#EAF1F8;
+}
+
+.goodsNameImageToTopFar{
+   height: calc(100% - 180px);
+  background:#EAF1F8;
+}
+
+
 .listNumberView {
   height: 40rpx;
   background-color:#EAF1F8;
@@ -192,6 +211,16 @@ page {
   box-sizing: content-box;
 }
 
+.imageViewNoMargin{
+  height: 80px;
+  width: 100%;
+  margin-top: -10rpx;
+  position: relative;
+  align-items: center;
+  justify-content: center;
+  box-sizing: content-box;
+}
+
 .currentImage {
   width: 100%;
   height: 100%;