feat:添加登录接口

App.vue

@@ -1,10 +1,8 @@
-<script>
+<script>
+	import USER from '@/api/user.js'
 	export default {
 		onLaunch: function() {
-			console.log('App Launch')
-			// #ifdef MP-WEIXIN
 			this.handleWxLogin()
-			// #endif
 		},
 		onShow: function() {
 			console.log('App Show')
@@ -19,28 +17,24 @@
 					// 1. 获取code
 					const loginRes = await new Promise((resolve, reject) => {
 						uni.login({
-							success: resolve,
+							success:async({code}) =>{
+								// 2、登录获取用户信息
+								const {data} = USER.fetchLogin({code})
+								uni.setStorageSync('userInfo', data);
+								resolve(data)
+							},
 							fail: reject
 						});
-					});
-
-					// 2. 获取用户信息
-					// const userInfo = await new Promise((resolve, reject) => {
-					//   uni.getUserProfile({
-					//     desc: '用于登录',
-					//     success: resolve,
-					//     fail: reject
-					//   });
-					// });
-
-					console.log('登录成功:', {
-						code: loginRes.code,
-						// userInfo: userInfo.userInfo
-					});
-
+					});
 				} catch (err) {
-					console.error('登录失败:', err);
+					console.error('登录失败:', err);
+					reject(err)
 				}
+				// #endif
+				
+				// #ifdef H5
+				const {data} = await USER.userInfo()
+				uni.setStorageSync('userInfo', data);
 				// #endif
 			}
 		}

api/user.js

@@ -6,5 +6,8 @@ export default {
   userInfo() {
     return http.get('mini/bbs_my/userInfo')
   },
-  
+  // ! 登录并获取token
+  fetchLogin(data) {
+    return http.post('mini/mini_min_app_user/login',data)
+  },
 }

pages/tabBar/mine/mine.vue

@@ -67,6 +67,7 @@
 
 <script setup>
 import config from "@/api/config.js"
+import { onLoad } from '@dcloudio/uni-app'
 
 const orderList = ["待付款","待发货","待收货","待评价","退款/售后"]
 const imageList = []
@@ -81,7 +82,12 @@ const handleItem = (status) =>{
 	uni.navigateTo({
 		url: `/pages/tabBar/mine/subPages/order?status=${status + 1}`
 	});
-}
+}
+
+onLoad(()=>{
+	console.log(1)
+	console.log(uni.getStorageSync('userInfo'))
+})
 </script>
 
 <style lang="scss" scoped>

pages/tabBar/tree/components/treeAlbumPopup.vue

@@ -11,8 +11,8 @@
 			<view class="album-cont">
 				<view class="time-line">
 					<view class="time-item" v-for="item in 6" :key="item">
-						<text :style="{color:item==6?'#2199F8':'#DBDBDB'}">07/28</text>
-						<view class="dot" :style="{background:item==6?'#2199F8':'#DBDBDB'}"></view>
+						<text :style="{color:item==6?'#2199F8':'#777777'}">07/28</text>
+						<view class="dot" :style="{background:item==6?'#2199F8':'#777777'}"></view>
 						<text class="today" v-if="item==6">今</text>
 					</view>
 				</view>
@@ -109,7 +109,7 @@
 				.time-item{
 					flex: 1;
 					font-size: 24rpx;
-					color: #DBDBDB;
+					color: #777777;
 					display: flex;
 					flex-direction: column;
 					align-items: center;
@@ -126,7 +126,7 @@
 					.dot{
 						width: 14rpx;
 						height: 14rpx;
-						background: #DBDBDB;
+						background: #777777;
 						border-radius: 50%;
 					}
 					.today{

utils/http.js

@@ -54,13 +54,26 @@ class HttpRequest {
         title: '加载中',
         mask: true
       })
-      
-      // 添加token
+	  // 添加token
+	  
+	  // #ifdef H5
 	  const token = '6288d39b-ed8e-4e67-9dac-796ee30eb5e4'
-      // const token = uni.getStorageSync('token')
+	  // #endif
+	  
+	  // #ifdef MP-WEIXIN
+	  const token = uni.getStorageSync('userInfo')
+	  // #endif
+	  config.header.appId = 'wx628f62793fdf5251'
       if (token) {
         config.header = config.header || {}
+		
+		// #ifdef H5
 		config.header.token = token
+		// #endif
+		
+		// #ifdef MP-WEIXIN
+		config.header.token = userInfo.token
+		// #endif
       }
       
       // 记录请求开始时间（用于计算请求耗时）