From 178e5327024b496565a30d5a1a659cdd79ead539 Mon Sep 17 00:00:00 2001
From: chenxuhui <qwehui12@163.com>
Date: Tue, 20 Nov 2018 11:36:02 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=202=E3=80=81=E8=BD=A6=E8=BE=86=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/myCars/myCars.wxml                     |  3 ++
 pages/myCars/myCars.wxss                     | 13 ++++++--
 pages/orderList/orderDetail/orderDetail.wxml | 21 +++++++++++--
 pages/orderList/orderDetail/orderDetail.wxss | 13 +++++---
 pages/orderList/orderList.wxml               | 31 +++++++++++---------
 pages/orderList/orderList.wxss               | 15 ++++++++--
 6 files changed, 70 insertions(+), 26 deletions(-)

diff --git a/pages/myCars/myCars.wxml b/pages/myCars/myCars.wxml
index b0c4e4d..b68f1ca 100644
--- a/pages/myCars/myCars.wxml
+++ b/pages/myCars/myCars.wxml
@@ -7,6 +7,7 @@
 
 
 <template name="outStoreOrderTemplate">
+  <view class='listContainer'>
   <view class='listItem' catchtap='transToCarsDetail' data-detailitemid='{{item.orderID}}' data-detailitemstate='{{item.orderState}}'>
     <view class='topView'>
       <view class='goodsNum'>
@@ -25,4 +26,6 @@
       </view>
     </view>
   </view>
+  <view class='horizontallineView'></view>
+  </view>
 </template>
\ No newline at end of file
diff --git a/pages/myCars/myCars.wxss b/pages/myCars/myCars.wxss
index fa077ec..07f45d0 100644
--- a/pages/myCars/myCars.wxss
+++ b/pages/myCars/myCars.wxss
@@ -12,13 +12,22 @@ page {
   flex-direction: column;
 }
 
+.listContainer{
+  background-color:  #fff;
+}
+
+.horizontallineView {
+  height: 1rpx;
+  background-color: #dbdbdb;
+  margin-left: 20rpx;
+  margin-right: 0rpx;
+}
+
 .listItem{
   /* height: 100rpx; */
   display: flex;
   flex-direction: column;
-  background-color:  #fff;
   padding: 20rpx 20rpx;
-  border-bottom: 1rpx solid #ddd;
   background: white;
 
 }
diff --git a/pages/orderList/orderDetail/orderDetail.wxml b/pages/orderList/orderDetail/orderDetail.wxml
index ced9977..0a0fb09 100644
--- a/pages/orderList/orderDetail/orderDetail.wxml
+++ b/pages/orderList/orderDetail/orderDetail.wxml
@@ -121,20 +121,35 @@
 </swiper>
 
 <template name="detailInfoTemplate">
+
   <view class='listNumberView'>
     <text class='lightGray'>存货明细：</text>{{idx}}</view>
+
   <view class='listItem'>
     <text class='lightGray'>存货名称：</text>{{item.Goods_Name}}单据明细</view>
+  <view class='horizontallineView'></view>
+
   <view class='listItem'>
-    <text class='lightGray'>报价数量：</text>{{item.Number}}</view>
+    <text class='lightGray'>报价数量：</text>{{item.Number}}
+  </view>
+  <view class='horizontallineView'></view>
+
   <view class='listItem'>
-    <text class='lightGray'>辅数量：</text>{{item.SecondNumber}}</view>
+    <text class='lightGray'>辅数量：</text>{{item.SecondNumber}}
+  </view>
+  <view class='horizontallineView'></view>
+
   <view class='listItem'>
-    <text class='lightGray'>政策单价：</text>{{item.ProduceDate}}</view>
+    <text class='lightGray'>政策单价：</text>{{item.ProduceDate}}
+  </view>
+  <view class='horizontallineView'></view>
+
   <view class='groupTwo'>
     <view class='listItem'>
       <text class='lightGray'>单价：</text>{{item.DeliveryDate}}</view>
     <view class='listItem'>
       <text class='lightGray'>金额：</text>{{item.ProduceRequest}}</view>
   </view>
+  <view class='horizontallineView'></view>
+
 </template>
\ No newline at end of file
diff --git a/pages/orderList/orderDetail/orderDetail.wxss b/pages/orderList/orderDetail/orderDetail.wxss
index 0380a73..6f0f564 100644
--- a/pages/orderList/orderDetail/orderDetail.wxss
+++ b/pages/orderList/orderDetail/orderDetail.wxss
@@ -113,8 +113,8 @@ page {
 }
 
 .verticallineView{
-  margin-top: 10rpx;
-  height: 80rpx;
+  margin-top: 20rpx;
+  height: 60rpx;
   width: 2rpx;
   background-color: #dbdbdb;
 }
@@ -134,18 +134,23 @@ page {
 }
 
 .listNumberView {
+  height: 60rpx;
   background-color:#EAF1F8;
-  padding: 10rpx 10rpx;
+  line-height: 60rpx;
+  padding: 20rpx 20rpx;
   font-size: 16px;
   color: #666;
 }
 
 .listItem {
+  height: 60rpx;
+  line-height: 60rpx;
   padding: 20rpx 20rpx;
-  border-bottom: 0.1px solid #dbdbdb;
+  /* border-bottom: 0.1px solid #dbdbdb; */
   justify-content: space-between;
   font-size: 16px;
   color: black;
+  /* text-align: right; */
 }
 .groupTwo{
   display: flex;
diff --git a/pages/orderList/orderList.wxml b/pages/orderList/orderList.wxml
index 4acaae8..3cd237f 100644
--- a/pages/orderList/orderList.wxml
+++ b/pages/orderList/orderList.wxml
@@ -26,22 +26,25 @@
 </swiper>
 
 <template name="outStoreOrderTemplate">
-  <view class='listItem' catchtap='transToOrderDetail' data-detailitemid='{{item.orderID}}' data-detailitemstate='{{item.orderState}}'>
-    <view class='topView'>
-      <view class='goodsNum'>
-        <text class='goodsIDText'>{{item.orderID}}仙坛食品有限公司</text>
+  <view class='listContainer'>
+    <view class='listItem' catchtap='transToOrderDetail' data-detailitemid='{{item.orderID}}' data-detailitemstate='{{item.orderState}}'>
+      <view class='topView'>
+        <view class='goodsNum'>
+          <text class='goodsIDText'>{{item.orderID}}仙坛食品有限公司</text>
+        </view>
+        <view class='goodsMoney'>
+          <text class='goodsIDText'>业务员：梁方刚{{item.workFlowState}}</text>
+        </view>
       </view>
-      <view class='goodsMoney'>
-        <text class='goodsIDText'>业务员：梁方刚{{item.workFlowState}}</text>
-      </view>
-    </view>
-    <view class='bottomView'>
-      <view class='goodsNum'>
-        <text class='goodsNumText'>数量：1000{{item.Customer_Name}}</text>
-      </view>
-      <view class='goodsMoney'>
-        <text class='goodsMoneyText'>日期：2018.2.9{{item.time}}</text>
+      <view class='bottomView'>
+        <view class='goodsNum'>
+          <text class='goodsNumText'>数量：1000{{item.Customer_Name}}</text>
+        </view>
+        <view class='goodsMoney'>
+          <text class='goodsMoneyText'>日期：2018.2.9{{item.time}}</text>
+        </view>
       </view>
     </view>
+    <view class='horizontallineView'></view>
   </view>
 </template>
\ No newline at end of file
diff --git a/pages/orderList/orderList.wxss b/pages/orderList/orderList.wxss
index a995591..71d7e4f 100644
--- a/pages/orderList/orderList.wxss
+++ b/pages/orderList/orderList.wxss
@@ -52,17 +52,26 @@ page {
   flex-direction: column;
 }
 
-.listItem{
+.listContainer{
+  background-color:  #fff;
+}
 
+.listItem{
   display: flex;
   flex-direction: column;
-  background-color:  #fff;
   padding: 20rpx 20rpx;
-  border-bottom: 1rpx solid #ddd;
+  /* border-bottom: 1rpx solid #ddd; */
   background: white;
 
 }
 
+.horizontallineView {
+  height: 1rpx;
+  background-color: #dbdbdb;
+  margin-left: 20rpx;
+  margin-right: 0rpx;
+}
+
 .topView{
   height: 50%;
   width: 100%;