From 5b87095bf97af620f039ca82ec94aad2cc1a4024 Mon Sep 17 00:00:00 2001 From: "453530270@qq.com" Date: Tue, 14 Nov 2023 09:39:17 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=94=A8=E6=88=B7=E4=B8=AD?= =?UTF-8?q?=E5=BF=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/user.js | 9 ++- pages/user/index.vue | 158 ++++++++++++++---------------------------- store/modules/user.js | 1 + 3 files changed, 60 insertions(+), 108 deletions(-) diff --git a/api/user.js b/api/user.js index 6e3c30c..ed56957 100644 --- a/api/user.js +++ b/api/user.js @@ -5,7 +5,9 @@ const api = { userInfo: 'user/info', assets: 'user/assets', bindMobile: 'user/bindMobile', - personal: 'user/personal' + personal: 'user/personal', + // 操作日志 + oplogs: "slb/userself/v1/account/operation", } // 当前登录的用户信息 @@ -32,3 +34,8 @@ export const bindMobile = (data, option) => { export const personal = (data, option) => { return request.post(api.personal, data, option) } + +// 操作日志 +export const oplogs = (param, option) => { + return request.get(api.oplogs, param, option) +} \ No newline at end of file diff --git a/pages/user/index.vue b/pages/user/index.vue index 6a97e92..28a8231 100644 --- a/pages/user/index.vue +++ b/pages/user/index.vue @@ -36,6 +36,26 @@ + + + + + + + + {{ item.operation }} + + + {{ item.createTime }} + + + + {{ 11 }} + + + + + @@ -48,14 +68,6 @@ 账户余额 - - - {{ isLogin ? assets.points : '--' }} - - - {{ setting[SettingKeyEnum.POINTS.value].points_name }} - - {{ isLogin ? assets.coupon : '--' }} @@ -183,6 +195,8 @@ assets: { balance: '--', points: '--', coupon: '--' }, // 我的服务 service, + // 操作日志 + oplist:[], // 订单操作 orderNavbar, // 当前用户待处理的订单数量 @@ -201,8 +215,6 @@ // 刷新页面 onRefreshPage() { - // 更新购物车角标 - setCartTabBadge() // 判断是否已登录 this.isLogin = checkLogin() if(!this.isLogin){ @@ -211,14 +223,14 @@ }) } // 获取页面数据 - //this.getPageData() + this.getPageData() }, // 获取页面数据 getPageData(callback) { const app = this app.isLoading = true - Promise.all([app.getSetting(), app.getUserInfo(), app.getUserAssets(), app.getTodoCounts()]) + Promise.all([/*app.getUserInfo(), app.getUserAssets(), */app.getOplogs()]) .then(result => { app.isFirstload = false // 初始化我的服务数据 @@ -262,17 +274,6 @@ app.orderNavbar = newOrderNavbar }, - // 获取商城设置 - getSetting() { - const app = this - return new Promise((resolve, reject) => { - SettingModel.data() - .then(setting => { - app.setting = setting - resolve(setting) - }).catch(reject) - }) - }, // 获取当前用户信息 getUserInfo() { @@ -294,14 +295,17 @@ }) }, - // 获取账户资产 - getUserAssets() { + // 用户登录日志 + getOplogs () { const app = this + const accid = uni.getStorageSync('accountId') return new Promise((resolve, reject) => { - !app.isLogin ? resolve(null) : UserApi.assets({}, { load: app.isFirstload }) + !app.isLogin ? resolve(null) : UserApi.oplogs({'accountId': accid}, { load: app.isFirstload }) .then(result => { - app.assets = result.data.assets - resolve(app.assets) + // app.assets = result.data.assets + app.oplist = result.data + console.log("oplogs",app.oplist) + resolve(app.oplist) }) .catch(err => { if (err.result && err.result.status == 401) { @@ -314,8 +318,8 @@ }) }, - // 获取当前用户待处理的订单数量 - getTodoCounts() { + // 获取当前用户的 + getOplogsTodo() { const app = this return new Promise((resolve, reject) => { !app.isLogin ? resolve(null) : OrderApi.todoCounts({}, { load: app.isFirstload }) @@ -333,6 +337,7 @@ }) }) }, + // 跳转到登录页 handleLogin() { @@ -404,7 +409,7 @@ // 页面头部 .main-header { background-color: #fff; - // background-image: url('/static/background/user-header.png'); + background-image: url('/static/background/user-header.png'); position: relative; width: 100%; height: 280rpx; @@ -477,6 +482,21 @@ } } + } + + + .log-list { + padding: 0 30rpx; + } + + .log-item { + font-size: 28rpx; + padding: 20rpx 20rpx; + line-height: 1.8; + border-bottom: 1rpx solid rgb(238, 238, 238); + display: flex; + justify-content: center; + align-items: center; } // 角标组件 @@ -496,55 +516,6 @@ font-size: 24rpx; } - // 我的钱包 - .my-asset { - display: flex; - background: #fff; - padding: 40rpx 0; - - .asset-right { - width: 200rpx; - border-left: 1rpx solid #eee; - } - - .asset-right-item { - text-align: center; - color: #545454; - - .item-icon { - font-size: 44rpx; - } - - .item-name { - margin-top: 14rpx; - font-size: 28rpx; - } - - } - - .asset-left-item { - max-width: 183rpx; - text-align: center; - color: #666; - padding: 0 16rpx; - - .item-value { - font-size: 34rpx; - color: red; - } - - .item-name { - margin-top: 6rpx; - } - - .item-name { - margin-top: 14rpx; - font-size: 28rpx; - } - } - - } - // 订单操作 .order-navbar { display: flex; @@ -593,33 +564,6 @@ font-size: 30rpx; } - .service-content { - - margin-bottom: -20rpx; - - .service-item { - position: relative; - width: 25%; - float: left; - margin-bottom: 30rpx; - - .item-icon { - text-align: center; - margin: 0 auto; - padding: 14rpx 0; - color: #ff3800; - font-size: 44rpx; - } - - .item-name { - font-size: 28rpx; - color: #545454; - text-align: center; - margin-right: 10rpx; - } - - } - } } // 退出登录 diff --git a/store/modules/user.js b/store/modules/user.js index 9b30395..f7f3199 100644 --- a/store/modules/user.js +++ b/store/modules/user.js @@ -9,6 +9,7 @@ const loginSuccess = (commit, { token, user }) => { // 保存tokne和userId到缓存 storage.set(ACCOUNT_ID, user.accountId, expiryTime) storage.set(ACCESS_TOKEN, token, expiryTime) + storage.set("cuser",user) // 记录到store全局变量 commit('SET_TOKEN', token) commit('SET_ACCOUNT_ID', user.accountId)