diff --git a/CHANGELOG.md b/CHANGELOG.md
index cc48ae0..9a9bbc4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,38 +3,41 @@
 ### 🌟 新功能
 范围|描述|commitId
 --|--|--
- - | app.vue | [970cf9a](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/970cf9a)
- - | first commit | [8dc26de](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8dc26de)
- project | 日常任务面板添加 | [b3f16ff](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/b3f16ff)
- theme | theme demo | [9175758](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/9175758)
- - | vue3 | [12ed2ad](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/12ed2ad)
- - | 使用uview完成api请求 | [1b3efd8](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/1b3efd8)
- - | 日历页添加 | [1b46a91](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/1b46a91)
+ - | 表单验证 | [8f3bc1e](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8f3bc1e)
+ - | 更新代码 | [392c8cc](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/392c8cc)
  - | 日历页首页 | [561c8e6](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/561c8e6)
- - | 时间轴展示 | [8b1b380](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8b1b380)
+ - | 日历页添加 | [1b46a91](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/1b46a91)
  - | 时间轴接口 | [a95d005](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/a95d005)
  - | 时间轴页面 | [e926b75](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/e926b75)
- - | 更新代码 | [392c8cc](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/392c8cc)
+ - | 时间轴展示 | [8b1b380](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8b1b380)
+ - | 使用uview完成api请求 | [1b3efd8](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/1b3efd8)
+ - | 手机号登录 | [565585b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/565585b)
  - | 添加 timeline | [72dad2b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/72dad2b)
- - | 表单验证 | [8f3bc1e](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8f3bc1e)
- - | 账户名密码登录 | [ebf456e](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/ebf456e)
- - | 项目列表 | [a52e6d5](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/a52e6d5)
  - | 项目操作面板 | [3beb05e](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/3beb05e)
+ - | 项目列表 | [a52e6d5](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/a52e6d5)
+ - | 项目列表新 | [88cf48d](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/88cf48d)
+ - | 账户名密码登录 | [ebf456e](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/ebf456e)
+ - | app.vue | [970cf9a](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/970cf9a)
+ - | first commit | [8dc26de](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8dc26de)
+ project | 日常任务面板添加 | [b3f16ff](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/b3f16ff)
+ theme | theme demo | [9175758](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/9175758)
+ - | vue3 | [12ed2ad](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/12ed2ad)
 
 
 ### 🎨 代码样式
 范围|描述|commitId
 --|--|--
- - | calender格式及细节调整 | [db9602b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/db9602b)
  - | 细节调整 | [bdd5f87](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/bdd5f87)
+ - | calender格式及细节调整 | [db9602b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/db9602b)
 
 
 ### 🐛 Bug 修复
 范围|描述|commitId
 --|--|--
+ - | 修复一些内容 | [3cdb1ce](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/3cdb1ce)
  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)
- - | 修复一些内容 | [3cdb1ce](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/3cdb1ce)
+ - | defineExpose, defineEmits不需要引入 | [902cacc](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/902cacc)
 
 
 ### 📦 持续集成
@@ -42,13 +45,14 @@
 --|--|--
  - | 修改.drone.yml | [f5b52e3](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/f5b52e3)
  - | 添加drone.yml | [9fbae89](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/9fbae89)
+ - | 修改.drone.yml | [f5b52e3](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/f5b52e3)
 
 
 ### 🔨 代码重构
 范围|描述|commitId
 --|--|--
- - | project init 重构 | [2457a87](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/2457a87)
  - | 重构project init 部分 | [c7bf2df](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/c7bf2df)
+ - | project init 重构 | [2457a87](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/2457a87)
 
 
 ### 🚀 性能优化
diff --git a/apis/plugin.js b/apis/plugin.js
new file mode 100644
index 0000000..e881ec5
--- /dev/null
+++ b/apis/plugin.js
@@ -0,0 +1,21 @@
+import Config from '@/common/js/config.js'
+
+const apiUrl = Config.apiUrl;
+const defaultwbs = `${apiUrl}/defaultwbs`;
+
+export function setupPlugin(app) {
+  uni.$u.api = { ...uni.$u.api } || {};
+  // 获取插件信息
+  uni.$u.api.getOtherPlugin = param => uni.$u.post(`${apiUrl}/pluginshop/plugin/query?pluginId=${param.pluginId}&styleType=${param.styleType}`);
+
+  // 查询子任务
+  uni.$u.api.findSonTask = param => uni.$u.post(`${defaultwbs}/task/findSonTask`, param);
+  // 查询子项目
+  uni.$u.api.findSonProject = param => uni.$u.post(`${defaultwbs}/project/findSonProject`, param);
+  // 提交交付物
+  uni.$u.api.saveDeliver = param => uni.$u.post(`${defaultwbs}/deliver/save`, param);
+  // 查询任务的交付物历史记录
+  uni.$u.api.queryDeliverOfTask = param => uni.$u.post(`${defaultwbs}/deliver/queryDeliverOfTask`, param);
+  // 检查交付物
+  uni.$u.api.checkDeliver = param => uni.$u.post(`${defaultwbs}/deliver/checkDeliver`, param);
+};
diff --git a/apis/tall.js b/apis/tall.js
index fcb1872..8dc53aa 100644
--- a/apis/tall.js
+++ b/apis/tall.js
@@ -2,6 +2,7 @@ import Config from '@/common/js/config.js'
 
 const apiUrl = Config.apiUrl;
 const tall = `${apiUrl}/tall3/v3.0`;
+const tall1 = `http://101.201.226.163/gateway/ptos`;
 
 export function setupTall(app) {
 	uni.$u.api = { ...uni.$u.api } || {};
@@ -21,7 +22,7 @@ export function setupTall(app) {
 	// 修改用户信息
 	uni.$u.api.updateUserInfo = params => uni.$u.http.post(`${tall}/users/userInfo`, params);
 	// 获取项目列表
-	uni.$u.api.getProjects = (startTime, endTime) => uni.$u.post(`${tall}/project/query`, { startTime, endTime });
+	uni.$u.api.getProjects = (startTime, endTime) => uni.$u.post(`${tall1}/project/query`, { startTime, endTime });
 	// 查询日历是否有小红点
 	uni.$u.api.findRedPoint = (startTime, endTime) => uni.$u.post(`${tall}/project/day`, { startTime, endTime });
 	// 设置项目顺序
diff --git a/apis/wbs.js b/apis/wbs.js
index 2816f08..d3d0a20 100644
--- a/apis/wbs.js
+++ b/apis/wbs.js
@@ -3,5 +3,5 @@ import Config from "@/common/js/config.js"
 export function setupWbs(app) {
 	uni.$u.api = { ...uni.$u.api } || {};
 	// 导入wbs
-	uni.$u.api.import = formData => this.$upload.chooseAndUpload(`${Config.apiUrl}/wbs`, formData);
+	uni.$u.api.import = formData => uni.$upload.chooseAndUpload(`${Config.apiUrl}/wbs`, formData);
 }
\ No newline at end of file
diff --git a/common/styles/tailwind.scss b/common/styles/tailwind.scss
index 62fc09b..aff246f 100644
--- a/common/styles/tailwind.scss
+++ b/common/styles/tailwind.scss
@@ -2425,6 +2425,18 @@
   grid-auto-flow: column dense;
 }
 
+.gap-1{
+  gap: 0.25rem;
+}
+
+.gap-2{
+  gap: 0.5rem;
+}
+
+.gap-3{
+  gap: 0.75rem;
+}
+
 .auto-rows-auto {
   grid-auto-rows: auto;
 }
diff --git a/common/styles/theme/default.scss b/common/styles/theme/default.scss
index 29733e9..f851f5a 100644
--- a/common/styles/theme/default.scss
+++ b/common/styles/theme/default.scss
@@ -1,8 +1,16 @@
 // 默认主题文件
 .theme-default {
-  background-color: #333;
+  background-color: #007aff;
+  color: #fff;
   .u-card {
     font-size: 24px !important;
     color: #0f0;
   }
+  .u-navbar {
+    background-color: #007aff !important;
+    color: #fff;
+    .uicon-nav-back {
+      color: #fff !important;
+    }
+  }
 }
diff --git a/common/styles/theme/test.scss b/common/styles/theme/test.scss
index e29dddc..33db59c 100644
--- a/common/styles/theme/test.scss
+++ b/common/styles/theme/test.scss
@@ -5,4 +5,7 @@
     font-size: 24px !important;
     background-color: #ff0 !important;
   }
+  .u-navbar {
+    background-color: #ff0 !important;
+  }
 }
diff --git a/components/ChooseChecker/ChooseChecker.vue b/components/ChooseChecker/ChooseChecker.vue
new file mode 100644
index 0000000..f57d375
--- /dev/null
+++ b/components/ChooseChecker/ChooseChecker.vue
@@ -0,0 +1,89 @@
+<template>
+  <view class="my-3" v-if="data.allMembers && data.allMembers.length">
+    <view class="flex justify-between">
+      <view class="flex flex-wrap text-center items-center">
+        <u-tag
+          :type="member.checked ? 'primary' : 'info'"
+          :mode="member.checked ? 'dark' : 'light'"
+          v-for="(member, index) in data.topMembers"
+          :key="member.memberId"
+          class="mb-2 mr-3"
+          style="width: 60px"
+          :text="member.name"
+          :closeable="false"
+          @click="tagClick(index, member, 'topMembers')"
+        />
+        <span class="ml-2" v-if="!data.show" @click="data.show = true">...</span>
+      </view>
+    </view>
+    <!-- 折叠起来的 -->
+    <view class="flex flex-wrap text-center items-center" v-if="data.show">
+      <u-tag
+        :type="member.checked ? 'primary' : 'info'"
+        :mode="member.checked ? 'dark' : 'light'"
+        v-for="(member, index) in data.bottomMembers"
+        :key="member.memberId"
+        class="mb-2 mr-3"
+        style="width: 60px"
+        :text="member.name"
+        :closeable="false"
+        @click="tagClick(index, member, 'bottomMembers')"
+      />
+      <u-icon class="ml-2" name="arrow-up" v-if="data.show" size="26" @click="data.show = false"></u-icon>
+    </view>
+  </view>
+</template>
+
+<script setup>
+import { reactive, computed, onMounted } from 'vue';
+import { useStore } from 'vuex';
+
+const props = defineProps({
+  checkerList: {
+    default: () => [],
+    type: Array,
+  },
+});
+
+const data = reactive({
+  allMembers: [],
+  show: false,
+  topMembers: [],
+  bottomMembers: [],
+});
+
+const store = useStore();
+const members = computed(() => store.state.role.members);
+const emit = defineEmits(['setCheckerList']);
+
+onMounted(() => {
+  if (members.value && members.value.length) {
+    data.allMembers = members.value;
+    // TODO: 等后台返回默认检查人后修改
+    data.allMembers.forEach(item => {
+      item.checked = false;
+    });
+    data.topMembers = members.value.slice(0, 3);
+    data.bottomMembers = members.value.slice(3);
+  }
+});
+
+function tagClick(index, item, membersType) {
+  // 点击选择或取消选择
+  const arr = uni.$u.deepClone(data[membersType]);
+  arr[index].checked = !arr[index].checked;
+  data[membersType] = [...arr];
+  // 将选中的id传给checkerList
+  emit('setCheckerList', arr[index].checked, item);
+}
+
+// 清空所有选中的检查人
+function clearChecked() {
+  for (let i = 0; i < data.topMembers.length; i++) {
+    data.topMembers[i].checked = false;
+  }
+  for (let i = 0; i < data.bottomMembers.length; i++) {
+    data.bottomMembers[i].checked = false;
+  }
+}
+</script>
diff --git a/components/Globals/Globals.vue b/components/Globals/Globals.vue
index e8d5f9c..07c37c9 100644
--- a/components/Globals/Globals.vue
+++ b/components/Globals/Globals.vue
@@ -11,8 +11,7 @@
     >
       <template v-slot:body>
         <scroll-view :scrollY="true" :style="{ 'max-height': globalsHeight - 30 + 'px' }">
-          <skeleton :banner="false" :loading="!globals.length" :row="3" animate class="u-line-2 skeleton"></skeleton>
-
+          <skeleton :banner="false" :loading="showGlobalSkeleton" :row="3" animate class="u-line-2 skeleton"></skeleton>
           <view class="grid gap-2">
             <view v-for="item in globals" :key="item.id">
               <template v-if="item.plugins && item.plugins.length">
@@ -53,8 +52,8 @@ const sysHeight = uni.getSystemInfoSync().screenHeight; // 屏幕的高度
 const globalsHeight = Math.floor(((sysHeight - 44 - 30 - 10) / 5) * 4); // 全局任务的最大高度
 const store = useStore();
 const isShrink = computed(() => store.state.task.isShrink); // 全局任务是否收缩
+const showGlobalSkeleton = computed(() => store.state.task.showGlobalSkeleton); // 全局任务骨架屏
 const globals = computed(() => store.getters['task/globals']);
-console.log('globals: ', globals.value);
 
 // 手动展开日常任务
 function openCard() {
diff --git a/components/Plugin/Plugin.vue b/components/Plugin/Plugin.vue
index 6382c31..d740eca 100644
--- a/components/Plugin/Plugin.vue
+++ b/components/Plugin/Plugin.vue
@@ -1,29 +1,10 @@
 <template>
   <view class="u-font-14" style="height: 100%">
-  插件面板
-    <!-- <view v-if="data.pluginContent" @click="setStorage">
-      <view
-        :data-did="task.detailId"
-        :data-param="param"
-        :data-pdu="task.planDuration"
-        :data-pid="projectId"
-        :data-pstart="task.planStart"
-        :data-rdu="task.realDuration"
-        :data-rid="roleId"
-        :data-tid="task.id"
-        :data-tname="task.name"
-        :data-token="token"
-        :data-rstart="task.realStart"
-        :data-uid="userId"
-        style="height: 100%"
-        v-html="data.pluginContent"
-      ></view>
-    </view> -->
-
-    <!-- <view v-else @click="setStorage"> -->
+    <view @click="setStorage" class="grid gap-3">
+      <Render :task="task" :pluginId="pluginId" :styleType="styleType" :pluginTaskId="pluginTaskId" :param="param" />
       <!-- <plugin-default /> -->
       <!-- <component :task="task" :is="pluginComponent"></component> -->
-      <!-- <p-task-title :task="task" v-if="pluginId === '1'" />
+      <p-task-title :task="task" v-if="pluginId === '1'" />
       <p-task-description :task="task" v-if="pluginId === '2'" />
       <p-task-duration-delay :task="task" v-if="pluginId === '3'" />
       <p-task-start-time-delay :task="task" v-if="pluginId === '4'" />
@@ -37,13 +18,13 @@
       <p-manage-member :task="task" v-if="pluginId === '11'" />
       <p-manage-task :task="task" v-if="pluginId === '12'" />
       <p-wbs-import :task="task" v-if="pluginId === '13' || pluginId === '14'" />
-      <p-deliver-check :task="task" v-if="pluginId === '15'" /> -->
-    <!-- </view> -->
+      <p-deliver-check :task="task" v-if="pluginId === '15'" />
+    </view>
   </view>
 </template>
 
 <script setup>
-import { reactive, nextTick, computed } from 'vue';
+import { computed } from 'vue';
 import { useStore } from 'vuex';
 
 const props = defineProps({
@@ -54,83 +35,22 @@ const props = defineProps({
   param: { type: String, default: '' },
 });
 
-// const data = reactive({ pluginContent: null });
-
 const store = useStore();
 const roleId = computed(() => store.state.role.roleId);
-// const token = computed(() => store.state.user.token);
-// const userId = computed(() => store.getters['user/userId']);
+const token = computed(() => store.state.user.token);
+const userId = computed(() => store.getters['user/userId']);
 const projectId = computed(() => store.getters['project/projectId']);
-// const isMine = computed(() => store.getters['role/isMine']);
-
+const isMine = computed(() => store.getters['role/isMine']);
 // 插件名称
-// pluginComponent() {
-//   const target = this.$t.plugin.defaults.find(item => item.id === +this.pluginId);
+// const pluginComponent = computed(() => {
+//   const target = uni.$pluginConfig.defaults.find(item => item.id === +props.pluginId);
 //   if (!target) return '';
 //   return target.component;
-// },
-
-// 创建script dom
-// function handleDom(js) {
-  // const domList = Array.from(document.getElementsByTagName('script'));
-  // const index = domList.findIndex(item => item.id === `p${props.pluginTaskId}`);
-  // if (index >= 0) {
-  //   document.body.removeChild(document.getElementById(`p${props.pluginTaskId}`));
-  // }
-  // const scriptDom = document.createElement('script');
-  // scriptDom.id = `p${props.pluginTaskId}`;
-  // scriptDom.setAttribute('data-type', 'plugin');
-  // scriptDom.innerHTML = js;
-  // nextTick(() => {
-  //   document.body.append(scriptDom);
-  // });
-// }
-
-// 获取插件信息
-// async function getPlugin() {
-  // const params = { pluginId: props.pluginId, styleType: props.styleType };
-  // uni.$catchReq.getOtherPlugin(params, (err, data) => {
-  //   if (err) {
-  //     console.error('err: ', err);
-  //   } else {
-  //     if (!data || !data.id) return;
-  //     const reg = /data-root=["|']?(\w+)["|']?/gi;
-  //     let uuid = '';
-  //     // FIXME: 没有兼容  只有js, 没有html的情况
-  //     if (data.html) {
-  //       // 查有没有data-root=“xxx” 有的话 将xxx替换为 pluginTaskId
-
-  //       if (reg.test(data.html)) {
-  //         uuid = RegExp.$1;
-  //         const str = data.html.replace(new RegExp(uuid, 'g'), `p${props.pluginTaskId}`);
-  //         data.pluginContent = str;
-  //       } else {
-  //         data.pluginContent = data.html;
-  //       }
-
-  //       const str = data.js.replace(new RegExp(uuid, 'g'), `p${props.pluginTaskId}`);
-  //       handleDom(str);
-  //     }
-  //   }
-  // });
-
-  // if (data.js) {
-  //   if (reg.test(data.js)) {
-  //     const uuid = RegExp.$1;
-  //     const str = data.js.replace(new RegExp(uuid, 'g'), `p${this.pluginTaskId}`);
-  //     this.handleDom(str);
-  //   } else {
-  //     this.handleDom(data.js);
-  //   }
-  // }
-// }
+// });
 
-console.log('props.pluginId: ', props.pluginId);
 if (props.pluginId === '5') {
-  // 根据项目id获取成员列表
   store.dispatch('role/getAllMembers', { projectId: projectId.value });
 }
-// getPlugin();
 
 // 点击时存储 storage
 async function setStorage() {
diff --git a/components/Render/Render.vue b/components/Render/Render.vue
new file mode 100644
index 0000000..5f83039
--- /dev/null
+++ b/components/Render/Render.vue
@@ -0,0 +1,104 @@
+<template>
+  <view>
+    <!-- #ifdef H5 -->
+    <view
+      class="content"
+      id="project"
+      :data-did="task.detailId"
+      :data-param="param"
+      :data-pdu="task.planDuration"
+      :data-pid="projectId"
+      :data-pstart="task.planStart"
+      :data-rdu="task.realDuration"
+      :data-rid="roleId"
+      :data-tid="task.id"
+      :data-tname="task.name"
+      :data-token="token"
+      :data-rstart="task.realStart"
+      :data-uid="userId"
+    ></view>
+    <!-- #endif -->
+    <!-- #ifdef APP-PLUS -->
+    <view
+      class="content"
+      id="project"
+      :data-did="task.detailId"
+      :data-param="param"
+      :data-pdu="task.planDuration"
+      :data-pid="projectId"
+      :data-pstart="task.planStart"
+      :data-rdu="task.realDuration"
+      :data-rid="roleId"
+      :data-tid="task.id"
+      :data-tname="task.name"
+      :data-token="token"
+      :data-rstart="task.realStart"
+      :data-uid="userId"
+    ></view>
+    <!-- #endif -->
+  </view>
+</template>
+
+<script setup>
+import { computed } from 'vue';
+import { useStore } from 'vuex';
+
+defineProps({
+  task: { default: () => {}, type: Object },
+  pluginId: { default: '1', type: String },
+  styleType: { default: 0, type: Number },
+  pluginTaskId: { default: '', type: String },
+  param: { type: String, default: '' },
+});
+
+const store = useStore();
+const roleId = computed(() => store.state.role.roleId);
+const token = computed(() => store.state.user.token);
+const userId = computed(() => store.getters['user/userId']);
+const projectId = computed(() => store.getters['project/projectId']);
+</script>
+
+<script module="project" lang="renderjs">
+export default {
+  data() {
+    return {
+      pluginContent: null,
+      pluginJs: null,
+    };
+  },
+
+  mounted() {
+    this.$nextTick(() => {
+      this.getPlugin();
+    });
+  },
+
+  methods: {
+    // 获取插件信息
+    async getPlugin() {
+      const params = { pluginId: this.pluginId, styleType: this.styleType };
+      this.$catchReq.getOtherPlugin(params, (err, res) => {
+        if (err) {
+          console.error('err: ', err);
+        } else {
+          if (!res || !res.id) return;
+          if (res.html && res.js) {
+            this.$nextTick(() => {
+              this.init(res);
+            });
+          }
+        }
+      });
+    },
+
+    init(res) {
+      const content = document.querySelector('.content');
+      content.innerHTML = res.html;
+
+      const script = document.createElement('script');
+      script.innerHTML = res.js;
+      document.body.appendChild(script);
+    },
+  },
+};
+</script>
diff --git a/components/TimeLine/TimeLine.vue b/components/TimeLine/TimeLine.vue
index 2b308d9..489c680 100644
--- a/components/TimeLine/TimeLine.vue
+++ b/components/TimeLine/TimeLine.vue
@@ -22,7 +22,7 @@
 </template>
 
 <script setup>
-import { reactive, computed, defineExpose, defineEmits } from 'vue';
+import { reactive, computed } from 'vue';
 import { useStore } from 'vuex';
 // import Barrier from './component/Barrier.vue';
 import dayjs from 'dayjs';
diff --git a/components/TimeLine/component/TimeBox.vue b/components/TimeLine/component/TimeBox.vue
index 040143d..e82a89b 100644
--- a/components/TimeLine/component/TimeBox.vue
+++ b/components/TimeLine/component/TimeBox.vue
@@ -1,6 +1,6 @@
 <template>
-<!-- v-finger:pinch="pinchHandler" -->
-  <view class="column" >
+  <!-- v-finger:pinch="pinchHandler" -->
+  <view class="column">
     <view v-if="tasks && tasks.length">
       <view :key="task.id" v-for="task in tasks" :id="`a${task.id}`">
         <view class="flex">
@@ -18,26 +18,22 @@
           <view class="ml-3 overflow-hidden shadow-lg task-box">
             <u-card :show-foot="false" :show-head="false" :style="{ height: setHeight(task.panel) }" class="h-16" margin="0" v-if="showSkeleton">
               <view slot="body">
-                <view>
-                  <skeleton :banner="false" :loading="true" :row="4" animate class="mt-2 u-line-2 skeleton"></skeleton>
-                </view>
+                <view><skeleton :banner="false" :loading="true" :row="4" animate class="mt-2 u-line-2 skeleton"></skeleton></view>
               </view>
             </u-card>
-
             <u-card
               @click="onClickTask(task.planStart - 0, task.id)"
+              :style="{ height: setHeight(task.panel) }"
               :show-foot="false"
               :show-head="false"
-              :style="{ height: setHeight(task.panel) }"
               class="h-16"
               margin="0"
               v-if="tasks && tasks.length && task.process !== 4 && !showSkeleton"
             >
-              <!-- 任务面板插件 -->
-              <view slot="body">
+              <template v-slot:body>
                 <view class="p-0 u-col-between">
                   <view :key="pIndex" v-for="(row, pIndex) in task.plugins">
-                    <!-- <view class="grid gap-2 grid-cols-1" v-if="row.length">
+                    <view class="grid gap-2 grid-cols-1" v-if="row.length">
                       <Plugin
                         :class="[`row-span-${plugin.row}`, `col-span-${plugin.col}`]"
                         :task="task"
@@ -48,17 +44,17 @@
                         :style-type="data.styleType || 0"
                         v-for="plugin in row"
                       />
-                    </view> -->
+                    </view>
                   </view>
                 </view>
-              </view>
+              </template>
             </u-card>
           </view>
         </view>
       </view>
     </view>
     <!-- 局部弹框操作栏 -->
-    <!-- <Tips /> -->
+    <Tips />
   </view>
 </template>
 
@@ -67,11 +63,13 @@ import { useStore } from 'vuex';
 import { computed, reactive } from 'vue';
 import TimeStatus from './TimeStatus.vue';
 import TaskTools from './TaskTools.vue';
+import Skeleton from '@/components/Skeleton/Skeleton.vue';
+
 
-// const data = reactive({
-//   currentComponent: '',
-//   styleType: 0,
-// });
+const data = reactive({
+  currentComponent: '',
+  styleType: 0,
+});
 
 const store = useStore();
 const roleId = computed(() => store.state.role.roleId);
diff --git a/components/Tips/Tips.vue b/components/Tips/Tips.vue
index ad48ca0..a663e8c 100644
--- a/components/Tips/Tips.vue
+++ b/components/Tips/Tips.vue
@@ -24,7 +24,8 @@
 </template>
 
 <script setup>
-import { useStore, onMounted, computed, reactive } from 'vuex';
+import { onMounted, computed, reactive } from 'vue';
+import { useStore } from 'vuex';
 
 defineProps({ title: { default: '提示', type: String } });
 
diff --git a/components/Title/Title.vue b/components/Title/Title.vue
index cfd4896..d0e60f7 100644
--- a/components/Title/Title.vue
+++ b/components/Title/Title.vue
@@ -1,4 +1,5 @@
 <template>
+<theme>
   <view>
     <!-- :is-back="false" -->
     <u-navbar :custom-back="onBack" class="overflow-hidden">
@@ -45,6 +46,7 @@
     <u-picker title="开始时间" mode="time" v-model="data.showStart" :params="data.params" @confirm="confirmStartTime"></u-picker>
     <u-picker title="结束时间" mode="time" v-model="data.showEnd" :params="data.params" @confirm="confirmEndTime"></u-picker>
   </view>
+  </theme>
 </template>
 
 <script setup>
diff --git a/components/Upload/Upload.vue b/components/Upload/Upload.vue
index 6ba08be..e9cb663 100644
--- a/components/Upload/Upload.vue
+++ b/components/Upload/Upload.vue
@@ -7,6 +7,7 @@
 <script setup>
 import { computed } from 'vue';
 import { useStore } from 'vuex';
+import Config from '@/common/js/config.js';
 
 const emit = defineEmits(['success', 'error']);
 
@@ -20,7 +21,9 @@ const handleUpload = async cur => {
     // 导入WBS成功后
     // 直接打开导入的项目
     emit('success');
-    res.url && (uni.$t.domain = res.url);
+    const { apiUrl } = Config;
+    const defaultwbs = `${apiUrl}/defaultwbs`;
+    res.url && (defaultwbs = res.url);
     setTimeout(() => {
       uni.navigateTo({ url: `/pages/project/project?u=${userId.value}&p=${res.id}&pname=${res.pname}&url=${res.url}` });
     }, 2000);
diff --git a/components/uni-popup/message.js b/components/uni-popup/message.js
new file mode 100644
index 0000000..577dd33
--- /dev/null
+++ b/components/uni-popup/message.js
@@ -0,0 +1,22 @@
+export default {
+  created() {
+    if (this.type === 'message') {
+      // 不显示遮罩
+      this.maskShow = false;
+      // 获取子组件对象
+      this.childrenMsg = null;
+    }
+  },
+  methods: {
+    customOpen() {
+      if (this.childrenMsg) {
+        this.childrenMsg.open();
+      }
+    },
+    customClose() {
+      if (this.childrenMsg) {
+        this.childrenMsg.close();
+      }
+    },
+  },
+};
diff --git a/components/uni-popup/popup.js b/components/uni-popup/popup.js
new file mode 100644
index 0000000..b646013
--- /dev/null
+++ b/components/uni-popup/popup.js
@@ -0,0 +1,23 @@
+import message from './message.js';
+// 定义 type 类型:弹出类型：top/bottom/center
+const config = {
+  // 顶部弹出
+  top: 'top',
+  // 底部弹出
+  bottom: 'bottom',
+  // 居中弹出
+  center: 'center',
+  // 消息提示
+  message: 'top',
+  // 对话框
+  dialog: 'center',
+  // 分享
+  share: 'bottom',
+};
+
+export default {
+  data() {
+    return { config: config };
+  },
+  mixins: [message],
+};
diff --git a/components/uni-popup/uni-popup-dialog.vue b/components/uni-popup/uni-popup-dialog.vue
new file mode 100644
index 0000000..9102286
--- /dev/null
+++ b/components/uni-popup/uni-popup-dialog.vue
@@ -0,0 +1,246 @@
+<template>
+  <view class="uni-popup-dialog">
+    <view class="uni-dialog-title">
+      <text class="uni-dialog-title-text" :class="['uni-popup__' + dialogType]">{{ title }}</text>
+    </view>
+    <view class="uni-dialog-content">
+      <text class="uni-dialog-content-text" v-if="mode === 'base'">{{ content }}</text>
+      <input v-else class="uni-dialog-input" v-model="val" type="text" :placeholder="placeholder" :focus="focus" />
+    </view>
+    <view class="uni-dialog-button-group">
+      <view class="uni-dialog-button" @click="close">
+        <text class="uni-dialog-button-text">取消</text>
+      </view>
+      <view class="uni-dialog-button uni-border-left" @click="onOk">
+        <text class="uni-dialog-button-text uni-button-color">确定</text>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+/**
+ * PopUp 弹出层-对话框样式
+ * @description 弹出层-对话框样式
+ * @tutorial https://ext.dcloud.net.cn/plugin?id=329
+ * @property {String} value input 模式下的默认值
+ * @property {String} placeholder input 模式下输入提示
+ * @property {String} type = [success|warning|info|error] 主题样式
+ *  @value success 成功
+ * 	@value warning 提示
+ * 	@value info 消息
+ * 	@value error 错误
+ * @property {String} mode = [base|input] 模式、
+ * 	@value base 基础对话框
+ * 	@value input 可输入对话框
+ * @property {String} content 对话框内容
+ * @property {Boolean} beforeClose 是否拦截取消事件
+ * @event {Function} confirm 点击确认按钮触发
+ * @event {Function} close 点击取消按钮触发
+ */
+
+export default {
+  name: 'uniPopupDialog',
+  props: {
+    value: {
+      type: [String, Number],
+      default: '',
+    },
+    placeholder: {
+      type: [String, Number],
+      default: '请输入内容',
+    },
+    /**
+     * 对话框主题 success/warning/info/error	  默认 success
+     */
+    type: {
+      type: String,
+      default: 'error',
+    },
+    /**
+     * 对话框模式 base/input
+     */
+    mode: {
+      type: String,
+      default: 'base',
+    },
+    /**
+     * 对话框标题
+     */
+    title: {
+      type: String,
+      default: '提示',
+    },
+    /**
+     * 对话框内容
+     */
+    content: {
+      type: String,
+      default: '',
+    },
+    /**
+     * 拦截取消事件 ，如果拦截取消事件，必须监听close事件，执行 done()
+     */
+    beforeClose: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  data() {
+    return {
+      dialogType: 'error',
+      focus: false,
+      val: '',
+    };
+  },
+  inject: ['popup'],
+  watch: {
+    type(val) {
+      this.dialogType = val;
+    },
+    mode(val) {
+      if (val === 'input') {
+        this.dialogType = 'info';
+      }
+    },
+    value(val) {
+      this.val = val;
+    },
+  },
+  created() {
+    // 对话框遮罩不可点击
+    this.popup.mkclick = false;
+    if (this.mode === 'input') {
+      this.dialogType = 'info';
+      this.val = this.value;
+    } else {
+      this.dialogType = this.type;
+    }
+  },
+  mounted() {
+    this.focus = true;
+  },
+  methods: {
+    /**
+     * 点击确认按钮
+     */
+    onOk() {
+      this.$emit(
+        'confirm',
+        () => {
+          this.popup.close();
+          if (this.mode === 'input') this.val = this.value;
+        },
+        this.mode === 'input' ? this.val : '',
+      );
+    },
+    /**
+     * 点击取消按钮
+     */
+    close() {
+      if (this.beforeClose) {
+        this.$emit('close', () => {
+          this.popup.close();
+        });
+        return;
+      }
+      this.popup.close();
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.uni-popup-dialog {
+  width: 300px;
+  border-radius: 15px;
+  background-color: #fff;
+}
+
+.uni-dialog-title {
+  /* #ifndef APP-NVUE */
+  display: flex;
+  /* #endif */
+  flex-direction: row;
+  justify-content: center;
+  padding-top: 15px;
+  padding-bottom: 5px;
+}
+
+.uni-dialog-title-text {
+  font-size: 16px;
+  font-weight: 500;
+}
+
+.uni-dialog-content {
+  /* #ifndef APP-NVUE */
+  display: flex;
+  /* #endif */
+  flex-direction: row;
+  justify-content: center;
+  align-items: center;
+  padding: 5px 15px 15px 15px;
+}
+
+.uni-dialog-content-text {
+  font-size: 14px;
+  color: #6e6e6e;
+}
+
+.uni-dialog-button-group {
+  /* #ifndef APP-NVUE */
+  display: flex;
+  /* #endif */
+  flex-direction: row;
+  border-top-color: #f5f5f5;
+  border-top-style: solid;
+  border-top-width: 1px;
+}
+
+.uni-dialog-button {
+  /* #ifndef APP-NVUE */
+  display: flex;
+  /* #endif */
+
+  flex: 1;
+  flex-direction: row;
+  justify-content: center;
+  align-items: center;
+  height: 45px;
+}
+
+.uni-border-left {
+  border-left-color: #f0f0f0;
+  border-left-style: solid;
+  border-left-width: 1px;
+}
+
+.uni-dialog-button-text {
+  font-size: 14px;
+}
+
+.uni-button-color {
+  color: $uni-color-primary;
+}
+
+.uni-dialog-input {
+  flex: 1;
+  font-size: 14px;
+}
+
+.uni-popup__success {
+  color: $uni-color-success;
+}
+
+.uni-popup__warn {
+  color: $uni-color-warning;
+}
+
+.uni-popup__error {
+  color: $uni-color-error;
+}
+
+.uni-popup__info {
+  color: #909399;
+}
+</style>
diff --git a/components/uni-popup/uni-popup-message.vue b/components/uni-popup/uni-popup-message.vue
new file mode 100644
index 0000000..fe401a7
--- /dev/null
+++ b/components/uni-popup/uni-popup-message.vue
@@ -0,0 +1,115 @@
+<template>
+  <view class="uni-popup-message" :class="'uni-popup__' + [type]">
+    <text class="uni-popup-message-text" :class="'uni-popup__' + [type] + '-text'">{{ message }}</text>
+  </view>
+</template>
+
+<script>
+/**
+ * PopUp 弹出层-消息提示
+ * @description 弹出层-消息提示
+ * @tutorial https://ext.dcloud.net.cn/plugin?id=329
+ * @property {String} type = [success|warning|info|error] 主题样式
+ *  @value success 成功
+ * 	@value warning 提示
+ * 	@value info 消息
+ * 	@value error 错误
+ * @property {String} message 消息提示文字
+ * @property {String} duration 显示时间，设置为 0 则不会自动关闭
+ */
+
+export default {
+  name: 'UniPopupMessage',
+  props: {
+    /**
+     * 主题 success/warning/info/error	  默认 success
+     */
+    type: {
+      type: String,
+      default: 'success',
+    },
+    /**
+     * 消息文字
+     */
+    message: {
+      type: String,
+      default: '',
+    },
+    /**
+     * 显示时间，设置为 0 则不会自动关闭
+     */
+    duration: {
+      type: Number,
+      default: 3000,
+    },
+  },
+  inject: ['popup'],
+  data() {
+    return {};
+  },
+  created() {
+    this.popup.childrenMsg = this;
+  },
+  methods: {
+    open() {
+      if (this.duration === 0) return;
+      clearTimeout(this.popuptimer);
+      this.popuptimer = setTimeout(() => {
+        this.popup.close();
+      }, this.duration);
+    },
+    close() {
+      clearTimeout(this.popuptimer);
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+.uni-popup-message {
+  /* #ifndef APP-NVUE */
+  display: flex;
+  /* #endif */
+  flex-direction: row;
+  background-color: #e1f3d8;
+  padding: 10px 15px;
+  border-color: #eee;
+  border-style: solid;
+  border-width: 1px;
+}
+.uni-popup-message-text {
+  font-size: 14px;
+  padding: 0;
+}
+
+.uni-popup__success {
+  background-color: #e1f3d8;
+}
+
+.uni-popup__success-text {
+  color: #67c23a;
+}
+
+.uni-popup__warn {
+  background-color: #faecd8;
+}
+
+.uni-popup__warn-text {
+  color: #e6a23c;
+}
+
+.uni-popup__error {
+  background-color: #fde2e2;
+}
+
+.uni-popup__error-text {
+  color: #f56c6c;
+}
+
+.uni-popup__info {
+  background-color: #f2f6fc;
+}
+
+.uni-popup__info-text {
+  color: #909399;
+}
+</style>
diff --git a/components/uni-popup/uni-popup-share.vue b/components/uni-popup/uni-popup-share.vue
new file mode 100644
index 0000000..224a9b7
--- /dev/null
+++ b/components/uni-popup/uni-popup-share.vue
@@ -0,0 +1,171 @@
+<template>
+  <view class="uni-popup-share">
+    <view class="uni-share-title">
+      <text class="uni-share-title-text">{{ title }}</text>
+    </view>
+    <view class="uni-share-content">
+      <view class="uni-share-content-box">
+        <view class="uni-share-content-item" v-for="(item, index) in bottomData" :key="index" @click.stop="select(item, index)">
+          <image class="uni-share-image" :src="item.icon" mode="aspectFill"></image>
+          <text class="uni-share-text">{{ item.text }}</text>
+        </view>
+      </view>
+    </view>
+    <view class="uni-share-button-box">
+      <button class="uni-share-button" @click="close">取消</button>
+    </view>
+  </view>
+</template>
+
+<script>
+export default {
+  name: 'UniPopupShare',
+  props: {
+    title: {
+      type: String,
+      default: '分享到',
+    },
+  },
+  inject: ['popup'],
+  data() {
+    return {
+      bottomData: [
+        {
+          text: '微信',
+          icon: 'https://img-cdn-qiniu.dcloud.net.cn/uni-ui/grid-2.png',
+          name: 'wx',
+        },
+        {
+          text: '支付宝',
+          icon: 'https://img-cdn-qiniu.dcloud.net.cn/uni-ui/grid-8.png',
+          name: 'wx',
+        },
+        {
+          text: 'QQ',
+          icon: 'https://img-cdn-qiniu.dcloud.net.cn/uni-ui/gird-3.png',
+          name: 'qq',
+        },
+        {
+          text: '新浪',
+          icon: 'https://img-cdn-qiniu.dcloud.net.cn/uni-ui/grid-1.png',
+          name: 'sina',
+        },
+        {
+          text: '百度',
+          icon: 'https://img-cdn-qiniu.dcloud.net.cn/uni-ui/grid-7.png',
+          name: 'copy',
+        },
+        {
+          text: '其他',
+          icon: 'https://img-cdn-qiniu.dcloud.net.cn/uni-ui/grid-5.png',
+          name: 'more',
+        },
+      ],
+    };
+  },
+  created() {},
+  methods: {
+    /**
+     * 选择内容
+     */
+    select(item, index) {
+      this.$emit(
+        'select',
+        {
+          item,
+          index,
+        },
+        () => {
+          this.popup.close();
+        },
+      );
+    },
+    /**
+     * 关闭窗口
+     */
+    close() {
+      this.popup.close();
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+.uni-popup-share {
+  background-color: #fff;
+}
+.uni-share-title {
+  /* #ifndef APP-NVUE */
+  display: flex;
+  /* #endif */
+  flex-direction: row;
+  align-items: center;
+  justify-content: center;
+  height: 40px;
+}
+.uni-share-title-text {
+  font-size: 14px;
+  color: #666;
+}
+.uni-share-content {
+  /* #ifndef APP-NVUE */
+  display: flex;
+  /* #endif */
+  flex-direction: row;
+  justify-content: center;
+  padding-top: 10px;
+}
+
+.uni-share-content-box {
+  /* #ifndef APP-NVUE */
+  display: flex;
+  /* #endif */
+  flex-direction: row;
+  flex-wrap: wrap;
+  width: 360px;
+}
+
+.uni-share-content-item {
+  width: 90px;
+  /* #ifndef APP-NVUE */
+  display: flex;
+  /* #endif */
+  flex-direction: column;
+  justify-content: center;
+  padding: 10px 0;
+  align-items: center;
+}
+
+.uni-share-content-item:active {
+  background-color: #f5f5f5;
+}
+
+.uni-share-image {
+  width: 30px;
+  height: 30px;
+}
+
+.uni-share-text {
+  margin-top: 10px;
+  font-size: 14px;
+  color: #3b4144;
+}
+
+.uni-share-button-box {
+  /* #ifndef APP-NVUE */
+  display: flex;
+  /* #endif */
+  flex-direction: row;
+  padding: 10px 15px;
+}
+
+.uni-share-button {
+  flex: 1;
+  border-radius: 50px;
+  color: #666;
+  font-size: 16px;
+}
+
+.uni-share-button::after {
+  border-radius: 50px;
+}
+</style>
diff --git a/components/uni-popup/uni-popup.vue b/components/uni-popup/uni-popup.vue
new file mode 100644
index 0000000..4d3b867
--- /dev/null
+++ b/components/uni-popup/uni-popup.vue
@@ -0,0 +1,289 @@
+<template>
+  <view v-if="showPopup" class="uni-popup" :class="[popupstyle]" @touchmove.stop.prevent="clear">
+    <uni-transition v-if="maskShow" :mode-class="['fade']" :styles="maskClass" :duration="duration" :show="showTrans" @click="onTap" />
+    <uni-transition :mode-class="ani" :styles="transClass" :duration="duration" :show="showTrans" @click="onTap">
+      <view class="uni-popup__wrapper-box" @click.stop="clear">
+        <slot />
+      </view>
+    </uni-transition>
+  </view>
+</template>
+
+<script>
+import uniTransition from '../uni-transition/uni-transition.vue';
+import popup from './popup.js';
+/**
+ * PopUp 弹出层
+ * @description 弹出层组件，为了解决遮罩弹层的问题
+ * @tutorial https://ext.dcloud.net.cn/plugin?id=329
+ * @property {String} type = [top|center|bottom] 弹出方式
+ * 	@value top 顶部弹出
+ * 	@value center 中间弹出
+ * 	@value bottom 底部弹出
+ * 	@value message 消息提示
+ * 	@value dialog 对话框
+ * 	@value share 底部分享示例
+ * @property {Boolean} animation = [ture|false] 是否开启动画
+ * @property {Boolean} maskClick = [ture|false] 蒙版点击是否关闭弹窗
+ * @event {Function} change 打开关闭弹窗触发，e={show: false}
+ */
+
+export default {
+  name: 'UniPopup',
+  components: { uniTransition },
+  props: {
+    // 开启动画
+    animation: {
+      type: Boolean,
+      default: true,
+    },
+    // 弹出层类型，可选值，top: 顶部弹出层；bottom：底部弹出层；center：全屏弹出层
+    // message: 消息提示 ; dialog : 对话框
+    type: {
+      type: String,
+      default: 'center',
+    },
+    // maskClick
+    maskClick: {
+      type: Boolean,
+      default: true,
+    },
+  },
+  provide() {
+    return { popup: this };
+  },
+  mixins: [popup],
+  watch: {
+    /**
+     * 监听type类型
+     */
+    type: {
+      handler: function (newVal) {
+        this[this.config[newVal]]();
+      },
+      immediate: true,
+    },
+    /**
+     * 监听遮罩是否可点击
+     * @param {Object} val
+     */
+    maskClick(val) {
+      this.mkclick = val;
+    },
+  },
+  data() {
+    return {
+      duration: 300,
+      ani: [],
+      showPopup: false,
+      showTrans: false,
+      maskClass: {
+        position: 'fixed',
+        bottom: 0,
+        top: 0,
+        left: 0,
+        right: 0,
+        backgroundColor: 'rgba(0, 0, 0, 0.4)',
+      },
+      transClass: {
+        position: 'fixed',
+        left: 0,
+        right: 0,
+      },
+      maskShow: true,
+      mkclick: true,
+      popupstyle: 'top',
+    };
+  },
+  created() {
+    this.mkclick = this.maskClick;
+    if (this.animation) {
+      this.duration = 300;
+    } else {
+      this.duration = 0;
+    }
+  },
+  methods: {
+    clear(e) {
+      // TODO nvue 取消冒泡
+      e.stopPropagation();
+    },
+    open() {
+      this.showPopup = true;
+      this.$nextTick(() => {
+        new Promise(resolve => {
+          clearTimeout(this.timer);
+          this.timer = setTimeout(() => {
+            this.showTrans = true;
+            // fixed by mehaotian 兼容 app 端
+            this.$nextTick(() => {
+              resolve();
+            });
+          }, 50);
+        }).then(res => {
+          console.log('res: ', res);
+          // 自定义打开事件
+          clearTimeout(this.msgtimer);
+          this.msgtimer = setTimeout(() => {
+            this.customOpen && this.customOpen();
+          }, 100);
+          this.$emit('change', {
+            show: true,
+            type: this.type,
+          });
+        });
+      });
+    },
+    close(type) {
+      this.showTrans = false;
+      this.$nextTick(() => {
+        this.$emit('change', {
+          show: false,
+          type,
+        });
+        clearTimeout(this.timer);
+        // 自定义关闭事件
+        this.customOpen && this.customClose();
+        this.timer = setTimeout(() => {
+          this.showPopup = false;
+        }, 300);
+      });
+    },
+    onTap() {
+      if (!this.mkclick) return;
+      this.close();
+    },
+    /**
+     * 顶部弹出样式处理
+     */
+    top() {
+      this.popupstyle = 'top';
+      this.ani = ['slide-top'];
+      this.transClass = {
+        position: 'fixed',
+        left: 0,
+        right: 0,
+      };
+    },
+    /**
+     * 底部弹出样式处理
+     */
+    bottom() {
+      this.popupstyle = 'bottom';
+      this.ani = ['slide-bottom'];
+      this.transClass = {
+        position: 'fixed',
+        left: 0,
+        right: 0,
+        bottom: 0,
+      };
+    },
+    /**
+     * 中间弹出样式处理
+     */
+    center() {
+      this.popupstyle = 'center';
+      this.ani = ['zoom-out', 'fade'];
+      this.transClass = {
+        position: 'fixed',
+        /* #ifndef APP-NVUE */
+        display: 'flex',
+        flexDirection: 'column',
+        /* #endif */
+        bottom: 0,
+        left: 0,
+        right: 0,
+        top: 0,
+        justifyContent: 'center',
+        alignItems: 'center',
+      };
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+.uni-popup {
+  position: fixed;
+  /* #ifndef APP-NVUE */
+  z-index: 99;
+  /* #endif */
+}
+
+.uni-popup__mask {
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  background-color: $uni-bg-color-mask;
+  opacity: 0;
+}
+
+.mask-ani {
+  transition-property: opacity;
+  transition-duration: 0.2s;
+}
+
+.uni-top-mask {
+  opacity: 1;
+}
+
+.uni-bottom-mask {
+  opacity: 1;
+}
+
+.uni-center-mask {
+  opacity: 1;
+}
+
+.uni-popup__wrapper {
+  /* #ifndef APP-NVUE */
+  display: block;
+  /* #endif */
+  position: absolute;
+}
+
+.top {
+  /* #ifdef H5 */
+  top: var(--window-top);
+  /* #endif */
+  /* #ifndef H5 */
+  top: 0;
+  /* #endif */
+}
+
+.bottom {
+  bottom: 0;
+}
+
+.uni-popup__wrapper-box {
+  /* #ifndef APP-NVUE */
+  display: block;
+  /* #endif */
+  position: relative;
+  /* iphonex 等安全区设置，底部安全区适配 */
+  /* #ifndef APP-NVUE */
+  padding-bottom: constant(safe-area-inset-bottom);
+  padding-bottom: env(safe-area-inset-bottom);
+  /* #endif */
+}
+
+.content-ani {
+  // transition: transform 0.3s;
+  transition-property: transform, opacity;
+  transition-duration: 0.2s;
+}
+
+.uni-top-content {
+  transform: translateY(0);
+}
+
+.uni-bottom-content {
+  transform: translateY(0);
+}
+
+.uni-center-content {
+  transform: scale(1);
+  opacity: 1;
+}
+</style>
diff --git a/config/plugin.js b/config/plugin.js
new file mode 100644
index 0000000..a12856b
--- /dev/null
+++ b/config/plugin.js
@@ -0,0 +1,97 @@
+// 定义插件相关信息
+/* eslint-disable */
+export default {
+  defaults: [
+    {
+      id: 1,
+      name: 'TASK_NAME',
+      description: '任务名插件',
+      component: 'p-task-title',
+    },
+    {
+      id: 2,
+      name: 'TASK_DESCRIPTION',
+      description: '任务描述插件',
+      component: 'p-task-description',
+    },
+    {
+      id: 3,
+      name: 'TASK_DURATION_DELAY',
+      description: '任务时长延迟插件（+-1min）时间格式可设置',
+      component: 'p-task-duration-delay',
+    },
+    {
+      id: 4,
+      name: 'TASK_START_TIME_DELAY',
+      description: '任务开始时间延迟插件（+-1hour）',
+      component: 'p-task-start-time-delay',
+    },
+    {
+      id: 5,
+      name: 'DELIVERABLE',
+      description: '交付物插件（人 + 交付物）可配置【仅人】 or 【仅交付物】 or 【人+交付物】',
+      component: 'p-deliverable',
+    },
+    {
+      id: 6,
+      name: 'SUBTASKS',
+      description: '子任务插件：显示子任务',
+      component: 'p-subtasks',
+    },
+    {
+      id: 7,
+      name: 'SUB_PROJECT',
+      description: '子项目插件：显示子项目',
+      component: 'p-sub-project',
+    },
+    {
+      id: 8,
+      name: 'TASK_COUNTDOWN',
+      description: '任务倒计时插件',
+      component: 'p-task-countdown',
+    },
+    {
+      id: 9,
+      name: 'MANAGE_PROJECT',
+      description: '项目信息管理插件',
+      component: 'p-manage-project',
+    },
+
+    {
+      id: 10,
+      name: 'MANAGE_ROLE',
+      description: '角色信息管理插件',
+      component: 'p-manage-role',
+    },
+    {
+      id: 11,
+      name: 'MANAGE_MEMBER',
+      description: '成员信息管理插件',
+      component: 'p-manage-member',
+    },
+    {
+      id: 12,
+      name: 'MANAGE_TASK',
+      description: '任务信息管理插件',
+      component: 'p-manage-task',
+    },
+    {
+      id: 13,
+      name: 'WBS_IMPORT',
+      description: '导入WBS新建项目',
+      component: 'p-wbs-import',
+    },
+    {
+      id: 14,
+      name: 'WBS_IMPORT_UPDATE',
+      description: '导入WBS更新项目',
+      component: 'p-wbs-update',
+    },
+    {
+      id: 15,
+      name: 'DELIVER_CHECK',
+      description: '交付物检查',
+      component: 'p-deliver-check',
+    },
+  ], // 默认插件id列表
+};
diff --git a/hooks/user/userMixin.js b/hooks/user/userMixin.js
index 3ab2cd0..a5b4a0c 100644
--- a/hooks/user/userMixin.js
+++ b/hooks/user/userMixin.js
@@ -1,11 +1,13 @@
-import { ref, computed } from 'vue';
-import { useStore } from 'vuex';
-import clipboard from "@/common/js/dc-clipboard/clipboard.js"
+import { ref, computed, reactive } from 'vue';
+import { useStore } from 'vuex';
+import { onReady } from '@dcloudio/uni-app';
+import clipboard from "@/common/js/dc-clipboard/clipboard.js";
+import Config from '@/common/js/config.js'
 
 export default function userMixin() {
   const store = useStore();
   const user = computed(() => store.state.user.user);
-  const rules = ref({
+  const rules = {
     phone: [{
         required: true,
         message: '请输入手机号',
@@ -78,46 +80,146 @@ export default function userMixin() {
         trigger: ['change', 'blur'],
       }
     ],
-  });
-  const errorType = ['message'];
-  const labelPosition = 'left';
-  const border = false;
-  const smsCode = ref(''); // 短信验证码
+  };
+  const smsCode = ref(null); // 短信验证码
   const showInterval = ref(false);
   const interval = ref(120);
   const codeTimer = ref(null);
-  const showPaste = ref(false);
-
-  // 获取图形验证码
-  async function getImageCode() {
-    console.log('5555')
-    uni.$ui.showLoading();
-    try {
-      const data = await uni.$u.api.getImageCode();
-      const { imageBase64, verificationCodeId } = data;
-      imageBase64 = imageBase64 || '';
-      verificationCodeId = verificationCodeId || '';
-      uni.$ui.hideLoading();
-    } catch (error) {
-      uni.$ui.hideLoading();
-      uni.$ui.showToast(error);
-    }
+  const showPaste = ref(false);
+
+  //有图片验证码的值
+  function hasvalue(form) {
+    if(form.smsCode || form.showPaste) return
+    if (!verifyPhone(form.phone)) {
+      uni.$ui.showToast('请输入正确的手机号');
+      return;
+    }
+    if (!form.verificationCodeValue) {
+      uni.$ui.showToast('请输入图形验证码');
+      return;
+    }
+    getCode();
+  }
+
+  // 获取验证码
+  async function getCode() {
+    try {
+      if (!verificationCodeId.value || !form.verificationCodeValue) {
+        showToast('缺少图形验证码参数');
+        return;
+      }
+      const params = {
+        phone: form.phone,
+        verificationCodeId: verificationCodeId.value,
+        verificationCodeValue: form.verificationCodeValue,
+      };
+      const date = await store.dispatch('user/sendCode', params);
+      getCodeInterval();
+      showPaste.value = true;
+    } catch (err) {
+      throw err;
+    }
+  }
+
+  // 获取验证码倒计时
+  function getCodeInterval() {
+    showInterval.value = true;
+    codeTimer.value = setInterval(() => {
+      if (interval.value === 0) {
+        clearInterval(codeTimer.value);
+        codeTimer.value = null;
+        showInterval.value = false;
+        interval.value = 120;
+        return;
+      }
+      interval.value = interval.value - 1;
+    }, 1000);
+  }
+
+  // 粘贴
+  function setCode() {
+    // 获取粘贴板内容
+    // 小程序平台
+    //#ifdef MP-WEIXIN
+    uni.getClipboardData({
+      success (res) {
+        smsCode.value = res.data;
+      }
+    });
+    //#endif
+
+    // 非小程序平台
+    //#ifndef MP-WEIXIN
+    getClipboardContents()
+    //#endif
+  }
+
+  // 非小程序平台粘贴
+  async function getClipboardContents() {
+    try {
+      const text = await navigator.clipboard.readText();
+      smsCode.value = text;
+    } catch (err) {
+      console.error('Failed to read clipboard contents: ', err);
+    }
+  }
+
+  // 验证信息
+  function checkRules() {
+    if (!verifyPhone(phone.value)) {
+      uni.$ui.showToast('请输入正确的手机号');
+      return false;
+    }
+    if (!smsCode.value) {
+      uni.$ui.showToast('验证码无效');
+      return false;
+    }
+
+    if (phone.value === user.value.phone) {
+      uni.$ui.showToast('新手机号不能与旧手机号相同');
+      return;
+    }
+    return true;
+  }
+
+  /**
+   * 验证手机号格式
+   * @param {string} phone 手机号
+   */
+  function verifyPhone(phone) {
+    const phoneExg = /^1\d{10}$/;
+    return phoneExg.test(phone);
+  }
+
+  /**
+   * 验证账号/密码 格式
+   * @param {string} account 账号
+   */
+  function verifyLoginname(account) {
+    const accountExg = /^[a-zA-Z0-9._-]{2,20}$/;
+    return accountExg.test(account);
+  }
+
+  // 微信登录
+  function handleWxLogin() {
+    const origin = `${Config.baseUrl}/pt-mui`; // 测试
+    const appid = 'wxd1842e073e0e6d91';
+    const state = 'wx_web';
+    const href = 'https://open.weixin.qq.com/connect/qrconnect';
+    // eslint-disable-next-line
+    window.location.href =
+      `${href}?appid=${appid}&redirect_uri=${origin}&response_type=code&scope=snsapi_login&state=${state}#wechat_redirect`;
   }
 
   return {
-    rules,
-    errorType,
-    labelPosition,
-    border,
-    getImageCode,
-    // hasvalue,
-    // getCode,
-    // getCodeInterval,
-    // checkRules,
-    // setCode,
-    // getClipboardContents,
-    // verifyPhone,
-    // verifyLoginname,
-    // handleWxLogin
+    rules,
+    showPaste,
+    showInterval,
+    interval,
+    hasvalue,
+    checkRules,
+    setCode,
+    verifyLoginname,
+    handleWxLogin
   }
 }
diff --git a/main.js b/main.js
index 06e6f74..8f37209 100644
--- a/main.js
+++ b/main.js
@@ -9,12 +9,14 @@ import { setupRole } from '@/apis/role.js';
 import { setupTall } from '@/apis/tall.js';
 import { setupTask } from '@/apis/task.js';
 import { setupWbs } from '@/apis/wbs.js';
+import { setupPlugin } from '@/apis/plugin.js';
 import storage from '@/utils/storage.js';
 import store from './store';
 import task from '@/utils/task.js';
 import time from '@/utils/time.js';
 import timeConfig from '@/config/time';
 import taskConfig from '@/config/task';
+import pluginConfig from '@/config/plugin';
 import uView from './uni_modules/vk-uview-ui'; // 引入 uView UI
 import ui from '@/utils/ui.js';
 import upload from '@/utils/upload.js';
@@ -31,6 +33,7 @@ export function createApp() {
   app.config.globalProperties.$task = task;
   app.config.globalProperties.$timeConfig = timeConfig;
   app.config.globalProperties.$taskConfig = taskConfig;
+  app.config.globalProperties.$pluginConfig = pluginConfig;
 
   uni.$cache = cache;
   uni.$catchReq = cacheAndRequest;
@@ -41,6 +44,7 @@ export function createApp() {
   uni.$task = task;
   uni.$timeConfig = timeConfig;
   uni.$taskConfig = taskConfig;
+  uni.$pluginConfig = pluginConfig;
 
   setupDayjs(app);
   app.use(uView); // 使用 uView UI
@@ -51,6 +55,7 @@ export function createApp() {
   setupRole(app);
   setupTask(app);
   setupWbs(app);
+  setupPlugin(app);
 
   return {
     app,
diff --git a/pages.json b/pages.json
index a3be40c..feb8e1e 100644
--- a/pages.json
+++ b/pages.json
@@ -12,13 +12,22 @@
 				"navigationStyle": "custom",
 				"navigationBarTextStyle": "white"
 			}
-		},
+		},
+		// 用户名密码登录
 		{
 			"path": "pages/user/accountLogin",
 			"style": {
 				"navigationStyle": "custom",
 				"navigationBarTextStyle": "white"
 			}
+		},
+		// 手机号登录
+		{
+			"path": "pages/user/login",
+			"style": {
+				"navigationStyle": "custom",
+				"navigationBarTextStyle": "white"
+			}
 		}
 	],
 	"globalStyle": {
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 5b0349e..7daadb6 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -7,7 +7,7 @@
 			<!-- 上传 导入wbs -->
 			<Upload @success="onUploadSuccess" @error="onUploadError" />
 		</view>
-
+<u-button @click="toLogin">登录</u-button>
 		<!-- 项目列表 -->
 		<Projects @getProjects="getProjects" class="flex-1 overflow-y-auto" />
 
@@ -75,20 +75,22 @@ const onDateChange = event => {
 
 // 导入成功
 const onUploadSuccess = () => {
-  uTips.show({
-    title: '导入成功，即将打开新项目',
-    type: 'success',
-    duration: '3000',
-  });
+  uni.$ui.showToast('导入成功，即将打开新项目', 3000);
+  // uTips.show({
+  //   title: '导入成功，即将打开新项目',
+  //   type: 'success',
+  //   duration: '3000',
+  // });
 };
 
 // 导入失败
 const onUploadError = error => {
-  uTips.show({
-    title: error || '导入失败',
-    type: 'error',
-    duration: '6000',
-  });
+  uni.$ui.showToast('导入失败', 6000);
+  // uTips.show({
+  //   title: error || '导入失败',
+  //   type: 'error',
+  //   duration: '6000',
+  // });
 };
 
 // 监听触摸滑动 切换日历的模式 月/周
@@ -104,6 +106,10 @@ function onMove(event) {
   prevY = y;
   data.value.calendar.initDate();
 }
+
+function toLogin() {
+  uni.navigateTo({ url: '/pages/user/accountLogin' })
+}
 </script>
 
 <style>
diff --git a/pages/user/accountLogin.vue b/pages/user/accountLogin.vue
index bfff565..4061af2 100644
--- a/pages/user/accountLogin.vue
+++ b/pages/user/accountLogin.vue
@@ -1,11 +1,11 @@
 <template>
   <view class="u-p-l-50 u-p-r-50 u-p-t-30">
-    <u-form :model="model" ref="loginForm" :rules="mixinInit.rules" :error-type="mixinInit.errorType">
-      <u-form-item :label-position="mixinInit.labelPosition" label="用户名" prop="account" label-width="150">
-        <u-input :border="mixinInit.border" placeholder="请输入用户名" v-model="model.account" type="text"></u-input>
+    <u-form :model="form" ref="loginForm" :error-type="['message']">
+      <u-form-item label="用户名" prop="account" label-width="150">
+        <u-input placeholder="请输入用户名" v-model="form.account" type="text"></u-input>
       </u-form-item>
-      <u-form-item :label-position="mixinInit.labelPosition" label="密码" prop="password" label-width="150">
-        <u-input :password-icon="true" :border="mixinInit.border" type="password" v-model="model.password" placeholder="请输入密码">
+      <u-form-item label="密码" prop="password" label-width="150">
+        <u-input :password-icon="true" type="password" v-model="form.password" placeholder="请输入密码">
         </u-input>
       </u-form-item>
       <view class="flex flex-nowrap">
@@ -26,69 +26,72 @@
     <view style="margin-top: 200rpx;text-align: center; color: #999999;font-size: 35rpx;">
       快速登录
     </view>
-    <view style="text-align: center; margin-top: 20rpx;">
+    <view style="text-align: center; margin-top: 20rpx;" @click="mixinInit.handleWxLogin">
       <image src="/common/img/weixinIcon.png" mode="" style="width: 85rpx;height: 85rpx;"></image>
     </view>
   </view>
 </template>
 
 <script setup>
-  import { ref, computed } from 'vue';
+  import { ref, computed, reactive } from 'vue';
   import { useStore } from 'vuex';
+  import { onReady} from '@dcloudio/uni-app';
   import userMixin from '@/hooks/user/userMixin'
 
   const store = useStore();
-  const mixinInit = userMixin();
-  const userInfo = uni.$storage.getStorageSync('user');
-  const user = ref({});
-  const loginForm = ref(null);
-  const model = ref({
+  const mixinInit = userMixin();
+  const loginForm = ref(null);
+  
+  const form = reactive({
     account: '',
     password: ''
   })
-
-
-  if (userInfo) {
-    user.value = JSON.parse(userInfo);
-  }
+
+  onReady(() => {
+    loginForm.value.setRules(mixinInit.rules);
+  });
 
   const submit = () => {
-    loginForm.value.validate(data => {
-      console.log(data);
+    loginForm.value.validate(valid => {
+      if (valid) {
+        login()
+      }
     });
   }
 
-  async function login() {
+  async function login() {
+    uni.$ui.showLoading();
     try {
-      uni.$ui.showLoading();
-      if (account.value === user.value.account) {
-        uni.$ui.showToast('当前账户已登录');
-      } else {
-        const params = ref({
-          client: 1,
-          data: {
-            identifier: account.value,
-            credential: password.value,
-          },
-          type: 3,
-        });
-
-        let res = await uni.$u.api.signin(params.value);
-        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.navigateTo({
-        url: '/pages/index/index'
+      const params = reactive({
+        client: 1,
+        data: {
+          identifier: form.account,
+          credential: form.password,
+        },
+        type: 3,
       });
 
-      uni.$ui.hideLoading();
+      let res = await uni.$u.api.signin(params);
+      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.$ui.hideLoading();
+      
+      uni.navigateTo({
+        url: '/pages/index/index'
+      });
     } catch (error) {
       uni.$ui.hideLoading();
       uni.$ui.showToast(error);
     }
+  }
+
+  function openPage(url) {
+    uni.navigateTo({
+      url: url
+    })
   }
 </script>
 
diff --git a/pages/user/forgetPassword.vue b/pages/user/forgetPassword.vue
new file mode 100644
index 0000000..48d48ea
--- /dev/null
+++ b/pages/user/forgetPassword.vue
@@ -0,0 +1,8 @@
+<template>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>
diff --git a/pages/user/login.vue b/pages/user/login.vue
index 48d48ea..2f375cc 100644
--- a/pages/user/login.vue
+++ b/pages/user/login.vue
@@ -1,8 +1,132 @@
 <template>
+  <view class="u-p-l-50 u-p-r-50 u-p-t-30">
+    <u-form :model="form" ref="loginForm" :error-type="['message']">
+      <u-form-item label="手机号码" prop="phone" label-width="150">
+        <u-input placeholder="请输入手机号" v-model="form.phone" type="number"></u-input>
+      </u-form-item>
+
+      <u-form-item label="图形验证码" prop="verificationCodeValue" label-width="150">
+        <u-input placeholder="请输入计算结果" v-model="form.verificationCodeValue" type="number"></u-input>
+        <image slot="right" :src="imageBase64" mode="aspectFit" class="code-image" @click="getImageCode"></image>
+      </u-form-item>
+
+      <u-form-item label="验证码" prop="smsCode" label-width="150">
+        <u-input @focus="mixinInit.hasvalue(form)" placeholder="请输入验证码" v-model="form.smsCode" type="text"> </u-input>
+        <u-button slot="right" type="primary" size="mini" v-show="mixinInit.showPaste" @click="mixinInit.setCode" class="u-m-r-20">粘贴</u-button>
+        <u-button slot="right" size="mini" v-if="mixinInit.showInterval">{{ mixinInit.interval }}</u-button>
+      </u-form-item>
+
+      <view class="flex flex-nowrap">
+        <view class="flex-sub"></view>
+        <view class="u-m-t-30 u-font-12 text-gray-400" @click="openPage('/pages/user/forgetPassword')">忘记密码</view>
+      </view>
+    </u-form>
+
+    <view class="u-m-t-50">
+      <u-button @click="submit" type="primary">立即登录</u-button>
+    </view>
+
+    <view class="flex justify-between">
+      <view class="u-m-t-30" style="color: #2885ED;" @click="openPage('/pages/user/rigister')">新用户注册</view>
+      <view class="u-m-t-30" style="color: #2885ED;" @click="openPage('/pages/user/accountLogin')">用户名登录</view>
+    </view>
+
+    <view style="margin-top: 200rpx;text-align: center; color: #999999;font-size: 35rpx;">
+      快速登录
+    </view>
+    <view style="text-align: center; margin-top: 20rpx;" @click="mixinInit.handleWxLogin">
+      <image src="/common/img/weixinIcon.png" mode="" style="width: 85rpx;height: 85rpx;"></image>
+    </view>
+  </view>
 </template>
 
-<script>
+<script setup>
+  import { ref, computed, reactive } from 'vue';
+  import { useStore } from 'vuex';
+  import { onLoad, onReady } from '@dcloudio/uni-app';
+  import userMixin from '@/hooks/user/userMixin'
+
+  const store = useStore();
+  const mixinInit = userMixin();
+  const loginForm = ref(null);
+
+  const form = reactive({
+    phone: '',
+    verificationCodeValue: '',
+    smsCode: ''
+  });
+  const imageBase64 = ref(null); // 图形验证码图片
+  const verificationCodeId = ref(null); // 图形验证码id
+  const data = {};
+  const treeId = ref(null);
+
+  getImageCode();
+
+  onReady(() => {
+    loginForm.value.setRules(mixinInit.rules);
+  });
+
+  const submit = () => {
+    loginForm.value.validate(valid => {
+      if (valid) {
+        login()
+      }
+    });
+  }
+
+  // 获取图形验证码
+  async function getImageCode() {
+    uni.$ui.showLoading();
+    try {
+      const data = await uni.$u.api.getImageCode();
+      imageBase64.value = data.imageBase64 || '';
+      verificationCodeId.value = data.verificationCodeId || '';
+      uni.$ui.hideLoading();
+    } catch (error) {
+      uni.$ui.hideLoading();
+      uni.$ui.showToast(error);
+    }
+  }
+
+  async function login() {
+    uni.$ui.showLoading();
+    try {
+      const params = reactive({
+        client: 1,
+        data: {
+          identifier: form.phone,
+          credential: form.smsCode,
+        },
+        type: 1,
+      });
+
+      let res = await uni.$u.api.signin(params);
+      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.$ui.hideLoading();
+
+      uni.navigateTo({
+        url: '/pages/index/index'
+      });
+    } catch (error) {
+      uni.$ui.hideLoading();
+      uni.$ui.showToast(error);
+    }
+  }
+
+  function openPage(url) {
+    uni.navigateTo({
+      url: url
+    })
+  }
 </script>
 
-<style>
+<style lang="scss" scoped>
+  .code-image {
+    width: 200rpx;
+    height: 70rpx;
+  }
 </style>
diff --git a/pages/user/rigister.vue b/pages/user/rigister.vue
new file mode 100644
index 0000000..48d48ea
--- /dev/null
+++ b/pages/user/rigister.vue
@@ -0,0 +1,8 @@
+<template>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>
diff --git a/plugins/p-deliver-check/p-deliver-check.vue b/plugins/p-deliver-check/p-deliver-check.vue
new file mode 100644
index 0000000..2bbab16
--- /dev/null
+++ b/plugins/p-deliver-check/p-deliver-check.vue
@@ -0,0 +1,62 @@
+<template>
+  <!-- 上传交付物 -->
+  <view class="px-3 py-6 bg-white">
+    <u-input :auto-height="autoHeight" :border="border" :height="height" :type="type" placeholder="输入备注" v-model="remark" />
+    <view class="flex flex-row-reverse text-xs text-gray-400 mt-2">{{ wordNum }}/140</view>
+    <!-- 评分 -->
+    <view class="flex justify-between mt-3">
+      <slider :value="score" @change="sliderChange" max="100" min="0" show-value style="width: 60%" />
+      <u-input :border="border" :type="type1" @input="changeNumber" maxlength="100" placeholder="输入分数" v-model="score" />
+    </view>
+
+    <view class="flex flex-col justify-center mt-5">
+      <u-button @click="submit" size="medium" type="primary">提交</u-button>
+      <u-button @click="$emit('closeScore')" class="mt-2" size="medium">取消</u-button>
+    </view>
+  </view>
+</template>
+
+<script setup>
+import { reactive, watchEffect, defineEmits } from 'vue';
+
+const data = reactive({
+      remark: '',
+      type: 'textarea',
+      border: true,
+      height: 100,
+      autoHeight: true,
+      wordNum: 0,
+      score: 0,
+      type1: 'number',
+});
+
+const emit = defineEmits(['submit']);
+
+
+watchEffect(() => {
+  if(remark) {
+    data.wordNum = remark.value.length;
+  }
+
+  if(score) {
+    data.score1 = score.value;
+  }
+});
+
+    // 提交交付物
+    function submit() {
+      emit('submit', this.remark, this.score);
+    }
+
+    function sliderChange(e) {
+      data.score = e.detail.value;
+    }
+
+    function changeNumber(e) {
+      if (e > 100) {
+        data.score = 100;
+      }
+    }
+</script>
+
+<style></style>
diff --git a/plugins/p-delivery-history/p-delivery-history.vue b/plugins/p-delivery-history/p-delivery-history.vue
new file mode 100644
index 0000000..928fd6b
--- /dev/null
+++ b/plugins/p-delivery-history/p-delivery-history.vue
@@ -0,0 +1,131 @@
+<template>
+  <!-- 交付物 -->
+  <view class="mt-3">
+    <view v-if="data.lists && data.lists.length">
+      <view :key="list.id" v-for="list in data.lists">
+        <view class="p-3 mt-3 shadow">
+          <view class="text-gray-400 pb-2">
+            <span class="mr-4">{{ list.name }}</span>
+            <span>{{ $moment(+list.time).format('YYYY-MM-DD HH:mm:ss') }}</span>
+          </view>
+          <view class="pb-2 flex flex-wrap overflow-hidden" v-if="list.content">
+            <a :href="list.content" class="text-blue-500" target="_blank" v-if="CheckUrl(list.content)">{{ list.content }}</a>
+            <span v-else>{{ list.content }}</span>
+          </view>
+          <view :key="checker.checkerId" v-for="checker in list.checkerList" class="mb-2">
+            <view class="flex justify-between">
+              <view class="font-bold">
+                {{ checker.checkerName }}
+                <span v-if="checker.isMine">(我)</span>
+              </view>
+              <view>
+                <span class="text-blue-500" v-if="checker.status === 1">通过</span>
+                <span class="text-red-500" v-if="checker.status === 2">驳回</span>
+                <span class="ml-4" v-if="checker.status !== 0">{{ checker.score }}分</span>
+                <span class="text-gray-400" v-if="checker.status === 0 && !checker.isMine">未审核</span>
+                <view v-if="checker.status === 0 && checker.isMine">
+                  <u-button @click="showScore(checker.checkId, 2)" class="mr-3" plain size="mini" type="error">驳回</u-button>
+                  <u-button @click="showScore(checker.checkId, 1)" plain size="mini" type="primary">通过</u-button>
+                </view>
+              </view>
+            </view>
+            <view class="text-gray-400 text-xs mt-1">{{ checker.remark }}</view>
+          </view>
+        </view>
+      </view>
+    </view>
+    <u-empty icon-size="90" mode="history" text="暂未上传交付物" v-else></u-empty>
+
+    <!-- 评分 -->
+    <!-- <uni-popup :maskClick="false" background-color="#fff" ref="popup" type="bottom"><PDeliverCheck @closeScore="closeScore" @submit="submit"></PDeliverCheck></uni-popup> -->
+  </view>
+</template>
+
+<script setup>
+import { ref, reactive, onMounted, computed } from 'vue';
+import { useStore } from 'vuex';
+// import UniPopup from '../../components/uni-popup/uni-popup.vue';
+import PDeliverCheck from '../p-deliver-check/p-deliver-check.vue';
+
+const props = defineProps({ task: { type: Object, default: null } });
+
+const data = reactive({
+  lists: [],
+  show: false,
+  options: null,
+  loading: true, // 是否显示骨架屏组件
+});
+
+const store = useStore();
+const projectId = computed(() => store.getters['project/projectId']);
+const popup = ref(null);
+
+onMounted(() => {
+  getDeliverOfTask();
+});
+
+async function getDeliverOfTask() {
+  try {
+    const params = { projectId: projectId.value, taskSubId: props.task.id };
+    const res = await uni.$u.api.queryDeliverOfTask(params);
+    data.lists = res;
+  } catch (error) {
+    console.error('p-delivery-history.vue getDeliverOfTask error: ', error);
+    uni.$ui.showToast(error.msg || '提交失败');
+  }
+}
+
+function showScore(checkId, status) {
+  // 通过组件定义的ref调用uni-popup方法 ,如果传入参数 ，type 属性将失效 ，仅支持 ['top','left','bottom','right','center']
+  popup.open('bottom');
+  data.options = { checkId, status };
+}
+
+function closeScore() {
+  popup.close('bottom');
+}
+
+async function submit(remark, score) {
+  try {
+    await checkDeliver(remark, score);
+    closeScore();
+  } catch (error) {
+    console.error('error: ', error);
+  }
+}
+
+/**
+     * 检查交付物
+     * @param {string} checkId 检查记录id
+     * @param {string} projectId 项目id
+     * @param {string} remark 评论
+     * @param {number} score 分数
+     * @param {number} status 检查状态(1-通过,2-驳回)
+     */
+async function checkDeliver(remark, score) {
+  try {
+    data.show = true;
+    const { checkId, status } = data.options;
+    const params = { checkId, projectId: projectId.value, status, remark, score };
+    await uni.$u.api.checkDeliver(params);
+    uni.$ui.showToast('交付物检查成功');
+    data.options = null;
+    getDeliverOfTask();
+  } catch (error) {
+    console.error('p-delivery-history.vue checkDeliver error: ', error);
+    uni.$t.ui.showToast('交付物检查失败，请稍后重试');
+    data.options = null;
+  }
+}
+
+// 判断内容是不是链接
+function CheckUrl(url) {
+  const reg = /^([hH][tT]{2}[pP]:\/\/|[hH][tT]{2}[pP][sS]:\/\/)(.)+$/;
+  if (!reg.test(url)) {
+    return false;
+  }
+  return true;
+}
+</script>
+
+<style></style>
diff --git a/plugins/p-delivery-history/p-delivery-history1.vue b/plugins/p-delivery-history/p-delivery-history1.vue
new file mode 100644
index 0000000..f97cb1c
--- /dev/null
+++ b/plugins/p-delivery-history/p-delivery-history1.vue
@@ -0,0 +1,149 @@
+<template>
+  <!-- 交付物 -->
+  <view class="mt-3">
+    <view v-if="lists && lists.length">
+      <view :key="list.id" v-for="list in lists">
+        <view class="text-gray-400 u-font-12 font-thin leading-none">
+          <span class="mr-2">{{ list.name }}</span>
+          <span>{{ $moment(+list.time).format('YYYY-MM-DD HH:mm:ss') }}</span>
+        </view>
+        <view class="mt-2 py-1 px-2.5 border border-gray-200 rounded flex flex-wrap overflow-hidden break-all" v-if="list.content">
+          <a :href="list.content" class="text-blue-500 u-font-12 font-thin" target="_blank" v-if="CheckUrl(list.content)">{{
+            list.content
+          }}</a>
+          <span v-else>{{ list.content }}</span>
+        </view>
+        <view :class="index === 0 ? 'mt-4' : 'mt-3'" v-for="(checker, index) in list.checkerList" :key="index">
+          <view class="flex justify-between leading-none">
+            <view>
+              {{ checker.checkerName }}
+              <span v-if="checker.isMine">(我)</span>
+            </view>
+            <view>
+              <span class="text-blue-500" v-if="checker.status === 1">通过</span>
+              <span class="text-red-500" v-if="checker.status === 2">驳回</span>
+              <span class="ml-4" v-if="checker.status !== 0">{{ checker.score }}分</span>
+              <span class="text-gray-400" v-if="checker.status === 0 && !checker.isMine">未审核</span>
+              <view v-if="checker.status === 0 && checker.isMine">
+                <u-button class="action-btn mr-2" @click="showScore(checker.checkId, 1)" size="mini" shape="circle" type="primary">
+                  通过
+                </u-button>
+                <u-button class="action-btn" @click="showScore(checker.checkId, 2)" size="mini" shape="circle" type="error">驳回</u-button>
+              </view>
+            </view>
+          </view>
+          <view class="text-gray-400 text-xs mt-1">{{ checker.remark }}</view>
+        </view>
+      </view>
+    </view>
+    <u-empty icon-size="90" mode="history" text="暂未上传交付物" v-else></u-empty>
+
+    <!-- 评分 -->
+    <uni-popup :maskClick="false" background-color="#fff" ref="popup" type="bottom">
+      <PDeliverCheck @closeScore="closeScore" @submit="submit"></PDeliverCheck>
+    </uni-popup>
+  </view>
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+import UniPopup from '../../components/uni-popup/uni-popup.vue';
+import PDeliverCheck from '../p-deliver-check/p-deliver-check.vue';
+
+export default {
+  name: 'p-delivery-history',
+  props: { task: { type: Object, default: null } },
+  components: { PDeliverCheck, UniPopup },
+  data() {
+    return {
+      lists: [],
+      show: false,
+      options: null,
+      loading: true, // 是否显示骨架屏组件
+    };
+  },
+
+  computed: mapGetters('project', ['projectId']),
+
+  mounted() {
+    this.getDeliverOfTask();
+  },
+
+  methods: {
+    async getDeliverOfTask() {
+      try {
+        const { projectId, task } = this;
+        const params = { projectId, taskSubId: task.id };
+        const data = await this.$u.api.queryDeliverOfTask(params);
+        this.lists = data;
+      } catch (error) {
+        console.error('p-delivery-history.vue getDeliverOfTask error: ', error);
+        this.$t.ui.showToast(error.msg || '提交失败');
+      }
+    },
+
+    showScore(checkId, status) {
+      // 通过组件定义的ref调用uni-popup方法 ,如果传入参数 ，type 属性将失效 ，仅支持 ['top','left','bottom','right','center']
+      this.$refs.popup.open('bottom');
+      this.options = { checkId, status };
+    },
+
+    closeScore() {
+      this.$refs.popup.close('bottom');
+    },
+
+    async submit(remark, score) {
+      try {
+        await this.checkDeliver(remark, score);
+        this.closeScore();
+      } catch (error) {
+        console.error('error: ', error);
+      }
+    },
+
+    /**
+     * 检查交付物
+     * @param {string} checkId 检查记录id
+     * @param {string} projectId 项目id
+     * @param {string} remark 评论
+     * @param {number} score 分数
+     * @param {number} status 检查状态(1-通过,2-驳回)
+     */
+    async checkDeliver(remark, score) {
+      try {
+        this.show = true;
+        const { projectId, options } = this;
+        const { checkId, status } = options;
+        const params = { checkId, projectId, status, remark, score };
+        await this.$u.api.checkDeliver(params);
+        this.$t.ui.showToast('交付物检查成功');
+        this.options = null;
+        this.getDeliverOfTask();
+      } catch (error) {
+        console.error('p-delivery-history.vue checkDeliver error: ', error);
+        this.$t.ui.showToast('交付物检查失败，请稍后重试');
+        this.options = null;
+      }
+    },
+
+    // 判断内容是不是链接
+    CheckUrl(url) {
+      var reg = /^([hH][tT]{2}[pP]:\/\/|[hH][tT]{2}[pP][sS]:\/\/)(.)+$/;
+      if (!reg.test(url)) {
+        return false;
+      } else {
+        return true;
+      }
+    },
+  },
+};
+</script>
+
+<style scoped>
+.action-btn {
+  padding: 0;
+  width: 80rpx;
+  height: 40rpx;
+  line-height: 40rpx;
+}
+</style>
diff --git a/plugins/p-manage-member/p-manage-member.vue b/plugins/p-manage-member/p-manage-member.vue
new file mode 100644
index 0000000..220e966
--- /dev/null
+++ b/plugins/p-manage-member/p-manage-member.vue
@@ -0,0 +1,6 @@
+<template>
+  <view>成员管理</view>
+</template>
+
+<script setup>
+</script>
diff --git a/plugins/p-manage-project/p-manage-project.vue b/plugins/p-manage-project/p-manage-project.vue
new file mode 100644
index 0000000..65a16bb
--- /dev/null
+++ b/plugins/p-manage-project/p-manage-project.vue
@@ -0,0 +1,6 @@
+<template>
+  <view>项目管理</view>
+</template>
+
+<script setup>
+</script>
diff --git a/plugins/p-manage-role/p-manage-role.vue b/plugins/p-manage-role/p-manage-role.vue
new file mode 100644
index 0000000..51558a0
--- /dev/null
+++ b/plugins/p-manage-role/p-manage-role.vue
@@ -0,0 +1,6 @@
+<template>
+  <view>角色管理</view>
+</template>
+
+<script setup>
+</script>
diff --git a/plugins/p-manage-task/p-manage-task.vue b/plugins/p-manage-task/p-manage-task.vue
new file mode 100644
index 0000000..575e828
--- /dev/null
+++ b/plugins/p-manage-task/p-manage-task.vue
@@ -0,0 +1,6 @@
+<template>
+  <view>任务管理</view>
+</template>
+
+<script setup>
+</script>
diff --git a/plugins/p-subproject/p-subproject.vue b/plugins/p-subproject/p-subproject.vue
new file mode 100644
index 0000000..a53419c
--- /dev/null
+++ b/plugins/p-subproject/p-subproject.vue
@@ -0,0 +1,54 @@
+<template>
+  <!-- 子项目插件 -->
+  <view>
+    <view v-for="item in data.sonProject" :key="item.detailId">
+      <span class="text-xs text-blue-500" @click="openProject(item)">{{ item.name }}</span>
+    </view>
+  </view>
+</template>
+
+<script setup>
+import { onMounted } from 'vue';
+import Config from '@/common/js/config.js';
+
+const props = defineProps({
+  task: {
+    type: Object,
+    default: () => {},
+  },
+});
+
+const data = reactive({ sonProject: [] });
+
+onMounted(() => {
+  getSonProject();
+});
+
+async function getSonProject() {
+  try {
+    const data = await uni.$u.api.findSonProject({ projectId: props.task.detailId });
+    data.sonProject = data;
+  } catch (error) {
+    console.error('p-subproject.vue getSonProject error: ', error);
+  }
+}
+
+/**
+ * 打开项目
+ * @param {object} project 所点击的项目的信息
+ */
+function openProject(project) {
+  const { name, id, url } = project;
+  const { apiUrl } = Config;
+  const defaultwbs = `${apiUrl}/defaultwbs`;
+  url && (defaultwbs = url);
+  uni.$u.route('pages/project/project', {
+    u: userId.value,
+    p: id,
+    pname: name,
+    url: encodeURIComponent(url),
+  });
+}
+</script>
+
+<style></style>
diff --git a/plugins/p-subtasks/p-subtasks.vue b/plugins/p-subtasks/p-subtasks.vue
new file mode 100644
index 0000000..1edc4e0
--- /dev/null
+++ b/plugins/p-subtasks/p-subtasks.vue
@@ -0,0 +1,31 @@
+<template>
+  <view>
+    <view v-for="item in data.sonTask" :key="item.detailId">
+      <span class="text-xs text-gray-500">{{ item.name }}</span>
+    </view>
+  </view>
+</template>
+
+<script setup>
+import { reactive } from 'vue';
+
+const props = defineProps({
+  task: {
+    type: Object,
+    default: () => {},
+  },
+});
+const data = reactive({ sonTask: [] });
+
+async function getSonTask() {
+  try {
+    const res = await uni.$u.api.findSonTask({ detailId: props.task.detailId });
+    data.sonTask = res;
+  } catch (error) {
+    console.error('p-subtasks.vue getSonTask error: ', error);
+  }
+}
+getSonTask();
+</script>
+
+<style></style>
diff --git a/plugins/p-task-countdown/p-task-countdown.vue b/plugins/p-task-countdown/p-task-countdown.vue
new file mode 100644
index 0000000..ee7bf8f
--- /dev/null
+++ b/plugins/p-task-countdown/p-task-countdown.vue
@@ -0,0 +1,10 @@
+<template>
+  <!-- 任务倒计时插件 -->
+  <view>任务倒计时插件</view>
+</template>
+
+<script setup>
+
+</script>
+
+<style></style>
diff --git a/plugins/p-task-description/p-task-description.vue b/plugins/p-task-description/p-task-description.vue
new file mode 100644
index 0000000..bd4bdc9
--- /dev/null
+++ b/plugins/p-task-description/p-task-description.vue
@@ -0,0 +1,9 @@
+<template>
+  <!-- 任务描述 -->
+  <view>{{ task.description }}</view>
+</template>
+
+<script setup>
+defineProps({ task: { default: () => {}, type: Object } });
+
+</script>
diff --git a/plugins/p-task-duration-delay/p-task-duration-delay.vue b/plugins/p-task-duration-delay/p-task-duration-delay.vue
new file mode 100644
index 0000000..ab9aba4
--- /dev/null
+++ b/plugins/p-task-duration-delay/p-task-duration-delay.vue
@@ -0,0 +1,23 @@
+<template>
+  <view v-if="realDuration && planDuration">
+    <!-- 任务时长延迟插件 -->
+    <!-- 超时 -->
+    <span class="font-bold text-green-500" v-if="realDuration - 0 > planDuration - 0">
+      +{{ $time.formatDuration(realDuration - planDuration) }}
+    </span>
+    <!-- 延时 -->
+    <span class="font-bold text-red-500" v-if="realDuration - 0 < planDuration - 0">
+      -{{ $time.formatDuration(planDuration - realDuration) }}
+    </span>
+  </view>
+</template>
+
+<script setup>
+import { computed } from 'vue';
+
+const props = defineProps({ task: { default: () => {}, type: Object } });
+
+const realDuration = computed(() => props.task.realDuration);
+const planDuration = computed(() => props.task.planDuration);
+
+</script>
diff --git a/plugins/p-task-start-time-delay/p-task-start-time-delay.vue b/plugins/p-task-start-time-delay/p-task-start-time-delay.vue
new file mode 100644
index 0000000..df4daeb
--- /dev/null
+++ b/plugins/p-task-start-time-delay/p-task-start-time-delay.vue
@@ -0,0 +1,18 @@
+<template>
+  <!-- <view>任务开始时间延迟插件</view> -->
+  <view v-if="realStart && planStart">
+    <!-- 任务开始时间延迟插件 -->
+    <!-- 超时 -->
+    <span>{{ $time.formatDuration(+realStart - +planStart) }}</span>
+  </view>
+</template>
+
+<script setup>
+import { computed } from 'vue';
+
+const props = defineProps({ task: { default: () => {}, type: Object } });
+
+const realStart = computed(() => props.task.realStart);
+const planStart = computed(() => props.task.planStart);
+
+</script>
diff --git a/plugins/p-upload-deliverable/p-upload-deliverable.vue b/plugins/p-upload-deliverable/p-upload-deliverable.vue
new file mode 100644
index 0000000..951ab3f
--- /dev/null
+++ b/plugins/p-upload-deliverable/p-upload-deliverable.vue
@@ -0,0 +1,90 @@
+<template>
+  <!-- 上传交付物 -->
+  <view class="py-2">
+    <u-input :auto-height="data.autoHeight" :border="data.border" :height="data.height" :type="data.type" v-model="data.content" width="100" />
+
+    <!-- 选择检查人 -->
+    <!-- <ChooseChecker ref="checker" :checkerList="data.checkerList" @setCheckerList="setCheckerList"></ChooseChecker> -->
+
+    <view class="flex justify-between">
+      <u-button @click="submit" class="m-0" size="mini" type="primary">提交</u-button>
+      <u-icon @click="changeShowHistory" name="arrow-up" v-if="data.showHistory"></u-icon>
+      <u-icon @click="changeShowHistory" name="arrow-down" v-else></u-icon>
+    </view>
+
+    <p-delivery-history :task="task" v-if="data.showHistory" />
+  </view>
+</template>
+
+<script setup>
+import { reactive, ref, computed  } from 'vue';
+import { useStore } from 'vuex';
+// import ChooseChecker from '@/components/ChooseChecker/ChooseChecker.vue';
+
+const props = defineProps({
+  task: { default: () => {}, type: Object },
+});
+
+const data = reactive({
+  content: '',
+  type: 'textarea',
+  border: true,
+  height: 30,
+  autoHeight: true,
+  checkerList: [],
+  showHistory: false, // 展开历史记录
+});
+
+const checker = ref(null);
+const store = useStore();
+const members = computed(() => store.state.role.members);
+const projectId = computed(() => store.getters['project/projectId']);
+const checkers = computed(() => {
+  let arr = [];
+  if (members.value.length) {
+    members.value.forEach(member => {
+      const item = { value: member.memberId, label: member.name };
+      arr.push(item);
+    });
+  }
+  return arr;
+});
+
+// 设置检查人
+function setCheckerList(checked, item) {
+  if (checked) {
+    data.checkerList.push(item.memberId);
+  } else {
+    const index = data.checkerList.findIndex(checker => checker === item.memberId);
+    data.checkerList.splice(index, 1);
+  }
+}
+
+// 展开合上历史记录
+function changeShowHistory() {
+  data.showHistory = !data.showHistory;
+}
+
+// 提交交付物
+async function submit() {
+  try {
+    const { content, checkerList } = data;
+    const { task } = props;
+    if (!checkerList.length) {
+      uni.$ui.showToast('请选择检查人');
+      return;
+    }
+    const params = { content, checkerList, projectId: projectId.value, taskSubId: task.id };
+    await uni.$u.api.saveDeliver(params);
+    uni.$ui.showToast('交付物提交成功');
+    data.content = '';
+    data.checkerList = [];
+    checker.clearChecked();
+  } catch (error) {
+    console.error('p-upload-deliverable.vue submit error: ', error);
+    uni.$ui.showToast('交付物提交失败，请稍后重试');
+  }
+}
+</script>
+
+<style scoped lang="scss"></style>
diff --git a/plugins/p-wbs-import/p-wbs-import.vue b/plugins/p-wbs-import/p-wbs-import.vue
new file mode 100644
index 0000000..8b1b9de
--- /dev/null
+++ b/plugins/p-wbs-import/p-wbs-import.vue
@@ -0,0 +1,71 @@
+<template>
+  <view>
+    <view @click="handleUpload" v-if="task.name === '导入WBS新建项目'">{{ task.name }}</view>
+    <view @click="handleUpdate" v-if="task.name === '导入WBS更新项目'">{{ task.name }}</view>
+    <!-- 全局提示框 -->
+    <u-top-tips ref="uTips"></u-top-tips>
+  </view>
+</template>
+
+<script setup>
+import { ref, computed } from 'vue';
+import { useStore } from 'vuex';
+
+defineProps({ task: { type: Object, default: () => {} } });
+
+const store = useStore();
+const userId = computed(() => store.state.user.userId);
+const projectId = computed(() => store.getters['project/projectId']);
+const uTips = ref(null);
+
+// 导入成功
+function onUploadSuccess() {
+  uTips.show({
+    title: '导入成功，即将打开新项目',
+    type: 'success',
+    duration: '3000',
+  });
+}
+
+// 导入失败
+function onUploadError(error) {
+  uTips.show({
+    title: error || '导入失败',
+    type: 'error',
+    duration: '6000',
+  });
+}
+
+// 更新项目
+// TODO: 更新接口没写完
+async function handleUpdate() {
+  try {
+    await uni.$u.api.import({ projectId: projectId.value });
+    // 导入WBS成功后
+    // 直接打开导入的项目
+    onUploadSuccess();
+  } catch (error) {
+    onUploadError(error);
+  }
+}
+
+// 导入wbs
+async function handleUpload() {
+  try {
+    const res = await uni.$u.api.import();
+    // 导入WBS成功后
+    // 直接打开导入的项目
+    onUploadSuccess();
+    setTimeout(() => {
+      uni.$u.route('/pages/project/project', {
+        u: userId.value,
+        p: res.id,
+        pname: res.pname,
+        url: res.url,
+      });
+    }, 2000);
+  } catch (error) {
+    onUploadError(error);
+  }
+}
+</script>
diff --git a/store/task/actions.js b/store/task/actions.js
index 2ff1f56..15a5909 100644
--- a/store/task/actions.js
+++ b/store/task/actions.js
@@ -5,7 +5,9 @@ const actions = {
    * @param {string} roleId 角色id
    */
   getPermanent({ commit }, param) {
+    commit('setShowGlobalSkeleton', true);
     uni.$catchReq.getPermanent(param, (err, data) => {
+      commit('setShowGlobalSkeleton', false);
       if (err) {
         console.error('err: ', err);
       } else {
@@ -20,7 +22,9 @@ const actions = {
    * @param {object} param 请求参数 roleId, timeNode, timeUnit
    */
   getGlobal({ commit }, param) {
+    commit('setShowGlobalSkeleton', true);
     uni.$catchReq.getGlobal(param, (err, data) => {
+      commit('setShowGlobalSkeleton', false);
       if (err) {
         console.error('err: ', err);
       } else {
diff --git a/store/task/mutations.js b/store/task/mutations.js
index 01d9dd7..af17063 100644
--- a/store/task/mutations.js
+++ b/store/task/mutations.js
@@ -225,6 +225,15 @@ const mutations = {
     state.showSkeleton = show;
   },
 
+  /**
+   * 设置日常任务骨架屏是否显示
+   * @param {Object} state
+   * @param {Boolean} show
+   */
+  setShowGlobalSkeleton(state, show) {
+    state.showGlobalSkeleton = show;
+  },
+
   /**
    * 是否设置时间轴自动滚动的位置
    * @param {Object} state
diff --git a/store/task/state.js b/store/task/state.js
index 023378d..ae3cca5 100644
--- a/store/task/state.js
+++ b/store/task/state.js
@@ -18,6 +18,7 @@ const state = {
   dailyTasks: [], // 日常任务
   tasks: [], // 所有的定期任务
   showSkeleton: false, // 定期任务骨架屏
+  showGlobalSkeleton: false, // 日常任务骨架屏
   newProjectInfo: {},
   showScrollTo: false, // 是否可以设置时间轴自动滚动的位置
 };
diff --git a/utils/cacheAndRequest.js b/utils/cacheAndRequest.js
index f04baa7..cb0598a 100644
--- a/utils/cacheAndRequest.js
+++ b/utils/cacheAndRequest.js
@@ -83,7 +83,6 @@ export default {
     uni.$cache
       .getStorageRegularTask(params)
       .then(data => {
-        console.log('cache data: ', data);
         !remote && fn(null, data);
       })
       .catch(err => !remote && fn(err));
@@ -93,7 +92,6 @@ export default {
       uni.$u.api
         .getRegularTask(params)
         .then(data => {
-          console.log('api data: ', uni.$u.deepClone(data));
           remote = true;
 
           fn(null, uni.$u.deepClone(data));
diff --git a/utils/upload.js b/utils/upload.js
index 91139d3..60e4d25 100644
--- a/utils/upload.js
+++ b/utils/upload.js
@@ -55,8 +55,8 @@ export default {
 	 */
 	chooseAndUpload(url, formData = {}, extension = ['.xls', '.xlsx'], name = 'param') {
 		uni.hideLoading();
-		clearTimeout(timer);
 		let timer = null;
+		clearTimeout(timer);
 		return new Promise((resolve, reject) => {
 			const token = uni.$storage.getStorageSync('anyringToken');
 			if (!token) {