From d10256bcc527ab0d516743bf7c0807a1c685bfe4 Mon Sep 17 00:00:00 2001
From: helming <strive_code@163.com>
Date: Wed, 22 Mar 2023 23:33:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/creator/creatorDetail.vue              |  92 ++++++++-----
 pages/creator/imgDetail.vue                  |  11 +-
 pages/userInfo/myCollection/myCollection.vue |   2 +-
 pages/userInfo/setting/setting.vue           |  17 ++-
 utils/request.js                             | 128 +++++++++++++++++--
 5 files changed, 205 insertions(+), 45 deletions(-)

diff --git a/pages/creator/creatorDetail.vue b/pages/creator/creatorDetail.vue
index 5011272..0dfa50c 100644
--- a/pages/creator/creatorDetail.vue
+++ b/pages/creator/creatorDetail.vue
@@ -1,38 +1,41 @@
 <template>
 	<view class="creatorDetail">
 		<view class="avatar-box">
-			<view class="avatar-top">
-				<view class="avatar-left-box">
-					<image :src="creatorInfo.img" mode=""></image>
-					<text>{{creatorInfo.scanCode}}</text>
-				</view>
-				<view class="avatar-right-box">
-					<button class="" open-type="share" size="mini" type="default" style="background: none; outline: none;">
-            <uni-icons class="list-menu-icon" custom-prefix="iconfont" :type="'icon-fenxiang'" size="20" :color="'#FFFFFF'"></uni-icons>
-					</button>
-				</view>
-			</view>
-			<view class="avatar-box-text">
-				<text>{{creatorInfo.intro}}</text>
-			</view>
-			<view class="avatar-box-tag">
-				<view class="avatar-box-tag-left">
-					<view class="tag-left-box">
-						<text>{{creatorInfo.imgTotalNum}}</text>
-						<text>图片</text>
-					</view>
-					<view class="tag-left-box">
-						<text>{{creatorInfo.imgCollectionNum}}</text>
-						<text>收藏</text>
-					</view>
-					<view class="tag-left-box">
-						<text>{{creatorInfo.imgLikeNum}}</text>
-						<text>喜欢</text>
-					</view>
-				</view>
-				<view class="avatar-box-tag-right">
-				</view>
-			</view>
+      <view class="dim-div"></view>
+      <view class="avatar-content">
+        <view class="avatar-top">
+          <view class="avatar-left-box">
+            <image :src="creatorInfo.img" mode=""></image>
+            <text>{{creatorInfo.scanCode}}</text>
+          </view>
+          <view class="avatar-right-box">
+            <button class="" open-type="share" size="mini" type="default" style="background: none; outline: none;">
+              <uni-icons class="list-menu-icon" custom-prefix="iconfont" :type="'icon-fenxiang'" size="20" :color="'#FFFFFF'"></uni-icons>
+            </button>
+          </view>
+        </view>
+        <view class="avatar-box-text">
+          <text>{{creatorInfo.intro}}</text>
+        </view>
+        <view class="avatar-box-tag">
+          <view class="avatar-box-tag-left">
+            <view class="tag-left-box">
+              <text>{{creatorInfo.imgTotalNum}}</text>
+              <text>图片</text>
+            </view>
+            <view class="tag-left-box">
+              <text>{{creatorInfo.imgCollectionNum}}</text>
+              <text>收藏</text>
+            </view>
+            <view class="tag-left-box">
+              <text>{{creatorInfo.imgLikeNum}}</text>
+              <text>喜欢</text>
+            </view>
+          </view>
+          <view class="avatar-box-tag-right">
+          </view>
+        </view>
+      </view>
 		</view>
 		<view class="middle">
 			<uni-segmented-control :current="current" :values="arrList" @clickItem="onClickItem" styleType="text"
@@ -193,8 +196,31 @@
 <style lang="scss" scoped>
 	.creatorDetail {
 		.avatar-box {
-			padding: 20rpx 20rpx;
+      height: 20vh;
       background-image: linear-gradient(-225deg, #007adf 0%, #00ecbc 100%);
+      position: relative;
+
+      .dim-div {
+        width: 100%;
+        height: 100%;
+        position: absolute;
+        top: 0;
+        left: 0;
+        /* 主要内容 */
+        background: rgba(26, 148, 188, .1);
+        /* 模糊大小就是靠的blur这个函数中的数值大小 */
+        backdrop-filter: blur(25rpx);
+      }
+
+      .avatar-content {
+        width: 100%;
+        height: 100%;
+        padding: 20px;
+        position: absolute;
+        top: 0;
+        left: 0;
+        display: grid;
+      }
 
 			.avatar-top {
 				display: flex;
diff --git a/pages/creator/imgDetail.vue b/pages/creator/imgDetail.vue
index fbc0d75..b2c5a06 100644
--- a/pages/creator/imgDetail.vue
+++ b/pages/creator/imgDetail.vue
@@ -63,14 +63,21 @@
         primaryColor: '#1a94bc',
         likeColor: '#ef223c',
         collectColor: '#dcaa04',
+        urlParamId: undefined,
 			}
 		},
+    onLoad(option){
+      if (option?.id) {
+        this.urlParamId = option.id;
+      }
+    },
 		created() {
 			const detailId = uni.getStorageSync('detailId')
 			if (detailId) {
 				this.getImgDetail(detailId)
 			} else {
-				this.getImgDetail(detailId)
+			  //可能是路径参数
+        this.urlParamId && this.getImgDetail(this.urlParamId);
 			}
 		},
 		onShareAppMessage(res) {
@@ -83,7 +90,7 @@
       })
 			return {
 				title: '来看看艺术家[' + this.scanCode + ']精心准备的图片吧~',
-				path: `/pages/creator/imgDetail?id=${this.userInfo.id}`,
+				path: `/pages/creator/imgDetail?id=${this.detailMsg.id}`,
 				bgImgUrl: `${this.detailMsg.imgUrl}`
 			}
 		},
diff --git a/pages/userInfo/myCollection/myCollection.vue b/pages/userInfo/myCollection/myCollection.vue
index c3be0c4..92b7e7f 100644
--- a/pages/userInfo/myCollection/myCollection.vue
+++ b/pages/userInfo/myCollection/myCollection.vue
@@ -92,7 +92,7 @@
 				if (item.id) {
 					uni.setStorage({
 						key: 'detailId',
-						data: item.imgId,
+						data: item.id,
 						success() {
 							uni.navigateTo({
 								url: '../../creator/imgDetail'
diff --git a/pages/userInfo/setting/setting.vue b/pages/userInfo/setting/setting.vue
index 80d3d67..bbba3ef 100644
--- a/pages/userInfo/setting/setting.vue
+++ b/pages/userInfo/setting/setting.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="container">
     <view class="list-menu">
-      <view class="list-menu-item" @click="logoutUser">
+      <view class="list-menu-item" @click="clearCache">
         <uni-icons class="list-menu-icon" custom-prefix="iconfont" :type="clearIcon" size="20" :color="primaryColor"></uni-icons>
         <view class="text">清除缓存</view>
         <uni-icons class="list-menu-genduo" custom-prefix="iconfont" type="icon-gengduo"></uni-icons>
@@ -65,6 +65,21 @@
 		// 	}
 		// },
 		methods: {
+		  //清除缓存
+      clearCache() {
+        let that = this;
+        uni.showModal({
+          title: "提示",
+          content: "确定清除缓存吗！",
+          showCancel: true,
+          success: function(ress){
+            if(ress.confirm){
+
+            }
+          }
+        });
+      }
+      },
 			//注销
 			logoutUser(){
 				let that = this;
diff --git a/utils/request.js b/utils/request.js
index 2d1235a..1408d46 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -1,6 +1,7 @@
 import axios from "axios"
 import qs from "qs"
 import Vue from "vue"
+import {loginTiktok} from "../api/auth";
 
 const service = axios.create({
 	withCredentials: true,
@@ -8,18 +9,128 @@ const service = axios.create({
 	baseURL: Vue.prototype.baseURL, //这个baseURL是我在main.js下配置的请求url
 	timeout: 10000
 })
+const loginFunc = (res, userInfo) => {
+	const params = {
+		code: res.code,
+		encryptedData: userInfo.encryptedData,
+		iv: userInfo.iv
+	}
+	// 用户授权登录
+	loginTiktok(params).then(res => {
+		if (res.data.code === 200) {
+			uni.setStorage({
+				key: 'userInfo',
+				data: res.data.data.userInfo,
+			})
+			this.userInfo = res.data.data.userInfo;
+			uni.setStorage({
+				key: 'token',
+				data: res.data.data.access_token
+			})
+		} else {
+			uni.showToast({
+				title: res.data.msg,
+				icon: 'none'
+			})
+		}
+	}).catch(res => {})
+}
+
+const refreshToken = () => {
+	uni.showModal({
+		title: '登录信息已过期',
+		content: '重新授权登录？',
+		success: function (res) {
+			if (res.confirm) {
+				uni.getSetting({
+					success: (settingObj) => {
+						if (settingObj.authSetting['scope.userInfo'] === undefined || settingObj.authSetting['scope.userInfo']) {
+							uni.login({
+								force: true,
+								success: (res) => {
+									uni.getUserInfo({
+										withCredentials: true,
+										success: (userInfo) => {
+											loginFunc(res, userInfo)
+										},
+										complete: () => {
+
+										},
+										fail: (errMsg) => {
+
+										}
+									})
+								},
+								complete: () => {
+
+								},
+								fail: (errMsg) => {
+
+								}
+							})
+						} else {
+							uni.showModal({
+								title: '您已拒绝授权用户信息',
+								content: '是否进入权限管理，调整授权？',
+								success: function (res) {
+									if (res.confirm) {
+										uni.openSetting({
+											success: (settingRes) => {
+												if (settingRes.authSetting['scope.userInfo']) {
+													uni.login({
+														force: true,
+														success: (res) => {
+															uni.getUserInfo({
+																withCredentials: true,
+																success: (userInfo) => {
+																	loginFunc(res, userInfo)
+																},
+																complete: () => {
+
+																},
+																fail: (errMsg) => {
 
+																}
+															})
+														},
+														complete: () => {
+
+														},
+														fail: (errMsg) => {
+
+														}
+													})
+												}
+											},
+											fail: () => {
+
+											}
+										})
+									} else if (res.cancel) {
+										console.log('用户点击取消');
+									}
+								}
+							});
+						}
+					}
+				})
+			} else if (res.cancel) {
+				console.log('用户点击取消');
+			}
+		}
+	})
+}
 
 // request拦截器,在请求之前做一些处理
 service.interceptors.request.use(
 	config => {
 		const token = uni.getStorageSync('token');
-		console.log('获取到的token',token)
+		// console.log('获取到的token',token)
 		if (token) {
 		    // 给请求头添加user-token
-			console.log('进入携带token方法')
+			// console.log('进入携带token方法')
 		    config.headers["TiktokAuthorization"] = token;
-			console.log('token放入headers',config.headers)
+			// console.log('token放入headers',config.headers)
 		}
 		config.headers['Content-Type'] = 'application/json'
 		// config.method === 'post' ?
@@ -30,7 +141,7 @@ service.interceptors.request.use(
 		return config;
 	},
 	error => {
-		console.log(error); // for debug
+		// console.log(error); // for debug
 		return Promise.reject(error);
 	}
 );
@@ -44,10 +155,11 @@ service.interceptors.response.use(res => {
 	// 	return Promise.reject(res.data.msg);
 	// }
 }, error => {
-	/*if(error.response.status === 403){
-		// refreshToken() 刷新token并重置token
-	}*/
-	return Promise.reject(error)
+	if(error.response.status === 401){
+		refreshToken() //刷新token并重置token
+	} else {
+		return Promise.reject(error)
+	}
 })
 
 axios.defaults.adapter = function(config) { //自己定义个适配器，用来适配uniapp的语法