diff --git a/application/api/controller/Orderaftersale.php b/application/api/controller/Orderaftersale.php
index 42712eb352995bee1bd8d5fc7d00dd45a712fc17..aff83a261b97b3b48ecb7b7d580f148aeaa27ed4 100644
--- a/application/api/controller/Orderaftersale.php
+++ b/application/api/controller/Orderaftersale.php
@@ -57,7 +57,7 @@ class Orderaftersale extends Common
         $page = max(1, isset($this->data_post['page']) ? intval($this->data_post['page']) : 1);
 
         // 条件
-        $where = OrderService::OrderListWhere($params);
+        $where = OrderAftersaleService::OrderAftersaleListWhere($params);
 
         // 获取总数
         $total = OrderAftersaleService::OrderAftersaleTotal($where);
@@ -78,7 +78,6 @@ class Orderaftersale extends Common
             'total'                     => $total,
             'page_total'                => $page_total,
             'data'                      => $data['data'],
-            'aftersale_type_list'       => lang('common_order_aftersale_type_list'),
         ];
         return DataReturn('success', 0, $result);
     }
diff --git a/public/appmini/old/alipay/pages/user-order/user-order.acss b/public/appmini/old/alipay/pages/user-order/user-order.acss
index af462a10d9173e7d788262c1ed8a3c8b9abe4885..bfb7670eb58f31d81cd7674a2f257874a72d10fa 100755
--- a/public/appmini/old/alipay/pages/user-order/user-order.acss
+++ b/public/appmini/old/alipay/pages/user-order/user-order.acss
@@ -47,7 +47,7 @@
     bottom: 0;
 }
 .item-base, .item-describe, .item-operation {
-    padding: 25rpx 10rpx 20rpx 10rpx;
+    padding: 20rpx 10rpx 20rpx 10rpx;
 }
 .submit-cancel {
     border: 1px solid #f7c3b3;
diff --git a/public/appmini/old/baidu/pages/user-order/user-order.css b/public/appmini/old/baidu/pages/user-order/user-order.css
index 0f72eea39f20b1a8e95277a3b304fb713f0a19d0..e029d47a48d566bed9e69b094b05c2214316871c 100755
--- a/public/appmini/old/baidu/pages/user-order/user-order.css
+++ b/public/appmini/old/baidu/pages/user-order/user-order.css
@@ -47,7 +47,7 @@
     bottom: 0;
 }
 .item-base, .item-describe, .item-operation {
-    padding: 25rpx 10rpx 10rpx 10rpx;
+    padding: 20rpx 10rpx 20rpx 10rpx;
 }
 .submit-cancel {
     border: 1px solid #f7c3b3;
diff --git a/public/appmini/old/weixin/app.js b/public/appmini/old/weixin/app.js
index 4abeac210de94cfc702644b9feac966ce762da9b..e04afe197e6163dd377b376c07f661be5e722d56 100755
--- a/public/appmini/old/weixin/app.js
+++ b/public/appmini/old/weixin/app.js
@@ -58,13 +58,13 @@ App({
       "user_goods_browse": "我的足迹",
       "goods_comment": "商品评论",
       "user_orderaftersale": "退款/售后",
-      "user_orderaftersale_detail": "售后详情",
+      "user_orderaftersale_detail": "订单售后",
     },
 
     // 请求地址
     request_url: "{{request_url}}",
      request_url: 'http://tp5-dev.com/',
-     request_url: 'https://test.shopxo.net/',
+     //request_url: 'https://test.shopxo.net/',
 
     // 基础信息
     application_title: "{{application_title}}",
diff --git a/public/appmini/old/weixin/app.json b/public/appmini/old/weixin/app.json
index 3f8f5fc76616f6b24077732ae57411fea72910b5..b1f27f61032e067f0ba5b713f997c22515e11801 100755
--- a/public/appmini/old/weixin/app.json
+++ b/public/appmini/old/weixin/app.json
@@ -1,11 +1,9 @@
 {
-  "pages": [
-    "pages/user/user",
-    "pages/user-order/user-order",
-    
+  "pages": [    
     "pages/index/index",
     "pages/goods-category/goods-category",
     "pages/cart/cart",
+    "pages/user/user",
     "pages/web-view/web-view",
     "pages/login/login",
     "pages/paytips/paytips",
@@ -16,6 +14,7 @@
     "pages/buy/buy",
     "pages/user-address/user-address",
     "pages/user-address-save/user-address-save",
+    "pages/user-order/user-order",
     "pages/user-order-detail/user-order-detail",
     "pages/user-faovr/user-faovr",
     "pages/user-answer-list/user-answer-list",
diff --git a/public/appmini/old/weixin/pages/user-orderaftersale-detail/user-orderaftersale-detail.js b/public/appmini/old/weixin/pages/user-orderaftersale-detail/user-orderaftersale-detail.js
index b291f880d4c6009e8faee4f16e97be136317df07..4d1668d6041b6b2411587f58a21abd00976e9ac6 100644
--- a/public/appmini/old/weixin/pages/user-orderaftersale-detail/user-orderaftersale-detail.js
+++ b/public/appmini/old/weixin/pages/user-orderaftersale-detail/user-orderaftersale-detail.js
@@ -111,7 +111,10 @@ Page({
   },
 
   onLoad(params) {
-    this.setData({ params: params });
+    this.setData({
+      params: params,
+      popup_delivery_status: ((params.is_delivery_popup || 0) == 1),
+    });
     this.init();
   },
 
diff --git a/public/appmini/old/weixin/pages/user-orderaftersale-detail/user-orderaftersale-detail.wxss b/public/appmini/old/weixin/pages/user-orderaftersale-detail/user-orderaftersale-detail.wxss
index 557c6ec3d4b14e477cf7883308467630fb4a8ce3..6a01e8c59bb511929f7e83a0af5585e06630b5c9 100644
--- a/public/appmini/old/weixin/pages/user-orderaftersale-detail/user-orderaftersale-detail.wxss
+++ b/public/appmini/old/weixin/pages/user-orderaftersale-detail/user-orderaftersale-detail.wxss
@@ -125,7 +125,7 @@
 }
 .panel-item .panel-title,
 .panel-item .panel-content {
-  padding: 10rpx;
+  padding: 15rpx;
 }
 .panel-item .panel-value {
   padding: 10rpx 0;
diff --git a/public/appmini/old/weixin/pages/user-orderaftersale/user-orderaftersale.js b/public/appmini/old/weixin/pages/user-orderaftersale/user-orderaftersale.js
index 95e857d8ae34a2c1d44727bcdf342a6b006efe9e..f56c72af8c5fd341af4930d84ebceb1e59d44f33 100644
--- a/public/appmini/old/weixin/pages/user-orderaftersale/user-orderaftersale.js
+++ b/public/appmini/old/weixin/pages/user-orderaftersale/user-orderaftersale.js
@@ -1,66 +1,244 @@
 const app = getApp();
 Page({
-
-  /**
-   * 页面的初始数据
-   */
   data: {
-
+    params: null,
+    data_list_loding_status: 1,
+    data_list_loding_msg: '',
+    data_bottom_line_status: false,
+
+    // 接口数据
+    data_list: [],
+    data_page_total: 0,
+    data_page: 1,
+    input_keyword_value: '',
+
+    // 导航
+    // 状态（0待确认, 1待退货, 2待审核, 3已完成, 4已拒绝, 5已取消）
+    nav_status_list: [
+      { name: "全部", value: "-1" },
+      { name: "待确认", value: "0" },
+      { name: "待退货", value: "1" },
+      { name: "待审核", value: "2" },
+      { name: "已完成", value: "3" },
+      { name: "拒绝", value: "4" },
+      { name: "取消", value: "5" },
+    ],
+    nav_status_index: 0,
   },
 
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad: function (options) {
-
+  onLoad(params) {
+    // 是否指定状态
+    var nav_status_index = 0;
+    if ((params.status || null) != null) {
+      for (var i in this.data.nav_status_list) {
+        if (this.data.nav_status_list[i]['value'] == params.status) {
+          nav_status_index = i;
+          break;
+        }
+      }
+    }
+
+    this.setData({
+      params: params,
+      nav_status_index: nav_status_index,
+    });
+    this.init();
   },
 
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady: function () {
-
+  onShow() {
+    wx.setNavigationBarTitle({ title: app.data.common_pages_title.user_orderaftersale });
   },
 
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow: function () {
-
+  init() {
+    var user = app.get_user_cache_info(this, "init");
+    // 用户未绑定用户则转到登录页面
+    if (app.user_is_need_login(user)) {
+      wx.redirectTo({
+        url: "/pages/login/login?event_callback=init"
+      });
+      return false;
+    } else {
+      // 获取数据
+      this.get_data_list();
+    }
   },
 
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide: function () {
-
+  // 获取数据
+  get_data_list(is_mandatory) {
+    // 分页是否还有数据
+    if ((is_mandatory || 0) == 0) {
+      if (this.data.data_bottom_line_status == true) {
+        return false;
+      }
+    }
+
+    // 加载loding
+    wx.showLoading({ title: "加载中..." });
+    this.setData({
+      data_list_loding_status: 1
+    });
+
+    // 参数
+    var status = ((this.data.nav_status_list[this.data.nav_status_index] || null) == null) ? -1 : this.data.nav_status_list[this.data.nav_status_index]['value'];
+
+    wx.request({
+      url: app.get_request_url("index", "orderaftersale"),
+      method: "POST",
+      data: {
+        page: this.data.data_page,
+        keywords: this.data.input_keyword_value || "",
+        status: status,
+        is_more: 1,
+      },
+      dataType: "json",
+      success: res => {
+        wx.hideLoading();
+        wx.stopPullDownRefresh();
+        if (res.data.code == 0) {
+          if (res.data.data.data.length > 0) {
+            if (this.data.data_page <= 1) {
+              var temp_data_list = res.data.data.data;
+            } else {
+              var temp_data_list = this.data.data_list;
+              var temp_data = res.data.data.data;
+              for (var i in temp_data) {
+                temp_data_list.push(temp_data[i]);
+              }
+            }
+
+            this.setData({
+              data_list: temp_data_list,
+              data_total: res.data.data.total,
+              data_page_total: res.data.data.page_total,
+              data_list_loding_status: 3,
+              data_page: this.data.data_page + 1,
+            });
+
+            // 是否还有数据
+            if (this.data.data_page > 1 && this.data.data_page > this.data.data_page_total) {
+              this.setData({ data_bottom_line_status: true });
+            } else {
+              this.setData({ data_bottom_line_status: false });
+            }
+          } else {
+            this.setData({
+              data_list_loding_status: 0,
+              data_list_loding_msg: '没有相关数据',
+              data_list: [],
+              data_bottom_line_status: false,
+            });
+          }
+        } else {
+          this.setData({
+            data_list_loding_status: 0,
+            data_list_loding_msg: res.data.msg,
+          });
+
+          app.showToast(res.data.msg);
+        }
+      },
+      fail: () => {
+        wx.hideLoading();
+        wx.stopPullDownRefresh();
+        self.setData({
+          data_list_loding_status: 2,
+          data_list_loding_msg: '服务器请求出错',
+        });
+
+        app.showToast("服务器请求出错");
+      }
+    });
   },
 
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload: function () {
+  // 下拉刷新
+  onPullDownRefresh() {
+    this.setData({
+      data_page: 1
+    });
+    this.get_data_list(1);
+  },
 
+  // 滚动加载
+  scroll_lower(e) {
+    this.get_data_list();
   },
 
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh: function () {
+  // 导航事件
+  nav_event(e) {
+    this.setData({
+      nav_status_index: e.currentTarget.dataset.index || 0,
+      data_page: 1,
+    });
+    this.get_data_list(1);
+  },
 
+  // 输入框事件
+  input_event(e) {
+    this.setData({ input_keyword_value: e.detail.value });
   },
 
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom: function () {
+  // 取消
+  cancel_event(e) {
+    wx.showModal({
+      title: "温馨提示",
+      content: "取消后不可恢复，确定继续吗?",
+      confirmText: "确认",
+      cancelText: "不了",
+      success: result => {
+        if (result.confirm) {
+          // 参数
+          var id = e.currentTarget.dataset.value;
+          var index = e.currentTarget.dataset.index;
+
+          // 加载loding
+          wx.showLoading({ title: "处理中..." });
+
+          wx.request({
+            url: app.get_request_url("cancel", "orderaftersale"),
+            method: "POST",
+            data: { id: id },
+            dataType: "json",
+            success: res => {
+              wx.hideLoading();
+              if (res.data.code == 0) {
+                var temp_data_list = this.data.data_list;
+                temp_data_list[index]['status'] = 5;
+                temp_data_list[index]['status_text'] = '已取消';
+                this.setData({ data_list: temp_data_list });
+
+                app.showToast(res.data.msg, "success");
+              } else {
+                app.showToast(res.data.msg);
+              }
+            },
+            fail: () => {
+              wx.hideLoading();
+              app.showToast("服务器请求出错");
+            }
+          });
+        }
+      }
+    });
+  },
 
+  // 退货
+  delivery_event(e) {
+    var oid = e.currentTarget.dataset.oid || 0;
+    var did = e.currentTarget.dataset.did || 0;
+    if (oid == 0 || did == 0) {
+      app.showToast("参数有误");
+      return false;
+    }
+
+    // 进入售后页面
+    wx.navigateTo({
+      url: "/pages/user-orderaftersale-detail/user-orderaftersale-detail?oid=" + oid + "&did=" + did +"&is_delivery_popup=1"
+    });
   },
 
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage: function () {
+  // 下拉刷新
+  onPullDownRefresh() {
+    this.init();
+  },
 
-  }
-})
\ No newline at end of file
+});
diff --git a/public/appmini/old/weixin/pages/user-orderaftersale/user-orderaftersale.json b/public/appmini/old/weixin/pages/user-orderaftersale/user-orderaftersale.json
index 8835af0699ccec004cbe685ef938cd2d63ea7037..331ad4f3d98660918818a7657404ac8cb0a6f312 100644
--- a/public/appmini/old/weixin/pages/user-orderaftersale/user-orderaftersale.json
+++ b/public/appmini/old/weixin/pages/user-orderaftersale/user-orderaftersale.json
@@ -1,3 +1,3 @@
 {
-  "usingComponents": {}
+  "enablePullDownRefresh": true
 }
\ No newline at end of file
diff --git a/public/appmini/old/weixin/pages/user-orderaftersale/user-orderaftersale.wxml b/public/appmini/old/weixin/pages/user-orderaftersale/user-orderaftersale.wxml
index a8f1ac6ca5d95881b22e8d4aa8a667257db8daad..5ce9aebbee2d3a6f131477b2e0ed6cd796a138ef 100644
--- a/public/appmini/old/weixin/pages/user-orderaftersale/user-orderaftersale.wxml
+++ b/public/appmini/old/weixin/pages/user-orderaftersale/user-orderaftersale.wxml
@@ -1,2 +1,61 @@
-<!--pages/user-orderaftersale.wxml-->
-<text>pages/user-orderaftersale.wxml</text>
+<!-- 导航 -->
+<view class="nav">
+  <block wx:for="{{nav_status_list}}" wx:key="key">
+    <view wx:if="{{nav_status_index == index}}" class="item fl tc cr-main" data-index="{{index}}" bindtap="nav_event">{{item.name}}</view>
+    <view wx:else class="item fl tc" data-index="{{index}}" bindtap="nav_event">{{item.name}}</view>
+  </block>
+</view>
+
+<!-- 订单列表 -->
+<scroll-view scroll-y="{{true}}" class="scroll-box" bindscrolltolower="scroll_lower" lower-threshold="30">
+  <view class="list-content">
+    <view class="list-item bg-white spacing-mb" wx:if="{{data_list.length > 0}}" wx:for="{{data_list}}" wx:key="key">
+      <view class="item-base oh br-b">
+        <text class="cr-666">{{item.add_time_time}}</text>
+        <text class="fr cr-main">{{item.status_text}}</text>
+      </view>
+      <view class="goods-item oh">
+        <navigator url="/pages/user-orderaftersale-detail/user-orderaftersale-detail?oid={{item.order_id}}&did={{item.order_detail_id}}" hover-class="none">
+          <image class="goods-image fl" src="{{item.order_data.items.images}}" mode="aspectFill" />
+          <view class="goods-base">
+            <view class="goods-title multi-text" >{{item.order_data.items.title}}</view>
+            <block wx:if="{{item.order_data.items.spec != null}}">
+              <view class="goods-spec cr-888" wx:for="{{item.order_data.items.spec}}" wx:key="key" wx:for-item="spec">
+                {{spec.type}}:{{spec.value}}
+              </view>
+            </block>
+            <view class="orderaftersale-btn-text" catchtap="orderaftersale_event" data-oid="{{item.id}}" data-did="{{item.order_data.items.id}}">{{item.order_data.items.orderaftersale_btn_text}}</view>
+          </view>
+          <view class="oh goods-price">
+            <text class="sales-price">￥{{item.order_data.items.price}}</text>
+            <text wx:if="{{item.order_data.items.original_price > 0}}" class="original-price">￥{{item.order_data.items.original_price}}</text>
+            <text class="buy-number">x{{item.order_data.items.buy_number}}</text>
+          </view>
+        </navigator>
+      </view>
+      <view class="item-describe">
+        <text class="cr-666">{{item.type_text}}</text>
+        <text class="cr-ccc"> / </text>
+        <text class="cr-666">{{item.reason}}</text>
+        <text wx:if="{{item.price > 0}}" class="cr-ccc"> / </text>
+        <text wx:if="{{item.price > 0}}" class="sales-price">￥{{item.price}}</text>
+        <text wx:if="{{item.number > 0}}" class="cr-main"> x{{item.number}}</text>
+      </view>
+      <view wx:if="{{item.status <= 2 || item.status == 4}}" class="item-operation tr br-t">
+        <button wx:if="{{item.status != 3 && item.status != 5}}" class="submit-cancel" type="default" size="mini" bindtap="cancel_event" data-value="{{item.id}}" data-index="{{index}}" hover-class="none">取消
+        </button>
+        <button wx:if="{{item.status == 1 && item.type == 1}}" class="submit-pay cr-666 br" type="default" size="mini" bindtap="delivery_event" data-oid="{{item.order_id}}" data-did="{{item.order_detail_id}}" data-index="{{index}}" hover-class="none">退货
+        </button>
+      </view>
+    </view>
+
+    <view wx:if="{{data_list.length == 0}}">
+      <import src="/pages/common/nodata.wxml" />
+      <template is="nodata" data="{{status: data_list_loding_status, msg: data_list_loding_msg}}">
+      </template>
+    </view>
+
+    <import src="/pages/common/bottom_line.wxml" />
+    <template is="bottom_line" data="{{status: data_bottom_line_status}}"></template>
+  </view>
+</scroll-view>
\ No newline at end of file
diff --git a/public/appmini/old/weixin/pages/user-orderaftersale/user-orderaftersale.wxss b/public/appmini/old/weixin/pages/user-orderaftersale/user-orderaftersale.wxss
index 7904dd1707e57686aa14e8676c041214369a1383..169af341ffc5762fb8ae656b06d0399244b5ace6 100644
--- a/public/appmini/old/weixin/pages/user-orderaftersale/user-orderaftersale.wxss
+++ b/public/appmini/old/weixin/pages/user-orderaftersale/user-orderaftersale.wxss
@@ -1 +1,62 @@
-/* pages/user-orderaftersale.wxss */
\ No newline at end of file
+/*
+ * 导航
+ */
+.nav {
+  background: #eee;
+  height: 80rpx;
+  line-height: 80rpx;
+}
+.nav .item {
+  width: 14.28%;
+}
+
+/*
+ * 列表
+ */
+.scroll-box{
+    height: calc(100vh - 80rpx);
+}
+.goods-base {
+  min-height: 160rpx;
+  margin-left: 180rpx;
+  position: relative;
+}
+.goods-title {
+    line-height: 36rpx;
+}
+.list-item .goods-item:not(:last-child) {
+    border-bottom: 1px dashed #efefef;
+}
+.goods-item {
+    padding: 20rpx 10rpx;
+}
+.goods-title, .goods-spec {
+    margin-bottom: 10rpx;
+}
+.goods-image {
+    width: 160rpx;
+    height: 160rpx;
+    margin-right: 20rpx;
+}
+.goods-price {
+    position: relative;
+    margin-top: 10rpx;
+}
+.buy-number {
+    position: absolute;
+    right: 0;
+    bottom: 0;
+}
+.item-base, .item-describe, .item-operation {
+    padding: 20rpx 10rpx 20rpx 10rpx;
+}
+.submit-cancel {
+    border: 1px solid #f7c3b3;
+    color: #f7c3b3 !important;
+}
+.item-operation button:not(:first-child) {
+    margin-left: 20rpx;
+}
+.item-operation button {
+    padding: 0 35rpx;
+}
\ No newline at end of file