Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
F
FlashMan
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
华国豪
FlashMan
Commits
669dc424
Commit
669dc424
authored
Jul 05, 2019
by
华国豪
🙄
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
e4d291f2
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
26 additions
and
17 deletions
+26
-17
app.js
app.js
+2
-3
activity.js
pages/activity/activity.js
+1
-1
invesDetails.js
pages/member/invesDetails/invesDetails.js
+1
-1
member.js
pages/member/member.js
+22
-12
No files found.
app.js
View file @
669dc424
...
...
@@ -119,13 +119,12 @@ App({
let
data
=
{};
var
promise
=
new
Promise
((
resolve
,
reject
)
=>
{
wx
.
showLoading
({
title
:
'加载中'
,
title
:
'加载中
...
'
,
});
let
timestamp
=
(
new
Date
()).
valueOf
()
let
sign
=
md5
(
'msg='
+
encodeURIComponent
(
JSON
.
stringify
(
msg
)).
toLowerCase
()
+
'&'
+
'timestamp='
+
timestamp
+
'&'
+
'token='
+
token
+
'&'
+
'key='
+
secretKey
)
wx
.
request
({
// url: 'https://reborn.oytour.com/api/common/post'+ url, //线上
url
:
'http://efficient.oytour.com/'
+
url
,
//线上
url
:
'https://efficient.oytour.com/'
+
url
,
//线上
// url: 'http://47.96.12.235:9001/' + url, //测试
// url: 'http://192.168.2.215:9000/'+ url,
...
...
pages/activity/activity.js
View file @
669dc424
...
...
@@ -15,7 +15,7 @@ Page({
let
userInfo
=
wx
.
getStorageSync
(
'admin'
)
console
.
log
(
userInfo
)
this
.
setData
({
url
:
"http://activity.oytour.com/html/task/home.html?customerId="
+
userInfo
.
id
+
"&accountId="
+
userInfo
.
customerAccountId
+
"&token="
+
userInfo
.
token
+
"&secretKey="
+
userInfo
.
secretKey
url
:
"http
s
://activity.oytour.com/html/task/home.html?customerId="
+
userInfo
.
id
+
"&accountId="
+
userInfo
.
customerAccountId
+
"&token="
+
userInfo
.
token
+
"&secretKey="
+
userInfo
.
secretKey
})
console
.
log
(
this
.
data
.
url
)
},
...
...
pages/member/invesDetails/invesDetails.js
View file @
669dc424
...
...
@@ -14,7 +14,7 @@ Page({
onLoad
:
function
(
options
)
{
console
.
log
(
options
)
this
.
setData
({
url
:
"http://activity.oytour.com/html/invesDetails.html"
+
'?ID='
+
options
.
ID
+
'&name='
+
encodeURI
(
options
.
name
)
+
'&MobilePhone='
+
options
.
MobilePhone
url
:
"http
s
://activity.oytour.com/html/invesDetails.html"
+
'?ID='
+
options
.
ID
+
'&name='
+
encodeURI
(
options
.
name
)
+
'&MobilePhone='
+
options
.
MobilePhone
})
console
.
log
(
this
.
data
.
url
)
},
...
...
pages/member/member.js
View file @
669dc424
...
...
@@ -55,16 +55,21 @@ Page({
*/
onLoad
:
function
(
options
)
{
let
userInfo
=
wx
.
getStorageSync
(
'admin'
);
if
(
wx
.
getStorageSync
(
'admin'
)
)
{
if
(
userInfo
)
{
this
.
setData
({
isLogin
:
true
,
userInfo
:
userInfo
,
photo
:
app
.
state
.
admin
.
photo
===
null
?
''
:
app
.
state
.
admin
.
photo
,
isMember
:
app
.
state
.
admin
.
isMember
,
account
:
app
.
state
.
admin
.
account
,
address
:
app
.
state
.
admin
.
address
,
businessCardPhotos
:
app
.
state
.
admin
.
businessCardPhotos
===
null
?
[]
:
app
.
state
.
admin
.
businessCardPhotos
,
housePhotos
:
app
.
state
.
admin
.
housePhotos
===
null
?
[]
:
app
.
state
.
admin
.
housePhotos
,
images
:
app
.
state
.
admin
.
images
===
null
?
[]
:
app
.
state
.
admin
.
images
})
this
.
getInfo
()
this
.
getUserMemberExp
()
}
this
.
setData
({
userInfo
:
userInfo
})
this
.
getInfo
()
this
.
getUserMemberExp
()
},
/**
...
...
@@ -81,16 +86,21 @@ Page({
*/
onShow
:
function
()
{
let
userInfo
=
wx
.
getStorageSync
(
'admin'
);
if
(
wx
.
getStorageSync
(
'admin'
)
)
{
if
(
userInfo
)
{
this
.
setData
({
isLogin
:
true
,
userInfo
:
userInfo
,
photo
:
app
.
state
.
admin
.
photo
===
null
?
''
:
app
.
state
.
admin
.
photo
,
isMember
:
app
.
state
.
admin
.
isMember
,
account
:
app
.
state
.
admin
.
account
,
address
:
app
.
state
.
admin
.
address
,
businessCardPhotos
:
app
.
state
.
admin
.
businessCardPhotos
===
null
?
[]
:
app
.
state
.
admin
.
businessCardPhotos
,
housePhotos
:
app
.
state
.
admin
.
housePhotos
===
null
?
[]
:
app
.
state
.
admin
.
housePhotos
,
images
:
app
.
state
.
admin
.
images
===
null
?
[]
:
app
.
state
.
admin
.
images
})
this
.
getInfo
()
this
.
getUserMemberExp
()
}
this
.
setData
({
userInfo
:
userInfo
})
this
.
getInfo
()
this
.
getUserMemberExp
()
},
/**
...
...
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