diff --git a/service/Application/Home/View/Default/Order/Index.html b/service/Application/Home/View/Default/Order/Index.html
index b2823e5eb..e58c6b040 100755
--- a/service/Application/Home/View/Default/Order/Index.html
+++ b/service/Application/Home/View/Default/Order/Index.html
@@ -31,11 +31,11 @@
                 </div>
                 <label class="am-fl thin_sub">
                     更多筛选条件
-                    <input type="checkbox" name="so_type" value="1" class="none am-field-valid">
+                    <input type="checkbox" name="so_type" value="1" class="none am-field-valid" <if condition="isset($params['so_type'])">checked</if> />
                     <i class="am-icon-angle-up"></i>
                 </label>
             </div>
-            <table class="so-list none">
+            <table class="so-list <if condition="!isset($params['so_type'])">none</if>">
                 <tbody><tr>
                     <td class="time">
                         <span>时间：</span>
@@ -93,7 +93,9 @@
                 <tr>
                     <td>
                         <button type="submit" class="am-btn am-btn-primary am-radius am-btn-xs btn-loading-example" data-am-loading="{spinner:'circle-o-notch', loadingText:'搜索中...'}">搜 索</button>
-                        <a href="{{:U('Home/Order/Index')}}" class="am-btn am-btn-danger am-radius am-btn-sm reset-submit">清除条件</a>
+                        <a href="{{:U('Home/Order/Index')}}">
+                            <button class="am-btn am-btn-warning am-radius am-btn-sm reset-submit">清除条件</button>
+                        </a>
                     </td>
                 </tr>
             </tbody></table>
@@ -145,8 +147,8 @@
                             <if condition="$goods['original_price'] gt 0">
                                 <span class="original-price">￥{{$goods.original_price}}</span>
                             </if>
-                            <strong class="total-price-content">￥{{$goods.price}}</strong>
-                            <span class="wap-number">x{{$goods.stock}}</span>
+                            <strong class="line-price">￥{{$goods.price}}</strong>
+                            <span class="wap-number">x{{$goods.buy_number}}</span>
                         </div>
                     </td>
                     <td class="row-price am-hide-sm-only">
@@ -162,8 +164,21 @@
                         <td class="row-total-price" 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>
-                        <td class="row-operate" rowspan="{{$order.items_count}}"></td>
+                        <td class="row-status am-hide-sm-only" rowspan="{{$order.items_count}}">
+                            {{$order.status_name}}
+                        </td>
+                        <td class="row-operate" rowspan="{{$order.items_count}}">
+                            <!-- 0待确认, 1已确认/待支付, 2已支付/待发货, 3已发货/待收货, 4已完成, 5已取消, 6已关闭 -->
+                            <if condition="in_array($order['status'], [0,1])">
+                                <button type="button" class="am-btn am-btn-danger am-btn-xs am-radius am-btn-block submit-cancel" data-url="{{:U('Home/Order/Cancel', ['id'=>$order['id']])}}">取消</button>
+                            </if>
+                            <if condition="in_array($order['status'], [1])">
+                                <a href="{{:U('Home/Order/Pay', ['id'=>$order['id']])}}" class="am-btn am-btn-primary am-btn-xs am-radius am-btn-block submit-pay">支付</a>
+                            </if>
+                            <if condition="in_array($order['status'], [3])">
+                                <button type="button" class="am-btn am-btn-secondary am-btn-xs am-radius am-btn-block submit-confirm" data-url="{{:U('Home/Order/Cancel', ['id'=>$order['id']])}}">收货</button>
+                            </if>
+                        </td>
                     </if>
                     <!-- <td class="total-price am-hide-sm-only">
                         <strong class="total-price-content">￥{{$goods.total_price}}</strong>
diff --git a/service/Application/Service/OrderService.class.php b/service/Application/Service/OrderService.class.php
index 8424781be..eabdc2c07 100755
--- a/service/Application/Service/OrderService.class.php
+++ b/service/Application/Service/OrderService.class.php
@@ -320,8 +320,14 @@ class OrderService
             $detail_field = 'id,goods_id,title,images,original_price,price,attribute,buy_number';
             $images_host = C('IMAGE_HOST');
             $total_price = 0;
+            $order_status_list = L('common_order_user_status');
             foreach($data as &$v)
             {
+                // 订单基础
+                $v['status_name'] = $order_status_list[$v['status']]['name'];
+                $v['payment_name'] = '';
+                
+                // 订单详情
                 $items = $detail_m->where(['order_id'=>$v['id']])->field($detail_field)->select();
                 if(!empty($items))
                 {
diff --git a/service/Public/Home/Default/Css/Common.css b/service/Public/Home/Default/Css/Common.css
index af95ce047..f3aa10061 100755
--- a/service/Public/Home/Default/Css/Common.css
+++ b/service/Public/Home/Default/Css/Common.css
@@ -513,46 +513,130 @@ background:url(../Images/ibar_sprites.png) no-repeat;background-position:0px -23
 /**
  * 框架覆盖
  */
+.am-btn-default {
+    color: #959595;;
+    background-color: #e6e6e6;
+    border-color: #e6e6e6;
+}
+.am-btn-default:hover, .am-btn-default:focus {
+    background-color: #D4D3D3;
+}
+.am-btn-default:hover, .am-btn-default:focus, .am-btn-default:active, .am-btn-default.am-active, .am-dropdown.am-active .am-btn-default.am-dropdown-toggle {
+    color: #666;
+    border-color: #D4D3D3;
+}
+.am-btn-default.am-disabled, .am-btn-default[disabled], fieldset[disabled] .am-btn-default, .am-btn-default.am-disabled:hover, .am-btn-default[disabled]:hover, fieldset[disabled] .am-btn-default:hover, .am-btn-default.am-disabled:focus, .am-btn-default[disabled]:focus, fieldset[disabled] .am-btn-default:focus, .am-btn-default.am-disabled:active, .am-btn-default[disabled]:active, fieldset[disabled] .am-btn-default:active, .am-btn-default.am-disabled.am-active, .am-btn-default[disabled].am-active, fieldset[disabled] .am-btn-default.am-active {
+    background-color: #e6e6e6;
+    border-color: #e6e6e6;
+}
+.am-btn-default:active, .am-btn-default.am-active, .am-dropdown.am-active .am-btn-default.am-dropdown-toggle {
+    background-image: none;
+    background-color: #D4D3D3;
+}
+
 .am-btn-secondary {
-    color: #fff !important;
-    background-color: #f07c8c;
-    border-color: #f07c8c;
+    color: #74C0E6;
+    background-color: #D1EDFB;
+    border-color: #D1EDFB;
 }
 .am-btn-secondary:hover, .am-btn-secondary:focus {
-    background-color: #e86175;
+    background-color: #bce9ff;
 }
 .am-btn-secondary:hover, .am-btn-secondary:focus, .am-btn-secondary:active, .am-btn-secondary.am-active, .am-dropdown.am-active .am-btn-secondary.am-dropdown-toggle {
-    color: #fff !important;
-    border-color: #e86175;
+    color: #fff;
+    border-color: #bce9ff;
 }
 .am-btn-secondary.am-disabled, .am-btn-secondary[disabled], fieldset[disabled] .am-btn-secondary, .am-btn-secondary.am-disabled:hover, .am-btn-secondary[disabled]:hover, fieldset[disabled] .am-btn-secondary:hover, .am-btn-secondary.am-disabled:focus, .am-btn-secondary[disabled]:focus, fieldset[disabled] .am-btn-secondary:focus, .am-btn-secondary.am-disabled:active, .am-btn-secondary[disabled]:active, fieldset[disabled] .am-btn-secondary:active, .am-btn-secondary.am-disabled.am-active, .am-btn-secondary[disabled].am-active, fieldset[disabled] .am-btn-secondary.am-active {
-    background-color: #e86175;
-    border-color: #e86175;
+    background-color: #D1EDFB;
+    border-color: #D1EDFB;
 }
 .am-btn-secondary:active, .am-btn-secondary.am-active, .am-dropdown.am-active .am-btn-secondary.am-dropdown-toggle {
     background-image: none;
-    background-color: #d13b49;
+    background-color: #bce9ff;
 }
 
 .am-btn-primary {
-    color: #fff !important;
-    background-color: #d2364c;
-    border-color: #d2364c;
+    color: #31a8e5;
+    background-color: #b3e5ff;
+    border-color: #b3e5ff;
 }
 .am-btn-primary:hover, .am-btn-primary:focus {
-    background-color: #d31e37;
+    background-color: #93daff;
 }
 .am-btn-primary:hover, .am-btn-primary:focus, .am-btn-primary:active, .am-btn-primary.am-active, .am-dropdown.am-active .am-btn-primary.am-dropdown-toggle {
-    color: #fff !important;
-    border-color: #d31e37;
+    color: #fff;
+    border-color: #93daff;
 }
 .am-btn-primary.am-disabled, .am-btn-primary[disabled], fieldset[disabled] .am-btn-primary, .am-btn-primary.am-disabled:hover, .am-btn-primary[disabled]:hover, fieldset[disabled] .am-btn-primary:hover, .am-btn-primary.am-disabled:focus, .am-btn-primary[disabled]:focus, fieldset[disabled] .am-btn-primary:focus, .am-btn-primary.am-disabled:active, .am-btn-primary[disabled]:active, fieldset[disabled] .am-btn-primary:active, .am-btn-primary.am-disabled.am-active, .am-btn-primary[disabled].am-active, fieldset[disabled] .am-btn-primary.am-active {
-    background-color: #d31e37;
-    border-color: #d31e37;
+    background-color: #b3e5ff;
+    border-color: #b3e5ff;
 }
 .am-btn-primary:active, .am-btn-primary.am-active, .am-dropdown.am-active .am-btn-primary.am-dropdown-toggle {
     background-image: none;
-    background-color: #d13b49;
+    background-color: #93daff;
+}
+
+.am-btn-danger {
+    color: #DC9A9A;
+    background-color: #F8F2F2;
+    border-color: #F8F2F2;
+}
+.am-btn-danger:hover, .am-btn-danger:focus {
+    background-color: #F5D2D2;
+}
+.am-btn-danger:hover, .am-btn-danger:focus, .am-btn-danger:active, .am-btn-danger.am-active, .am-dropdown.am-active .am-btn-danger.am-dropdown-toggle {
+    color: #fff;
+    border-color: #F5D2D2;
+}
+.am-btn-danger.am-disabled, .am-btn-danger[disabled], fieldset[disabled] .am-btn-danger, .am-btn-danger.am-disabled:hover, .am-btn-danger[disabled]:hover, fieldset[disabled] .am-btn-danger:hover, .am-btn-danger.am-disabled:focus, .am-btn-danger[disabled]:focus, fieldset[disabled] .am-btn-danger:focus, .am-btn-danger.am-disabled:active, .am-btn-danger[disabled]:active, fieldset[disabled] .am-btn-danger:active, .am-btn-danger.am-disabled.am-active, .am-btn-danger[disabled].am-active, fieldset[disabled] .am-btn-danger.am-active {
+    background-color: #F8F2F2;
+    border-color: #F8F2F2;
+}
+.am-btn-danger:active, .am-btn-danger.am-active, .am-dropdown.am-active .am-btn-danger.am-dropdown-toggle {
+    background-image: none;
+    background-color: #F5D2D2;
+}
+
+.am-btn-success {
+    color: #82BE82;
+    background-color: #E4F3E4;
+    border-color: #E4F3E4;
+}
+.am-btn-success:hover, .am-btn-success:focus {
+    background-color: #A5DEA5;
+}
+.am-btn-success:hover, .am-btn-success:focus, .am-btn-success:active, .am-btn-success.am-active, .am-dropdown.am-active .am-btn-success.am-dropdown-toggle {
+    color: #fff;
+    border-color: #A5DEA5;
+}
+.am-btn-success.am-disabled, .am-btn-success[disabled], fieldset[disabled] .am-btn-success, .am-btn-success.am-disabled:hover, .am-btn-success[disabled]:hover, fieldset[disabled] .am-btn-success:hover, .am-btn-success.am-disabled:focus, .am-btn-success[disabled]:focus, fieldset[disabled] .am-btn-success:focus, .am-btn-success.am-disabled:active, .am-btn-success[disabled]:active, fieldset[disabled] .am-btn-success:active, .am-btn-success.am-disabled.am-active, .am-btn-success[disabled].am-active, fieldset[disabled] .am-btn-success.am-active {
+    background-color: #E4F3E4;
+    border-color: #E4F3E4;
+}
+.am-btn-success:active, .am-btn-success.am-active, .am-dropdown.am-active .am-btn-success.am-dropdown-toggle {
+    background-image: none;
+    background-color: #A5DEA5;
+}
+
+.am-btn-warning {
+    color: #E8BA88;
+    background-color: #FBF1E9;
+    border-color: #FBF1E9;
+}
+.am-btn-warning:hover, .am-btn-warning:focus {
+    background-color: #FBDBC3;
+}
+.am-btn-warning:hover, .am-btn-warning:focus, .am-btn-warning:active, .am-btn-warning.am-active, .am-dropdown.am-active .am-btn-warning.am-dropdown-toggle {
+    color: #fff;
+    border-color: #FBDBC3;
+}
+.am-btn-warning.am-disabled, .am-btn-warning[disabled], fieldset[disabled] .am-btn-warning, .am-btn-warning.am-disabled:hover, .am-btn-warning[disabled]:hover, fieldset[disabled] .am-btn-warning:hover, .am-btn-warning.am-disabled:focus, .am-btn-warning[disabled]:focus, fieldset[disabled] .am-btn-warning:focus, .am-btn-warning.am-disabled:active, .am-btn-warning[disabled]:active, fieldset[disabled] .am-btn-warning:active, .am-btn-warning.am-disabled.am-active, .am-btn-warning[disabled].am-active, fieldset[disabled] .am-btn-warning.am-active {
+    background-color: #FBF1E9;
+    border-color: #FBF1E9;
+}
+.am-btn-warning:active, .am-btn-warning.am-active, .am-dropdown.am-active .am-btn-warning.am-dropdown-toggle {
+    background-image: none;
+    background-color: #FBDBC3;
 }
 
 .am-popup-hd .am-popup-title { font-size: 18px; }
@@ -593,4 +677,5 @@ background:url(../Images/ibar_sprites.png) no-repeat;background-position:0px -23
 }
 .user-main { padding-top: 10px; }
 
-.more-icon-rotate {-webkit-transform: rotate(-90deg);transform: rotate(-90deg);-webkit-transition: all 300ms;transition: all 300ms;}
\ No newline at end of file
+.more-icon-rotate {-webkit-transform: rotate(-90deg);transform: rotate(-90deg);-webkit-transition: all 300ms;transition: all 300ms;}
+button { outline: none !important;}
\ No newline at end of file
diff --git a/service/Public/Home/Default/Css/Order.css b/service/Public/Home/Default/Css/Order.css
index c3dc20ca6..475df0f6c 100644
--- a/service/Public/Home/Default/Css/Order.css
+++ b/service/Public/Home/Default/Css/Order.css
@@ -23,11 +23,11 @@
     .so-list .chosen-container, .so-list select { width:217px !important; display: -webkit-inline-box; }
     .thin_sub:hover { color:#F60; }
 
-    .row-content { width:30%; }
+    .row-content { width:35%; }
     .row-price { width:15%; }
-    .row-number { width:15%; }
-    .row-total-price { width:15%; }
-    .row-status { 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){
@@ -39,9 +39,9 @@
     .so-list tr td:last-child { padding-top:0px !important; }
     .chosen-container-single .chosen-search input[type="text"] { width: 100% !important; }
 
-    .row-content { width:40%; }
+    .row-content { width:50%; }
     .row-price { width:30%; }
-    .row-operate { width:10%; }
+    .row-operate { width:20%; }
 }
 
 /**
@@ -62,11 +62,13 @@ table.data-list td { padding:10px; }
 .row-content { min-width:102px; }
 table.data-list tr td+td { text-align:center; }
 .content-checkbox-operate { padding:3px 5px; }
+.submit-pay { margin-top: 5px; }
+.wap-base { padding-top: 3px; }
 
 
 /* 不在进行中 */
 table.data-list { border-left: 1px solid #eee; border-right: 1px solid #eee; }
-table.data-list td.row-number, table.data-list td.row-total-price, table.data-list td.row-status { border-right: 1px solid #eee; }
+table.data-list td.row-number, table.data-list td.row-total-price,  table.data-list td.row-status, table.data-list td.row-operate { border-right: 1px solid #eee; }
 table.data-list td { border-bottom:1px solid #eee; }
 table.data-list .content-hd td { background:#EEE; border-bottom-color:#EEE; }
 table.data-list:hover { box-shadow:0 1px 1px #E4E4E4; background:#FCFCFC; }
@@ -74,7 +76,7 @@ table.data-list:hover { box-shadow:0 1px 1px #E4E4E4; background:#FCFCFC; }
 
 /* 进行中 */
 table.data-ongoing { border-left: 1px solid #daf3ff; border-right: 1px solid #daf3ff; }
-table.data-ongoing td.row-number, table.data-ongoing td.row-total-price, table.data-ongoing td.row-status { border-right: 1px solid #daf3ff; }
+table.data-ongoing td.row-number, table.data-ongoing td.row-total-price, table.data-ongoing td.row-status, table.data-ongoing td.row-operate { border-right: 1px solid #daf3ff; }
 table.data-ongoing td { border-bottom:1px solid #daf3ff; }
 table.data-ongoing .content-hd td { background: #eaf8ff; border-bottom-color:#eaf8ff; }
 table.data-ongoing:hover { box-shadow:0 1px 1px #9AD6F3; background:#F9FDFF; }