Commit 2568eb05 authored by 刘用法's avatar 刘用法

Merge branch 'dev' into test

parents 508d7f87 3918983e
;
(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 = {};
......
......@@ -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
......
......@@ -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) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment