From eedeb5c37fcd8f3f2b5b004ec46669941e4c619d Mon Sep 17 00:00:00 2001
From: "@fawn-nine" <1271023382@qq.com>
Date: Wed, 14 Aug 2024 16:14:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=B7=E6=B1=82=E6=97=B6?=
 =?UTF-8?q?=E9=95=BF=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/baseUrl.js            | 1 +
 config/requestConfig.js      | 3 ++-
 config/utils.js              | 2 +-
 manifest.json                | 6 +++---
 pages/bookShop/orderList.vue | 8 +++++---
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/config/baseUrl.js b/config/baseUrl.js
index 3355af6..f11123d 100644
--- a/config/baseUrl.js
+++ b/config/baseUrl.js
@@ -18,6 +18,7 @@ if (process.env.NODE_ENV === 'development') {
 	// baseUrl = "http://59.110.212.44:9100/pb/";
 	// baseUrl = "https://testapi.nuttyreading.com/";  
 	 baseUrl = "https://api.nuttyreading.com/";   //1
+	 // baseUrl = "http://192.168.110.100:9200/pb/";    //  开发用电脑
 	// baseUrl = "ws://twin-ui.com:6001/";
 	// socketUrl = "ws://twin-ui.com:6001/";
 }
diff --git a/config/requestConfig.js b/config/requestConfig.js
index f154b86..c1df608 100644
--- a/config/requestConfig.js
+++ b/config/requestConfig.js
@@ -39,7 +39,8 @@ let $http = new request({
 		// 'Content-Type': 'application/json;charset=UTF-8',
 		'Content-Type': 'application/x-www-form-urlencoded',
 		// 'project_token': base.projectToken, //项目token（可删除）
-	}
+	},
+		timeout:'60000'		
 });
 // 添加获取七牛云token的方法
 $http.getQnToken = function(callback) {
diff --git a/config/utils.js b/config/utils.js
index 59ed9c1..f37b77a 100644
--- a/config/utils.js
+++ b/config/utils.js
@@ -271,7 +271,7 @@ export const setWXPay = function(payInfo, callback) {
 			'Content-Type': 'application/json'
 		},
 	}).then(res => {
-		console.log(res,'resshoppingPay')			
+		console.log('resshoppingPay',res)			
 		if(res.code === 0){
 			let payData = {
 				provider : 'wxpay',
diff --git a/manifest.json b/manifest.json
index 4501da4..1d35e70 100644
--- a/manifest.json
+++ b/manifest.json
@@ -3,7 +3,7 @@
     "appid" : "__UNI__9788EB5",
     "description" : "疯子读书",
     "networkTimeout" : {
-        "request" : 3000
+        "request" : 30000
     },
     "transformPx" : false,
     "icons" : [
@@ -12,8 +12,8 @@
             "src" : "图片路径"
         }
     ],
-    "versionName" : "1.2.51",
-    "versionCode" : 1251,
+    "versionName" : "1.2.52",
+    "versionCode" : 1252,
     "app-plus" : {
         "compatible" : {
             "ignoreVersion" : true
diff --git a/pages/bookShop/orderList.vue b/pages/bookShop/orderList.vue
index 3f63498..71549da 100644
--- a/pages/bookShop/orderList.vue
+++ b/pages/bookShop/orderList.vue
@@ -264,9 +264,9 @@ import { data } from 'jquery';
 			},
 			getBookList(flag, refreshflag){
 				// 根据tab不同，获取最新书评、最热书评、书集列表
-				// uni.showLoading({
-				// 	title: '加载中'
-				// });
+				uni.showLoading({
+					title: '加载中'
+				});
 
 				// 顶部红点数量
 				$http.request({
@@ -298,6 +298,7 @@ import { data } from 'jquery';
 						'Content-Type': 'application/json'
 					},
 				}).then(res => {
+					uni.hideLoading()
 					console.log(res, '内容获取成功')
 					if (res.code == 0 && res.page && res.page.records.length > 0) {
 						this.newList = this.newList.concat(res.page.records)
@@ -310,6 +311,7 @@ import { data } from 'jquery';
 						this.status = 0
 					}
 				}).catch(e => {
+					uni.hideLoading()
 					console.log(e)
 				})
 			},