Merge branch 'master' of hyq/kmall-pt into master

wx-mall/pages/ucenter/order/order.wxml

@@ -9,7 +9,7 @@
   </view>
   <view class="orders" wx:for="{{orderList}}" wx:if="{{orderList[index].id>0}}" wx:key="{{index}}">
     <view class="list-group">
-      <navigator class="list-cell" url="../orderDetail/orderDetail?id={{item.id}}">
+      <navigator class="list-cell" url="../orderDetail/orderDetail?id={{item.id}}&&tabIndex={{tabIndex}}&&isRefundStatus={{item.isRefundStatus}}&&refundStatus={{item.refundStatus}}&&approvalRemark={{item.approvalRemark}}">
         <view class="list-cell-bd">
           <view class="list-label" style="color: #FE7200;">
             
@@ -32,7 +32,7 @@
       </navigator>
       <view class="list-cell">
         <view class="list-cell-hd order-image-hd">
-          <navigator url="../orderDetail/orderDetail?id={{item.id}}">
+          <navigator url="../orderDetail/orderDetail?id={{item.id}}&&tabIndex={{tabIndex}}&&isRefundStatus={{item.isRefundStatus}}&&refundStatus={{item.refundStatus}}&&approvalRemark={{item.approvalRemark}}">
             <image class="order-image" src="{{item.goodsList[0].list_pic_url}}"></image>
           </navigator>
         </view>