导出列表
@@ -452,7 +452,7 @@ export default {
if (lebData.export.length) {
data = data.concat(lebData.export)
excelData.page++
- }
+ }
}
createWorkBook(lebData.header, lebData.title, data, lebData.foot,lebData.filename);
return
diff --git a/view/admin/src/views/order/list/index.vue b/view/admin/src/views/order/list/index.vue
index af07801..271c078 100644
--- a/view/admin/src/views/order/list/index.vue
+++ b/view/admin/src/views/order/list/index.vue
@@ -42,23 +42,7 @@
@change="onchangeTime"
/>
-
-
-
-
-
+
-
-
-
-
-
-
+
-
-
+
-
-
-
-
-
-
-
-
-
-
+
+ />
搜索
- 重置
+ 重置
-
+
导出列表
用户已删除
-
-
- {{scope.row.user&&scope.row.user.nickname +'/'+ scope.row.uid}}
-
-
-
-
- {{ scope.row.is_virtual == 1 ? "虚拟订单" : scope.row.order_type == 0 ? "普通订单" : "核销订单" }}
-
-
+
@@ -261,10 +193,10 @@
尾款:{{ scope.row.finalOrder.pay_price }}
+
- {{ scope.row.pay_type | orderPayType }}
- --
+ {{ scope.row.pay_type == 2 ? '微信' : '积分' }}
@@ -636,7 +568,7 @@ export default {