Merge branch 'bug修复/停用账号还可以登录问题(已更新楚楚)' into 德莱宝测试除了手机登录不合并

# Conflicts:
#	utils/Http.js

pages/login/modules/login.js

@@ -5,6 +5,10 @@ function loginMsg(res) {
     wx.setStorageSync('account_list', res.account_list);
     if (res.account_list.length == 1) {
         let item = res.account_list[0];
+        if (item.status == "INACTIVE") return wx.showToast({
+            title: '该账号已被停用，无法登录',
+            icon: "none"
+        });
         wx.setStorageSync('userrole', item.usertype == 1 ? '业务员' : '经销商');
         wx.setStorageSync('userMsg', item)
         query_userauth();

utils/Http.js

@@ -4,15 +4,9 @@ class HTTP {
 		if (ENV === 'release') { // 正式版
 			this.baseUrl = "https://lsa.cnyunl.com";
 		} else {
-<<<<<<< HEAD
-					// this.baseUrl = "https://lsa.cnyunl.com";
-					this.baseUrl = "http://61.164.207.46:8200";
-					// this.baseUrl = "https://cucu.cnyunl.com:8079";
-=======
 			// this.baseUrl = "https://lsa.cnyunl.com";
-			this.baseUrl = "http://61.164.207.46:8300";
-			// this.baseUrl = "http://61.164.207.46:8200";
->>>>>>> 新功能开发/定制项
+			this.baseUrl = "http://61.164.207.46:8200";
+			// this.baseUrl = "https://cucu.cnyunl.com:8079";
 		}
 		console.log("接口地址:", this.baseUrl)
 	}