Skip to content

Commit 2270753

Browse files
YunaiVgitee-org
authored andcommitted
!300 refactor: vue3 vxe table
Merge pull request !300 from xingyu/feature/vue3
2 parents caf33c8 + 22a02e3 commit 2270753

File tree

9 files changed

+27
-69
lines changed

9 files changed

+27
-69
lines changed

src/api/login.js

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,5 +126,23 @@ export function authorize(responseType, clientId, redirectUri, state,
126126
})
127127
}
128128

129+
// 获取验证图片 以及token
130+
export function reqGet(data) {
131+
return request({
132+
url: 'system/captcha/get',
133+
method: 'post',
134+
data
135+
})
136+
}
137+
138+
// 滑动或者点选验证
139+
export function reqCheck(data) {
140+
return request({
141+
url: '/system/captcha/check',
142+
method: 'post',
143+
data
144+
})
145+
}
146+
129147
export class socialBindLogin {
130148
}

src/components/RightToolbar/index.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,13 +92,13 @@ export default {
9292
};
9393
</script>
9494
<style lang="scss" scoped>
95-
::v-deep .el-transfer__button {
95+
:deep(.el-transfer__button) {
9696
border-radius: 50%;
9797
padding: 12px;
9898
display: block;
9999
margin-left: 0px;
100100
}
101-
::v-deep .el-transfer__button:first-child {
101+
:deep(.el-transfer__button:first-child) {
102102
margin-bottom: 10px;
103103
}
104104
</style>

src/components/Verifition/Verify/VerifyPoints.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
* */
6161
import { resetSize } from './../utils/util'
6262
import { aesEncrypt } from '@/utils/ase'
63-
import { reqGet, reqCheck } from './../api/index'
63+
import { reqGet, reqCheck } from '@/api/login'
6464
6565
export default {
6666
name: 'VerifyPoints',

src/components/Verifition/Verify/VerifySlide.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
* */
6565
import { aesEncrypt } from '@/utils/ase'
6666
import { resetSize } from './../utils/util'
67-
import { reqGet, reqCheck } from './../api/index'
67+
import { reqGet, reqCheck } from '@/api/login'
6868
6969
// "captchaType":"blockPuzzle",
7070
export default {

src/components/Verifition/api/index.js

Lines changed: 0 additions & 27 deletions
This file was deleted.

src/components/Verifition/utils/axios.js

Lines changed: 0 additions & 29 deletions
This file was deleted.

src/views/mall/trade/order/detail.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ export default {
244244
</script>
245245

246246
<style lang="scss" scoped>
247-
::v-deep .el-descriptions{
247+
:deep(.el-descriptions){
248248
&:not(:nth-child(1)) {
249249
margin-top: 20px;
250250
}

src/views/mall/trade/order/index.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,7 @@
332332
</script>
333333

334334
<style lang="scss" scoped>
335-
::v-deep .order-table{
335+
:deep(.order-table){
336336
margin-top: 20px;
337337
border-bottom: none;
338338
&::before{

src/views/system/notice/index.vue

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,9 @@
44
<el-form-item label="公告标题" prop="title">
55
<el-input v-model="queryParams.title" placeholder="请输入公告标题" clearable @keyup.enter.native="handleQuery"/>
66
</el-form-item>
7-
<el-form-item label="操作人员" prop="createBy">
8-
<el-input v-model="queryParams.createBy" placeholder="请输入操作人员" clearable @keyup.enter.native="handleQuery"/>
9-
</el-form-item>
10-
<el-form-item label="类型" prop="type">
11-
<el-select v-model="queryParams.type" placeholder="公告类型" clearable>
12-
<el-option v-for="dict in noticeTypeDictDatas" :key="parseInt(dict.value)" :label="dict.label" :value="parseInt(dict.value)"/>
7+
<el-form-item label="公告状态" prop="status">
8+
<el-select v-model="queryParams.status" placeholder="公告状态" clearable>
9+
<el-option v-for="dict in statusDictDatas" :key="parseInt(dict.value)" :label="dict.label" :value="parseInt(dict.value)"/>
1310
</el-select>
1411
</el-form-item>
1512
<el-form-item>
@@ -136,7 +133,6 @@ export default {
136133
pageNo: 1,
137134
pageSize: 10,
138135
title: undefined,
139-
createBy: undefined,
140136
status: undefined
141137
},
142138
// 表单参数

0 commit comments

Comments
 (0)