Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
飞
飞鹤小程序
Project
Project
Details
Activity
Releases
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
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
FH
飞鹤小程序
Commits
6813cd81
Commit
6813cd81
authored
Jun 13, 2025
by
黄韬
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '20250528-dev-ht' into 'dev'
fix: 修复注册后有宝宝信息不需填写 See merge request sparkprojects/20250528_FHQ1!36
parents
92033f33
51d0891b
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
8 deletions
+8
-8
my.js
mock/my.js
+1
-1
user.js
stores/user.js
+4
-1
My.vue
views/My.vue
+3
-6
No files found.
mock/my.js
View file @
6813cd81
...
@@ -47,7 +47,7 @@ export const myObj = {
...
@@ -47,7 +47,7 @@ export const myObj = {
"desc"
:
"宝宝体质测试"
,
"desc"
:
"宝宝体质测试"
,
"link"
:
{
"link"
:
{
"type"
:
3
,
"type"
:
3
,
"url"
:
"https://
www.baidu.com
"
,
"url"
:
"https://
ali.xudankeji.com/play/rCeXjMai
"
,
"extra"
:
{}
"extra"
:
{}
}
}
}
}
...
...
stores/user.js
View file @
6813cd81
...
@@ -61,7 +61,7 @@ export const useUserStore = defineStore("userInfo", {
...
@@ -61,7 +61,7 @@ export const useUserStore = defineStore("userInfo", {
* @param {Object} data : {encryptedData, iv, code}
* @param {Object} data : {encryptedData, iv, code}
* @returns
* @returns
*/
*/
async
phoneCallback
(
data
)
{
async
phoneCallback
(
data
,
onOpenRegisterFn
=
()
=>
{}
)
{
uni
.
login
({
uni
.
login
({
provider
:
"weixin"
,
provider
:
"weixin"
,
success
:
async
(
res
)
=>
{
success
:
async
(
res
)
=>
{
...
@@ -74,6 +74,9 @@ export const useUserStore = defineStore("userInfo", {
...
@@ -74,6 +74,9 @@ export const useUserStore = defineStore("userInfo", {
code
:
data
.
code
,
code
:
data
.
code
,
codeLogin
:
res
.
code
,
codeLogin
:
res
.
code
,
});
});
!
babyExistence
&&
onOpenRegisterFn
&&
onOpenRegisterFn
();
const
homeStore
=
useHomeStore
();
const
homeStore
=
useHomeStore
();
await
homeStore
.
setBabyExistence
(
babyExistence
);
await
homeStore
.
setBabyExistence
(
babyExistence
);
...
...
views/My.vue
View file @
6813cd81
...
@@ -173,7 +173,6 @@ const $baseUrl = proxy.$baseUrl;
...
@@ -173,7 +173,6 @@ const $baseUrl = proxy.$baseUrl;
const
userStore
=
useUserStore
();
const
userStore
=
useUserStore
();
const
pageCfgStore
=
usePageCfgStore
();
const
pageCfgStore
=
usePageCfgStore
();
const
cfgStatus
=
ref
({
const
cfgStatus
=
ref
({
openBabyCardDesc
:
false
,
openBabyCardDesc
:
false
,
showDetail
:
false
,
showDetail
:
false
,
...
@@ -233,8 +232,6 @@ const handleToolClick = async (item) => {
...
@@ -233,8 +232,6 @@ const handleToolClick = async (item) => {
const
{
sign
,
timestamp
,
appId
,
partnerUserId
,
env
}
=
res
.
data
;
const
{
sign
,
timestamp
,
appId
,
partnerUserId
,
env
}
=
res
.
data
;
console
.
log
(
'sign, timestamp, appId, partnerUserId:'
,
sign
,
timestamp
,
appId
,
partnerUserId
,
env
);
jump
({
jump
({
type
:
JumpType
.
MINI
,
type
:
JumpType
.
MINI
,
url
:
"/pages/partner/redirect"
,
url
:
"/pages/partner/redirect"
,
...
@@ -318,9 +315,9 @@ const getRealtimePhoneNumber = async (e) => {
...
@@ -318,9 +315,9 @@ const getRealtimePhoneNumber = async (e) => {
});
});
return
;
return
;
}
}
console
.
log
(
"detail"
,
e
.
detail
);
await
userStore
.
phoneCallback
(
e
.
detail
,
()
=>
{
await
userStore
.
phoneCallback
(
e
.
detail
)
;
showRegisterLayer
.
value
=
true
;
showRegisterLayer
.
value
=
true
;
})
;
};
};
const
handleChangeBaby
=
()
=>
{
const
handleChangeBaby
=
()
=>
{
...
...
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