瀏覽代碼

测试环境下,更改小方配电图跳转逻辑

ming 3 年之前
父節點
當前提交
b9d296518f
共有 2 個文件被更改,包括 25 次插入23 次删除
  1. 17 17
      pages/device-Manage/device-Manage.vue
  2. 8 6
      util/api.js

+ 17 - 17
pages/device-Manage/device-Manage.vue

@@ -17,9 +17,9 @@
 			</view>
 		</view>
 		
-		<!-- <view class="btn-area submitBottomBtn padding-lr-sm" v-if="this.num!=1">
+		<view class="btn-area submitBottomBtn padding-lr-sm" v-if="this.num!=1">
 			<button class="bg-blue round  margin-top" @click="goDetail"> 配电系统模拟图 </button>
-		</view> -->
+		</view>
 		
 		
 	</view>
@@ -75,22 +75,22 @@
 			// 页面跳转
 			goDeviceDetail(item) {
 				
-				uni.navigateTo({
-					url: '/pages/device-Manage/deviceDetail/deviceDetail?deviceType=1&companyCode='+this.companyCode+'&deviceCode='+item.deviceCode+'',
-					success: res => {},
-					fail: () => {},
-					complete: () => {}
-				});
-				// if(this.num==1){
-				// 	uni.navigateTo({
-				// 		url: '/pages/device-Manage/deviceDetail/deviceDetail?deviceType=1&companyCode='+this.companyCode+'&deviceCode='+item.deviceCode+'',
-				// 		success: res => {},
-				// 		fail: () => {},
-				// 		complete: () => {}
-				// 	});
-				// }else{
+				// uni.navigateTo({
+				// 	url: '/pages/device-Manage/deviceDetail/deviceDetail?deviceType=1&companyCode='+this.companyCode+'&deviceCode='+item.deviceCode+'',
+				// 	success: res => {},
+				// 	fail: () => {},
+				// 	complete: () => {}
+				// });
+				if(this.num==1){
+					uni.navigateTo({
+						url: '/pages/device-Manage/deviceDetail/deviceDetail?deviceType=1&companyCode='+this.companyCode+'&deviceCode='+item.deviceCode+'',
+						success: res => {},
+						fail: () => {},
+						complete: () => {}
+					});
+				}else{
 					
-				// }
+				}
 				
 			},
 			

+ 8 - 6
util/api.js

@@ -1,9 +1,11 @@
-// const BASE_URL = 'https://iot.usky.cn/USKYOF/USKYOF.php/Home/' //(测试域名)  
-const BASE_URL = 'https://wx.ewoogi.com/USKYOF/USKYOF.php/Home/' //(正式域名新)  
-const websiteUrl = 'https://wx.ewoogi.com'
 
-// const websiteUrl = 'https://wx.ewoogi.com'
-// const BASE_URL='http://https://wx.ewoogi.com/USKYOF/USKYOF.php/Home/'
+
+/** qhome.usky.cn测试域名  wx.ewoogi.com 正式域名 **/
+
+const BASE_URL = 'https://qhome.usky.cn/USKYOF/USKYOF.php/Home/'  
+const websiteUrl = 'https://qhome.usky.cn'
+
+
 // 同时发送异步代码的次数,防止一次点击中有多次请求,用于处理
 let ajaxTimes = 0;
 
@@ -62,7 +64,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,