Skip to content

Commit 746bf86

Browse files
YunaiVYunaiV
committed
Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
� Conflicts: � src/views/mall/promotion/combination/record/index.vue
2 parents cfbc2ed + d096e6e commit 746bf86

File tree

14 files changed

+675
-12
lines changed

14 files changed

+675
-12
lines changed

‎src/api/member/point/record/index.ts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,14 @@ export interface RecordVO {
1414
thawingTime: Date
1515
createDate: Date
1616
}
17+
export interface RecordQueryVO {
18+
bizType: string | null | undefined
19+
title: string | null | undefined
20+
pageNo: number
21+
pageSize: number
22+
userId: number | null | undefined
23+
createDate: string[]
24+
}
1725

1826
// 查询用户积分记录列表
1927
export const getRecordPage = async (params) => {

‎src/api/member/signin/record/index.ts

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,15 @@ export interface SignInRecordVO {
66
day: number
77
point: number
88
}
9+
export interface SignInRecordQueryVO {
10+
pageNo: number
11+
pageSize: number
12+
userId?: number
13+
nickname: number | undefined | null
14+
day?: number | null | undefined
15+
point?: number | null | undefined
16+
createTime: string[] | null | undefined
17+
}
918

1019
// 查询用户签到积分列表
1120
export const getSignInRecordPage = async (params) => {

‎src/api/member/user/index.ts

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,23 @@ export interface UserVO {
1717
mark: string
1818
createTime: Date
1919
}
20-
20+
export interface UserBaseInfoVO {
21+
id: number | undefined | null
22+
mobile: string
23+
password: string | null | undefined
24+
status: number
25+
registerIp: string | null | undefined
26+
loginIp: string | null | undefined
27+
loginDate: Date | null | undefined
28+
nickname: string | null | undefined
29+
avatar: string | null | undefined
30+
name: string | null | undefined
31+
sex: number
32+
areaId: number | null | undefined
33+
birthday: Date | null | undefined
34+
mark: string | null | undefined
35+
createTime: Date | null | undefined
36+
}
2137
// 查询会员用户列表
2238
export const getUserPage = async (params) => {
2339
return await request.get({ url: `/member/user/page`, params })

‎src/config/axios/service.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ let requestList: any[] = []
3131
// 是否正在刷新中
3232
let isRefreshToken = false
3333
// 请求白名单，无须token的接口
34-
const whiteList: string[] = ['/login', '/refresh-token', '/system/tenant/get-id-by-name']
34+
const whiteList: string[] = ['/login', '/refresh-token']
3535

3636
// 创建axios实例
3737
const service: AxiosInstance = axios.create({
@@ -47,7 +47,8 @@ service.interceptors.request.use(
4747
let isToken = (config!.headers || {}).isToken === false
4848
whiteList.some((v) => {
4949
if (config.url) {
50-
return (isToken = config.url.indexOf(v) > -1)
50+
config.url.indexOf(v) > -1
51+
return (isToken = false)
5152
}
5253
})
5354
if (getAccessToken() && !isToken) {

‎src/views/Profile/components/BasicInfo.vue

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
<template>
2-
<Form ref="formRef" :labelWidth="80" :rules="rules" :schema="schema">
2+
<Form ref="formRef" :labelWidth="200" :rules="rules" :schema="schema">
33
<template #sex="form">
44
<el-radio-group v-model="form['sex']">
55
<el-radio :label="1">{{ t('profile.user.man') }}</el-radio>
66
<el-radio :label="2">{{ t('profile.user.woman') }}</el-radio>
77
</el-radio-group>
88
</template>
99
</Form>
10-
<XButton :title="t('common.save')" @click="submit()" />
11-
<XButton :title="t('common.reset')" type="danger" @click="init()" />
10+
<div style="text-align: center">
11+
<XButton :title="t('common.save')" type="primary" @click="submit()" />
12+
<XButton :title="t('common.reset')" type="danger" @click="init()" />
13+
</div>
1214
</template>
1315
<script lang="ts" setup>
1416
import type { FormRules } from 'element-plus'

‎src/views/Profile/components/ResetPwd.vue

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<template>
2-
<el-form ref="formRef" :model="password" :rules="rules" label-width="80px">
3-
<el-form-item :label="t('profile.password.oldPassword')">
2+
<el-form ref="formRef" :model="password" :rules="rules" :label-width="200">
3+
<el-form-item :label="t('profile.password.oldPassword')" prop="oldPassword">
44
<InputPassword v-model="password.oldPassword" />
55
</el-form-item>
6-
<el-form-item :label="t('profile.password.newPassword')">
6+
<el-form-item :label="t('profile.password.newPassword')" prop="newPassword">
77
<InputPassword v-model="password.newPassword" strength />
88
</el-form-item>
9-
<el-form-item :label="t('profile.password.confirmPassword')">
9+
<el-form-item :label="t('profile.password.confirmPassword')" prop="confirmPassword">
1010
<InputPassword v-model="password.confirmPassword" strength />
1111
</el-form-item>
1212
<el-form-item>
@@ -33,17 +33,18 @@ const password = reactive({
3333
})
3434
3535
// 表单校验
36-
const equalToPassword = (value, callback) => {
36+
const equalToPassword = (_rule, value, callback) => {
3737
if (password.newPassword !== value) {
3838
callback(new Error(t('profile.password.diffPwd')))
3939
} else {
4040
callback()
4141
}
4242
}
43+
4344
const rules = reactive<FormRules>({
4445
oldPassword: [
4546
{ required: true, message: t('profile.password.oldPwdMsg'), trigger: 'blur' },
46-
{ min: 3, max: 5, message: t('profile.password.pwdRules'), trigger: 'blur' }
47+
{ min: 6, max: 20, message: t('profile.password.pwdRules'), trigger: 'blur' }
4748
],
4849
newPassword: [
4950
{ required: true, message: t('profile.password.newPwdMsg'), trigger: 'blur' },
@@ -54,6 +55,7 @@ const rules = reactive<FormRules>({
5455
{ required: true, validator: equalToPassword, trigger: 'blur' }
5556
]
5657
})
58+
5759
const submit = (formEl: FormInstance | undefined) => {
5860
if (!formEl) return
5961
formEl.validate(async (valid) => {
@@ -63,6 +65,7 @@ const submit = (formEl: FormInstance | undefined) => {
6365
}
6466
})
6567
}
68+
6669
const reset = (formEl: FormInstance | undefined) => {
6770
if (!formEl) return
6871
formEl.resetFields()

‎src/views/member/user/components/account-info.vue

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
<template>
2+
<el-descriptions :column="2">
3+
<el-descriptions-item>
4+
<template #label>
5+
<div class="cell-item"> 储值余额 </div>
6+
</template>
7+
{{ 0 }}
8+
</el-descriptions-item>
9+
<el-descriptions-item>
10+
<template #label>
11+
<div class="cell-item"> 现金余额 </div>
12+
</template>
13+
{{ 0 }}
14+
</el-descriptions-item>
15+
<el-descriptions-item>
16+
<template #label>
17+
<div class="cell-item"> 积分 </div>
18+
</template>
19+
{{ 0 }}
20+
</el-descriptions-item>
21+
<el-descriptions-item>
22+
<template #label>
23+
<div class="cell-item"> 成长值 </div>
24+
</template>
25+
{{ 0 }}
26+
</el-descriptions-item>
27+
</el-descriptions>
28+
</template>
29+
<script lang="ts" setup>
30+
import { defineComponent } from 'vue'
31+
32+
defineComponent({
33+
name: 'AccountInfo'
34+
})
35+
</script>
36+
<style scoped lang="scss">
37+
.cell-item {
38+
display: inline;
39+
}
40+
.cell-item::after {
41+
content: ':';
42+
}
43+
</style>

‎src/views/member/user/components/address-list.vue

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<script lang="ts">
2+
import { defineComponent } from 'vue'
3+
4+
export default defineComponent({
5+
name: 'AddressList'
6+
})
7+
</script>
8+
9+
<template>
10+
<div>收货地址列表</div>
11+
</template>
12+
13+
<style scoped lang="scss"></style>

‎src/views/member/user/components/balance-list.vue

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<script lang="ts">
2+
import { defineComponent } from 'vue'
3+
4+
export default defineComponent({
5+
name: 'BalanceList'
6+
})
7+
</script>
8+
9+
<template>
10+
<div>余额列表</div>
11+
</template>
12+
13+
<style scoped lang="scss"></style>

‎src/views/member/user/components/card-title.vue

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
<script lang="ts" setup>
2+
import { defineComponent } from 'vue'
3+
defineComponent({
4+
name: 'CardTitle'
5+
})
6+
const { title } = defineProps({
7+
title: {
8+
type: String,
9+
required: true
10+
}
11+
})
12+
</script>
13+
14+
<template>
15+
<span class="card-title">{{ title }}</span>
16+
</template>
17+
18+
<style scoped lang="scss">
19+
.card-title {
20+
font-size: 14px;
21+
font-weight: 600;
22+
&::before {
23+
content: '';
24+
display: inline-block;
25+
width: 3px;
26+
height: 14px;
27+
//background-color: #105cfb;
28+
background: var(--el-color-primary);
29+
position: relative;
30+
left: -5px;
31+
top: 8px;
32+
border-radius: 5px;
33+
transform: translateY(-50%);
34+
}
35+
}
36+
</style>

0 commit comments

Comments
 (0)