Browse Source

Merge branch 'milestone-20250711-金币前端二期' of http://39.101.133.168:8807/huangqizhen/gold-vue into milestone-20250711-金币前端二期

zhangrenyuan/feature-20250714163943-金币前端二期
zhangyongQINGHU 2 weeks ago
parent
commit
500d01d455
  1. 9
      src/components/changePassword.vue
  2. 4
      src/views/usergold/clientCountBalance.vue
  3. 4
      src/views/usergold/clientCountDetail.vue
  4. 13
      src/views/workspace/index.vue

9
src/components/changePassword.vue

@ -177,12 +177,15 @@ const changePassword = async function () {
const result = await API({url: '/admin/password', data: params})
console.log('@@@@@@@@@@@修改密码结果:', result)
if (result.code === 0){
ElMessage.error('原密码错误')
}
if (result.code === 200) {
// 使
await router.push({ name: 'PasswordSuccess' });
// 使
//await router.push({ name: 'PasswordSuccess' });
// 使
// await router.push('/PasswordSuccess');
await router.push('/PasswordSuccess');
ElMessage.success('修改密码成功');
resetFields();

4
src/views/usergold/clientCountBalance.vue

@ -35,7 +35,9 @@ const getmarket = async () => {
console.log('获取地区数据成功', result)
// { value, label }
if (Array.isArray(result.data) && typeof result.data[0] === 'string') {
market.value = result.data.map(item => ({ value: item, label: item }));
market.value = result.data
.filter(item => item !== null && item !== undefined && item.trim() !== '') //
.map(item => ({ value: item, label: item }));
} else {
market.value = result.data;
}

4
src/views/usergold/clientCountDetail.vue

@ -101,7 +101,9 @@ const getArea = async () => {
});
// { value, label }
if (Array.isArray(result.data) && typeof result.data[0] === 'string') {
market.value = result.data.map(item => ({ value: item, label: item }));
market.value = result.data
.filter(item => item !== null && item !== undefined && item.trim() !== '') //
.map(item => ({ value: item, label: item }));
} else {
market.value = result.data;
}

13
src/views/workspace/index.vue

@ -408,8 +408,12 @@ const processData = (data) => {
dailyRefund.value = yesterdayRefund.toFixed(2)
yearlyRechargeNum.value = summary.yearlyRechargeNum
sumWow.value = (summary.sumWow / length.value).toFixed(2)
sumDaily.value = (summary.sumDaily / length.value).toFixed(2)
// //
// sumWow.value = (marketCards.sumWow / length.value).toFixed(2)
// //
// sumDaily.value = (marketCards.sumDaily / length.value).toFixed(2)
rechargeNum.value = summary.rechargeNum
firstRecharge.value = summary.firstRecharge
}
@ -712,6 +716,11 @@ const getCardData = async () => {
try {
const response = await API({ url: '/workbench/getCard', data: {} })
workDataUpdateTime.value = response.updateTime
//
sumWow.value = response.sumWow .toFixed(2)
//
sumDaily.value = response.sumDaily.toFixed(2)
if (response && response.data) {
processData(response.data)
} else if (Array.isArray(response?.marketCards)) {

Loading…
Cancel
Save