diff --git a/src/api/account/index.js b/src/api/account/index.js index 7058c5c..65db84d 100644 --- a/src/api/account/index.js +++ b/src/api/account/index.js @@ -48,3 +48,12 @@ export const getPersonAccount = async () => { method: 'get' }); }; + +// 修改密码 +export const updatePassword = async data => { + return request({ + url: '/system/user/profile/update-password', + method: 'put', + data + }); +}; diff --git a/src/api/distribution/distributor.js b/src/api/distribution/distributor.js index af49d57..e29787f 100644 --- a/src/api/distribution/distributor.js +++ b/src/api/distribution/distributor.js @@ -52,3 +52,12 @@ export const getDistributorDetail = id => { method: 'get' }); }; + +// 更新二维码状态 +export const updateQrcodeStatus = data => { + return request({ + url: '/applet/xunjia/distributor/status/update', + method: 'put', + data + }); +}; diff --git a/src/pages/distribution/qrcode.vue b/src/pages/distribution/qrcode.vue index c7d5f03..7b04a23 100644 --- a/src/pages/distribution/qrcode.vue +++ b/src/pages/distribution/qrcode.vue @@ -6,8 +6,7 @@ 专属二维码管理 - - 批量生成 + @@ -15,38 +14,23 @@ - 分销员 - - - {{ distributorOptions[distributorIndex] }} - - - - - 状态 - - - {{ statusOptions[statusIndex] }} - - - - - 搜索 + 姓名 + + + + 手机号 + + @@ -65,46 +49,45 @@ > - {{ qrcode.code }} - {{ qrcode.status }} + {{ qrcode.id }} + {{ qrcode.status == '0' ? '已启用' : '已禁用' }} - - {{ qrcode.code }} + + + + 分销员: - {{ qrcode.distributor }} + {{ qrcode.name }} + + + 手机号: + {{ qrcode.phone }} 生成时间: - {{ qrcode.createTime }} + {{ new Date(qrcode.createTime).toLocaleString() }} - 扫码次数: - {{ qrcode.scanCount }} - - - 备注: - {{ qrcode.remark }} + 总收入: + {{ qrcode.totalIncome }} - - 下载 - - + 预览 - - {{ qrcode.status === '启用' ? '禁用' : '启用' }} + {{ qrcode.status == '0' ? '禁用' : '启用' }} @@ -145,179 +128,75 @@ @@ -551,11 +430,12 @@ .info-item { display: flex; font-size: 18rpx; + align-items: center; } .info-label { color: #606266; - width: 80rpx; + width: 125rpx; } .info-value { diff --git a/src/pages/login.vue b/src/pages/login.vue index 481c14c..3400418 100644 --- a/src/pages/login.vue +++ b/src/pages/login.vue @@ -194,14 +194,7 @@ // 跳转到首页 proxy.$tab.reLaunch('/pages/index') - } catch (error) { - // 登录失败 - uni.showToast({ - title: error.message || "登录失败,请重试", - icon: "none", - duration: 2000 - }) - } finally { + } finally { // 结束登录状态 isLoggingIn.value = false } diff --git a/src/pages/member/gift.vue b/src/pages/member/gift.vue index 8545513..9a579ae 100644 --- a/src/pages/member/gift.vue +++ b/src/pages/member/gift.vue @@ -253,8 +253,7 @@ return } currentPage.value = page - // 实际项目中应加载指定页码的核验码 - // loadCodePage(page) + loadCodeList() } // 获取状态文本 diff --git a/src/pages/mine/password-change.vue b/src/pages/mine/password-change.vue index 1848981..39851b1 100644 --- a/src/pages/mine/password-change.vue +++ b/src/pages/mine/password-change.vue @@ -111,6 +111,7 @@ diff --git a/src/pages/work/index.vue b/src/pages/work/index.vue index 3af67bc..9bc6af5 100644 --- a/src/pages/work/index.vue +++ b/src/pages/work/index.vue @@ -83,7 +83,7 @@ - + 📱