Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
self-support
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
李俊赕
self-support
Commits
2568eb05
Commit
2568eb05
authored
May 21, 2021
by
刘用法
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' into test
parents
508d7f87
3918983e
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
11 deletions
+11
-11
.env.js
.env.js
+6
-3
index.vue
src/pages/index/index.vue
+5
-5
mine.vue
src/pages/index/mine.vue
+0
-3
No files found.
.env.js
View file @
2568eb05
;
(
function
()
{
let
NODE_ENV
=
'
test
'
;
// dev:开发环境 | test:测试环境 | prod:生产环境
let
NODE_ENV
=
'
prod
'
;
// dev:开发环境 | test:测试环境 | prod:生产环境
let
ENV_VAR
=
null
;
if
(
process
.
env
.
NODE_ENV
===
"development"
)
{
if
(
NODE_ENV
===
'dev'
)
{
...
...
@@ -12,8 +12,11 @@
}
}
else
if
(
process
.
env
.
NODE_ENV
===
"production"
)
{
// ENV_VAR = require('./.env.prod.js');
ENV_VAR
=
require
(
'./.env.test.js'
);
if
(
NODE_ENV
===
'test'
)
{
ENV_VAR
=
require
(
'./.env.test.js'
);
}
else
if
(
NODE_ENV
===
'prod'
)
{
ENV_VAR
=
require
(
'./.env.prod.js'
);
}
}
if
(
ENV_VAR
)
{
process
.
uniEnv
=
{};
...
...
src/pages/index/index.vue
View file @
2568eb05
...
...
@@ -172,10 +172,7 @@
// 每次进入页面都刷新入驻状态
this
.
pageNumber
=
0
this
.
initSettleInfo
();
if
(
this
.
status
==
7
)
{
this
.
getLocation
()
}
this
.
initSettleInfo
();
},
methods
:
{
getData
()
{
...
...
@@ -211,7 +208,10 @@
self
.
search
.
pageNumber
=
0
self
.
loadedOrder
=
false
self
.
loadOrderList
();
await
app
.
getBaseInfo
(
self
,
callBack
);
await
app
.
getBaseInfo
(
self
,
callBack
);
if
(
this
.
status
==
7
)
{
this
.
getLocation
()
}
this
.
loaded
=
true
;
}
else
{
this
.
loaded
=
true
...
...
src/pages/index/mine.vue
View file @
2568eb05
...
...
@@ -177,9 +177,6 @@
app
.
setUserData
({},
this
)
app
.
globalData
.
logout
=
true
},
handleSuperButton
()
{
this
.
$u
.
route
({
url
:
'pages/mine/superLogin/index'
})
},
async
allowLogin
()
{
let
res
=
await
this
.
$u
.
api
.
allowLogin
()
if
(
res
&&
res
.
code
==
200
)
{
...
...
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