|
|
@@ -30,7 +30,7 @@
|
|
|
@keyup.enter.native="handleQuery"
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="注册时间" prop="createTimeRange">
|
|
|
+ <el-form-item label="绑定时间" prop="createTimeRange">
|
|
|
<el-date-picker clearable size="small" style="width: 340px"
|
|
|
v-model="dateRange"
|
|
|
type="daterange"
|
|
|
@@ -186,7 +186,7 @@
|
|
|
<el-table-column label="用户余额" align="center" prop="nowMoney" />
|
|
|
<!-- <el-table-column label="推广佣金" align="center" prop="brokeragePrice" />-->
|
|
|
<el-table-column label="积分" align="center" prop="integral" />
|
|
|
- <el-table-column label="会员注册时间" align="center" prop="createTime" />
|
|
|
+ <el-table-column label="绑定时间" align="center" prop="bindTime" width="100" />
|
|
|
<!-- <el-table-column label="累计消费金额" align="center" prop="totalAmount" />-->
|
|
|
<!-- <el-table-column label="上次消费时间" align="center" prop="lastBuyTime" />-->
|
|
|
<!-- <el-table-column label="上次消费金额(元)" align="center" prop="number" />-->
|
|
|
@@ -226,13 +226,13 @@
|
|
|
</el-table-column>
|
|
|
<el-table-column label="操作" align="center" width="150px" class-name="small-padding fixed-width">
|
|
|
<template slot-scope="scope">
|
|
|
- <el-button
|
|
|
- size="mini"
|
|
|
- type="text"
|
|
|
- icon="el-icon-edit"
|
|
|
- @click="handleUpdate(scope.row)"
|
|
|
- v-hasPermi="['store:user:edit']"
|
|
|
- >修改</el-button>
|
|
|
+<!-- <el-button-->
|
|
|
+<!-- size="mini"-->
|
|
|
+<!-- type="text"-->
|
|
|
+<!-- icon="el-icon-edit"-->
|
|
|
+<!-- @click="handleUpdate(scope.row)"-->
|
|
|
+<!-- v-hasPermi="['store:user:edit']"-->
|
|
|
+<!-- >修改</el-button>-->
|
|
|
|
|
|
<el-button
|
|
|
size="mini"
|
|
|
@@ -450,7 +450,8 @@ export default {
|
|
|
startCreateTime: null,
|
|
|
endCreateTime: null,
|
|
|
companyId: null,
|
|
|
- companyUserNickName: null
|
|
|
+ companyUserNickName: null,
|
|
|
+ userId: null
|
|
|
},
|
|
|
// 表单参数
|
|
|
form: {},
|
|
|
@@ -489,7 +490,7 @@ export default {
|
|
|
};
|
|
|
},
|
|
|
created() {
|
|
|
- this.getDicts("user_status").then((response) => {
|
|
|
+ this.getDicts("project_user_status").then((response) => {
|
|
|
this.statusOptions = response.data;
|
|
|
});
|
|
|
this.getDicts("user_level").then((response) => {
|
|
|
@@ -598,6 +599,8 @@ export default {
|
|
|
this.queryParams.companyId = null;
|
|
|
this.queryParams.companyUserNickName = null;
|
|
|
this.companyQueryUserOptions = null;
|
|
|
+ this.queryParams.startCreateTime = null
|
|
|
+ this.queryParams.endCreateTime = null
|
|
|
this.handleQuery();
|
|
|
},
|
|
|
/** 处理日期范围变化 */
|
|
|
@@ -649,7 +652,7 @@ export default {
|
|
|
}else {
|
|
|
this.form.status = null;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
this.open = true;
|
|
|
this.title = "修改用户";
|
|
|
});
|
