feat: 获取手机唯一码

App.vue

@@ -19,18 +19,20 @@ export default {
     this.getSystemInfo(); // 获取系统设备信息、
 
     const token = this.$store.state.user.token || this.$storage.getStorageSync('anyringToken') || '';
-    if (!token) {
+    if (token) {
-      this.$ui.showToast('获取用户信息失败, 请登录');
-      // TODO: 跳转登录界面
-      return;
-    } else {
       this.$store.commit('user/setToken', token);
     }
 
+    // if (!token) {
+    //   this.$ui.showToast('获取用户信息失败, 请登录');
+    //   // TODO: 跳转登录界面
+    //   return;
+    // }
+
     // await this.syncLocalDataToStore(options.query.u); // 将localStorage里的数据同步到store里
     // token = await this.getToken();
 
-    this.noPhone(this.$store.state.user.phone);
+    // this.noPhone(this.$store.state.user.phone);
     this.$store.dispatch('socket/initSocket');
   },
 

CHANGELOG.md

@@ -49,6 +49,7 @@
  - | 时间轴任务 | [98abdf6](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/98abdf6)
  - | 项目列表排序 | [ad0ce75](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/ad0ce75)
  - | 修复一些内容 | [3cdb1ce](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/3cdb1ce)
+ - | 子组件传参 | [489e218](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/489e218)
  app.vue | 修复获取token报错的问题 | [9120d54](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/9120d54)
  createTask | 修复createTask v-model的问题 | [b20d3f0](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/b20d3f0)
  - | defineExpose, defineEmits不需要引入 | [902cacc](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/902cacc)

components/Projects/ProjectItem.vue

@@ -12,9 +12,9 @@
         </view>
 
         <view class="flex items-center text-xs text-gray-400">
-          <view class="pr-2">{{ dayjs(item.startTime).format('MM-DD HH:mm') }}</view>
+          <view class="pr-2">{{ dayjs(+item.startTime).format('MM-DD HH:mm') }}</view>
           至
-          <view class="pl-2">{{ dayjs(item.endTime).format('MM-DD HH:mm') }}</view>
+          <view class="pl-2">{{ dayjs(+item.endTime).format('MM-DD HH:mm') }}</view>
         </view>
       </view>
 

pages/index/index.vue

@@ -27,21 +27,23 @@ const uTips = ref(null);
 
   const data = reactive({
     calendar: null,
-  days: [],
+    // days: [],
   });
 
-// 监听token
-watchEffect(() => {
-  if (!token.value) return;
-  if (token.value) {
   getProjects();
   handleFindPoint();
-  }
+
-});
+  // 监听token
+  // watchEffect(() => {
+  //   if (!token.value) return;
+  //   if (token.value) {
+  //     getProjects();
+  //     handleFindPoint();
+  //   }
+  // });
 
   // 获取项目列表
   function getProjects(start = dayjs().startOf('day').valueOf(), end = dayjs().endOf('day').valueOf()) {
-  // const data = await this.$u.api.getProjects(start, end);
     uni.$catchReq.getProjects(start, end, (err, data) => {
       if (err) {
         console.error('err: ', err);
@@ -98,17 +100,19 @@ function onMove(event) {
     const y = event.changedTouches[0].pageY;
     if (y - prevY > 0) {
       // 向下滑动 如果是周视图weekMode=true 就 变成 月视图weekMode=false
-    data.value.calendar.weekMode && (data.value.calendar.weekMode = false);
+      data.calendar.weekMode && (data.calendar.weekMode = false);
     } else if (y - prevY < 0) {
       // 向上滑动 如果是月视图weekMode=false 就变成 周视图weekMode=true
-    !data.value.calendar.weekMode && (data.value.calendar.weekMode = true);
+      !data.calendar.weekMode && (data.calendar.weekMode = true);
     }
     prevY = y;
-  data.value.calendar.initDate();
+    data.calendar.initDate();
   }
 
   function toLogin() {
-  uni.navigateTo({ url: '/pages/user/login' })
+    uni.navigateTo({
+      url: '/pages/user/login'
+    })
   }
 </script>
 

pages/user/accountLogin.vue

@@ -81,7 +81,7 @@
       store.commit('user/setToken', res.token);
       store.commit('user/setUser', res);
       uni.$storage.setStorageSync('anyringToken', res.token || '');
-      uni.$storage.setStorageSync('user', JSON.stringify(res));
+      uni.$storage.setStorageSync('user', JSON.stringify(res) || '');
 
       uni.$ui.hideLoading();
 

pages/user/login.vue

@@ -98,11 +98,10 @@
       });
 
       let res = await uni.$u.api.signin(params);
-      console.log(res, '----------')
       store.commit('user/setToken', res.token);
       store.commit('user/setUser', res);
       uni.$storage.setStorageSync('anyringToken', res.token || '');
-      uni.$storage.setStorageSync('user', JSON.stringify(res));
+      uni.$storage.setStorageSync('user', JSON.stringify(res) || '');
 
       uni.$ui.hideLoading();
 

pages/user/rigister.vue

@@ -108,7 +108,7 @@
       store.commit('user/setToken', res.token);
       store.commit('user/setUser', res);
       uni.$storage.setStorageSync('anyringToken', res.token || '');
-      uni.$storage.setStorageSync('user', JSON.stringify(res));
+      uni.$storage.setStorageSync('user', JSON.stringify(res) || '');
 
       uni.$ui.hideLoading();
 

store/user/actions.js

@@ -10,7 +10,7 @@ const actions = {
       commit('setToken', res.token);
       commit('setUser', res);
       uni.$storage.setStorageSync('anyringToken', res.token || '');
-      uni.$storage.setStorageSync('user', JSON.stringify(res));
+      uni.$storage.setStorageSync('user', JSON.stringify(res) || '');
       return res;
     } catch (error) {
       uni.$ui.showToast(error.msg || '获取个人信息失败');

utils/cacheAndRequest.js

@@ -31,6 +31,7 @@ export default {
         })
         .catch(err => !remote && fn(err));
     }
+    
     waitTokenRequest(() => {
       // 拿到api数据后 再用api的数据
       uni.$u.api

utils/request.js

@@ -22,6 +22,12 @@ export function setupHttp(app) {
 			config.header.Authorization = `Bearer ${token}`;
 		}
 
+    uni.getSystemInfo({
+      success: function (res) {
+        config.header.deviceId = res.deviceId;
+      }
+    })
+
 		return config;
 	};