Merge branch 'master' of https://gitee.com/pennyJoly/bnyer-cloud-tiktok

 Conflicts:

	pages/userInfo/myCollection/myCollection.vue

	utils/request.js

main.js

@@ -1,7 +1,7 @@
 import App from './App'
 import store from './store/'
 
-const baseURL = 'http://81.69.47.31:7010'
+const baseURL = 'http://localhost:7010'
 
 Vue.prototype.baseURL = baseURL;
 

pages/userInfo/myCollection/myCollection.vue

@@ -1,6 +1,9 @@
 <template>
 	<view>
 		<text>这是我的收藏</text>
+		<view v-for="(item,index) in myCollection" :key="index">
+			<image :src="item.imgUrl"></image>
+		</view>
 	</view>
 </template>
 
@@ -9,28 +12,27 @@
 	export default {
 		data() {
 			return {
-				
+				myCollection:[]
 			}
 		},
 		onLoad() {
 			this.getMyCollection(1)
 		},
 		methods: {
-			
+				async getMyCollection(userId){
-			getMyCollection(userId){
 				let data = {
-					
+					userId : userId
+				}
+				const res = await getCollectionList(data)
+				if(res.data.code === 200){
+					this.myCollection = res.data.data
+					console.log(res)
+				}else{
+					uni.showModal({
+						content: '我的收藏加载失败！', 
+						showCancel: false
+					});
 				}
-				const res = getCollectionList(data);
-				// if(res.data.code === 200){
-				// 	//this.banner = res.data.data
-				// 	console.log('结果为：',res)
-				// }else{
-				// 	uni.showModal({
-				// 		content: '我的收藏加载失败！', 
-				// 		showCancel: false
-				// 	});
-				// }
 			}
 		}
 	}

utils/request.js

@@ -9,6 +9,7 @@ const service = axios.create({
 	timeout: 10000
 })
 
+
 // request拦截器,在请求之前做一些处理
 service.interceptors.request.use(
 	config => {
@@ -16,12 +17,12 @@ service.interceptors.request.use(
 		//     // 给请求头添加user-token
 		//     config.headers["user-token"] = store.state.token;
 		// }
-		config.headers['Content-Type'] = 'application/json';
+		config.headers['Content-Type'] = 'application/json'
-		config.method === 'post' ?
+		// config.method === 'post' ?
-			config.data = qs.stringify({ ...config.data
+		// 	config.data = qs.stringify({ ...config.data
-			}) :
+		// 	}) :
-			config.params = { ...config.params
+		// 	config.params = { ...config.params
-			};
+		// 	};
 		console.log('请求拦截成功')
 		console.log(config)
 		return config;