diff --git a/.env.development b/.env.development index b046618..5a24dde 100644 --- a/.env.development +++ b/.env.development @@ -4,8 +4,8 @@ ENV = 'development' # http://mer.crmeb.net/admin # base api # www.shop.xyz -VUE_APP_BASE_API = 'http://zkx.tropjoin.com' -# VUE_APP_BASE_API = 'http://testg.tropjoin.com' +# VUE_APP_BASE_API = 'http://zkx.tropjoin.com' +VUE_APP_BASE_API = 'http://testg.tropjoin.com' # VUE_APP_BASE_API = 'https://api.tropjoin.com' # socket 连接地址 diff --git a/src/api/marketing.js b/src/api/marketing.js index 8e694ef..875e499 100644 --- a/src/api/marketing.js +++ b/src/api/marketing.js @@ -373,6 +373,12 @@ export function integralLogTitle() { export function integralLogLst(data) { return request.get(`user/integral/lst`, data) } +/** + * @description 用户余额信息 -- 列表 + */ +export function userMoneyLogLst(data) { + return request.get(`user/money/list`, data) +} /** * @description 成长值 -- 列表 */ diff --git a/src/router/modules/promoter.js b/src/router/modules/promoter.js index 4631943..72ad488 100644 --- a/src/router/modules/promoter.js +++ b/src/router/modules/promoter.js @@ -48,6 +48,15 @@ const promoterRouter = }, component: () => import('@/views/promoter/bankCard/index') }, + { + path: 'userInfo', + name: 'userInfo', + meta: { + title: '用户账户余额信息', + noCache: true + }, + component: () => import('@/views/promoter/userInfo/index') + }, { path: 'user', name: 'AccountsUser', diff --git a/src/views/marketing/integral/log/index.vue b/src/views/marketing/integral/log/index.vue index 70074a6..c95de3a 100644 --- a/src/views/marketing/integral/log/index.vue +++ b/src/views/marketing/integral/log/index.vue @@ -1,7 +1,13 @@ - - + + + style="width: 280px" + @change="onchangeTime" + /> - + - 搜索 - 重置 + 搜索 + 重置 @@ -33,10 +48,14 @@ - - +{{scope.row.number}} - -{{scope.row.number}} - + + +{{ scope.row.number }} + -{{ scope.row.number }} + @@ -54,20 +73,22 @@ /> - + diff --git a/src/views/systemForm/setSystem/index.vue b/src/views/systemForm/setSystem/index.vue index 22cfb21..adbbded 100644 --- a/src/views/systemForm/setSystem/index.vue +++ b/src/views/systemForm/setSystem/index.vue @@ -32,7 +32,6 @@ @@ -178,7 +177,7 @@ export default { font-size: 12px !important; } .FromData ::v-deep .el-textarea__inner { - min-height: 100px !important; + min-height: 100px !important; } .guide { text-align: right;