|  | @@ -90,23 +90,23 @@
 | 
											
												
													
														|  |                              <div>
 |  |                              <div>
 | 
											
												
													
														|  |                                  {if $row['order_status']==101}
 |  |                                  {if $row['order_status']==101}
 | 
											
												
													
														|  |                                      <!-- 待支付状态 -->
 |  |                                      <!-- 待支付状态 -->
 | 
											
												
													
														|  | -                                    <button type="button" class="btn btn-danger btn-status-click" data-order='{"order_status":102}'>
 |  | 
 | 
											
												
													
														|  | 
 |  | +                                    <!-- <button type="button" class="btn btn-danger btn-status-click" data-order='{"order_status":102}'>
 | 
											
												
													
														|  |                                          <i class="fa fa-times"></i> 取消订单
 |  |                                          <i class="fa fa-times"></i> 取消订单
 | 
											
												
													
														|  |                                      </button>
 |  |                                      </button>
 | 
											
												
													
														|  |                                      <button type="button" class="btn btn-success btn-status-click" data-order='{"pay_time":1}'>
 |  |                                      <button type="button" class="btn btn-success btn-status-click" data-order='{"pay_time":1}'>
 | 
											
												
													
														|  |                                          <i class="fa fa-check"></i> 设为已支付
 |  |                                          <i class="fa fa-check"></i> 设为已支付
 | 
											
												
													
														|  | -                                    </button>
 |  | 
 | 
											
												
													
														|  | 
 |  | +                                    </button> -->
 | 
											
												
													
														|  |                                  {elseif $row['order_status']==201}
 |  |                                  {elseif $row['order_status']==201}
 | 
											
												
													
														|  |                                      <!-- 已支付状态 -->
 |  |                                      <!-- 已支付状态 -->
 | 
											
												
													
														|  | -                                    <button type="button" class="btn btn-primary btn-deliver" data-expressname="{$row.express_name|htmlentities}" data-expressno="{$row.express_no|htmlentities}" data-type="0">
 |  | 
 | 
											
												
													
														|  | 
 |  | +                                    <!-- <button type="button" class="btn btn-primary btn-deliver" data-expressname="{$row.express_name|htmlentities}" data-expressno="{$row.express_no|htmlentities}" data-type="0">
 | 
											
												
													
														|  |                                          <i class="fa fa-truck"></i> 发货
 |  |                                          <i class="fa fa-truck"></i> 发货
 | 
											
												
													
														|  |                                      </button>
 |  |                                      </button>
 | 
											
												
													
														|  |                                      <button type="button" class="btn btn-success btn-status-click" data-order='{"order_status":401}'>
 |  |                                      <button type="button" class="btn btn-success btn-status-click" data-order='{"order_status":401}'>
 | 
											
												
													
														|  |                                          <i class="fa fa-check-circle"></i> 设为已完成
 |  |                                          <i class="fa fa-check-circle"></i> 设为已完成
 | 
											
												
													
														|  | -                                    </button>
 |  | 
 | 
											
												
													
														|  | 
 |  | +                                    </button> -->
 | 
											
												
													
														|  |                                  {elseif $row['order_status']==301}
 |  |                                  {elseif $row['order_status']==301}
 | 
											
												
													
														|  |                                      <!-- 已发货状态 -->
 |  |                                      <!-- 已发货状态 -->
 | 
											
												
													
														|  | -                                    <button type="button" class="btn btn-warning btn-deliver" data-expressname="{$row.express_name|htmlentities}" data-expressno="{$row.express_no|htmlentities}" data-type="1">
 |  | 
 | 
											
												
													
														|  | 
 |  | +                                    <!-- <button type="button" class="btn btn-warning btn-deliver" data-expressname="{$row.express_name|htmlentities}" data-expressno="{$row.express_no|htmlentities}" data-type="1">
 | 
											
												
													
														|  |                                          <i class="fa fa-edit"></i> 修改快递
 |  |                                          <i class="fa fa-edit"></i> 修改快递
 | 
											
												
													
														|  |                                      </button>
 |  |                                      </button>
 | 
											
												
													
														|  |                                      <button type="button" class="btn btn-info btn-logistics" data-expressno="{$row.express_no|htmlentities}">
 |  |                                      <button type="button" class="btn btn-info btn-logistics" data-expressno="{$row.express_no|htmlentities}">
 | 
											
										
											
												
													
														|  | @@ -114,7 +114,7 @@
 | 
											
												
													
														|  |                                      </button>
 |  |                                      </button>
 | 
											
												
													
														|  |                                      <button type="button" class="btn btn-success btn-status-click" data-order='{"order_status":401}'>
 |  |                                      <button type="button" class="btn btn-success btn-status-click" data-order='{"order_status":401}'>
 | 
											
												
													
														|  |                                          <i class="fa fa-check-circle"></i> 设为已完成
 |  |                                          <i class="fa fa-check-circle"></i> 设为已完成
 | 
											
												
													
														|  | -                                    </button>
 |  | 
 | 
											
												
													
														|  | 
 |  | +                                    </button> -->
 | 
											
												
													
														|  |                                  {elseif $row['order_status']==401}
 |  |                                  {elseif $row['order_status']==401}
 | 
											
												
													
														|  |                                      <!-- 已完成状态 -->
 |  |                                      <!-- 已完成状态 -->
 | 
											
												
													
														|  |                                      <span class="label label-success">
 |  |                                      <span class="label label-success">
 | 
											
										
											
												
													
														|  | @@ -224,11 +224,6 @@
 | 
											
												
													
														|  |                      <ul class="list-group">
 |  |                      <ul class="list-group">
 | 
											
												
													
														|  |                          <li class="list-group-item">支付订单号:{$row.pay_info.order_sn|default='无'}</li>
 |  |                          <li class="list-group-item">支付订单号:{$row.pay_info.order_sn|default='无'}</li>
 | 
											
												
													
														|  |                          <li class="list-group-item">支付金额:¥{$row.pay_info.amount|default='0.00'}</li>
 |  |                          <li class="list-group-item">支付金额:¥{$row.pay_info.amount|default='0.00'}</li>
 | 
											
												
													
														|  | -                        <li class="list-group-item">支付状态:
 |  | 
 | 
											
												
													
														|  | -                            <span class="label label-{if $row.pay_info.status == 'success'}success{elseif $row.pay_info.status == 'pending'}warning{elseif $row.pay_info.status == 'failed'}danger{else/}default{/if}">
 |  | 
 | 
											
												
													
														|  | -                                {$row.pay_info.status_text|default='未知'}
 |  | 
 | 
											
												
													
														|  | -                            </span>
 |  | 
 | 
											
												
													
														|  | -                        </li>
 |  | 
 | 
											
												
													
														|  |                          <li class="list-group-item">支付平台:{$row.pay_info.platform_text|default='无'}</li>
 |  |                          <li class="list-group-item">支付平台:{$row.pay_info.platform_text|default='无'}</li>
 | 
											
												
													
														|  |                      </ul>
 |  |                      </ul>
 | 
											
												
													
														|  |                  </div>
 |  |                  </div>
 |