From 3cb0b4c990bd6340ba26fe94664be9e5767128b1 Mon Sep 17 00:00:00 2001
From: "@fawn-nine" <1271023382@qq.com>
Date: Wed, 16 Oct 2024 15:16:51 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E7=99=BB=E9=99=86=E9=A1=B5bu?=
 =?UTF-8?q?g?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/baseUrl.js                                |  4 ++--
 config/requestConfig.js                          |  2 +-
 pages/course/courseDetail.vue                    | 13 ++++++++++---
 .../zhouWei-request/js_sdk/request/core/utils.js | 16 +++++++++++++---
 4 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/config/baseUrl.js b/config/baseUrl.js
index 34b1545..d0b6b61 100644
--- a/config/baseUrl.js
+++ b/config/baseUrl.js
@@ -6,9 +6,9 @@ if (process.env.NODE_ENV === 'development') {
 	// socketUrl = "ws://localhost:6001/";
 	// baseUrl = "https://twin-ui.com/demo/";
 	// baseUrl = "https://testapi.nuttyreading.com/"; // 线上测试环境
-	baseUrl = "https://api.nuttyreading.com/"; // 线上正式
+	// baseUrl = "https://api.nuttyreading.com/"; // 线上正式
 	// baseUrl = "http://192.168.110.110:9200/pb/"; // 磊哥
-	// baseUrl = "http://192.168.110.100:9200/pb/";    //  开发用电脑
+	baseUrl = "http://192.168.110.100:9200/pb/";    //  开发用电脑
 	// baseUrl = "http://59.110.212.44:9200/pb/";
 	// baseUrl = "http://192.168.110.100:9100/pb/";    //  开发用电脑
 	// baseUrl = "http://192.168.110.110:9200/pb/";
diff --git a/config/requestConfig.js b/config/requestConfig.js
index 042a16b..96d90a1 100644
--- a/config/requestConfig.js
+++ b/config/requestConfig.js
@@ -40,7 +40,7 @@ let $http = new request({
 		'Content-Type': 'application/x-www-form-urlencoded',
 		// 'project_token': base.projectToken, //项目token（可删除）
 	},
-	// timeout:'360000'
+	  timeout:'15000' // 15秒
 	
 	});
 // 添加获取七牛云token的方法
diff --git a/pages/course/courseDetail.vue b/pages/course/courseDetail.vue
index 3f62db9..ff1852f 100644
--- a/pages/course/courseDetail.vue
+++ b/pages/course/courseDetail.vue
@@ -3,7 +3,7 @@
 		<!-- 公共组件-每个页面必须引入 -->
 		<public-module></public-module>
 		<!-- <z-nav-bar :title="pageTitle ? pageTitle : '课程详情'"> -->
-		<z-nav-bar title="课程介绍"></z-nav-bar>
+		<z-nav-bar title="课程介绍"></z-nav-bar>		
 		<view class="contentBox commonPageContentBox" >
 			<u-alert v-if="goBuyTitle && isAndorid" style="
           background: linear-gradient(90deg, #258feb 0%, #00e1ec 100%);
@@ -1247,7 +1247,7 @@
 				uni.navigateTo({
 					url: `/pages/course/myCourseLearn?id=${this.course.id}`,
 				});
-			},
+			},			
 			async getData(id) {				
 				this.courseList = [];
 				// console.log("at line 1167:", "调用了几次");
@@ -1260,7 +1260,7 @@
 							data: {
 								id: id,
 							},
-							header: {
+							header: {								
 								//默认 无 说明：请求头
 								"Content-Type": "application/json",
 							},
@@ -1335,6 +1335,13 @@
 						})
 						.catch((e) => {
 							console.log(e, "获取目录数据报错");
+							// if(e.statusCode == 0){
+							// 	uni.showToast({
+							// 		title:'获取课程信息失败,请稍后尝试',
+							// 		icon:'none',
+							// 		duration: 5000
+							// 	})
+							// }
 						});
 				},
 			goBuy() {
diff --git a/uni_modules/zhouWei-request/js_sdk/request/core/utils.js b/uni_modules/zhouWei-request/js_sdk/request/core/utils.js
index c2881d0..aa2a044 100644
--- a/uni_modules/zhouWei-request/js_sdk/request/core/utils.js
+++ b/uni_modules/zhouWei-request/js_sdk/request/core/utils.js
@@ -36,9 +36,19 @@ export const dispatchRequest = function(requestInfo) {
 						errMsg: "请求超时，请重新尝试",
 						statusCode: 0,
 					});
-					uni.navigateTo({
-					    url: "/pages/user/login"
-					});
+					console.log('requestInfo.url',requestInfo.url);
+					if(!requestInfo.url.includes('sociology/course/saveCoursePosition')){					
+						uni.showToast({
+							title:'请求超时，请重新尝试',
+							icon:'none',
+							duration: 5000
+						})
+					}
+					
+					// console.log('');
+					// uni.navigateTo({
+					//     url: "/pages/user/login"
+					// });
 				} else {
 					reject(err);
 				}