更新:修改开发服务器的主机地址,优化用户模块的表格功能,增加排序和搜索功能,更新静态配置的API地址
This commit is contained in:
@@ -23,7 +23,7 @@ module.exports = {
|
|||||||
},
|
},
|
||||||
|
|
||||||
// Various Dev Server settings
|
// Various Dev Server settings
|
||||||
host: '192.168.110.161', // can be overwritten by process.env.HOST
|
host: '192.168.110.160', // can be overwritten by process.env.HOST
|
||||||
port: 8002, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
|
port: 8002, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
|
||||||
autoOpenBrowser: true,
|
autoOpenBrowser: true,
|
||||||
errorOverlay: true,
|
errorOverlay: true,
|
||||||
|
|||||||
@@ -33,10 +33,7 @@
|
|||||||
<el-form-item>
|
<el-form-item>
|
||||||
<el-button
|
<el-button
|
||||||
size="small"
|
size="small"
|
||||||
@click="
|
@click="handleSearch()"
|
||||||
pageIndex = 1;
|
|
||||||
getDataList();
|
|
||||||
"
|
|
||||||
>查询</el-button
|
>查询</el-button
|
||||||
>
|
>
|
||||||
<el-button
|
<el-button
|
||||||
@@ -57,10 +54,12 @@
|
|||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-form>
|
</el-form>
|
||||||
<el-table
|
<el-table
|
||||||
|
ref="dataTable"
|
||||||
:data="dataList"
|
:data="dataList"
|
||||||
border
|
border
|
||||||
v-loading="dataListLoading"
|
v-loading="dataListLoading"
|
||||||
style="width: 100%;"
|
style="width: 100%;"
|
||||||
|
@sort-change="handleSortChange"
|
||||||
>
|
>
|
||||||
<!-- <el-table-column type="selection" header-align="center" align="center" width="50">
|
<!-- <el-table-column type="selection" header-align="center" align="center" width="50">
|
||||||
</el-table-column> -->
|
</el-table-column> -->
|
||||||
@@ -138,6 +137,18 @@
|
|||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
|
<el-table-column
|
||||||
|
min-width="120"
|
||||||
|
prop="createTime"
|
||||||
|
header-align="center"
|
||||||
|
align="center"
|
||||||
|
sortable="custom"
|
||||||
|
label="注册时间"
|
||||||
|
>
|
||||||
|
<template slot-scope="scope">
|
||||||
|
{{ scope.row.createTime }}
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
min-width="140"
|
min-width="140"
|
||||||
prop="nickname"
|
prop="nickname"
|
||||||
@@ -153,6 +164,18 @@
|
|||||||
<span v-else v-html="computedVipType(scope.row.userVips)"> </span>
|
<span v-else v-html="computedVipType(scope.row.userVips)"> </span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
|
<el-table-column
|
||||||
|
min-width="120"
|
||||||
|
prop="migrationTime"
|
||||||
|
header-align="center"
|
||||||
|
align="center"
|
||||||
|
sortable="custom"
|
||||||
|
label="迁移时间"
|
||||||
|
>
|
||||||
|
<template slot-scope="scope">
|
||||||
|
{{ scope.row.migrationTime }}
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
min-width="170"
|
min-width="170"
|
||||||
prop="tel"
|
prop="tel"
|
||||||
@@ -613,7 +636,10 @@ export default {
|
|||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
dataForm: {
|
dataForm: {
|
||||||
key: ""
|
key: "",
|
||||||
|
vipType: "",
|
||||||
|
sortKey: "",
|
||||||
|
sortValue: ""
|
||||||
},
|
},
|
||||||
pointFormRules: {
|
pointFormRules: {
|
||||||
pointAmount: [
|
pointAmount: [
|
||||||
@@ -676,6 +702,21 @@ export default {
|
|||||||
this.getDataList();
|
this.getDataList();
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
|
handleSortChange({ prop, order }) {
|
||||||
|
this.dataForm.sortKey = prop
|
||||||
|
this.dataForm.sortValue = order
|
||||||
|
console.log(this.dataForm.sortKey, this.dataForm.sortValue)
|
||||||
|
this.getDataList()
|
||||||
|
},
|
||||||
|
handleSearch() {
|
||||||
|
this.pageIndex = 1;
|
||||||
|
this.dataForm.sortKey = ""
|
||||||
|
this.dataForm.sortValue = ""
|
||||||
|
this.$nextTick(() => {
|
||||||
|
this.$refs.dataTable.clearSort()
|
||||||
|
})
|
||||||
|
this.getDataList();
|
||||||
|
},
|
||||||
//批量开通课程
|
//批量开通课程
|
||||||
addOpenCourse() {
|
addOpenCourse() {
|
||||||
this.$router.push("/user-add-course");
|
this.$router.push("/user-add-course");
|
||||||
@@ -793,7 +834,9 @@ export default {
|
|||||||
page: this.pageIndex,
|
page: this.pageIndex,
|
||||||
limit: this.pageSize,
|
limit: this.pageSize,
|
||||||
key: this.dataForm.key,
|
key: this.dataForm.key,
|
||||||
vipType: this.dataForm.vipType
|
vipType: this.dataForm.vipType,
|
||||||
|
sortKey: this.dataForm.sortKey,
|
||||||
|
sortValue: this.dataForm.sortValue
|
||||||
})
|
})
|
||||||
// params: this.$http.adornParams({
|
// params: this.$http.adornParams({
|
||||||
// 'page': 1,
|
// 'page': 1,
|
||||||
|
|||||||
@@ -6,9 +6,9 @@
|
|||||||
|
|
||||||
// api接口请求地址
|
// api接口请求地址
|
||||||
// window.SITE_CONFIG['baseUrl'] = 'https://testapi.nuttyreading.com'; // 线上测试环境11
|
// window.SITE_CONFIG['baseUrl'] = 'https://testapi.nuttyreading.com'; // 线上测试环境11
|
||||||
// window.SITE_CONFIG['baseUrl'] = 'https://global.nuttyreading.com'; //线上
|
// window.SITE_CONFIG['baseUrl'] = 'https://global.nuttyreading.com'; // 线上
|
||||||
// window.SITE_CONFIG['baseUrl'] = 'https://api.nuttyreading.com'; //线上正式环境
|
// window.SITE_CONFIG['baseUrl'] = 'https://api.nuttyreading.com'; // 线上正式环境
|
||||||
window.SITE_CONFIG['baseUrl'] = 'http://192.168.110.100:9300/pb'; //zcc
|
window.SITE_CONFIG['baseUrl'] = 'http://192.168.110.131:9300/pb'; // zcc
|
||||||
|
|
||||||
// cdn地址 = 域名 + 版本号
|
// cdn地址 = 域名 + 版本号
|
||||||
window.SITE_CONFIG['domain'] = './'; // 域名
|
window.SITE_CONFIG['domain'] = './'; // 域名
|
||||||
|
|||||||
Reference in New Issue
Block a user