Merge branch 'master' of http://47.111.81.118:3000/yuanMM/uniapp2

pages/index/index.vue

@@ -192,14 +192,15 @@
 
 		onLoad: function(option) {
 
+		
 			// if (option.op) {
 			// 	this.getData();
-
+			
 			// } else {
 			// 	this.init()
 			// }
-
-
+			
+			
 			this.getData();
 
 			this.hackReset = false;

pages/processDetailEle/processDetailEle.vue

@@ -35,6 +35,10 @@
 						<text>线路名称：</text>
 						<text>{{detailMessage.deviceName}}</text>
 					</view>
+					<!-- <view>
+						<text>户号：</text>
+						<text>{{detailMessage.account_number}}</text>
+					</view> -->
 					<view>
 						<text>警告信息：</text>
 						<text>{{detailMessage.measValue}}</text>

pages/processDetailEle1/processDetailEle1.vue

@@ -35,6 +35,10 @@
 						<text>线路名称：</text>
 						<text>{{detailMessage.deviceName}}</text>
 					</view>
+					<!-- <view>
+						<text>户号：</text>
+						<text>{{detailMessage.account_number}}</text>
+					</view> -->
 					<view>
 						<text>警告信息：</text>
 						<text>{{detailMessage.measValue}}</text>

util/api.js

@@ -1,9 +1,10 @@
 // const BASE_URL = 'https://iot.usky.cn/USKYOF/USKYOF.php/Home/' //(测试域名)  
-const BASE_URL = 'https://qhome.usky.cn/USKYOF/USKYOF.php/Home/' //(正式域名新)  
-const websiteUrl = 'https://qhome.usky.cn'
 
-// const websiteUrl = 'https://wx.ewoogi.com'
-// const BASE_URL='http://https://wx.ewoogi.com/USKYOF/USKYOF.php/Home/'
+const BASE_URL = 'https://qhome.usky.cn//USKYOF/USKYOF.php/Home/' //(正式域名新)  
+const websiteUrl = 'https://qhome.usky.cn/'
+
+// const websiteUrl = 'https://qhome.usky.cn/'
+// const BASE_URL='http://https://qhome.usky.cn//USKYOF/USKYOF.php/Home/'
 // 同时发送异步代码的次数，防止一次点击中有多次请求，用于处理
 let ajaxTimes = 0;
 
@@ -62,7 +63,7 @@ function myRequest(options){
 				let notIndexFail = ['Index/getDataStatistics', 'Com/getAuthorizationUrl'];
 				if (notIndexFail.includes(options.url)) {
 					window.location.href =
-						'https://wx.ewoogi.com/wx/index.html#/pages/index/index';
+						'https://qhome.usky.cn//wx/index.html#/pages/index/index';
 				} else {
 					uni.showModal({
 						showCancel: false,