Merge remote-tracking branch 'origin/development' into development

75582005 · wangwei · c38acd90 · 1b4cafa9 · 75582005
Commit 75582005 authored Dec 29, 2018 by wangwei
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

index.vue src/components/monthOrder/index.vue +1 -1

No files found.
--- a/src/components/monthOrder/index.vue
+++ b/src/components/monthOrder/index.vue
@@ -193,7 +193,7 @@
              <el-button
                @click="onRefund(scope.row.id, scope.row.money)"
                type="warning"
-                v-if="(scope.row.status == 1 || scope.row.status == 4|| scope.row.status == 5) && $store.state.orderRefund"
+                v-if="(scope.row.status == 1 || scope.row.status == 4 || scope.row.status == 5  ) && $store.state.orderRefund && scope.row.order_type != 3 "
                plain
                size="mini">
                退款