From 3f60cf877106f475cbb4ec11c734f2f54c47ca7a Mon Sep 17 00:00:00 2001
From: xuesinan <1404152492@qq.com>
Date: Fri, 14 Jan 2022 11:10:33 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=8E=B7=E5=8F=96=E6=89=8B=E6=9C=BA?=
 =?UTF-8?q?=E5=94=AF=E4=B8=80=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                             |  14 +-
 CHANGELOG.md                        |   1 +
 components/Projects/ProjectItem.vue |   4 +-
 pages/index/index.vue               | 284 ++++++++++++++--------------
 pages/user/accountLogin.vue         |   2 +-
 pages/user/login.vue                |   3 +-
 pages/user/rigister.vue             |   2 +-
 store/user/actions.js               |   2 +-
 utils/cacheAndRequest.js            |   1 +
 utils/request.js                    |   8 +-
 10 files changed, 167 insertions(+), 154 deletions(-)

diff --git a/App.vue b/App.vue
index fce5850..eeb3868 100644
--- a/App.vue
+++ b/App.vue
@@ -19,18 +19,20 @@ export default {
     this.getSystemInfo(); // 获取系统设备信息、
 
     const token = this.$store.state.user.token || this.$storage.getStorageSync('anyringToken') || '';
-    if (!token) {
-      this.$ui.showToast('获取用户信息失败, 请登录');
-      // TODO: 跳转登录界面
-      return;
-    } else {
+    if (token) {
       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');
   },
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c7020c5..a2d7530 100644
--- a/CHANGELOG.md
+++ b/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)
diff --git a/components/Projects/ProjectItem.vue b/components/Projects/ProjectItem.vue
index 3ae7d79..5521e70 100644
--- a/components/Projects/ProjectItem.vue
+++ b/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>
 
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 733ef06..66aa3e2 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,141 +1,145 @@
-<template>
-	<!-- <view class="flex flex-col h-full bg-gray-50" @click="openAuth"> -->
-	<view class="flex flex-col h-full bg-gray-50">
-		<view class="relative" @touchmove="onMove">
-			<!-- 日历 -->
-			<Calendar @selected-change="onDateChange" :show-back="true" ref="calendar" @handleFindPoint="handleFindPoint" />
-			<!-- 上传 导入wbs -->
-			<Upload @success="onUploadSuccess" @error="onUploadError" />
-		</view>
-<u-button @click="toLogin">登录</u-button>
-		<!-- 项目列表 -->
-		<Projects @getProjects="getProjects" class="flex-1 overflow-y-auto" />
-
-		<!-- 全局提示框 -->
-		<u-top-tips ref="uTips"></u-top-tips>
-	</view>
-</template>
-
-<script setup>
-import { reactive, computed, watchEffect, ref } from 'vue';
-import { useStore } from 'vuex';
-import dayjs from 'dayjs';
-
-const store = useStore();
-const token = computed(() => store.state.user.token);
-const uTips = ref(null);
-
-const data = reactive({
-  calendar: null,
-  days: [],
-});
-
-// 监听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);
-    } else {
-      data.forEach(item => {
-        item.show = false;
-      });
-      store.commit('project/setProjects', data);
-    }
-  });
-}
-
-async function handleFindPoint(start, end) {
-  try {
-    const startTime = start || dayjs().startOf('month').valueOf();
-    const endTime = end || dayjs().endOf('month').valueOf();
-    const res = await uni.$u.api.findRedPoint(startTime, endTime);
-    store.commit('project/setDotList', res);
-  } catch (error) {
-    console.log('error: ', error);
-  }
-}
-
-// 点击了某个日期
-const onDateChange = event => {
-  const day = dayjs(event.fullDate);
-  const start = day.startOf('date').valueOf();
-  const end = day.endOf('date').valueOf();
-  getProjects(start, end);
-};
-
-// 导入成功
-const onUploadSuccess = () => {
-  uni.$ui.showToast('导入成功，即将打开新项目', 3000);
-  // uTips.show({
-  //   title: '导入成功，即将打开新项目',
-  //   type: 'success',
-  //   duration: '3000',
-  // });
-};
-
-// 导入失败
-const onUploadError = error => {
-  uni.$ui.showToast('导入失败', 6000);
-  // uTips.show({
-  //   title: error || '导入失败',
-  //   type: 'error',
-  //   duration: '6000',
-  // });
-};
-
-// 监听触摸滑动 切换日历的模式 月/周
-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);
-  } else if (y - prevY < 0) {
-    // 向上滑动 如果是月视图weekMode=false 就变成 周视图weekMode=true
-    !data.value.calendar.weekMode && (data.value.calendar.weekMode = true);
-  }
-  prevY = y;
-  data.value.calendar.initDate();
-}
-
-function toLogin() {
-  uni.navigateTo({ url: '/pages/user/login' })
-}
-</script>
-
-<style>
-.content {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-}
-
-.logo {
-  height: 200rpx;
-  width: 200rpx;
-  margin-top: 200rpx;
-  margin-left: auto;
-  margin-right: auto;
-  margin-bottom: 50rpx;
-}
-
-.text-area {
-  display: flex;
-  justify-content: center;
-}
-
-.title {
-  font-size: 36rpx;
-  color: #8f8f94;
-}
+<template>
+  <!-- <view class="flex flex-col h-full bg-gray-50" @click="openAuth"> -->
+  <view class="flex flex-col h-full bg-gray-50">
+    <view class="relative" @touchmove="onMove">
+      <!-- 日历 -->
+      <Calendar @selected-change="onDateChange" :show-back="true" ref="calendar" @handleFindPoint="handleFindPoint" />
+      <!-- 上传 导入wbs -->
+      <Upload @success="onUploadSuccess" @error="onUploadError" />
+    </view>
+    <u-button @click="toLogin">登录</u-button>
+    <!-- 项目列表 -->
+    <Projects @getProjects="getProjects" class="flex-1 overflow-y-auto" />
+
+    <!-- 全局提示框 -->
+    <u-top-tips ref="uTips"></u-top-tips>
+  </view>
+</template>
+
+<script setup>
+  import { reactive, computed, watchEffect, ref } from 'vue';
+  import { useStore } from 'vuex';
+  import dayjs from 'dayjs';
+
+  const store = useStore();
+  const token = computed(() => store.state.user.token);
+  const uTips = ref(null);
+
+  const data = reactive({
+    calendar: null,
+    // days: [],
+  });
+
+  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()) {
+    uni.$catchReq.getProjects(start, end, (err, data) => {
+      if (err) {
+        console.error('err: ', err);
+      } else {
+        data.forEach(item => {
+          item.show = false;
+        });
+        store.commit('project/setProjects', data);
+      }
+    });
+  }
+
+  async function handleFindPoint(start, end) {
+    try {
+      const startTime = start || dayjs().startOf('month').valueOf();
+      const endTime = end || dayjs().endOf('month').valueOf();
+      const res = await uni.$u.api.findRedPoint(startTime, endTime);
+      store.commit('project/setDotList', res);
+    } catch (error) {
+      console.log('error: ', error);
+    }
+  }
+
+  // 点击了某个日期
+  const onDateChange = event => {
+    const day = dayjs(event.fullDate);
+    const start = day.startOf('date').valueOf();
+    const end = day.endOf('date').valueOf();
+    getProjects(start, end);
+  };
+
+  // 导入成功
+  const onUploadSuccess = () => {
+    uni.$ui.showToast('导入成功，即将打开新项目', 3000);
+    // uTips.show({
+    //   title: '导入成功，即将打开新项目',
+    //   type: 'success',
+    //   duration: '3000',
+    // });
+  };
+
+  // 导入失败
+  const onUploadError = error => {
+    uni.$ui.showToast('导入失败', 6000);
+    // uTips.show({
+    //   title: error || '导入失败',
+    //   type: 'error',
+    //   duration: '6000',
+    // });
+  };
+
+  // 监听触摸滑动 切换日历的模式 月/周
+  function onMove(event) {
+    const y = event.changedTouches[0].pageY;
+    if (y - prevY > 0) {
+      // 向下滑动 如果是周视图weekMode=true 就 变成 月视图weekMode=false
+      data.calendar.weekMode && (data.calendar.weekMode = false);
+    } else if (y - prevY < 0) {
+      // 向上滑动 如果是月视图weekMode=false 就变成 周视图weekMode=true
+      !data.calendar.weekMode && (data.calendar.weekMode = true);
+    }
+    prevY = y;
+    data.calendar.initDate();
+  }
+
+  function toLogin() {
+    uni.navigateTo({
+      url: '/pages/user/login'
+    })
+  }
+</script>
+
+<style>
+  .content {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+  }
+
+  .logo {
+    height: 200rpx;
+    width: 200rpx;
+    margin-top: 200rpx;
+    margin-left: auto;
+    margin-right: auto;
+    margin-bottom: 50rpx;
+  }
+
+  .text-area {
+    display: flex;
+    justify-content: center;
+  }
+
+  .title {
+    font-size: 36rpx;
+    color: #8f8f94;
+  }
 </style>
diff --git a/pages/user/accountLogin.vue b/pages/user/accountLogin.vue
index 6e5d351..1453eaa 100644
--- a/pages/user/accountLogin.vue
+++ b/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();
 
diff --git a/pages/user/login.vue b/pages/user/login.vue
index fa1fa73..c94d866 100644
--- a/pages/user/login.vue
+++ b/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();
 
diff --git a/pages/user/rigister.vue b/pages/user/rigister.vue
index 3493e65..3be327f 100644
--- a/pages/user/rigister.vue
+++ b/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();
 
diff --git a/store/user/actions.js b/store/user/actions.js
index 520ada6..52a1c24 100644
--- a/store/user/actions.js
+++ b/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 || '获取个人信息失败');
diff --git a/utils/cacheAndRequest.js b/utils/cacheAndRequest.js
index cb0598a..9709027 100644
--- a/utils/cacheAndRequest.js
+++ b/utils/cacheAndRequest.js
@@ -31,6 +31,7 @@ export default {
         })
         .catch(err => !remote && fn(err));
     }
+    
     waitTokenRequest(() => {
       // 拿到api数据后 再用api的数据
       uni.$u.api
diff --git a/utils/request.js b/utils/request.js
index 49bb8a7..793f925 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -20,7 +20,13 @@ export function setupHttp(app) {
 		const token = store.state.user.token || storage.getStorageSync('anyringToken');
 		if (token) {
 			config.header.Authorization = `Bearer ${token}`;
-		}
+		}
+
+    uni.getSystemInfo({
+      success: function (res) {
+        config.header.deviceId = res.deviceId;
+      }
+    })
 
 		return config;
 	};