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

Merge branch 'dev' into test

parents 508d7f87 3918983e
; ;
(function() { (function() {
let NODE_ENV = 'test'; // dev:开发环境 | test:测试环境 | prod:生产环境 let NODE_ENV = 'prod'; // dev:开发环境 | test:测试环境 | prod:生产环境
let ENV_VAR = null; let ENV_VAR = null;
if (process.env.NODE_ENV === "development") { if (process.env.NODE_ENV === "development") {
if (NODE_ENV === 'dev') { if (NODE_ENV === 'dev') {
...@@ -12,8 +12,11 @@ ...@@ -12,8 +12,11 @@
} }
} else if (process.env.NODE_ENV === "production") { } else if (process.env.NODE_ENV === "production") {
// ENV_VAR = require('./.env.prod.js'); if (NODE_ENV === 'test') {
ENV_VAR = require('./.env.test.js'); ENV_VAR = require('./.env.test.js');
} else if (NODE_ENV === 'prod') {
ENV_VAR = require('./.env.prod.js');
}
} }
if (ENV_VAR) { if (ENV_VAR) {
process.uniEnv = {}; process.uniEnv = {};
......
...@@ -173,9 +173,6 @@ ...@@ -173,9 +173,6 @@
this.pageNumber = 0 this.pageNumber = 0
this.initSettleInfo(); this.initSettleInfo();
if (this.status == 7) {
this.getLocation()
}
}, },
methods: { methods: {
getData() { getData() {
...@@ -212,6 +209,9 @@ ...@@ -212,6 +209,9 @@
self.loadedOrder = false self.loadedOrder = false
self.loadOrderList(); self.loadOrderList();
await app.getBaseInfo(self, callBack); await app.getBaseInfo(self, callBack);
if (this.status == 7) {
this.getLocation()
}
this.loaded = true; this.loaded = true;
} else { } else {
this.loaded = true this.loaded = true
......
...@@ -177,9 +177,6 @@ ...@@ -177,9 +177,6 @@
app.setUserData({}, this) app.setUserData({}, this)
app.globalData.logout = true app.globalData.logout = true
}, },
handleSuperButton() {
this.$u.route({url: 'pages/mine/superLogin/index'})
},
async allowLogin() { async allowLogin() {
let res = await this.$u.api.allowLogin() let res = await this.$u.api.allowLogin()
if (res && res.code == 200) { 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