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
Show 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
<
style
lang=
"scss"
>
<
style
lang=
"scss"
>
@import
'@/common/index.scss'
;
@import
'@/common/index.scss'
;
@import
'uview-ui/index.scss'
;
@import
'uview-ui/index.scss'
;
</
style
>
</
style
>
<
script
>
<
script
>
import
{
import
{
AnalysysAgent
AnalysysAgent
}
from
'@/utils/analysys_paas.js'
}
from
'@/utils/analysys_paas.js'
import
util
from
'@/utils/util.js'
import
util
from
'@/utils/util.js'
export
default
{
export
default
{
globalData
:
{
globalData
:
{
//https://system.banshouhui.com
//https://system.banshouhui.com
...
@@ -25,113 +25,111 @@
...
@@ -25,113 +25,111 @@
//小青本地环境
//小青本地环境
//domain_Name: 'http://192.168.0.208:37080',
//domain_Name: 'http://192.168.0.208:37080',
token
:
''
,
token
:
''
,
//RTOKEN45f41a3053238cb72b3b72fe14df8d7040c9f502
//RTOKEN45f41a3053238cb72b3b72fe14df8d7040c9f502
//定位 图标
//定位 图标
icon_location
:
'https://qn-static.banshouhui.com/take_order/icon/location.png'
,
icon_location
:
'https://qn-static.banshouhui.com/take_order/icon/location.png'
,
//首页提示 图标
//首页提示 图标
icon_index_notice
:
'https://qn-static.banshouhui.com/index_notice.png'
,
icon_index_notice
:
'https://qn-static.banshouhui.com/index_notice.png'
,
//授权提示 图标
//授权提示 图标
icon_auth_notice
:
'https://qn-static.banshouhui.com/auth_notice.png'
,
icon_auth_notice
:
'https://qn-static.banshouhui.com/auth_notice.png'
,
//勾选确认 图标
//勾选确认 图标
icon_agree_yes
:
'https://qn-static.banshouhui.com/agree_yes.png'
,
icon_agree_yes
:
'https://qn-static.banshouhui.com/agree_yes.png'
,
//勾选取消 图标
//勾选取消 图标
icon_agrss_no
:
'https://qn-static.banshouhui.com/agree_no.png'
,
icon_agrss_no
:
'https://qn-static.banshouhui.com/agree_no.png'
,
//无数据 图标
//无数据 图标
icon_noData
:
'https://qn-static.banshouhui.com/empty.png'
,
icon_noData
:
'https://qn-static.banshouhui.com/empty.png'
,
//抢单 图标
//抢单 图标
icon_rob
:
'https://qn-static.banshouhui.com/take_order/icon/rob.png'
,
icon_rob
:
'https://qn-static.banshouhui.com/take_order/icon/rob.png'
,
//右箭头 图标
//右箭头 图标
icon_arrow_right
:
'https://qn-static.banshouhui.com/arrow_right.png'
,
icon_arrow_right
:
'https://qn-static.banshouhui.com/arrow_right.png'
,
//照片添加 图标
//照片添加 图标
icon_photo_add
:
'https://qn-static.banshouhui.com/take_order/icon/photo_add.png'
,
icon_photo_add
:
'https://qn-static.banshouhui.com/take_order/icon/photo_add.png'
,
//关闭 图标
//关闭 图标
icon_close
:
'https://qn-static.banshouhui.com/close.png'
,
icon_close
:
'https://qn-static.banshouhui.com/close.png'
,
//顶部 图标
//顶部 图标
icon_top
:
'https://qn-static.banshouhui.com/topIcon.png'
,
icon_top
:
'https://qn-static.banshouhui.com/topIcon.png'
,
//我的 图标
//我的 图标
icon_mine
:
'https://qn-static.banshouhui.com/mine.png'
,
icon_mine
:
'https://qn-static.banshouhui.com/mine.png'
,
//三角形向下 图标
//三角形向下 图标
icon_trangle_down
:
'https://qn-static.banshouhui.com/trangle_down.png'
,
icon_trangle_down
:
'https://qn-static.banshouhui.com/trangle_down.png'
,
//i 图标
//i 图标
icon_i
:
'https://qn-static.banshouhui.com/i.png'
,
icon_i
:
'https://qn-static.banshouhui.com/i.png'
,
//客服 图片
//客服 图片
icon_customer_service
:
'https://qn-static.banshouhui.com/customer-service.png'
,
icon_customer_service
:
'https://qn-static.banshouhui.com/customer-service.png'
,
//三角形向上 图标
//三角形向上 图标
icon_trangle_up
:
'https://qn-static.banshouhui.com/trangle_up.png'
,
icon_trangle_up
:
'https://qn-static.banshouhui.com/trangle_up.png'
,
//勾选 图标
//勾选 图标
icon_selected
:
'https://qn-static.banshouhui.com/selected.png'
,
icon_selected
:
'https://qn-static.banshouhui.com/selected.png'
,
//关闭新 图标
//关闭新 图标
icon_close_new
:
'https://qn-static.banshouhui.com/close_new.png'
,
icon_close_new
:
'https://qn-static.banshouhui.com/close_new.png'
,
//授权提示新 图标
//授权提示新 图标
icon_auth_notice_new
:
'https://qn-static.banshouhui.com/auth_notice_new.png'
,
icon_auth_notice_new
:
'https://qn-static.banshouhui.com/auth_notice_new.png'
,
//登录注册页--
//登录注册页--
//通过code获取用户信息(登录)
//通过code获取用户信息(登录)
getUsersByCode
:
'/wxh-support-rest/rest/ssoinfo/v3/getUsersByCode'
,
getUsersByCode
:
'/wxh-support-rest/rest/ssoinfo/v3/getUsersByCode'
,
//通过手机号获取用户信息(注册并登录)
//通过手机号获取用户信息(注册并登录)
findByMobile
:
'/wxh-support-rest/rest/ssoinfo/v3/findByMobile'
,
findByMobile
:
'/wxh-support-rest/rest/ssoinfo/v3/findByMobile'
,
//下单模块--
//下单模块--
//立即下单
//立即下单
createAppletsOrder
:
''
,
createAppletsOrder
:
''
,
//下单列表
//下单列表
createOrderList
:
''
,
createOrderList
:
''
,
//接单模块--
//接单模块--
//抢单广场
//抢单广场
grabbing
:
''
,
grabbing
:
''
,
//检查抢单用户状态
//检查抢单用户状态
checkRobStatus
:
''
,
checkRobStatus
:
''
,
///wxh-worker-rest/rest/order/revision/applets/{token}/order/check
///wxh-worker-rest/rest/order/revision/applets/{token}/order/check
//工单列表
//工单列表
workOrderList
:
''
,
workOrderList
:
''
,
//工单详情
//工单详情
workOrderDetail
:
''
,
workOrderDetail
:
''
,
//预约 V2
//预约 V2
orderReserve
:
''
,
orderReserve
:
''
,
//工单完工
//工单完工
configCompletion
:
''
,
configCompletion
:
''
,
protocolContent
:
''
,
protocolContent
:
''
,
signUrl
:
''
,
signUrl
:
''
,
jumpLoginStatus
:
true
,
jumpLoginStatus
:
true
,
settleRecommend
:
''
,
settleRecommend
:
''
,
navHeight
:
0
,
//导航栏高度
navHeight
:
0
,
//导航栏高度
rpxScreenHeight
:
0
,
// 照相视框高度
rpxScreenHeight
:
0
,
// 照相视框高度
//拍照相关数据
//拍照相关数据
photo
:
{
photo
:
{
product
:
{
product
:
{
brandId
:
''
,
// 品牌id
brandId
:
''
,
// 品牌id
brandName
:
''
,
// 品牌名称
brandName
:
''
,
// 品牌名称
classifyId
:
''
,
// 分类id
classifyId
:
''
,
// 分类id
systemId
:
''
,
// 系统id
systemId
:
''
,
// 系统id
},
},
currentItemLength
:
0
,
//已拍摄照片张数
currentItemLength
:
0
,
//已拍摄照片张数
productList
:
[],
productList
:
[],
currentItem
:
null
,
// 选择的某一项
currentItem
:
null
,
// 选择的某一项
setting
:
null
,
//自定义设置
setting
:
null
,
//自定义设置
waterSetting
:
null
,
// 水印设置
waterSetting
:
null
,
// 水印设置
tempPath
:
{
tempPath
:
{
origin
:
''
,
// 缓存拍照图片
origin
:
''
,
// 缓存拍照图片
mixWater
:
''
// 缓存水印拍照图片
mixWater
:
''
// 缓存水印拍照图片
}
}
},
},
// 用户信息
// 用户信息
tempUserInfo
:
''
,
// 临时用户选项
tempUserInfo
:
''
,
// 临时用户选项
userInfo
:
''
,
// 用户信息
authLoading
:
false
,
},
},
onLaunch
:
function
()
{
onLaunch
:
function
()
{
this
.
getSystemInfo
()
this
.
getSystemInfo
()
this
.
checkUpdate
()
this
.
checkUpdate
()
var
that
=
this
var
that
=
this
that
.
globalData
.
token
=
util
.
getToken
()
that
.
globalData
.
token
=
util
.
getToken
()
console
.
log
(
that
.
globalData
.
token
,
'that.globalData.token'
)
console
.
log
(
that
.
globalData
.
token
,
'that.globalData.token'
)
that
.
initAPIneedToken
()
that
.
initAPIneedToken
()
// uni.getStorage({
// uni.getStorage({
// key: 'token',
// key: 'token',
...
@@ -145,18 +143,16 @@
...
@@ -145,18 +143,16 @@
this
.
getProtocolContent
()
this
.
getProtocolContent
()
AnalysysAgent
.
registerSuperProperty
(
"platform"
,
"take-order"
);
AnalysysAgent
.
registerSuperProperty
(
"platform"
,
"take-order"
);
},
},
onShow
:
function
()
{
onShow
:
function
()
{
if
(
this
.
globalData
.
token
)
{
if
(
!
this
.
globalData
.
token
)
{
this
.
globalData
.
authLoading
=
false
}
else
{
this
.
autoLogin
()
this
.
autoLogin
()
}
}
},
},
methods
:
{
methods
:
{
getSystemInfo
()
{
getSystemInfo
()
{
try
{
try
{
let
a
=
wx
.
getSystemInfoSync
();
let
a
=
wx
.
getSystemInfoSync
();
...
@@ -167,7 +163,8 @@
...
@@ -167,7 +163,8 @@
this
.
globalData
.
navHeight
=
a
.
statusBarHeight
/
a
.
screenWidth
*
750
+
90
this
.
globalData
.
navHeight
=
a
.
statusBarHeight
/
a
.
screenWidth
*
750
+
90
this
.
globalData
.
rpxScreenHeight
=
a
.
screenHeight
/
a
.
screenWidth
*
750
this
.
globalData
.
rpxScreenHeight
=
a
.
screenHeight
/
a
.
screenWidth
*
750
this
.
globalData
.
screenHeight
=
a
.
screenHeight
this
.
globalData
.
screenHeight
=
a
.
screenHeight
}
catch
(
a
)
{}
}
catch
(
a
)
{
}
},
},
//检查更新
//检查更新
checkUpdate
:
function
()
{
checkUpdate
:
function
()
{
...
@@ -196,13 +193,13 @@
...
@@ -196,13 +193,13 @@
})
})
},
},
async
getBaseInfo
(
vm
,
callBack
)
{
async
getBaseInfo
(
vm
,
callBack
)
{
uni
.
showLoading
({
uni
.
showLoading
({
title
:
'加载中……'
title
:
'加载中……'
})
})
const
res
=
await
vm
.
$u
.
api
.
getSettleBaseInfo
()
const
res
=
await
vm
.
$u
.
api
.
getSettleBaseInfo
()
if
(
!
res
||
!
res
.
status
)
{
if
(
!
res
||
!
res
.
status
)
{
if
(
res
&&
res
.
message
)
{
if
(
res
&&
res
.
message
)
{
uni
.
showToast
({
uni
.
showToast
({
title
:
res
&&
res
.
message
||
'获取基本信息错误'
,
title
:
res
&&
res
.
message
||
'获取基本信息错误'
,
icon
:
'none'
icon
:
'none'
...
@@ -211,45 +208,45 @@
...
@@ -211,45 +208,45 @@
return
false
;
return
false
;
}
}
this
.
globalData
.
settledInfo
=
res
.
data
this
.
globalData
.
settledInfo
=
res
.
data
if
(
!
res
.
data
)
{
if
(
!
res
.
data
)
{
return
return
}
}
callBack
(
vm
,
res
.
data
)
callBack
(
vm
,
res
.
data
)
uni
.
hideLoading
()
uni
.
hideLoading
()
return
res
.
data
return
res
.
data
},
},
initAPIneedToken
:
function
()
{
initAPIneedToken
:
function
()
{
//RTOKEN45f41a3053238cb72b3b72fe14df8d7040c9f502
//RTOKEN45f41a3053238cb72b3b72fe14df8d7040c9f502
///*
///*
if
(
this
.
globalData
.
token
)
{
if
(
this
.
globalData
.
token
)
{
//console.log('initAPIneedToken')
//console.log('initAPIneedToken')
//下单模块--
//下单模块--
//立即下单
//立即下单
this
.
globalData
.
createAppletsOrder
=
'/wxh-worker-rest/rest/order/revision/applets/'
this
.
globalData
.
createAppletsOrder
=
'/wxh-worker-rest/rest/order/revision/applets/'
+
this
.
globalData
.
token
+
'/order/createAppletsOrder'
,
+
this
.
globalData
.
token
+
'/order/createAppletsOrder'
,
//console.log('立即下单'+this.globalData.createAppletsOrder)
//console.log('立即下单'+this.globalData.createAppletsOrder)
//下单列表
//下单列表
this
.
globalData
.
createOrderList
=
'/wxh-worker-rest/rest/order/revision/applets/'
this
.
globalData
.
createOrderList
=
'/wxh-worker-rest/rest/order/revision/applets/'
+
this
.
globalData
.
token
+
'/order/customer'
+
this
.
globalData
.
token
+
'/order/customer'
//console.log('下单列表'+this.globalData.createOrderList)
//console.log('下单列表'+this.globalData.createOrderList)
//接单模块--
//接单模块--
//抢单广场
//抢单广场
this
.
globalData
.
grabbing
=
'/wxh-worker-rest/rest/order/revision/applets/'
this
.
globalData
.
grabbing
=
'/wxh-worker-rest/rest/order/revision/applets/'
+
this
.
globalData
.
token
+
'/order/grabbing'
+
this
.
globalData
.
token
+
'/order/grabbing'
//console.log('抢单广场'+this.globalData.grabbing)
//console.log('抢单广场'+this.globalData.grabbing)
//检查抢单用户状态
//检查抢单用户状态
this
.
globalData
.
checkRobStatus
=
'/wxh-worker-rest/rest/order/revision/applets/'
this
.
globalData
.
checkRobStatus
=
'/wxh-worker-rest/rest/order/revision/applets/'
+
this
.
globalData
.
token
+
'/order/check'
,
+
this
.
globalData
.
token
+
'/order/check'
,
//console.log('检查抢单用户状态'+this.globalData.checkRobStatus)
//console.log('检查抢单用户状态'+this.globalData.checkRobStatus)
//工单列表
//工单列表
this
.
globalData
.
workOrderList
=
'/wxh-worker-rest/rest/order/revision/applets/'
this
.
globalData
.
workOrderList
=
'/wxh-worker-rest/rest/order/revision/applets/'
+
this
.
globalData
.
token
+
'/order/worker'
,
+
this
.
globalData
.
token
+
'/order/worker'
,
//console.log('工单列表'+this.globalData.workOrderList)
//console.log('工单列表'+this.globalData.workOrderList)
//工单详情
//工单详情
this
.
globalData
.
workOrderDetail
=
'/wxh-worker-rest/rest/order/revision/applets/'
this
.
globalData
.
workOrderDetail
=
'/wxh-worker-rest/rest/order/revision/applets/'
+
this
.
globalData
.
token
+
'/order/detail'
,
+
this
.
globalData
.
token
+
'/order/detail'
,
//console.log('工单详情'+this.globalData.workOrderDetail)
//console.log('工单详情'+this.globalData.workOrderDetail)
//预约 V2
//预约 V2
this
.
globalData
.
orderReserve
=
'/wxh-worker-rest/rest/project/order/reserve/'
this
.
globalData
.
orderReserve
=
'/wxh-worker-rest/rest/project/order/reserve/'
...
@@ -265,7 +262,7 @@
...
@@ -265,7 +262,7 @@
},
},
getProtocolContent
:
function
()
{
getProtocolContent
:
function
()
{
this
.
protocolContent
this
.
protocolContent
},
},
...
@@ -298,20 +295,20 @@
...
@@ -298,20 +295,20 @@
// 用户附加属性
// 用户附加属性
if
(
AnalysysAgent
)
{
if
(
AnalysysAgent
)
{
let
userInfo
=
{
let
userInfo
=
{
'mobile'
:
user
.
mobile
,
'mobile'
:
user
.
mobile
,
'userfrom_id'
:
user
.
uid
,
'userfrom_id'
:
user
.
uid
,
'userfrom'
:
'家维广场'
,
'userfrom'
:
'家维广场'
,
'avatar'
:
user
.
avatar
,
'avatar'
:
user
.
avatar
,
'nickname'
:
user
.
nickname
,
'nickname'
:
user
.
nickname
,
'username'
:
user
.
username
,
'username'
:
user
.
username
,
'wxhuid'
:
user
.
wxhuid
,
'wxhuid'
:
user
.
wxhuid
,
'id'
:
user
.
id
,
'id'
:
user
.
id
,
'money'
:
user
.
money
,
'money'
:
user
.
money
,
'score'
:
user
.
score
'score'
:
user
.
score
};
};
Object
.
keys
(
userInfo
).
map
(
key
=>
{
Object
.
keys
(
userInfo
).
map
(
key
=>
{
if
(
key
&&
userInfo
[
key
])
{
if
(
key
&&
userInfo
[
key
])
{
AnalysysAgent
.
profileAppend
(
key
,
userInfo
[
key
])
AnalysysAgent
.
profileAppend
(
key
,
userInfo
[
key
])
}
}
})
})
}
}
...
@@ -321,18 +318,18 @@
...
@@ -321,18 +318,18 @@
AnalysysAgent
.
share
(
toShareProperties
,
trackProperties
);
AnalysysAgent
.
share
(
toShareProperties
,
trackProperties
);
}
}
},
},
trackPage
(
pageName
,
properties
)
{
trackPage
(
pageName
,
properties
)
{
if
(
AnalysysAgent
)
{
if
(
AnalysysAgent
)
{
AnalysysAgent
.
pageView
(
pageName
,
properties
);
AnalysysAgent
.
pageView
(
pageName
,
properties
);
}
}
},
},
initShare
(
option
)
{
initShare
(
option
)
{
console
.
log
(
option
,
'option-initShare'
)
console
.
log
(
option
,
'option-initShare'
)
option
=
option
||
{}
option
=
option
||
{}
if
(
AnalysysAgent
&&
option
.
user_id
)
{
if
(
AnalysysAgent
&&
option
.
user_id
)
{
let
shareUserInfo
=
{
let
shareUserInfo
=
{
'share_from_id'
:
option
.
user_id
||
''
,
'share_from_id'
:
option
.
user_id
||
''
,
'share_from_nickname'
:
option
.
user_name
||
''
,
'share_from_nickname'
:
option
.
user_name
||
''
,
}
}
AnalysysAgent
.
registerSuperProperties
(
shareUserInfo
);
AnalysysAgent
.
registerSuperProperties
(
shareUserInfo
);
}
}
...
@@ -343,73 +340,56 @@
...
@@ -343,73 +340,56 @@
* 用户自动登录
* 用户自动登录
*/
*/
autoLogin
()
{
autoLogin
()
{
let
that
=
this
;
let
that
=
this
that
.
globalData
.
authLoading
=
true
uni
.
login
({
uni
.
login
({
success
(
res
)
{
async
success
(
res
)
{
if
(
res
.
code
)
{
if
(
res
.
code
)
{
let
params
=
{
code
:
res
.
code
};
let
result
=
await
that
.
$u
.
api
.
loginWechatAuth
({
code
:
res
.
code
})
that
.
authorization
(
params
)
if
(
result
)
{
if
(
result
.
code
==
200
&&
result
.
data
)
{
that
.
setUserData
(
result
.
data
)
}
}
else
{
}
else
{
uni
.
showModal
({
uni
.
showModal
({
title
:
'登录失败'
,
title
:
'请求失败'
,
content
:
'未获取到code'
,
content
:
result
.
message
,
showCancel
:
false
});
});
}
}
},
uni
.
hideLoading
()
fail
()
{
}
else
{
wx
.
showModal
({
uni
.
showModal
({
title
:
'登录失败'
,
title
:
'登录失败'
,
content
:
'
接口调用失败
'
,
content
:
'
未获取到code
'
,
});
});
}
}
});
},
},
fail
()
{
async
authorization
(
params
)
{
let
that
=
this
const
res
=
await
that
.
$u
.
api
.
loginWechatAuth
(
params
)
if
(
!
res
||
!
res
.
code
||
!
res
.
data
){
uni
.
hideLoading
()
return
}
else
if
(
res
.
code
==
200
)
{
that
.
setUserData
(
res
.
data
)
if
(
typeof
callback
==
"function"
)
{
callback
();
}
}
}
else
{
wx
.
showModal
({
title
:
'请求失败'
,
showCancel
:
false
});
});
}
that
.
globalData
.
authLoading
=
false
uni
.
hideLoading
()
},
},
setUserData
(
userInfo
)
{
setUserData
(
userInfo
)
{
if
(
userInfo
&&
userInfo
.
token
)
{
if
(
userInfo
&&
userInfo
.
token
)
{
// 如果已经登录则直接获取相关信息
// 如果已经登录则直接获取相关信息
util
.
setOpenid
(
userInfo
.
wxopenid
)
util
.
setOpenid
(
userInfo
.
wxopenid
)
util
.
setToken
(
userInfo
.
token
)
util
.
setToken
(
userInfo
.
token
)
this
.
globalData
.
userInfo
=
userInfo
;
uni
.
setStorageSync
(
'user-info'
,
userInfo
);
uni
.
setStorageSync
(
'user-info'
,
userInfo
);
uni
.
setStorageSync
(
'isNewUser'
,
false
);
}
else
{
}
else
{
uni
.
setStorageSync
(
'isNewUser'
,
true
);
util
.
setToken
(
''
)
}
}
},
},
},
},
onHide
:
function
()
{
onHide
:
function
()
{
console
.
log
(
'App Hide'
)
console
.
log
(
'App Hide'
)
},
},
}
}
</
script
>
</
script
>
<
style
>
<
style
>
/*每个页面公共css */
/*每个页面公共css */
</
style
>
</
style
>
take-order/pages.json
View file @
6a9da170
...
@@ -288,6 +288,10 @@
...
@@ -288,6 +288,10 @@
"name"
:
"照片预览"
,
//模式名称
"name"
:
"照片预览"
,
//模式名称
"path"
:
"pages/photo/preview"
,
//启动页面,必选
"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函数里面得到
"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
...
@@ -5,15 +5,19 @@
...
@@ -5,15 +5,19 @@
<image
class=
"noticeImage"
:src=
"icon_auth_notice_new"
mode=
""
></image>
<image
class=
"noticeImage"
:src=
"icon_auth_notice_new"
mode=
""
></image>
</view>
</view>
<view
class=
"noticeTitleView"
>
<view
class=
"noticeTitleView"
>
<text
class=
"noticeTitle"
>
{{
noticeTitle
}}
</text>
<text
class=
"noticeTitle"
>
{{
noticeTitle
}}
</text>
</view>
</view>
<button
class=
"loginBtn"
v-if=
"!isNewUser"
lang=
"zh_CN"
catchtap=
"getUserProfile"
>
<text
class=
"u-font-32 white"
>
立即登录
</text>
</button>
<!--
<button
class=
"loginBtn"
v-if=
"!isNewUser"
open-type=
"getUserInfo"
lang=
"zh_CN"
@
getuserinfo=
"getUserInfo"
>
<!--
<button
class=
"loginBtn"
v-if=
"!isNewUser"
open-type=
"getUserInfo"
lang=
"zh_CN"
@
getuserinfo=
"getUserInfo"
>
<text
class=
"u-font-32 white"
>
立即登录
</text>
<text
class=
"u-font-32 white"
>
立即登录
</text>
</button>
-->
</button>
-->
<button
class=
"loginBtn"
v-if=
"isNewUser"
open-type=
"getPhoneNumber"
throttle-time=
"1000"
@
getphonenumber=
"getPhoneNumber"
>
<button
class=
"loginBtn"
v-if=
"needAuth"
lang=
"zh_CN"
@
tap=
"getUserProfile"
>
<text
class=
"u-font-32 white"
>
立即登录
</text>
</button>
<!--
<button
class=
"loginBtn"
v-if=
"isNewUser"
open-type=
"getPhoneNumber"
throttle-time=
"1000"
@
getphonenumber=
"getPhoneNumber"
>
<text
class=
"u-font-32 white"
>
授权登录
</text>
</button>
-->
<button
class=
"loginBtn"
v-else
open-type=
"getPhoneNumber"
throttle-time=
"1000"
@
getphonenumber=
"signupLogin"
>
<text
class=
"u-font-32 white"
>
授权登录
</text>
<text
class=
"u-font-32 white"
>
授权登录
</text>
</button>
</button>
<view
class=
"cancelView"
>
<view
class=
"cancelView"
>
...
@@ -24,18 +28,21 @@
...
@@ -24,18 +28,21 @@
</
template
>
</
template
>
<
script
>
<
script
>
import
util
from
'@/utils/util.js'
import
util
from
'@/utils/util.js'
export
default
{
import
login
from
'@/utils/login.js'
const
app
=
getApp
()
export
default
{
data
()
{
data
()
{
return
{
return
{
domain_name
:
'http://192.168.0.208:8192'
,
isNewUser
:
false
,
isNewUser
:
false
,
needAuth
:
true
,
unionID
:
''
,
unionID
:
''
,
openID
:
''
,
openID
:
''
,
icon_notice
:
''
,
icon_notice
:
''
,
TimeID
:
-
1
,
TimeID
:
-
1
,
icon_auth_notice_new
:
''
,
icon_auth_notice_new
:
''
,
noticeTitle
:
'申请获得您的公开信息(昵称,头像等)以便于为您提供更好的服务'
,
noticeTitle
:
'申请获得您的公开信息(昵称,头像等)以便于为您提供更好的服务'
,
}
}
},
},
onLoad
()
{
onLoad
()
{
...
@@ -43,77 +50,140 @@
...
@@ -43,77 +50,140 @@
this
.
icon_notice
=
getApp
().
globalData
.
icon_auth_notice
this
.
icon_notice
=
getApp
().
globalData
.
icon_auth_notice
this
.
icon_auth_notice_new
=
getApp
().
globalData
.
icon_auth_notice_new
this
.
icon_auth_notice_new
=
getApp
().
globalData
.
icon_auth_notice_new
},
},
onShow
(){
onShow
()
{
const
app
=
getApp
()
app
.
globalData
.
jumpLoginStatus
=
true
app
.
globalData
.
jumpLoginStatus
=
true
// 微信授权过用户信息,则无需重复授权
if
(
app
.
globalData
.
tempUserInfo
)
{
this
.
needAuth
=
false
}
},
},
methods
:
{
methods
:
{
// 授权用户信息
// 授权用户信息
getUserProfile
()
{
getUserProfile
()
{
var
self
=
this
var
that
=
this
const
app
=
getApp
()
const
app
=
getApp
()
if
(
self
.
isNewUser
)
{
uni
.
getUserProfile
({
uni
.
getUserProfile
({
desc
:
'用于授权登录'
,
desc
:
'用于授权登录'
,
success
:
function
(
res
)
{
success
:
function
(
res
)
{
const
userInfo
=
res
.
userInfo
;
const
userInfo
=
res
.
userInfo
;
if
(
!
userInfo
)
{
if
(
userInfo
)
{
app
.
globalData
.
tempUserInfo
=
userInfo
;
uni
.
showLoading
({
title
:
'授权中..'
,
mask
:
true
});
that
.
authLogin
()
}
else
{
uni
.
showModal
({
uni
.
showModal
({
title
:
'授权失败'
,
title
:
'授权失败'
,
content
:
'获取用户信息的授权失败'
,
content
:
'获取用户信息的授权失败'
,
showCancel
:
false
showCancel
:
false
});
});
return
}
}
app
.
globalData
.
tempUserInfo
=
userInfo
;
uni
.
showLoading
({
title
:
'授权中..'
,
mask
:
true
});
self
.
authLogin
()
},
},
fail
:
function
(
res
)
{
fail
:
function
(
res
)
{
uni
.
showModal
({
uni
.
showModal
({
title
:
'授权失败'
,
title
:
'授权失败'
,
content
:
'请允许获取用户信息的授权'
,
content
:
'请允许获取用户信息的授权'
,
showCancel
:
false
showCancel
:
false
});
});
return
;
}
}
})
})
}
},
},
async
authLogin
()
{
authLogin
()
{
var
that
=
this
var
that
=
this
const
app
=
getApp
()
let
params
=
{
const
res
=
await
that
.
$u
.
api
.
loginWechatAuth
(
params
)
nickname
:
app
.
globalData
.
tempUserInfo
.
nickName
,
if
(
!
res
||
!
res
.
code
||
!
res
.
data
){
avatar
:
app
.
globalData
.
tempUserInfo
.
avatarUrl
uni
.
hideLoading
()
}
return
login
.
appLogin
().
then
(
res
=>
{
}
else
if
(
res
.
code
==
200
)
{
params
.
code
=
res
.
code
app
.
setUserData
(
res
.
data
)
return
login
.
authorization
(
params
);
}).
then
(
res
=>
{
uni
.
hideLoading
();
if
(
res
&&
util
.
getToken
())
{
that
.
goBackPage
()
}
else
{
}
else
{
uni
.
showToast
({
title
:
'授权失败,请重新授权'
,
icon
:
'none'
});
this
.
setLoginStatus
()
}
}
}).
catch
(
res
=>
{
uni
.
hideLoading
()
uni
.
hideLoading
()
uni
.
showToast
({
title
:
res
.
message
,
icon
:
'none'
});
this
.
setLoginStatus
()
})
},
},
async
signLogin
()
{
signupLogin
(
e
)
{
var
that
=
this
var
that
=
this
const
app
=
getApp
()
if
(
!
e
||
!
detail
||
e
.
detail
.
errMsg
.
indexOf
(
'user deny'
)
>
-
1
)
{
const
res
=
await
that
.
$u
.
api
.
loginWechatAuth
(
params
)
wx
.
showModal
({
if
(
!
res
||
!
res
.
code
||
!
res
.
data
){
title
:
'提示'
,
showCancel
:
false
,
content
:
'用户未授权不能完成注册'
});
}
else
{
let
params
=
{
nickname
:
app
.
globalData
.
tempUserInfo
.
nickName
,
avatar
:
app
.
globalData
.
tempUserInfo
.
avatarUrl
,
encryptedData
:
e
.
detail
.
encryptedData
,
iv
:
e
.
detail
.
iv
}
login
.
appLogin
().
then
(
res
=>
{
params
.
code
=
res
.
code
return
login
.
signup
(
params
);
}).
then
(
res
=>
{
uni
.
hideLoading
()
uni
.
hideLoading
()
return
if
(
util
.
getToken
())
{
}
else
if
(
res
.
code
==
200
)
{
that
.
goBackPage
()
app
.
setUserData
(
res
.
data
)
}
else
{
}
else
{
this
.
setLoginStatus
(
false
)
}
}
}).
catch
(
res
=>
{
uni
.
hideLoading
()
uni
.
hideLoading
()
uni
.
showToast
({
title
:
res
.
message
,
icon
:
'none'
});
this
.
setLoginStatus
(
false
)
})
}
},
goBackPage
()
{
let
pages
=
getCurrentPages
();
let
prevPage
=
pages
[
pages
.
length
-
2
];
//上一个页面
if
(
prevPage
&&
prevPage
.
$vm
)
{
prevPage
.
$vm
.
isRefresh
=
true
;
}
uni
.
navigateBack
({
delta
:
2
})
},
setLoginStatus
(
authed
=
true
)
{
if
(
authed
)
{
this
.
needAuth
=
false
uni
.
setNavigationBarTitle
({
title
:
'登录页'
});
}
else
{
this
.
needAuth
=
true
uni
.
setNavigationBarTitle
({
title
:
'授权页'
});
}
},
},
//用户授权得到用户的信息
//用户授权得到用户的信息
getUserInfo
:
async
function
(
e
)
{
getUserInfo
:
async
function
(
e
)
{
clearTimeout
(
this
.
TimeID
);
clearTimeout
(
this
.
TimeID
);
this
.
TimeID
=
setTimeout
(()
=>
{
this
.
TimeID
=
setTimeout
(()
=>
{
...
@@ -135,18 +205,18 @@
...
@@ -135,18 +205,18 @@
},
},
//小程序获取code
//小程序获取code
getCode
:
async
function
()
{
getCode
:
async
function
()
{
let
that
=
this
let
that
=
this
uni
.
showLoading
({
uni
.
showLoading
({
title
:
'加载中'
,
title
:
'加载中'
,
})
})
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
console
.
log
(
uni
.
login
,
'uni.login('
)
console
.
log
(
uni
.
login
,
'uni.login('
)
uni
.
login
({
uni
.
login
({
// #ifdef MP-ALIPAY
// #ifdef MP-ALIPAY
scopes
:
'auth_user'
,
scopes
:
'auth_user'
,
// #endif
// #endif
success
:
function
(
res
)
{
success
:
function
(
res
)
{
if
(
res
.
code
)
{
if
(
res
.
code
)
{
that
.
getUsersByCode
(
res
.
code
)
that
.
getUsersByCode
(
res
.
code
)
//that.getUnionID(res.code)
//that.getUnionID(res.code)
...
@@ -156,19 +226,19 @@
...
@@ -156,19 +226,19 @@
reject
(
'未取得code'
);
reject
(
'未取得code'
);
}
}
},
},
fail
:
function
(
res
)
{
fail
:
function
(
res
)
{
reject
(
'用户授权失败wx.login'
);
reject
(
'用户授权失败wx.login'
);
},
},
complete
(
res
)
{
complete
(
res
)
{
reject
(
'code获取失败'
);
reject
(
'code获取失败'
);
console
.
log
(
'code获取失败'
,
res
)
console
.
log
(
'code获取失败'
,
res
)
uni
.
hideLoading
()
uni
.
hideLoading
()
}
}
});
});
});
});
},
},
//通过code获取用户信息(新接口)
//通过code获取用户信息(新接口)
getUsersByCode
:
async
function
(
code
)
{
getUsersByCode
:
async
function
(
code
)
{
uni
.
showLoading
({
uni
.
showLoading
({
title
:
'加载中'
title
:
'加载中'
})
})
...
@@ -204,10 +274,10 @@
...
@@ -204,10 +274,10 @@
},
},
//用户信息存本地
//用户信息存本地
saveUserInfo
:
async
function
(
res
)
{
saveUserInfo
:
async
function
(
res
)
{
//console.log('用户信息存本地 token:' +res.data.data.token);
//console.log('用户信息存本地 token:' +res.data.data.token);
// this.$u.vuex('vuex_token', res.data.data.token)
// this.$u.vuex('vuex_token', res.data.data.token)
console
.
log
(
'token'
,
'token'
)
console
.
log
(
'token'
,
'token'
)
util
.
setToken
(
res
.
data
.
token
)
util
.
setToken
(
res
.
data
.
token
)
// uni.setStorage({
// uni.setStorage({
// key: 'token',
// key: 'token',
...
@@ -222,17 +292,17 @@
...
@@ -222,17 +292,17 @@
// if (prevPage.route == 'pages/index/index') {
// if (prevPage.route == 'pages/index/index') {
// prevPage.$vm.isRefresh = true;
// prevPage.$vm.isRefresh = true;
// }
// }
if
(
prevPage
&&
prevPage
.
$vm
)
{
if
(
prevPage
&&
prevPage
.
$vm
)
{
prevPage
.
$vm
.
isRefresh
=
true
;
prevPage
.
$vm
.
isRefresh
=
true
;
}
}
uni
.
navigateBack
({
uni
.
navigateBack
({
delta
:
2
delta
:
2
})
})
},
},
//获取用户手机号
//获取用户手机号
getPhoneNumber
:
async
function
(
e
)
{
getPhoneNumber
:
async
function
(
e
)
{
clearTimeout
(
this
.
TimeID
);
clearTimeout
(
this
.
TimeID
);
this
.
TimeID
=
setTimeout
(()
=>
{
this
.
TimeID
=
setTimeout
(()
=>
{
...
@@ -256,7 +326,7 @@
...
@@ -256,7 +326,7 @@
},
},
//通过手机号获取用户信息
//通过手机号获取用户信息
findByMobile
:
async
function
(
e
)
{
findByMobile
:
async
function
(
e
)
{
uni
.
showLoading
({
uni
.
showLoading
({
title
:
'加载中'
title
:
'加载中'
})
})
...
@@ -284,137 +354,15 @@
...
@@ -284,137 +354,15 @@
},
},
//取消点击
//取消点击
cancelClick
:
function
()
{
cancelClick
:
function
()
{
uni
.
navigateBack
({
uni
.
navigateBack
({})
})
},
/*
//微信授权
toLogin: async function(data) {
uni.showLoading({
title:'授权中……'
})
let res = await this.$u.api.gowxLogin(data);
console.log('微信授权')
console.log(res)
uni.hideLoading()
if (res.code!==1) {
this.$u.toast(res.msg);
return;
}
if (res.data) {
//this.setLoginStatus()
// this.success(res.data.user.id);
}
},
//获取unionID
getUnionID: async function(code) {
uni.request({
url: getApp().globalData.domain_Name
+'/wxh-support-rest/rest/ssoinfo/getUsersByCode',
method: 'GET',
data: {
code: code,
},
success: (res) => {
console.log('获取unionID 成功')
console.log(res)
if(res.data.code==200){
this.getSSOID(res.data.data.unionid)
}
},
},
fail: (e) => {
console.log('获取unionID 失败')
console.log(e)
}
})
},
//获取SSOID
getSSOID: async function(unionID) {
uni.request({
url: getApp().globalData.domain_Name
+ '/wxh-support-rest/rest/ssoinfo/v2/findByUnionId',
method: 'GET',
data: {
unionid: unionID,
},
success: (res) => {
console.log('获取SSOID 成功')
console.log(res)
},
fail: (e) => {
console.log('获取SSOID 失败')
console.log(e)
}
})
},
//获取loginCode
getLoginCode: async function() {
uni.request({
url: getApp().globalData.domain_Name
+ '/wxh-support-rest/rest/ssoinfo/v2/getLoginCode',
method: 'GET',
data: {
ssoId: '93140',
},
success: (res) => {
console.log('获取loginCode 成功')
console.log(res)
if(res.data.code==200){
this.getToken(res.data.data.loginCode)
}
},
fail: (e) => {
console.log('获取loginCode 失败')
console.log(e)
}
})
},
//获取token
getToken: async function(loginCode) {
uni.request({
url: getApp().globalData.domain_Name
+ '/wxh-support-rest/rest/worker/login/applets/'
+loginCode,
method: 'GET',
data: {
},
success: (res) => {
console.log('获取token 成功')
console.log(res)
},
fail: (e) => {
console.log('获取token 失败')
console.log(e)
}
})
},
*/
}
}
}
}
</
script
>
</
script
>
<
style
>
<
style
>
.backView
{
.backView
{
background-color
:
#FFFFFF
;
background-color
:
#FFFFFF
;
position
:
absolute
;
position
:
absolute
;
top
:
0
;
top
:
0
;
...
@@ -423,41 +371,41 @@
...
@@ -423,41 +371,41 @@
height
:
100%
;
height
:
100%
;
display
:
flex
;
display
:
flex
;
flex-direction
:
column
;
flex-direction
:
column
;
}
}
.noticeView
{
.noticeView
{
background-color
:
#FFFFFF
;
background-color
:
#FFFFFF
;
width
:
100%
;
width
:
100%
;
height
:
470
rpx
;
height
:
470
rpx
;
display
:
flex
;
display
:
flex
;
flex-direction
:
column
;
flex-direction
:
column
;
align-items
:
center
;
align-items
:
center
;
}
}
.noticeImage
{
.noticeImage
{
background-color
:
#FFFFFF
;
background-color
:
#FFFFFF
;
width
:
386
rpx
;
width
:
386
rpx
;
height
:
270
rpx
;
height
:
270
rpx
;
margin-top
:
180
rpx
;
margin-top
:
180
rpx
;
}
}
.noticeTitleView
{
.noticeTitleView
{
margin-top
:
80
rpx
;
margin-top
:
80
rpx
;
width
:
100%
;
width
:
100%
;
display
:
flex
;
display
:
flex
;
align-items
:
center
;
align-items
:
center
;
justify-content
:
center
;
justify-content
:
center
;
}
}
.noticeTitle
{
.noticeTitle
{
width
:
60%
;
width
:
60%
;
font-size
:
24
rpx
;
font-size
:
24
rpx
;
color
:
#999999
;
color
:
#999999
;
text-align
:
center
;
text-align
:
center
;
line-height
:
40
rpx
;
line-height
:
40
rpx
;
}
}
.loginBtn
{
.loginBtn
{
background-color
:
#2272FF
;
background-color
:
#2272FF
;
width
:
390
rpx
;
width
:
390
rpx
;
height
:
80
rpx
;
height
:
80
rpx
;
...
@@ -466,22 +414,22 @@
...
@@ -466,22 +414,22 @@
display
:
flex
;
display
:
flex
;
align-items
:
center
;
align-items
:
center
;
justify-content
:
center
;
justify-content
:
center
;
}
}
.cancelView
{
.cancelView
{
width
:
100%
;
width
:
100%
;
margin-top
:
30
rpx
;
margin-top
:
30
rpx
;
display
:
flex
;
display
:
flex
;
align-items
:
center
;
align-items
:
center
;
justify-content
:
center
;
justify-content
:
center
;
}
}
.cancelText
{
.cancelText
{
color
:
#666666
;
color
:
#666666
;
font-size
:
32
rpx
;
font-size
:
32
rpx
;
}
}
.white
{
.white
{
color
:
#FFFFFF
;
color
:
#FFFFFF
;
}
}
</
style
>
</
style
>
take-order/utils/login.js
View file @
6a9da170
...
@@ -4,7 +4,7 @@ const app = getApp();
...
@@ -4,7 +4,7 @@ const app = getApp();
function
appLogin
()
{
function
appLogin
()
{
return
new
Promise
(
function
(
resolve
,
reject
)
{
return
new
Promise
(
function
(
resolve
,
reject
)
{
uni
.
login
({
uni
.
login
({
success
:
res
=>
{
success
(
res
)
{
if
(
!
res
.
code
)
{
if
(
!
res
.
code
)
{
uni
.
hideLoading
();
uni
.
hideLoading
();
uni
.
showModal
({
uni
.
showModal
({
...
@@ -17,7 +17,7 @@ function appLogin() {
...
@@ -17,7 +17,7 @@ function appLogin() {
fail
()
{
fail
()
{
uni
.
hideLoading
();
uni
.
hideLoading
();
uni
.
showModal
({
uni
.
showModal
({
content
:
'登录失败'
,
content
:
'
小程序
登录失败'
,
showCancel
:
false
showCancel
:
false
});
});
reject
();
reject
();
...
@@ -28,51 +28,51 @@ function appLogin() {
...
@@ -28,51 +28,51 @@ function appLogin() {
// 小程序授权
// 小程序授权
function
authorization
(
data
)
{
function
authorization
(
data
)
{
return
new
Promise
(
function
(
resolve
,
reject
)
{
return
new
Promise
(
async
function
(
resolve
,
reject
)
{
data
=
data
||
{}
const
res
=
await
app
.
$vm
.
$u
.
api
.
loginWechatAuth
(
data
)
const
res
=
await
app
.
$u
.
api
.
loginWechatAuth
(
data
)
if
(
res
)
{
if
(
res
&&
res
.
status
)
{
if
(
res
.
code
==
200
&&
res
.
data
)
{
let
data
=
res
.
data
app
.
setUserData
(
res
.
data
)
app
.
setUserData
(
data
)
uni
.
hideLoading
();
resolve
(
res
);
resolve
(
res
);
}
else
()
{
}
else
{
uni
.
hideLoading
();
uni
.
showModal
({
uni
.
showModal
({
title
:
'请求
失败'
,
title
:
'用户登录
失败'
,
content
:
err
.
message
,
content
:
res
.
message
,
showCancel
:
false
showCancel
:
false
});
});
reject
();
reject
(
res
);
},
}
}
else
{
uni
.
showModal
({
title
:
'请求失败'
,
content
:
res
.
message
});
}
});
});
}
}
// 小程序注册
// 小程序注册
function
signup
(
data
)
{
function
signup
(
data
)
{
return
new
Promise
(
function
(
resolve
,
reject
)
{
return
new
Promise
(
async
function
(
resolve
,
reject
)
{
const
res
=
await
app
.
$u
.
api
.
loginWechatAuth
(
data
)
const
res
=
await
app
.
$vm
.
$u
.
api
.
loginWechatAuth
(
data
)
if
(
res
)
{
api
.
request
(
'login/signup-login'
,
{
if
(
res
.
code
==
200
&&
res
.
data
)
{
method
:
"post"
,
app
.
setUserData
(
res
.
data
)
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
);
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