Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
X
XiTianSenMall
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
leiqingsong
XiTianSenMall
Commits
e6b66912
Commit
e6b66912
authored
Mar 13, 2021
by
leiqingsong
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev_lqs' into 'master'
Dev lqs See merge request
!48
parents
2b3d6936
4d1e167f
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
77 additions
and
22 deletions
+77
-22
bank.js
H5/src/api/bank.js
+12
-1
user.js
H5/src/api/user.js
+14
-1
vant-ui.js
H5/src/plugins/vant-ui.js
+3
-1
bank.vue
H5/src/views/bank.vue
+32
-7
cash-out.vue
H5/src/views/cashOut/cash-out.vue
+5
-1
month-award.vue
H5/src/views/rewards/month-award.vue
+1
-1
settings.vue
H5/src/views/settings.vue
+10
-10
No files found.
H5/src/api/bank.js
View file @
e6b66912
...
...
@@ -55,7 +55,7 @@ export function cashOut(params) {
/**
* 获取用户银行卡信息
* @param {*} params
* @param {*} params
userId
* @returns
*/
export
function
getUserBankInfo
(
params
)
{
...
...
@@ -65,3 +65,14 @@ export function getUserBankInfo(params) {
params
});
}
/**
* 获取银行卡列表
* @returns
*/
export
function
getBankList
()
{
return
request
({
url
:
"/bank/getBankNameList"
,
method
:
"get"
})
}
H5/src/api/user.js
View file @
e6b66912
...
...
@@ -75,4 +75,17 @@ export function logout(token) {
url
:
"/api/user/info"
,
method
:
"post"
});
}
\ No newline at end of file
}
/**
* 获取用户信息
* @param {*} params userId
* @returns
*/
export
function
getUserInfo2
(
params
)
{
return
request
({
url
:
"/user/getByUserId"
,
method
:
"get"
,
params
})
}
H5/src/plugins/vant-ui.js
View file @
e6b66912
import
Vue
from
"vue"
;
import
{
ActionSheet
,
Button
,
Cell
,
CellGroup
,
...
...
@@ -24,7 +25,8 @@ import {
Loading
}
from
"vant"
;
Vue
.
use
(
Button
)
Vue
.
use
(
ActionSheet
)
.
use
(
Button
)
.
use
(
Cell
)
.
use
(
CellGroup
)
.
use
(
Dialog
)
...
...
H5/src/views/bank.vue
View file @
e6b66912
<
template
>
<div
class=
"bank"
>
<van-cell-group>
<van-
field
v-model=
"form.bankName"
label=
"所属银行
"
right-icon=
"arrow
"
<van-
cell
is-link
:value=
"form.bankName
"
title=
"所属银行
"
placeholder=
"请选择"
size=
"large"
readonly
@
click=
"sheetShow = true"
/>
<van-field
v-model=
"form.cardNumber"
...
...
@@ -31,15 +31,28 @@
@
click=
"addAndEditBankInfo"
>
编辑
</van-button
>
<van-popup
v-model=
"sheetShow"
round
position=
"bottom"
>
<van-picker
show-toolbar
title=
"请选择银行"
:columns=
"actions"
:default-index=
"2"
@
cancel=
"sheetShow = false"
@
confirm=
"onSelect"
/>
</van-popup>
<!--
<van-action-sheet
v-model=
"sheetShow"
:actions=
"actions"
@
select=
"onSelect"
/>
-->
</div>
</
template
>
<
script
>
import
{
getUserBankInfo
,
addUserBankInfo
,
editUserBankInfo
}
from
"@/api/bank"
;
import
{
getUserBankInfo
,
addUserBankInfo
,
editUserBankInfo
,
getBankList
}
from
"@/api/bank"
;
export
default
{
name
:
"Bank"
,
data
()
{
return
{
sheetShow
:
false
,
actions
:[],
form
:
{
bankName
:
""
,
cardNumber
:
""
,
...
...
@@ -49,9 +62,21 @@ export default {
};
},
mounted
()
{
this
.
getBank
();
this
.
getBankInfo
();
},
methods
:
{
onSelect
(
item
)
{
this
.
form
.
bankName
=
item
;
this
.
sheetShow
=
false
;
},
getBank
()
{
getBankList
().
then
(
res
=>
{
if
(
res
.
code
===
0
)
{
this
.
actions
=
res
.
data
;
}
})
},
addAndEditBankInfo
()
{
const
params
=
this
.
form
;
if
(
this
.
form
.
id
)
{
...
...
@@ -89,7 +114,7 @@ export default {
userId
:
this
.
$userId
};
getUserBankInfo
(
params
).
then
(
res
=>
{
if
(
res
.
code
===
0
)
{
if
(
res
.
code
===
0
&&
res
.
data
)
{
this
.
form
=
res
.
data
;
}
});
...
...
H5/src/views/cashOut/cash-out.vue
View file @
e6b66912
...
...
@@ -127,7 +127,11 @@ export default {
};
getUserBankInfo
(
params
).
then
(
res
=>
{
if
(
res
.
code
===
0
)
{
this
.
bank
=
res
.
data
.
bankName
;
if
(
res
.
data
.
bankName
)
{
this
.
bank
=
res
.
data
.
bankName
;
}
else
{
this
.
bank
=
""
;
}
}
});
},
...
...
H5/src/views/rewards/month-award.vue
View file @
e6b66912
...
...
@@ -38,7 +38,7 @@
:duration=
"3000"
style=
"font-weight: bold"
></countTo>
<p
style=
"font-size: 14px;color:#333333"
>
<p
v-if=
"awardInfo"
style=
"font-size: 14px;color:#333333"
>
历史累计奖金:¥
{{
awardInfo
.
awardTotal
.
toFixed
(
2
)
||
0
}}
</p>
</div>
...
...
H5/src/views/settings.vue
View file @
e6b66912
...
...
@@ -5,7 +5,7 @@
<van-cell
is-link
center
title=
"头像"
@
click=
"onModefy"
>
<img
class=
"avatar-img"
src=
"
"
:src=
"avatar
"
alt=
"头像"
/>
</van-cell>
...
...
@@ -13,7 +13,7 @@
<van-cell-group>
<van-cell
is-link
title=
"
邀请
人邀请码"
title=
"
推荐
人邀请码"
:value=
"inviteeCode"
@
click=
"fillInviterCode"
/>
...
...
@@ -46,7 +46,7 @@
</
template
>
<
script
>
// import { getUserInfo
} from "@/api/user";
import
{
getUserInfo2
}
from
"@/api/user"
;
import
{
logoutToApp
}
from
"@/utils/bridgeToAppFun"
;
import
{
logout
}
from
"@/api/user"
;
import
{
fillInviteCode
}
from
"@/api/user"
;
...
...
@@ -68,13 +68,13 @@ export default {
},
methods
:
{
getUser
()
{
const
user
=
JSON
.
parse
(
localStorage
.
getItem
(
'user'
));
console
.
log
(
user
);
// getUserInfo().then(res => {
// if (res.code === 0) {
//
localStorage.setItem("user", JSON.stringify(res.data));
//
}
//
})
getUserInfo2
().
then
(
res
=>
{
if
(
res
.
code
==
0
)
{
this
.
inviteeCode
=
res
.
data
.
inviteCode
;
this
.
avatar
=
'http://8.131.244.76:81/'
+
res
.
data
.
headImage
;
localStorage
.
setItem
(
"user"
,
JSON
.
stringify
(
res
.
data
));
}
})
},
logout
()
{
localStorage
.
removeItem
(
'token'
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment