From 6e4f5cfce68b04260b7c6cdef6e02e64b7bd44a9 Mon Sep 17 00:00:00 2001
From: zhangwentao <09094219www>
Date: Mon, 11 Nov 2024 14:31:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/home/detail.vue | 2 +-
pages/home/home.vue | 15 ++++++++-------
pages/mine/edit-info.vue | 1 +
pages/news/course.vue | 6 +++---
utils/lib/code.js | 12 +++++++++---
utils/lib/request.js | 39 ++++++++++++++++++++-------------------
6 files changed, 42 insertions(+), 33 deletions(-)
diff --git a/pages/home/detail.vue b/pages/home/detail.vue
index 4fc9956..cf1062d 100644
--- a/pages/home/detail.vue
+++ b/pages/home/detail.vue
@@ -6,7 +6,7 @@
-
+
diff --git a/pages/home/home.vue b/pages/home/home.vue
index f82dcce..323da47 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -72,14 +72,14 @@
title: '适应',
type: 3
}, {
- img: '/static/img/demo/chuangye.png',
- imgSelect: '/static/img/demo/chuangye-select.png',
+ img: '/static/img/demo/chuangye.png',
+ imgSelect: '/static/img/demo/chuangye-select.png',
title: '职业',
type: 2
},
{
img: '/static/img/demo/jineng.png',
- imgSelect: '/static/img/demo/jineng-select.png',
+ imgSelect: '/static/img/demo/jineng-select.png',
title: '创业',
type: 4
},
@@ -106,13 +106,12 @@
},
onLoad() {
- this.getUserInfo()
+ // this.getUserInfo()
this.getList()
this.getBannerList()
},
onShow() {
- //查看是否填写意向调查表
- this.getTrainHas()
+
},
methods: {
async getList() {
@@ -148,7 +147,7 @@
})
},
search() {
- this.queryParams.page=1
+ this.queryParams.page = 1
this.assetList = []
this.getList()
},
@@ -179,6 +178,7 @@
this.tabIndex = e.detail.current
},
btntabs(item) {
+ this.getTrainHas()
this.queryParams.type = item.type
this.queryParams.page = 1
this.assetList = []
@@ -219,6 +219,7 @@
assetInfo({
id: item.asset_id
}).then(Response => {
+ uni.hideLoading()
uni.downloadFile({
url: Response.data.pdf_url,
success: function(res) {
diff --git a/pages/mine/edit-info.vue b/pages/mine/edit-info.vue
index fcf2ac9..c1ab6c0 100644
--- a/pages/mine/edit-info.vue
+++ b/pages/mine/edit-info.vue
@@ -695,6 +695,7 @@
title: '提交成功',
icon: 'none'
})
+ uni.setStorageSync('token', res.data.token);
setTimeout(() => {
uni.reLaunch({
url: '/pages/home/home'
diff --git a/pages/news/course.vue b/pages/news/course.vue
index 0892475..7503168 100644
--- a/pages/news/course.vue
+++ b/pages/news/course.vue
@@ -5,13 +5,13 @@
-
+
{{info.asset_name}}
-
+
{{info.digest}}
-
+
diff --git a/utils/lib/code.js b/utils/lib/code.js
index 5988913..0f97773 100644
--- a/utils/lib/code.js
+++ b/utils/lib/code.js
@@ -69,9 +69,15 @@ function codes() {
title: '提示',
content: '请先用户注册',
success: function(res) {
- uni.reLaunch({
- url: '/pages/mine/edit-info?type=register'
- });
+ if (res.confirm) {
+ uni.reLaunch({
+ url: '/pages/mine/edit-info?type=register'
+ });
+ } else if (res.cancel) {
+ uni.navigateBack({
+ delta: 1
+ })
+ }
}
});
}
diff --git a/utils/lib/request.js b/utils/lib/request.js
index 5e7ea2e..50e6b18 100644
--- a/utils/lib/request.js
+++ b/utils/lib/request.js
@@ -49,27 +49,28 @@ export const apiResquest = (params) => {
success: (res) => {
// 如果返回的 code 为 1，表示需要重新获取 token
if (res.data.code == 1) {
- if (!isRefreshing) {
- isRefreshing = true; // 设置标志位
- wxCode.codes().then(newToken => {
- isRefreshing = false; // 请求完成，重置标志位
- // 更新所有等待中的请求的 token
- pendingRequests.forEach((req) => {
- req.resolve({ ...res.data, token: newToken });
- });
- pendingRequests = []; // 清空等待中的请求
- }).catch((err) => {
- isRefreshing = false; // 请求失败，重置标志位
- // 拒绝所有等待中的请求
- pendingRequests.forEach((req) => {
- req.reject(err);
- });
- pendingRequests = []; // 清空等待中的请求
- });
+ // if (!isRefreshing) {
+ // isRefreshing = true; // 设置标志位
+ wxCode.codes()
+ // .then(newToken => {
+ // isRefreshing = false; // 请求完成，重置标志位
+ // // 更新所有等待中的请求的 token
+ // pendingRequests.forEach((req) => {
+ // req.resolve({ ...res.data, token: newToken });
+ // });
+ // pendingRequests = []; // 清空等待中的请求
+ // }).catch((err) => {
+ // isRefreshing = false; // 请求失败，重置标志位
+ // // 拒绝所有等待中的请求
+ // pendingRequests.forEach((req) => {
+ // req.reject(err);
+ // });
+ // pendingRequests = []; // 清空等待中的请求
+ // });
}
// 如果正在刷新，加入等待中的请求
- return pendingRequests.push({ resolve, reject });
- }
+ // return pendingRequests.push({ resolve, reject });
+ // }
resolve(res.data); // 正常返回
},