Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
7
7-Eleven
Overview
Overview
Details
Activity
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
高淑倩
7-Eleven
Commits
2450dbfb
You need to sign in or sign up before continuing.
Commit
2450dbfb
authored
May 13, 2020
by
谢中龙
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改登录参数
parent
650fb307
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
16 additions
and
13 deletions
+16
-13
app.json
src/app.json
+1
-1
index.js
src/config/index.js
+1
-1
activateCardCallback.js
src/pages/activateCard/activateCardCallback.js
+4
-3
project.config.json
src/project.config.json
+1
-1
paymentStatus.js
src/subPackage/page/pages/paymentStatus/paymentStatus.js
+1
-0
util.js
src/utils/util.js
+4
-4
wxService.js
src/utils/wxService.js
+4
-3
No files found.
src/app.json
View file @
2450dbfb
...
@@ -143,7 +143,7 @@
...
@@ -143,7 +143,7 @@
"provider"
:
"wx104a1a20c3f81ec2"
"provider"
:
"wx104a1a20c3f81ec2"
},
},
"live-player-plugin"
:
{
"live-player-plugin"
:
{
"version"
:
"1.0.
7
"
,
"version"
:
"1.0.
9
"
,
"provider"
:
"wx2b03c6e691cd7370"
"provider"
:
"wx2b03c6e691cd7370"
}
}
},
},
...
...
src/config/index.js
View file @
2450dbfb
...
@@ -25,7 +25,7 @@ const PROJECT_ENV = 'prod' // 生产 prod, 开发 dev, 测试 test , 测试门
...
@@ -25,7 +25,7 @@ const PROJECT_ENV = 'prod' // 生产 prod, 开发 dev, 测试 test , 测试门
//2992 山东盛联微商城 wx53dedc202ae0d0c2
//2992 山东盛联微商城 wx53dedc202ae0d0c2
//2002 巴黎贝甜 wx21968cb3a486d4ab
//2002 巴黎贝甜 wx21968cb3a486d4ab
const
BRANCH_ID
=
3001
const
BRANCH_ID
=
2007
const
isMall
=
true
const
isMall
=
true
// const needMock = '' //
// const needMock = '' //
...
...
src/pages/activateCard/activateCardCallback.js
View file @
2450dbfb
...
@@ -75,10 +75,11 @@ wxService.page({
...
@@ -75,10 +75,11 @@ wxService.page({
code
:
res
.
code
,
code
:
res
.
code
,
wechatInfo
:
null
,
wechatInfo
:
null
,
brandId
:
app
.
globalData
.
brandId
,
brandId
:
app
.
globalData
.
brandId
,
appid
:
app
.
globalData
.
appId
};
};
if
(
!
envInfo
.
isMall
){
//
if (!envInfo.isMall){
param
.
appid
=
app
.
globalData
.
appId
//
param.appid = app.globalData.appId
}
//
}
wxService
.
post
(
`/member/minaLogin`
,
param
).
then
(
response
=>
{
wxService
.
post
(
`/member/minaLogin`
,
param
).
then
(
response
=>
{
let
dataResp
=
response
.
data
.
data
let
dataResp
=
response
.
data
.
data
...
...
src/project.config.json
View file @
2450dbfb
...
@@ -13,7 +13,7 @@
...
@@ -13,7 +13,7 @@
},
},
"compileType"
:
"miniprogram"
,
"compileType"
:
"miniprogram"
,
"libVersion"
:
"2.8.2"
,
"libVersion"
:
"2.8.2"
,
"appid"
:
"wx
313ec36b710125d4
"
,
"appid"
:
"wx
f7bc302c51166dc0
"
,
"projectname"
:
"%E5%BE%AE%E5%95%86%E5%9F%8E"
,
"projectname"
:
"%E5%BE%AE%E5%95%86%E5%9F%8E"
,
"debugOptions"
:
{
"debugOptions"
:
{
"hidedInDevtools"
:
[]
"hidedInDevtools"
:
[]
...
...
src/subPackage/page/pages/paymentStatus/paymentStatus.js
View file @
2450dbfb
...
@@ -63,6 +63,7 @@ wxService.page({
...
@@ -63,6 +63,7 @@ wxService.page({
code
:
res
.
code
,
code
:
res
.
code
,
wechatInfo
,
wechatInfo
,
brandId
:
app
.
globalData
.
brandId
,
brandId
:
app
.
globalData
.
brandId
,
appid
:
app
.
globalData
.
appId
};
};
if
(
!
envInfo
.
isMall
)
{
if
(
!
envInfo
.
isMall
)
{
param
.
appid
=
app
.
globalData
.
appId
param
.
appid
=
app
.
globalData
.
appId
...
...
src/utils/util.js
View file @
2450dbfb
...
@@ -340,11 +340,11 @@ function getUserInfoByBtn(userInfo) {
...
@@ -340,11 +340,11 @@ function getUserInfoByBtn(userInfo) {
code
:
res
[
1
].
code
,
code
:
res
[
1
].
code
,
wechatInfo
:
res
[
0
],
wechatInfo
:
res
[
0
],
brandId
:
app
.
globalData
.
brandId
,
brandId
:
app
.
globalData
.
brandId
,
//
appid: app.globalData.appId
appid
:
app
.
globalData
.
appId
};
};
if
(
!
envInfo
.
isMall
)
{
//
if (!envInfo.isMall) {
param
.
appid
=
app
.
globalData
.
appId
//
param.appid = app.globalData.appId
}
//
}
return
wxService
.
post
(
`
${
currentLoginUrl
}
`
,
param
)
return
wxService
.
post
(
`
${
currentLoginUrl
}
`
,
param
)
},
(
err
)
=>
{
},
(
err
)
=>
{
...
...
src/utils/wxService.js
View file @
2450dbfb
...
@@ -117,10 +117,11 @@ class WXService extends Http {
...
@@ -117,10 +117,11 @@ class WXService extends Http {
code
:
result
.
code
,
code
:
result
.
code
,
wechatInfo
:
null
,
wechatInfo
:
null
,
brandId
:
app
.
globalData
.
brandId
,
brandId
:
app
.
globalData
.
brandId
,
appid
:
app
.
globalData
.
appId
};
};
if
(
!
envInfo
.
isMall
)
{
//
if (!envInfo.isMall) {
param
.
appid
=
app
.
globalData
.
appId
//
param.appid = app.globalData.appId
}
//
}
_this
.
post
(
`/member/minaLogin`
,
param
).
then
(
response
=>
{
_this
.
post
(
`/member/minaLogin`
,
param
).
then
(
response
=>
{
...
...
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