From c485e2eafa265b9a4598375309ed97533be7a41e Mon Sep 17 00:00:00 2001
From: devil_gong <devil_gong@wochacha.com>
Date: Tue, 9 Oct 2018 10:15:01 +0800
Subject: [PATCH] order

---
 .../Home/View/Default/Order/Index.html        |  8 ++--
 .../Public/Home/Default/Css/Order.Detail.css  |  2 +-
 service/Public/Home/Default/Css/Order.css     | 38 +++++++++++--------
 3 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/service/Application/Home/View/Default/Order/Index.html b/service/Application/Home/View/Default/Order/Index.html
index 659d7e387..141a02bfd 100755
--- a/service/Application/Home/View/Default/Order/Index.html
+++ b/service/Application/Home/View/Default/Order/Index.html
@@ -112,8 +112,8 @@
                     <th class="row-content">商品</th>
                     <th class="row-price am-hide-sm-only">单价</th>
                     <th class="row-number am-hide-sm-only">数量</th>
-                    <th class="row-total-price">合计</th>
-                    <th class="row-status am-hide-sm-only">状态</th>
+                    <th class="row-total-price am-hide-sm-only">合计</th>
+                    <th class="row-status">状态</th>
                     <th class="row-operate">操作</th>
                 </tr>
             </tbody></table>
@@ -165,10 +165,10 @@
                                 x{{$goods.buy_number}}
                             </td>
                             <if condition="$keys eq 0">
-                                <td class="row-total-price" rowspan="{{$order.items_count}}">
+                                <td class="row-total-price am-hide-sm-only" rowspan="{{$order.items_count}}">
                                     <strong class="total-price-content">￥{{$order.total_price}}</strong>
                                 </td>
-                                <td class="row-status am-hide-sm-only" rowspan="{{$order.items_count}}">
+                                <td class="row-status" rowspan="{{$order.items_count}}">
                                     {{$order.status_name}}
                                     <div class="base-operate">
                                         <a class="block" href="{{:U('Home/Order/Detail', ['id'=>$order['id']])}}" target="_blank">订单详情</a>
diff --git a/service/Public/Home/Default/Css/Order.Detail.css b/service/Public/Home/Default/Css/Order.Detail.css
index 00b80379b..4aed0bbc1 100644
--- a/service/Public/Home/Default/Css/Order.Detail.css
+++ b/service/Public/Home/Default/Css/Order.Detail.css
@@ -110,7 +110,7 @@ ul.progress li.current .title {
     overflow: hidden;
 }
 .items-detail {
-    width: calc(100% - 60px);
+    width: calc(100% - 62px);
     color: #666;
 }
 
diff --git a/service/Public/Home/Default/Css/Order.css b/service/Public/Home/Default/Css/Order.css
index 1ef1fb7fe..7e8986404 100644
--- a/service/Public/Home/Default/Css/Order.css
+++ b/service/Public/Home/Default/Css/Order.css
@@ -16,18 +16,9 @@
 .chosen-container-single .chosen-single, .so-list select { height: 28px; line-height: 28px; width: 100%; }
 .reset-submit { margin-left: 20px; }
 .so-list select { padding: 0 0 0 8px; }
-
-
 @media only screen and (min-width: 641px){
     .so-list .chosen-container, .so-list select { width:217px !important; display: -webkit-inline-box; }
     .thin_sub:hover { color:#F60; }
-
-    .row-content { width:35%; }
-    .row-price { width:15%; }
-    .row-number { width:10%; }
-    .row-total-price { width:20%; }
-    .row-status { width:10%; }
-    .row-operate { width:10%; }
 }
 @media only screen and (max-width: 641px){
     .so-list input { width:40% !important; }
@@ -37,10 +28,6 @@
     .so-list .chosen-container { width:100%; }
     .so-list tr td:last-child { padding-top:0px !important; }
     .chosen-container-single .chosen-search input[type="text"] { width: 100% !important; }
-
-    .row-content { width:50%; }
-    .row-price { width:30%; }
-    .row-operate { width:20%; }
 }
 
 /**
@@ -65,6 +52,19 @@ table.data-list td { padding:10px; vertical-align: top; }
 .base-operate { margin-top: 3px; }
 .content-hd td span { color: #666; }
 .content-hd td span:not(:last-child) { margin-right: 20px; }
+@media only screen and (min-width: 641px){
+    .row-content { width:35%; }
+    .row-price { width:15%; }
+    .row-number { width:10%; }
+    .row-total-price { width:20%; }
+    .row-status { width:10%; }
+    .row-operate { width:10%; }
+}
+@media only screen and (max-width: 641px){
+    .row-content { width:55%; }
+    .row-status { width:25%; }
+    .row-operate { width:20%; }
+}
 
 
 /* 不在进行中 */
@@ -88,11 +88,12 @@ table.data-ongoing .base-operate { border-top: 1px dashed #fff1f5; }
 /**
  * 商品列表
  */
-.goods-detail img { width: 80px; height: 80px; }
+.goods-detail { position: relative; min-height: 80px; }
+.goods-detail img { width: 80px; height: 80px; position: absolute; }
 .goods-detail { position: relative; }
 .goods-title { display: block; max-height: 36px; overflow: hidden; text-overflow: ellipsis; }
 .goods-title:hover { text-decoration: underline; }
-.goods-base { position: absolute; top: 0; left: 85px; }
+.goods-base { float: left; top: 0; margin-left: 85px; }
 .goods-attr { margin-top: 5px;  }
 .goods-attr li { color: #888; line-height: 16px; }
 .original-price, .line-price { font-family: Verdana,Tahoma,arial; }
@@ -100,6 +101,13 @@ table.data-ongoing .base-operate { border-top: 1px dashed #fff1f5; }
 .line-price { color: #3c3c3c; }
 .line-price, strong.total-price-content { font-weight: 700; }
 strong.total-price-content { color: #d2364c; font-size: 16px; }
+@media only screen and (max-width:640px) {
+    .goods-detail { min-height: 40px; }
+    .goods-detail img { width: 40px; height: 40px; }
+    .goods-base { margin-left: 45px; }
+    table.data-list td.row-status { border-left: 1px solid #eee; }
+    table.data-ongoing td.row-status { border-left: 1px solid #fff1f5; }
+}
 
 
 /**