Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Sign in / Register
Toggle navigation
X
xinya_mini
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
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
xwq
xinya_mini
Commits
e19bf6f9
Commit
e19bf6f9
authored
Apr 26, 2021
by
xwq
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
log注释
parent
96d56f4b
Changes
9
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
20 additions
and
20 deletions
+20
-20
BabyManager.js
jade/BabyManager.js
+1
-1
BasePage.js
jade/BasePage.js
+5
-5
MiniProgramConfig.js
jade/MiniProgramConfig.js
+1
-1
Object.js
jade/Object.js
+1
-1
UploadFileManager.js
jade/UploadFileManager.js
+1
-1
UserManager.js
jade/UserManager.js
+3
-3
displayAnswers.js
pages/displayAnswers/displayAnswers.js
+5
-5
photo.js
pages/photo/photo.js
+2
-2
takePhoto.js
pages/takePhoto/takePhoto.js
+1
-1
No files found.
jade/BabyManager.js
View file @
e19bf6f9
...
@@ -107,7 +107,7 @@ Jade.BabyManager = class extends Jade.Object {
...
@@ -107,7 +107,7 @@ Jade.BabyManager = class extends Jade.Object {
url
:
getUrl
(
"
babies.json
"
),
url
:
getUrl
(
"
babies.json
"
),
success
:
(
result
)
=>
{
success
:
(
result
)
=>
{
// this.clearBaby()
// this.clearBaby()
console
.
log
(
'
---------
'
,
result
.
data
)
//
console.log('---------',result.data)
if
(
typeof
result
.
data
===
"
object
"
)
{
if
(
typeof
result
.
data
===
"
object
"
)
{
this
.
setBaby
(
result
.
data
)
this
.
setBaby
(
result
.
data
)
}
else
{
}
else
{
...
...
jade/BasePage.js
View file @
e19bf6f9
...
@@ -41,7 +41,7 @@ Jade.BasePage = class extends Jade.Page {
...
@@ -41,7 +41,7 @@ Jade.BasePage = class extends Jade.Page {
if
(
!
babyManager
.
checkBaby
())
{
if
(
!
babyManager
.
checkBaby
())
{
wx
.
navigateTo
({
url
:
'
/pages/users/BabyInfo
'
})
wx
.
navigateTo
({
url
:
'
/pages/users/BabyInfo
'
})
}
else
{
}
else
{
console
.
log
(
'
congls! you got a baby!
'
)
//
console.log('congls! you got a baby!')
}
}
})
})
let
onChangeCallback
=
this
.
networkChangeDelegate
()
let
onChangeCallback
=
this
.
networkChangeDelegate
()
...
@@ -131,7 +131,7 @@ Jade.BasePage = class extends Jade.Page {
...
@@ -131,7 +131,7 @@ Jade.BasePage = class extends Jade.Page {
let
um
=
Jade
.
UserManager
.
getInstance
()
let
um
=
Jade
.
UserManager
.
getInstance
()
um
.
executeAfterAuthenticated
(()
=>
{
um
.
executeAfterAuthenticated
(()
=>
{
this
.
checkReview
().
then
(
isReview
=>
{
this
.
checkReview
().
then
(
isReview
=>
{
console
.
log
(
"
isReview
"
,
isReview
)
//
console.log("isReview", isReview)
if
(
!
isReview
)
{
if
(
!
isReview
)
{
this
.
fetchBuyInfo
(
callback
)
this
.
fetchBuyInfo
(
callback
)
}
}
...
@@ -187,7 +187,7 @@ Jade.BasePage = class extends Jade.Page {
...
@@ -187,7 +187,7 @@ Jade.BasePage = class extends Jade.Page {
url
:
getUrl
(
`users/find_order.json?productable_type=TrainingCamp&productable_id=
${
1
}
`
),
url
:
getUrl
(
`users/find_order.json?productable_type=TrainingCamp&productable_id=
${
1
}
`
),
success
:
result
=>
{
success
:
result
=>
{
wx
.
hideLoading
()
wx
.
hideLoading
()
console
.
log
(
result
)
//
console.log(result)
if
(
result
.
data
.
is_bought
&&
result
.
data
.
has_address
)
{
if
(
result
.
data
.
is_bought
&&
result
.
data
.
has_address
)
{
var
userManager
=
Jade
.
UserManager
.
getInstance
()
var
userManager
=
Jade
.
UserManager
.
getInstance
()
var
currentUser
=
userManager
.
getUser
()
var
currentUser
=
userManager
.
getUser
()
...
@@ -202,14 +202,14 @@ Jade.BasePage = class extends Jade.Page {
...
@@ -202,14 +202,14 @@ Jade.BasePage = class extends Jade.Page {
}
}
}
}
let
paramsString
=
JSON
.
stringify
(
params
)
let
paramsString
=
JSON
.
stringify
(
params
)
console
.
log
(
paramsString
)
//
console.log(paramsString)
wx
.
redirectTo
({
wx
.
redirectTo
({
url
:
`/pages/webView/webView?url=
${
paramsString
}
`
url
:
`/pages/webView/webView?url=
${
paramsString
}
`
})
})
}
}
},
},
fail
:
err
=>
{
fail
:
err
=>
{
console
.
log
(
err
)
//
console.log(err)
wx
.
hideLoading
()
wx
.
hideLoading
()
wx
.
showToast
({
wx
.
showToast
({
title
:
err
.
errMsg
,
title
:
err
.
errMsg
,
...
...
jade/MiniProgramConfig.js
View file @
e19bf6f9
...
@@ -29,7 +29,7 @@ Jade.MiniProgramConfig = class extends Jade.Object {
...
@@ -29,7 +29,7 @@ Jade.MiniProgramConfig = class extends Jade.Object {
let
self
=
this
let
self
=
this
return
new
Promise
(
function
(
resolve
,
reject
)
{
return
new
Promise
(
function
(
resolve
,
reject
)
{
const
key
=
[
"
miniProgramReviewVersion
"
,
"
miniProgramOnlineVersion
"
].
join
(
'
,
'
)
const
key
=
[
"
miniProgramReviewVersion
"
,
"
miniProgramOnlineVersion
"
].
join
(
'
,
'
)
console
.
log
(
key
)
//
console.log(key)
request
.
XYRequest
({
request
.
XYRequest
({
url
:
request
.
getUrlAbs
(
`/api/system_configs.json?config_key=
${
key
}
`
)
url
:
request
.
getUrlAbs
(
`/api/system_configs.json?config_key=
${
key
}
`
)
}).
then
(
res
=>
{
}).
then
(
res
=>
{
...
...
jade/Object.js
View file @
e19bf6f9
...
@@ -12,7 +12,7 @@ Jade.Object = class {
...
@@ -12,7 +12,7 @@ Jade.Object = class {
}
}
info
(
msg
)
{
info
(
msg
)
{
console
.
log
(
`
${
this
.
getClass
().
className
}
:
${
msg
}
`
)
//
console.log(`${this.getClass().className}: ${msg}`)
}
}
warn
(
msg
)
{
warn
(
msg
)
{
...
...
jade/UploadFileManager.js
View file @
e19bf6f9
...
@@ -59,7 +59,7 @@ Jade.UploadFileManager = class extends Jade.Object {
...
@@ -59,7 +59,7 @@ Jade.UploadFileManager = class extends Jade.Object {
resolve
(
res
)
resolve
(
res
)
},
},
fail
:
error
=>
{
fail
:
error
=>
{
console
.
log
(
error
)
//
console.log(error)
reject
(
error
)
reject
(
error
)
},
},
complete
:
()
=>
{
complete
:
()
=>
{
...
...
jade/UserManager.js
View file @
e19bf6f9
...
@@ -121,7 +121,7 @@ Jade.UserManager = class extends Jade.Object {
...
@@ -121,7 +121,7 @@ Jade.UserManager = class extends Jade.Object {
wx
.
getUserInfo
({
wx
.
getUserInfo
({
withCredentials
:
true
,
withCredentials
:
true
,
success
:
res
=>
{
success
:
res
=>
{
console
.
log
(
'
getUserInfo
'
)
//
console.log('getUserInfo')
wx
.
request
({
wx
.
request
({
url
:
getUrl
(
"
users/sign_in.json
"
),
url
:
getUrl
(
"
users/sign_in.json
"
),
method
:
'
POST
'
,
method
:
'
POST
'
,
...
@@ -160,12 +160,12 @@ Jade.UserManager = class extends Jade.Object {
...
@@ -160,12 +160,12 @@ Jade.UserManager = class extends Jade.Object {
var
pages
=
getCurrentPages
()
var
pages
=
getCurrentPages
()
var
currentPage
=
pages
[
pages
.
length
-
1
]
var
currentPage
=
pages
[
pages
.
length
-
1
]
if
(
currentPage
.
route
==
'
pages/study_package_activities/studyPackageActivityList
'
||
currentPage
.
route
==
'
pages/webView/webView
'
)
{
if
(
currentPage
.
route
==
'
pages/study_package_activities/studyPackageActivityList
'
||
currentPage
.
route
==
'
pages/webView/webView
'
)
{
console
.
log
(
'
authorizeDialog NavigateTo
'
)
//
console.log('authorizeDialog NavigateTo')
wx
.
navigateTo
({
wx
.
navigateTo
({
url
:
`/pages/AuthorizeDialog/AuthorizeDialog?code=
${
code
}
&objc=UserManager`
url
:
`/pages/AuthorizeDialog/AuthorizeDialog?code=
${
code
}
&objc=UserManager`
})
})
}
else
{
}
else
{
console
.
log
(
'
authorizeDialog redirectTo
'
)
//
console.log('authorizeDialog redirectTo')
wx
.
redirectTo
({
wx
.
redirectTo
({
url
:
`/pages/AuthorizeDialog/AuthorizeDialog?code=
${
code
}
&objc=UserManager`
url
:
`/pages/AuthorizeDialog/AuthorizeDialog?code=
${
code
}
&objc=UserManager`
})
})
...
...
pages/displayAnswers/displayAnswers.js
View file @
e19bf6f9
...
@@ -52,7 +52,7 @@ Page({
...
@@ -52,7 +52,7 @@ Page({
true
true
)
)
.
then
((
res
)
=>
{
.
then
((
res
)
=>
{
console
.
log
(
"
detectAnswer
"
,
res
,
"
=============
"
,
wx
.
getStorageSync
(
"
result
"
));
//
console.log("detectAnswer", res,"=============",wx.getStorageSync("result"));
// const ret = JSON.parse(wx.getStorageSync("result"));
// const ret = JSON.parse(wx.getStorageSync("result"));
const
baby
=
wx
.
getStorageSync
(
"
baby
"
);
const
baby
=
wx
.
getStorageSync
(
"
baby
"
);
// const exerciseBookId = ret.exerciseBookId;
// const exerciseBookId = ret.exerciseBookId;
...
@@ -147,7 +147,7 @@ Page({
...
@@ -147,7 +147,7 @@ Page({
wx
.
showLoading
({
wx
.
showLoading
({
title
:
"
结果加载中
"
,
title
:
"
结果加载中
"
,
});
});
console
.
log
(
options
.
photo
,
"
=====
"
,
hosts
);
//
console.log(options.photo,"=====",hosts);
const
context
=
wx
.
createCanvasContext
(
"
photo_answer
"
);
const
context
=
wx
.
createCanvasContext
(
"
photo_answer
"
);
let
radio
;
let
radio
;
...
@@ -163,7 +163,7 @@ Page({
...
@@ -163,7 +163,7 @@ Page({
})
})
.
then
((
tempPath
)
=>
this
.
detectAnswer
(
tempPath
))
.
then
((
tempPath
)
=>
this
.
detectAnswer
(
tempPath
))
.
then
((
ret
)
=>
{
.
then
((
ret
)
=>
{
console
.
log
(
"
ret
"
,
ret
);
//
console.log("ret", ret);
return
Promise
.
all
([
return
Promise
.
all
([
this
.
getImageInfopromised
(
"
../../assets/images/correct.png
"
),
this
.
getImageInfopromised
(
"
../../assets/images/correct.png
"
),
this
.
getImageInfopromised
(
"
../../assets/images/error.png
"
),
this
.
getImageInfopromised
(
"
../../assets/images/error.png
"
),
...
@@ -222,7 +222,7 @@ Page({
...
@@ -222,7 +222,7 @@ Page({
fileType
:
"
jpg
"
,
fileType
:
"
jpg
"
,
success
:
(
pic
)
=>
{
success
:
(
pic
)
=>
{
const
tempFilePath
=
pic
.
tempFilePath
;
const
tempFilePath
=
pic
.
tempFilePath
;
console
.
log
(
tempFilePath
);
//
console.log(tempFilePath);
const
umf
=
UploadFileManager
.
getInstance
();
const
umf
=
UploadFileManager
.
getInstance
();
umf
umf
.
uploadFile
(
.
uploadFile
(
...
@@ -242,7 +242,7 @@ Page({
...
@@ -242,7 +242,7 @@ Page({
.
catch
(
reject
);
.
catch
(
reject
);
},
},
fail
:
(
e
)
=>
{
fail
:
(
e
)
=>
{
console
.
log
(
e
);
//
console.log(e);
reject
(
e
);
reject
(
e
);
},
},
});
});
...
...
pages/photo/photo.js
View file @
e19bf6f9
...
@@ -24,12 +24,12 @@ Page({
...
@@ -24,12 +24,12 @@ Page({
if
(
res
.
confirm
)
{
if
(
res
.
confirm
)
{
wx
.
login
({
wx
.
login
({
success
:
res
=>
{
success
:
res
=>
{
console
.
log
(
res
,
"
---------登录
"
);
//
console.log(res,"---------登录");
var
code
=
res
.
code
var
code
=
res
.
code
wx
.
getUserInfo
({
wx
.
getUserInfo
({
withCredentials
:
true
,
withCredentials
:
true
,
success
:
res
=>
{
success
:
res
=>
{
console
.
log
(
'
getUserInfo
'
)
//
console.log('getUserInfo')
wx
.
request
({
wx
.
request
({
url
:
Jade
.
getUrl
(
"
users/sign_in.json
"
),
url
:
Jade
.
getUrl
(
"
users/sign_in.json
"
),
method
:
'
POST
'
,
method
:
'
POST
'
,
...
...
pages/takePhoto/takePhoto.js
View file @
e19bf6f9
...
@@ -46,7 +46,7 @@ Page({
...
@@ -46,7 +46,7 @@ Page({
// this.setData({
// this.setData({
// cameraError: "摄像头打开错误, 请重启小程序,如需拍照检查,请允许摄像头授权"
// cameraError: "摄像头打开错误, 请重启小程序,如需拍照检查,请允许摄像头授权"
// })
// })
console
.
log
(
e
.
detail
)
//
console.log(e.detail)
},
},
/**
/**
...
...
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