Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
T
take_order
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
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
和慭琛
take_order
Commits
6a9da170
Commit
6a9da170
authored
Mar 30, 2021
by
Facius
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev-photo-v2' of
https://git.banshouhui.com/heyinchen/take_order
into dev-photo-v2
parents
8beeb8ea
de64a660
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
767 additions
and
835 deletions
+767
-835
App.vue
take-order/App.vue
+352
-372
pages.json
take-order/pages.json
+6
-2
wxlogin.vue
take-order/pages/login/wxlogin.vue
+368
-420
login.js
take-order/utils/login.js
+41
-41
No files found.
take-order/App.vue
View file @
6a9da170
This diff is collapsed.
Click to expand it.
take-order/pages.json
View file @
6a9da170
...
...
@@ -124,8 +124,8 @@
{
"path"
:
"pages/photo/setting"
,
"style"
:
{
"navigationBarTitleText"
:
"水印设置"
,
"navigationBarBackgroundColor"
:
"#FFFFFF"
,
"navigationBarTitleText"
:
"水印设置"
,
"navigationBarBackgroundColor"
:
"#FFFFFF"
,
"backgroundColor"
:
"#F4F5F7"
//
"navigationBarBackgroundColor"
:
"#333333"
,
//
"navigationBarTextStyle"
:
"#FFFFFF"
,
...
...
@@ -288,6 +288,10 @@
"name"
:
"照片预览"
,
//模式名称
"path"
:
"pages/photo/preview"
,
//启动页面,必选
"query"
:
"standardId=1&img=https://papers.co/wallpaper/papers.co-bk57-art-illust-girl-pink-tomboy-red-6-wallpaper.jpg"
//启动参数,在页面的onLoad函数里面得到
},{
"name"
:
"授权登录"
,
"path"
:
"pages/login/wxlogin"
,
"query"
:
""
}]
}
}
take-order/pages/login/wxlogin.vue
View file @
6a9da170
This diff is collapsed.
Click to expand it.
take-order/utils/login.js
View file @
6a9da170
...
...
@@ -4,7 +4,7 @@ const app = getApp();
function
appLogin
()
{
return
new
Promise
(
function
(
resolve
,
reject
)
{
uni
.
login
({
success
:
res
=>
{
success
(
res
)
{
if
(
!
res
.
code
)
{
uni
.
hideLoading
();
uni
.
showModal
({
...
...
@@ -17,7 +17,7 @@ function appLogin() {
fail
()
{
uni
.
hideLoading
();
uni
.
showModal
({
content
:
'登录失败'
,
content
:
'
小程序
登录失败'
,
showCancel
:
false
});
reject
();
...
...
@@ -28,51 +28,51 @@ function appLogin() {
// 小程序授权
function
authorization
(
data
)
{
return
new
Promise
(
function
(
resolve
,
reject
)
{
data
=
data
||
{}
const
res
=
await
app
.
$u
.
api
.
loginWechatAuth
(
data
)
if
(
res
&&
res
.
status
)
{
let
data
=
res
.
data
app
.
setUserData
(
data
)
uni
.
hideLoading
();
resolve
(
res
);
}
else
()
{
uni
.
hideLoading
();
uni
.
showModal
({
title
:
'请求失败'
,
content
:
err
.
message
,
showCancel
:
false
});
reject
();
},
return
new
Promise
(
async
function
(
resolve
,
reject
)
{
const
res
=
await
app
.
$vm
.
$u
.
api
.
loginWechatAuth
(
data
)
if
(
res
)
{
if
(
res
.
code
==
200
&&
res
.
data
)
{
app
.
setUserData
(
res
.
data
)
resolve
(
res
);
}
else
{
uni
.
showModal
({
title
:
'用户登录失败'
,
content
:
res
.
message
,
showCancel
:
false
});
reject
(
res
);
}
}
else
{
uni
.
showModal
({
title
:
'请求失败'
,
content
:
res
.
message
});
}
});
}
// 小程序注册
function
signup
(
data
)
{
return
new
Promise
(
function
(
resolve
,
reject
)
{
const
res
=
await
app
.
$u
.
api
.
loginWechatAuth
(
data
)
api
.
request
(
'login/signup-login'
,
{
method
:
"post"
,
data
:
{
code
:
data
.
code
,
encryptedData
:
data
.
encryptedData
,
iv
:
data
.
iv
},
success
:
function
(
res
)
{
if
(
res
&&
res
.
status
)
{
let
data
=
res
.
data
app
.
setUserData
(
data
)
resolve
(
res
);
}
else
{
if
(
!
res
.
status
&&
res
.
message
===
'用户授权信息失效,请重新授权'
){
api
.
setAuthToken
(
''
)
}
resolve
(
res
);
}
return
new
Promise
(
async
function
(
resolve
,
reject
)
{
const
res
=
await
app
.
$vm
.
$u
.
api
.
loginWechatAuth
(
data
)
if
(
res
)
{
if
(
res
.
code
==
200
&&
res
.
data
)
{
app
.
setUserData
(
res
.
data
)
resolve
(
res
);
}
else
{
uni
.
showModal
({
title
:
'用户授权失败'
,
content
:
res
.
message
,
showCancel
:
false
});
reject
(
res
);
}
});
}
else
{
uni
.
showModal
({
title
:
'请求失败'
,
content
:
res
.
message
});
}
});
}
...
...
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