取消退款列表

src/components/order/action.vue

@@ -47,8 +47,15 @@
                 <view class="btn" @click.stop="appraiseOrder">
                     <text>评价师傅</text>
                 </view>
-                <view class="del" @click.stop="delOrder">
+            </block>
-                    <text class="iconfont icon-shanchu"></text>
+            <block v-if="order.state == 7">
+                <view class="btn" @click.stop="cancelRefund">
+                    <text>取消申请</text>
+                </view>
+            </block>
+            <block v-if="order.state == 9">
+                <view class="btn" @click.stop="showReason">
+                    <text>查看未通过原因</text>
                 </view>
             </block>
         </block>
@@ -65,24 +72,6 @@
                 </view>
             </block>
         </block>
-        <!-- 退款 -->
-        <block v-if="order.listType == 't4'">
-            <block v-if="order.state == 0">
-                <view class="btn" @click.stop="cancelRefund">
-                    <text>取消申请</text>
-                </view>
-            </block>
-            <block v-if="order.state == 2">
-                <view class="btn" @click.stop="showReason">
-                    <text>查看未通过原因</text>
-                </view>
-            </block>
-            <block v-if="order.state == 1 || order.state == 2">
-                <view class="del" @click.stop="delOrder">
-                    <text class="iconfont icon-shanchu"></text>
-                </view>
-            </block>
-        </block>
     </view>
 </template>
 
@@ -104,7 +93,7 @@ export default {
     destroyed() {},
     methods: {
         /**
-         * 支付
+         * 支付普通订单
          */
         payOrder() {
             this.$models.order.payOrder(this.order.id).then(() => {
@@ -117,6 +106,9 @@ export default {
         payRetainage() {
             this.$emit("payRetainage");
         },
+        /**
+         * 支付货运订单
+         */
         payDistributionOrder() {
             this.$models.service.payDistributionOrder(this.order.id).then(() => {
                 this.$emit("afterPay");

src/core/apis.js

@@ -181,12 +181,6 @@ export default {
                 showLoading: true,
                 auth: true,
             },
-            // 退款订单
-            t4: {
-                url: "/wxapp/order/getmyorder",
-                showLoading: true,
-                auth: true,
-            },
         },
         detail: {
             // 购买订单
@@ -203,10 +197,6 @@ export default {
             t3: {
                 url: ""
             },
-            // 退款
-            t4: {
-                url: ""
-            },
         }
     }
 }

src/core/models/order.js

@@ -11,6 +11,9 @@ export default {
                 case 4: return ['待支付尾款'];
                 case 5: return ['服务已完成，待确认'];
                 case 6: return ['订单已完成'];
+                case 7: return ['退款申请审核中'];
+                case 8: return ['已退款'];
+                case 9: return ['退款未通过'];
             }
         } else if (listType == 't2') {
             switch (state) {
@@ -28,6 +31,9 @@ export default {
                 case 4: return ['待支付尾款'];
                 case 5: return ['服务已完成，待确认'];
                 case 6: return ['订单已完成'];
+                case 7: return ['退款申请审核中'];
+                case 8: return ['已退款'];
+                case 9: return ['退款未通过'];
             }
         } else if (listType == 't3') {
             switch (state) {
@@ -36,12 +42,6 @@ export default {
                 case 2: return ['进行中'];
                 case 3: return ['已完成'];
             }
-        } else if (listType == 't4') {
-            switch (state) {
-                case 0: return ['退款申请审核中'];
-                case 1: return ['已退款'];
-                case 2: return ['退款未通过'];
-            }
         }
 
         return ['未知', '#000000'];

src/pages/order/order.vue

@@ -62,8 +62,6 @@ export default {
                 {
                     listType: "t1",
                     name: "购买订单",
-                    api: "order.list.t1",
-                    status: -1,
                     page: 1,
                     more: true,
                     list: [],
@@ -71,8 +69,6 @@ export default {
                 {
                     listType: "t2",
                     name: "报/议价订单",
-                    api: "order.list.t2",
-                    status: -1,
                     page: 1,
                     more: true,
                     list: [],
@@ -80,17 +76,6 @@ export default {
                 {
                     listType: "t3",
                     name: "货运订单",
-                    api: "order.list.t3",
-                    status: -1,
-                    page: 1,
-                    more: true,
-                    list: [],
-                },
-                {
-                    listType: "t4",
-                    name: "退款记录",
-                    api: "order.list.t4",
-                    status: 1,
                     page: 1,
                     more: true,
                     list: [],
@@ -153,7 +138,7 @@ export default {
                 this.$models.order
                     .orderList({
                         request: {
-                            api: currentTab.api,
+                            api: "order.list." + currentTab.listType,
                             data: {
                                 page: currentTab.page,
                                 status: currentTab.status,