|
|
@@ -78,7 +78,7 @@
|
|
78
|
78
|
<el-option label="全部" value="" />
|
|
79
|
79
|
<el-option label="微信" :value="1" />
|
|
80
|
80
|
<el-option label="支付宝" :value="4" />
|
|
81
|
|
- <el-option label="虚拟支付" :value="0" />
|
|
|
81
|
+ <!-- <el-option label="虚拟支付" :value="0" /> -->
|
|
82
|
82
|
|
|
83
|
83
|
<!-- <el-option label="红积分兑换" :value="6" /> -->
|
|
84
|
84
|
</el-select>
|
|
|
@@ -146,6 +146,18 @@
|
|
146
|
146
|
<span>{{ scope.row.order_type == 0 ? "普通订单" : "核销订单" }}</span>
|
|
147
|
147
|
</template>
|
|
148
|
148
|
</el-table-column>
|
|
|
149
|
+
|
|
|
150
|
+ <el-table-column prop="user_info" label="用户信息" min-width="130" >
|
|
|
151
|
+ <template slot-scope="scope">
|
|
|
152
|
+ <div class="tabBox acea-row row-middle">
|
|
|
153
|
+ <span>{{ scope.row.user.nickname ? scope.row.user.nickname : '' }}</span>
|
|
|
154
|
+ </div>
|
|
|
155
|
+ <div class="tabBox acea-row row-middle">
|
|
|
156
|
+ <span>{{ scope.row.user.phone ? scope.row.user.phone : '' }}</span>
|
|
|
157
|
+ </div>
|
|
|
158
|
+ </template>
|
|
|
159
|
+ </el-table-column>
|
|
|
160
|
+
|
|
149
|
161
|
<el-table-column prop="real_name" label="收货人" min-width="130" />
|
|
150
|
162
|
<el-table-column label="商户名称" min-width="150">
|
|
151
|
163
|
<template slot-scope="scope">
|