From 5ede115cf91ab6d632d39623ad8b283664af2916 Mon Sep 17 00:00:00 2001
From: xuesinan <1404152492@qq.com>
Date: Wed, 12 Jan 2022 17:47:04 +0800
Subject: [PATCH 01/10] =?UTF-8?q?test:=20=E6=89=8B=E6=9C=BA=E5=8F=B7?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md            |  3 ++
 hooks/user/userMixin.js | 24 +++++++-------
 pages/user/login.vue    | 69 +++++++++++++++++++++++------------------
 3 files changed, 54 insertions(+), 42 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 720d2ba..62d068e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 范围|描述|commitId
 --|--|--
  - | 表单验证 | [8f3bc1e](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8f3bc1e)
+ - | 插件面板分开显示 | [fb5e86b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/fb5e86b)
  - | 更新代码 | [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)
  - | 日历页添加 | [1b46a91](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/1b46a91)
@@ -55,6 +56,8 @@
  - | 更新drone.yml | [a57d598](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/a57d598)
  - | 添加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)
+ - | ci update | [d38262e](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/d38262e)
+ - | drone | [8cddc7b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8cddc7b)
 
 
 ### 🔨 代码重构
diff --git a/hooks/user/userMixin.js b/hooks/user/userMixin.js
index 30e9b56..79d179f 100644
--- a/hooks/user/userMixin.js
+++ b/hooks/user/userMixin.js
@@ -1,6 +1,5 @@
 import { ref, computed, reactive } from 'vue';
-import { useStore } from 'vuex';
-import { onReady } from '@dcloudio/uni-app';
+import { useStore } from 'vuex';
 import clipboard from "@/common/js/dc-clipboard/clipboard.js";
 import Config from '@/common/js/config.js'
 
@@ -88,12 +87,12 @@ export default function userMixin() {
   // const showPaste = ref(false);
   const dataObj = reactive({
     showInterval: false,
-    interval: 120,
+    interval: 60,
     showPaste: false
-  })
+  });
 
   //有图片验证码的值
-  function hasvalue(form) {
+  function hasvalue(form, renderData) {
     if(form.smsCode || form.showPaste) return
     if (!verifyPhone(form.phone)) {
       uni.$ui.showToast('请输入正确的手机号');
@@ -103,26 +102,29 @@ export default function userMixin() {
       uni.$ui.showToast('请输入图形验证码');
       return;
     }
-    getCode(form);
+
+    if (!dataObj.showInterval) {
+      getCode(form, renderData);
+    }
   }
 
   // 获取验证码
-  async function getCode(form) {
+  async function getCode(form, renderData) {
     try {
-      if (!form.verificationCodeId || !form.verificationCodeValue) {
+      if (!renderData.verificationCodeId || !form.verificationCodeValue) {
         uni.$ui.showToast('缺少图形验证码参数');
         return;
       }
       const params = {
         phone: form.phone,
-        verificationCodeId: form.verificationCodeId,
+        verificationCodeId: renderData.verificationCodeId,
         verificationCodeValue: form.verificationCodeValue,
       };
       const date = await store.dispatch('user/sendCode', params);
       getCodeInterval();
       dataObj.showPaste = true;
     } catch (err) {
-      getImageCode();
+      dataObj.showPaste = false;
       throw err;
     }
   }
@@ -135,7 +137,7 @@ export default function userMixin() {
         clearInterval(codeTimer.value);
         codeTimer.value = null;
         dataObj.showInterval = false;
-        dataObj.interval = 120;
+        dataObj.interval = 60;
         return;
       }
       dataObj.interval = dataObj.interval - 1;
diff --git a/pages/user/login.vue b/pages/user/login.vue
index 2c904c5..9e48f86 100644
--- a/pages/user/login.vue
+++ b/pages/user/login.vue
@@ -1,17 +1,17 @@
 <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-form :model="form" ref="phoneLoginForm" :error-type="['message']">
+      <u-form-item label="手机号码" prop="phone" label-width="160">
         <u-input placeholder="请输入手机号" v-model="form.phone" type="number"></u-input>
       </u-form-item>
 
-      <u-form-item label="图形验证码" prop="verificationCodeValue" label-width="150">
+      <u-form-item label="图形验证码" prop="verificationCodeValue" label-width="160">
         <u-input placeholder="请输入计算结果" v-model="form.verificationCodeValue" type="number"></u-input>
-        <image slot="right" :src="imageBase64" mode="aspectFit" class="code-image" @click="getImageCode"></image>
+        <image slot="right" :src="renderData.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-form-item label="验证码" prop="smsCode" label-width="160">
+        <u-input @focus="mixinInit.hasvalue(form, renderData)" placeholder="请输入验证码" v-model="form.smsCode" type="text"></u-input>
         <u-button slot="right" type="primary" size="mini" v-show="mixinInit.dataObj.showPaste" @click="mixinInit.setCode" class="u-m-r-20">粘贴</u-button>
         <u-button slot="right" size="mini" v-if="mixinInit.dataObj.showInterval">{{ mixinInit.dataObj.interval }}</u-button>
       </u-form-item>
@@ -23,7 +23,7 @@
     </u-form>
 
     <view class="u-m-t-50">
-      <u-button @click="submit" type="primary">立即登录</u-button>
+      <u-button @click="submitLogin" type="primary">立即登录</u-button>
     </view>
 
     <view class="flex justify-between">
@@ -43,51 +43,43 @@
 <script setup>
   import { ref, computed, reactive } from 'vue';
   import { useStore } from 'vuex';
-  import { onLoad, onReady } from '@dcloudio/uni-app';
+  import { onReady } from '@dcloudio/uni-app';
   import userMixin from '@/hooks/user/userMixin'
 
   const store = useStore();
   const mixinInit = userMixin();
-  const loginForm = ref(null);
+  const phoneLoginForm = ref(null);
 
   const form = reactive({
     phone: '',
-    verificationCodeId: '', // 图形验证码id
     verificationCodeValue: '', // 图形验证码值
     smsCode: ''
   });
-  const imageBase64 = ref(null); // 图形验证码图片
-
-  getImageCode();
+  const renderData = reactive({
+    verificationCodeId: '', // 图形验证码id
+    imageBase64: '' // 图形验证码图片
+  })
 
   onReady(() => {
-    loginForm.value.setRules(mixinInit.rules);
+    phoneLoginForm.value.setRules(mixinInit.rules);
   });
 
-  function submit() {
+  getImageCode(); // 获取图形验证码
+
+  // 表单验证
+  const submitLogin = () => {
     console.log('111111')
-    loginForm.value.validate(valid => {
-      console.log('22222', valid)
+    phoneLoginForm.value.validate(valid => {
+      console.log('2222', valid)
       if (valid) {
         login()
       }
     });
   }
 
-  // 获取图形验证码
-  async function getImageCode() {
-    uni.$ui.showLoading();
-    try {
-      const data = await uni.$u.api.getImageCode();
-      imageBase64.value = data.imageBase64 || '';
-      form.verificationCodeId = data.verificationCodeId || '';
-      uni.$ui.hideLoading();
-    } catch (error) {
-      uni.$ui.hideLoading();
-      uni.$ui.showToast(error);
-    }
-  }
-
+  /**
+   * 登录
+   */
   async function login() {
     uni.$ui.showLoading();
     try {
@@ -117,6 +109,21 @@
     }
   }
 
+  // 获取图形验证码
+  async function getImageCode() {
+    uni.$ui.showLoading();
+    try {
+      const data = await uni.$u.api.getImageCode();
+      renderData.imageBase64 = data.imageBase64 || '';
+      renderData.verificationCodeId = data.verificationCodeId || '';
+      uni.$ui.hideLoading();
+    } catch (error) {
+      uni.$ui.hideLoading();
+      uni.$ui.showToast(error);
+    }
+  }
+
+  // 页面跳转
   function openPage(url) {
     uni.navigateTo({
       url: url

From 68e9189bbf20721e757578b15d349abd9ef295d0 Mon Sep 17 00:00:00 2001
From: xuesinan <1404152492@qq.com>
Date: Thu, 13 Jan 2022 10:14:41 +0800
Subject: [PATCH 02/10] =?UTF-8?q?feat:=20=E6=B3=A8=E5=86=8C=E3=80=81?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=8D=8F=E8=AE=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                |   3 +-
 apis/tall.js                |   7 +-
 hooks/user/userMixin.js     |   2 +-
 pages.json                  |  16 ++++
 pages/user/accountLogin.vue |  14 +++-
 pages/user/agreement.vue    |  18 ++++
 pages/user/login.vue        |   9 +-
 pages/user/rigister.vue     | 159 +++++++++++++++++++++++++++++++++++-
 8 files changed, 214 insertions(+), 14 deletions(-)
 create mode 100644 pages/user/agreement.vue

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c933547..b3a447a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-# 1.0.0 (2022-01-12)
+# 1.0.0 (2022-01-13)
 
 ### 🌟 新功能
 范围|描述|commitId
@@ -30,6 +30,7 @@
 ### 🎨 代码样式
 范围|描述|commitId
 --|--|--
+ - | 更新代码 | [aa6093a](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/aa6093a)
  - | 细节调整 | [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)
 
diff --git a/apis/tall.js b/apis/tall.js
index d692b56..7a11375 100644
--- a/apis/tall.js
+++ b/apis/tall.js
@@ -6,9 +6,10 @@ const tall1 = `http://101.201.226.163/gateway/ptos`;
 
 export function setupTall(app) {
 	uni.$u.api = { ...uni.$u.api } || {};
-	// 登录
-	// uni.$u.api.signin = params => login.index(params);
-  uni.$u.api.signin = params => uni.$u.http.post(`${tall}/users/signin`, params); // 登录
+	// 登录
+  uni.$u.api.signin = params => uni.$u.http.post(`${tall}/users/signin`, params); // 登录
+  // 注册
+  uni.$u.api.signup = params => uni.$u.http.post(`${tall}/users/signup`, params); // 登录
 	// 获取图片验证码
 	uni.$u.api.getImageCode = () => uni.$u.get(`${tall}/users/code`);
 	// 获取短信验证码
diff --git a/hooks/user/userMixin.js b/hooks/user/userMixin.js
index 79d179f..36e64da 100644
--- a/hooks/user/userMixin.js
+++ b/hooks/user/userMixin.js
@@ -15,7 +15,7 @@ export default function userMixin() {
       {
         validator: (rule, value, callback) => {
           // 调用uView自带的js验证规则，详见：https://www.uviewui.com/js/test.html
-          return this.$u.test.mobile(value);
+          return uni.$u.test.mobile(value);
         },
         message: '手机号码不正确',
         // 触发器可以同时用blur和change，二者之间用英文逗号隔开
diff --git a/pages.json b/pages.json
index feb8e1e..6dbc3a4 100644
--- a/pages.json
+++ b/pages.json
@@ -28,6 +28,22 @@
 				"navigationStyle": "custom",
 				"navigationBarTextStyle": "white"
 			}
+		},
+		// 注册
+		{
+			"path": "pages/user/rigister",
+			"style": {
+				"navigationStyle": "custom",
+				"navigationBarTextStyle": "white"
+			}
+		},
+		// 用户协议
+		{
+			"path": "pages/user/agreement",
+			"style": {
+				"navigationStyle": "custom",
+				"navigationBarTextStyle": "white"
+			}
 		}
 	],
 	"globalStyle": {
diff --git a/pages/user/accountLogin.vue b/pages/user/accountLogin.vue
index 4061af2..6e5d351 100644
--- a/pages/user/accountLogin.vue
+++ b/pages/user/accountLogin.vue
@@ -41,7 +41,7 @@
   const store = useStore();
   const mixinInit = userMixin();
   const loginForm = ref(null);
-  
+
   const form = reactive({
     account: '',
     password: ''
@@ -61,9 +61,15 @@
 
   async function login() {
     uni.$ui.showLoading();
-    try {
+    try {
+      // #ifdef H5
+      const client = 0;
+      // #endif
+      // #ifdef APP-PLUS
+      const client = 1;
+      // #endif
       const params = reactive({
-        client: 1,
+        client: client,
         data: {
           identifier: form.account,
           credential: form.password,
@@ -78,7 +84,7 @@
       uni.$storage.setStorageSync('user', JSON.stringify(res));
 
       uni.$ui.hideLoading();
-      
+
       uni.navigateTo({
         url: '/pages/index/index'
       });
diff --git a/pages/user/agreement.vue b/pages/user/agreement.vue
new file mode 100644
index 0000000..33ef0f9
--- /dev/null
+++ b/pages/user/agreement.vue
@@ -0,0 +1,18 @@
+<template>
+  <view>
+    <web-view class="webview" src="https://www.yuque.com/docs/share/2de362e1-33fb-460a-92ca-5e8ef57f6d59?# 《时物链条用户协议》"></web-view>
+    <!-- <u-modal title="时物链条用户协议" v-model="showAgreement" show-cancel-button @confirm="$emit('confirm')" @cancel="$emit('cancel')">
+      <iframe
+        src="https://www.yuque.com/docs/share/2de362e1-33fb-460a-92ca-5e8ef57f6d59?# 《时物链条用户协议》"
+        frameborder="0"
+        scrolling="no"
+        style="width: 100%;height: 100%"
+      ></iframe>
+    </u-modal> -->
+  </view>
+</template>
+
+<script>
+</script>
+
+<style></style>
diff --git a/pages/user/login.vue b/pages/user/login.vue
index 9e48f86..d44648c 100644
--- a/pages/user/login.vue
+++ b/pages/user/login.vue
@@ -83,8 +83,15 @@
   async function login() {
     uni.$ui.showLoading();
     try {
+      // #ifdef H5
+      const client = 0;
+      // #endif
+      // #ifdef APP-PLUS
+      const client = 1;
+      // #endif
+
       const params = reactive({
-        client: 1,
+        client: client,
         data: {
           identifier: form.phone,
           credential: form.smsCode,
diff --git a/pages/user/rigister.vue b/pages/user/rigister.vue
index 48d48ea..3493e65 100644
--- a/pages/user/rigister.vue
+++ b/pages/user/rigister.vue
@@ -1,8 +1,159 @@
-<template>
-</template>
+<template>
+  <view class="u-p-l-50 u-p-r-50 u-p-t-30">
+    <u-form :model="form" ref="signUpForm" :error-type="['message']">
+      <u-form-item label="手机号码" prop="phone" label-width="160">
+        <u-input placeholder="请输入手机号" v-model="form.phone" type="number"></u-input>
+      </u-form-item>
 
-<script>
-</script>
+      <u-form-item label="图形验证码" prop="verificationCodeValue" label-width="160">
+        <u-input placeholder="请输入计算结果" v-model="form.verificationCodeValue" type="number"></u-input>
+        <image slot="right" :src="renderData.imageBase64" mode="aspectFit" class="code-image" @click="getImageCode"></image>
+      </u-form-item>
 
+      <u-form-item label="验证码" prop="smsCode" label-width="160">
+        <u-input @focus="mixinInit.hasvalue(form, renderData)" placeholder="请输入验证码" v-model="form.smsCode" type="text"></u-input>
+        <u-button slot="right" type="primary" size="mini" v-show="mixinInit.dataObj.showPaste" @click="mixinInit.setCode" class="u-m-r-20">粘贴</u-button>
+        <u-button slot="right" size="mini" v-if="mixinInit.dataObj.showInterval">{{ mixinInit.dataObj.interval }}</u-button>
+      </u-form-item>
+
+      <u-form-item label="用户名" prop="account" label-width="160">
+        <u-input placeholder="请输入用户名" v-model="form.account" type="text"></u-input>
+      </u-form-item>
+
+      <u-form-item label="密码" prop="password" label-width="160">
+        <u-input :password-icon="true" type="password" v-model="form.password" placeholder="请输入密码"></u-input>
+      </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 flex-direction u-m-t-30">
+      <view class="flex flex-nowrap u-m-b-20">
+        <u-checkbox v-model="renderData.checked" @change="changeChecked"></u-checkbox>
+        <view class="agreement-text">
+          已阅读并同意使用
+          <span class="text-blue" @click="openPage('/pages/user/agreement')">《时物链条用户协议》</span>
+        </view>
+      </view>
+      <p class="text-blue u-m-l-70">没有套路，真实需求</p>
+    </view>
+
+    <view class="flex flex-nowrap">
+      <view class="flex-1"></view>
+      <view class="u-m-t-60 text-blue" @click="openPage('/pages/user/accountLogin')">已有账号，去登录</view>
+    </view>
+  </view>
+</template>
+
+<script setup>
+  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 signUpForm = ref(null);
+
+  const form = reactive({
+    phone: '',
+    verificationCodeValue: '', // 图形验证码值
+    smsCode: '',
+    account: '',
+    password: ''
+  })
+  const renderData = reactive({
+    verificationCodeId: '', // 图形验证码id
+    imageBase64: '', // 图形验证码图片
+    checked: false
+  })
+
+  onReady(() => {
+    signUpForm.value.setRules(mixinInit.rules);
+  });
+
+  getImageCode(); // 获取图形验证码
+
+  const submit = () => {
+    signUpForm.value.validate(valid => {
+      if (valid) {
+        signUp()
+      }
+    });
+  }
+
+  async function signUp() {
+    uni.$ui.showLoading();
+    try {
+      if (!renderData.checked) {
+        uni.$ui.showToast('请阅读并同意使用用户协议');
+        return;
+      }
+
+      const params = {
+        account: form.account,
+        password: form.password,
+        phone: form.phone,
+        smsCode: form.smsCode
+      };
+
+      let res = await uni.$u.api.signup(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);
+    }
+  }
+
+  // 获取图形验证码
+  async function getImageCode() {
+    uni.$ui.showLoading();
+    try {
+      const data = await uni.$u.api.getImageCode();
+      renderData.imageBase64 = data.imageBase64 || '';
+      renderData.verificationCodeId = data.verificationCodeId || '';
+      uni.$ui.hideLoading();
+    } catch (error) {
+      uni.$ui.hideLoading();
+      uni.$ui.showToast(error);
+    }
+  }
+
+  // 改变用户协议选中状态
+  function changeChecked() {
+    renderData.checked = !renderData.checked;
+  }
+
+  function openPage(url) {
+    uni.navigateTo({
+      url: url
+    })
+  }
+</script>
+
 <style>
+  .code-image {
+    width: 200rpx;
+    height: 70rpx;
+  }
+
+  .text-blue {
+    color: #0081ff;
+  }
 </style>

From d46125203481c93368e008875199a2145bf524ea Mon Sep 17 00:00:00 2001
From: Min5203 <2318556978@qq.com>
Date: Thu, 13 Jan 2022 15:06:42 +0800
Subject: [PATCH 03/10] =?UTF-8?q?feat:=20=E6=8F=92=E4=BB=B6=E7=9A=84?=
 =?UTF-8?q?=E5=A1=AB=E5=86=99=E4=B8=8E=E6=8F=90=E4=BA=A4=EF=BC=8C=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E4=B8=8E=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                          |   3 +-
 common/styles/tailwind.scss           |  72 +++++++++-
 common/styles/theme/default.scss      |  24 +++-
 components/Globals/Globals.vue        |   5 +-
 components/ModalBox/ModalBox.vue      |  19 +++
 components/Reviewer/Reviewer.vue      |  91 ++++++++++++
 pages.json                            |  11 +-
 pages/submitlist/submitlist.vue       |  26 ++++
 plugins/p-deliver/p-deliver.vue       | 197 +++++++++++++++++++++++++-
 plugins/p-task-title/p-task-title.vue |   6 +-
 project.config.json                   |  69 +++++++++
 11 files changed, 508 insertions(+), 15 deletions(-)
 create mode 100644 components/ModalBox/ModalBox.vue
 create mode 100644 components/Reviewer/Reviewer.vue
 create mode 100644 pages/submitlist/submitlist.vue
 create mode 100644 project.config.json

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 749d313..783d6bc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-# 1.0.0 (2022-01-10)
+# 1.0.0 (2022-01-13)
 
 ### 🌟 新功能
 范围|描述|commitId
@@ -9,6 +9,7 @@
  - | 日历页添加 | [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)
+ - | 时间轴展示 | [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)
  - | 添加 timeline | [72dad2b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/72dad2b)
  - | 项目操作面板 | [3beb05e](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/3beb05e)
diff --git a/common/styles/tailwind.scss b/common/styles/tailwind.scss
index 62fc09b..6f82085 100644
--- a/common/styles/tailwind.scss
+++ b/common/styles/tailwind.scss
@@ -2198,7 +2198,10 @@
 .-ml-px {
   margin-left: -1px;
 }
-
+	
+.border-none{
+	border-style: none;
+}
 .box-border {
   box-sizing: border-box;
 }
@@ -2215,7 +2218,12 @@
   --tw-border-opacity: 1;
   border-color: rgba(209, 213, 219, var(--tw-border-opacity));
 }
-
+.border{
+	border-width: 1px;
+}
+.border-solid{
+	border-style: solid;
+}
 .block {
   display: block;
 }
@@ -2684,7 +2692,12 @@
 .overflow-hidden {
   overflow: hidden;
 }
-
+.visible{
+	visibility: visible;
+}
+.invisible{
+	visibility: hidden;
+}
 .overflow-visible {
   overflow: visible;
 }
@@ -4323,10 +4336,22 @@
 .h-3 {
   height: 0.75rem;
 }
+	
+.h5{
+	height: 1.25rem;
+}
+	
+.h-10{
+	height: 2.5rem;
+}
+
 
 .h-full {
   height: 100%;
 }
+.leading-10{
+	line-height: 2.5rem;
+}
 .bg-gray-50 {
   --tw-bg-opacity: 1;
   background-color: rgba(249, 250, 251, var(--tw-bg-opacity));
@@ -4355,7 +4380,10 @@
 }
 
 .h-12 {
-  height: 3rem;
+  height: 3.15rem;
+}
+.h-8{
+	height: 2.2rem;
 }
 .bg-white {
   --tw-bg-opacity: 1;
@@ -4453,6 +4481,10 @@
   box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow);
 }
 
+.rounded-md{
+border-radius: 0.375rem;
+}
+
 .shadow-md {
   --tw-shadow: 0 4px 6px -1px rgba(0, 0, 0, 0.1), 0 2px 4px -1px rgba(0, 0, 0, 0.06);
   box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow);
@@ -4482,3 +4514,35 @@
   --tw-shadow: 0 0 #0000;
   box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow);
 }
+
+.bg-red-500{
+	--tw-bg-opacity: 1;
+	background-color: rgba(239, 68, 68, var(--tw-bg-opacity));
+}
+.bg-yellow-500{
+	--tw-bg-opacity: 1;
+	background-color: rgba(245, 158, 11, var(--tw-bg-opacity));
+}
+.leading-12{
+	line-height: 3.15rem;
+}
+.rounded-w-12{
+	border-radius: 1.5rem;
+}
+.bg-opacity-100{
+	--tw-bg-opacity: 1;
+}
+.bg-grey{
+	background-color: rgba(0,0,0,0.5);
+}
+.rounded-md{
+	border-radius: 0.375rem;
+}
+.border-t{
+	border-top-width: 1px;
+}
+.border-gray-200{
+	--tw-border-opacity: 1;
+	border-color: rgba(229, 231, 235, var(--tw-border-opacity));
+}
+
diff --git a/common/styles/theme/default.scss b/common/styles/theme/default.scss
index 29733e9..23f0e02 100644
--- a/common/styles/theme/default.scss
+++ b/common/styles/theme/default.scss
@@ -1,8 +1,26 @@
 // 默认主题文件
 .theme-default {
-  background-color: #333;
+  background-color: #F3F3F3;
   .u-card {
-    font-size: 24px !important;
-    color: #0f0;
+    font-size: 16px !important;
+     background-color: #F3F3F3 !important; 
+	 .deliverHead{
+		 align-items: center;
+	 }
+	 .btns u-button{
+		 margin: 0 !important;
+	 }
+	 .active{
+		 background-color: #2979FF;
+		 color: #FFFFFF;
+	 }
+	 .mask{
+		position:absolute;
+		top: 0;
+		left:0;
+		width: 100%;
+		height: 100%;
+		z-index: 100;
+	}
   }
 }
diff --git a/components/Globals/Globals.vue b/components/Globals/Globals.vue
index e8d5f9c..faf4bac 100644
--- a/components/Globals/Globals.vue
+++ b/components/Globals/Globals.vue
@@ -11,11 +11,11 @@
     >
       <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="!globals.length" :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">
+             <template v-if="item.plugins && item.plugins.length">
                 <view v-for="(pluginArr, i) in item.plugins" :key="i">
                   <template class="p-0 u-col-between" v-if="pluginArr.length">
                     <Plugin
@@ -62,6 +62,7 @@ function openCard() {
     store.commit('task/setShrink', false);
   }
 }
+
 </script>
 
 <style scoped lang="scss">
diff --git a/components/ModalBox/ModalBox.vue b/components/ModalBox/ModalBox.vue
new file mode 100644
index 0000000..576fa54
--- /dev/null
+++ b/components/ModalBox/ModalBox.vue
@@ -0,0 +1,19 @@
+<template>
+  <!-- 标题部分 -->
+	<view>
+    ssss
+	</view>
+  <!-- 输入框 -->
+  <view>
+
+  </view>
+  <!-- 按钮 -->
+</template>
+
+<script>
+
+</script>
+
+<style>
+
+</style>
diff --git a/components/Reviewer/Reviewer.vue b/components/Reviewer/Reviewer.vue
new file mode 100644
index 0000000..9335696
--- /dev/null
+++ b/components/Reviewer/Reviewer.vue
@@ -0,0 +1,91 @@
+<template>
+	<view class="deliverFoot border border-solid border-gray-300 rounded-md mt-3 p-2">
+		<view class="top flex justify-between">
+		    <view class="mr-3">
+		       审核人
+		     </view>
+         <!-- 展示选择的审核人 -->
+		    <view class="flex approver item-center truncate justify-end flex-1 text-sm" v-show="isUicon">
+		       <view v-for="item in computedDelivers">
+		          <view v-show="item.checked" class="mx-1">
+		             {{item.name}}
+		           </view>
+		       </view>
+		    </view>
+          <!-- 点击更换图标 -->
+        <view>
+		       <u-icon v-if="isUicon" name="arrow-down" @click="changeIcon"></u-icon>
+		       <u-icon v-else="isUicon" name="arrow-up" @click="changeIcon"></u-icon>
+		    </view>
+		  </view>
+      <!-- 隐藏的审核人选项 -->
+		 <view  v-show="!isUicon" class="foot mt-2 flex flex-wrap">
+		    <u-button
+		        v-for="item in delivers"
+		        size="mini" class="my-1 mx-2"
+		        @click="item.checked = !item.checked"
+		        :class="item.checked ? 'active' : '' "
+		        >
+		      {{item.name}}
+		    </u-button>
+		 </view>
+		</view>
+</template>
+
+<script setup>
+
+  import {ref , reactive , computed }from 'vue'
+  // 图标切换
+  let isUicon = ref('true')
+  // 审核人员列表
+  const delivers = reactive([
+    {
+      checked:true,
+      name:'冯教授'
+    },
+    {
+      checked:false,
+      name:'陈历珺'
+    },
+    {
+      checked:false,
+      name:'张野'
+    },
+    {
+      checked:false,
+      name:'宋瑞芳'
+    },
+    {
+      checked:false,
+      name:'张斌'
+    },
+    {
+      checked:false,
+      name:'孙方圆'
+    }
+  ])
+
+  // 显示已选择的审核人
+  const computedDelivers = computed(()=>{
+       let arr = [];
+        delivers.forEach((item)=>{
+          if(item.checked){
+            arr.push(item)
+          }
+          if(arr.length>3){
+            arr = arr.splice(0,3)
+            arr[3] = {checked:true,name:'...'}
+          }
+        })
+           return arr
+    })
+
+  // 点击切换箭头图标
+  function changeIcon(){
+    isUicon.value = !isUicon.value
+  }
+</script>
+
+<style lang="scss">
+
+</style>
diff --git a/pages.json b/pages.json
index a3be40c..8f7cb6a 100644
--- a/pages.json
+++ b/pages.json
@@ -20,7 +20,16 @@
 				"navigationBarTextStyle": "white"
 			}
 		}
-	],
+        ,{
+            "path" : "pages/submitList/submitList",
+            "style" :                                                                                    
+            {
+				"navigationStyle": "historty",
+				 "navigationBarTitleText": "历史交付物"
+            }
+            
+        }
+    ],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "TALL",
diff --git a/pages/submitlist/submitlist.vue b/pages/submitlist/submitlist.vue
new file mode 100644
index 0000000..6ea8089
--- /dev/null
+++ b/pages/submitlist/submitlist.vue
@@ -0,0 +1,26 @@
+<template>
+	<theme class="h-full w-full pt-1">
+      <view class="bg-white m-5 rounded-md p-3">
+        <view class="flex justify-between text-gray-400 mb-2">
+          <view>插件名</view> <view>提交时间</view>
+        </view>
+        <view class="text-blue-400 mb-2">
+          链接
+        </view>
+        <view class="mb-2">审核人</view>
+      </view>
+  </theme>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+			};
+		}
+	}
+</script>
+
+<style lang="scss">
+
+</style>
diff --git a/plugins/p-deliver/p-deliver.vue b/plugins/p-deliver/p-deliver.vue
index 1e501b0..38b4637 100644
--- a/plugins/p-deliver/p-deliver.vue
+++ b/plugins/p-deliver/p-deliver.vue
@@ -1,9 +1,202 @@
 <template>
-  <view class="deliver-container">p-deliver</view>
+ <!-- <view class="deliver-container">p-deliver</view> -->
+
+ <view class="my-2 bg-white p-2 rounded-md relative"  @longpress="logoTime" v-if="deliverRef">
+    <!-- 插件名称输入和提交 -->
+    <view class=" flex item-center justify-between py-3 pl-2" :class="inputRef">
+     <u-input v-model="iptValue" type="text" :border="false" placeholder="请编辑交付物名称" />
+     <view class="self-center" :class="viewRef">{{iptValue}}</view>
+     <u-button type="primary" size="mini" @click="submit" class="self-center" :disabled="sbumitState">提交</u-button>
+      <u-icon v-show="historyIcon" name="arrow-right" class="ml-1" @click="historical"></u-icon>
+    </view>
+    <view :class="viewRef" class="py-3 pl-2">
+      <span class="relative px-1">
+      <u-badge :is-dot="true" is-center></u-badge>
+      {{iptValue}}
+      </span>
+    </view>
+    <!-- 插件上传方式 -->
+    <view>
+      <u-input v-model="linkValue" type="text" :border="true" placeholder="请输入交付物地址/链接">
+      </u-input>
+      <view class="btns flexitems-start mt-3">
+          <u-button size="mini" :plain="true" style="color: #007AFF;" class="mr-3" @click="paste">粘贴</u-button>
+          <u-button size="mini" :plain="true" style="color: #007AFF;" class="mr-3" @click="getfile">文件</u-button>
+          <u-button size="mini" :plain="true" style="color: #007AFF;" class="mr-3" @click="photos">拍照</u-button>
+      </view>
+    </view>
+    <!-- 提示框 -->
+    <u-toast ref="tips" />
+
+    <!-- 取消和确定 -->
+    <u-mask :show="showRef" @click="showRef = false">
+        <view class="warp">
+            <view class="rect rounded-md" @tap.stop>
+                <view class="text-center my-7 font-semibold">
+                  交付物标题名称
+                </view>
+                <view class="">
+                  <u-input :border="true" class="m-5" placeholder="请输入交付物名称" v-model="newInputRef"/>
+                </view>
+                <view class="flex justify-around h-12 mt-7 justify-self-stretch" style="border-top: 1px solid #D1D5DB;">
+                    <view class="leading-12 flex-1 text-center" style="border-right: 1px solid #D1D5DB;" @click="cancelClick">
+                      取消
+                    </view>
+                    <view class="text-blue-700 leading-12 flex-1 text-center" @click="sureClick">
+                      确定
+                    </view>
+                </view>
+            </view>
+        </view>
+    	</u-mask>
+
+    <!-- 编辑和删除的遮罩层 -->
+    <view class="mask flex items-center justify-center bg-grey" :class="maskRef" @click="close"  >
+        <view class="bg-yellow-500 text-white w-12 h-12 text-center leading-12 rounded-w-12 mx-8" @click="revisePlugin" @tap.stop>修改</view>
+        <view class="bg-red-500 text-white w-12 h-12 text-center leading-12 rounded-w-12 mx-8" @click="deletePlugin" @tap.stop>删除</view>
+    </view>
+    <!-- 插件审核人员选择 -->
+     <Reviewer/>
+ </view>
+
+
+
 </template>
 
 <script setup>
+  import {ref,computed,reactive} from 'vue'
+ // 插件名称
+  const deliverRef = ref(true)
+  const iptValue = ref('')
+  const linkValue = ref('')
+  const historyIcon = ref(false)
+  const tips = ref('')
+  const showRef = ref(false)
+  const maskRef = ref('hidden')
+  const inputRef = ref('block')
+  const viewRef = ref('hidden')
+  const newInputRef = ref('')
+  const submitHistory = reactive([])
+
+  // 判断提交按钮的状态
+  const sbumitState = computed(()=>!(iptValue.value && linkValue.value))
+
+  // 获取当前时间
+  function getTime(){
+    const MM = uni.$dayjs().$M+1
+    const DD = uni.$dayjs().$D
+    const HH = uni.$dayjs().$H
+    const mm = uni.$dayjs().$m
+    const getTime = MM + '/' + DD + ' ' + HH + ':' + (mm < 10 ? '0' + mm : mm)
+    return getTime
+  }
+  // 提交后验证链接并修改状态
+  function submit(){
+    const reg=/^http(s)?:\/\/([\w-]+\.)+[\w-]+(\/[\w- ./?%&=]*)?$/;
+    if(!reg.test(linkValue.value)){
+      // 显示toast信息
+        uni.$ui.showToast('请输入正确的链接')
+    }else{
+      inputRef.value = 'hidden'
+      viewRef.value = 'block'
+      const time = getTime()
+      const obj = {}
+      obj.name = iptValue.value
+      obj.time = time
+      obj.link = linkValue.value
+      submitHistory.push(obj)
+      console.log(submitHistory)
+    }
+  }
+
+  // 查看历史记录
+  function historical(){
+    uni.navigateTo({
+      url: '/pages/submitList/submitList'
+    });
+
+  }
+
+  // 粘贴上传
+  function paste(){
+    uni.getClipboardData({
+        success: function (res) {
+            linkValue.value = res.data
+        }
+    });
+  }
+
+  // 文件上传
+  function getfile (){
+    uni.chooseFile({
+      count: 1, //默认100
+      extension:['.zip','.doc'],
+        success: function (res) {
+           linkValue.value = JSON.stringify(res.tempFilePaths)
+        }
+    });
+  }
+
+  // 拍照上传
+function photos (){
+ uni.chooseImage({
+     count: 1, //默认9
+     sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
+     sourceType: ['album','camera'], //从相册选择
+     success: function (res) {
+         linkValue.value = JSON.stringify(res.tempFilePaths)
+     }
+ });
+}
+
+function close(){
+     maskRef.value = 'hidden'
+  }
+
+// 长按出现遮罩（编辑和删除按钮）
+function logoTime(){
+  if( viewRef.value === 'block'){
+     maskRef.value = 'block'
+  }
+}
+// 修改插件按钮
+function revisePlugin(){
+   showRef.value = true
+}
+
+// 修改界面的取消按钮事件
+function cancelClick(){
+    showRef.value = false
+    // maskRef.value = 'hidden'
+}
+// 修改界面的确定按钮事件
+function sureClick (){
+    iptValue.value = newInputRef.value
+    newInputRef.value = ''
+    inputRef.value = 'block'
+    viewRef.value = 'hidden'
+    historyIcon.value = true
+    showRef.value = false
+    maskRef.value = 'hidden'
+}
+// 删除插件按钮
+function deletePlugin(){
+  deliverRef.value = false
+}
 
 </script>
 
-<style lang="scss"></style>
+<style lang="scss">
+  .warp {
+  		display: flex;
+  		align-items: center;
+  		justify-content: center;
+  		height: 80%;
+  	}
+  	.rect {
+  		width: 80%;
+  		height: 380rpx;
+  		background-color: #fff;
+  	}
+
+</style>
diff --git a/plugins/p-task-title/p-task-title.vue b/plugins/p-task-title/p-task-title.vue
index 2cf8195..6831b9c 100644
--- a/plugins/p-task-title/p-task-title.vue
+++ b/plugins/p-task-title/p-task-title.vue
@@ -1,10 +1,12 @@
 <template>
   <!-- 任务名插件 -->
-  <theme>
-    <view>{{ task.name }}</view>
+  <theme class="my-2">
+    <view class="bg-white rounded-md h-10 leading-10 pl-2">{{ task.name }}</view>
   </theme>
 </template>
 
 <script setup>
 defineProps({ task: { type: Object, default: () => {} } });
 </script>
+
+
diff --git a/project.config.json b/project.config.json
new file mode 100644
index 0000000..64e86a9
--- /dev/null
+++ b/project.config.json
@@ -0,0 +1,69 @@
+{
+    "description": "项目配置文件",
+    "packOptions": {
+        "ignore": []
+    },
+    "setting": {
+        "bundle": false,
+        "userConfirmedBundleSwitch": false,
+        "urlCheck": true,
+        "scopeDataCheck": false,
+        "coverView": true,
+        "es6": true,
+        "postcss": true,
+        "compileHotReLoad": false,
+        "lazyloadPlaceholderEnable": false,
+        "preloadBackgroundData": false,
+        "minified": true,
+        "autoAudits": false,
+        "newFeature": false,
+        "uglifyFileName": false,
+        "uploadWithSourceMap": true,
+        "useIsolateContext": true,
+        "nodeModules": false,
+        "enhance": true,
+        "useMultiFrameRuntime": true,
+        "useApiHook": true,
+        "useApiHostProcess": true,
+        "showShadowRootInWxmlPanel": true,
+        "packNpmManually": false,
+        "enableEngineNative": false,
+        "packNpmRelationList": [],
+        "minifyWXSS": true,
+        "showES6CompileOption": false,
+        "minifyWXML": true
+    },
+    "compileType": "miniprogram",
+    "libVersion": "2.21.3",
+    "appid": "wx0d9aabee071e228e",
+    "projectname": "TALL",
+    "debugOptions": {
+        "hidedInDevtools": []
+    },
+    "scripts": {},
+    "staticServerOptions": {
+        "baseURL": "",
+        "servePath": ""
+    },
+    "isGameTourist": false,
+    "condition": {
+        "search": {
+            "list": []
+        },
+        "conversation": {
+            "list": []
+        },
+        "game": {
+            "list": []
+        },
+        "plugin": {
+            "list": []
+        },
+        "gamePlugin": {
+            "list": []
+        },
+        "miniprogram": {
+            "list": []
+        }
+    }
+}
\ No newline at end of file

From e676cf07f6ae6fc7eb4b924800c34b3c225b41fd Mon Sep 17 00:00:00 2001
From: xuesinan <1404152492@qq.com>
Date: Thu, 13 Jan 2022 15:07:37 +0800
Subject: [PATCH 04/10] =?UTF-8?q?feat:=20=E7=99=BB=E5=BD=95=E3=80=81?=
 =?UTF-8?q?=E6=97=A5=E5=8E=86=E9=A1=B5=E5=B0=8F=E7=BB=BF=E7=82=B9=E3=80=81?=
 =?UTF-8?q?=E4=BA=8C=E7=BA=A7=E9=A1=B9=E7=9B=AE=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                                      |  12 +-
 CHANGELOG.md                                 |   1 +
 apis/tall.js                                 |  11 +-
 common/js/config.js                          |  13 +-
 components/PrettyExchange/PrettyExchange.vue | 930 +++++++++----------
 components/Projects/ProjectItem.vue          |  13 +-
 pages/index/index.vue                        |   2 +-
 pages/user/login.vue                         |   5 +-
 store/socket/actions.js                      |   2 +-
 utils/request.js                             |  17 +-
 10 files changed, 508 insertions(+), 498 deletions(-)

diff --git a/App.vue b/App.vue
index 0368041..fce5850 100644
--- a/App.vue
+++ b/App.vue
@@ -1,6 +1,4 @@
 <script>
-// import { mapState } from 'vuex';
-
 export default {
   // computed: {
   //   ...mapState(['theme']),
@@ -19,13 +17,19 @@ export default {
     console.log('onLaunch options: ', options);
     this.checkNetwork(); // 监听网络状态
     this.getSystemInfo(); // 获取系统设备信息、
-    await this.syncLocalDataToStore(options.query.u); // 将localStorage里的数据同步到store里
-    const token = await this.getToken();
+
+    const token = this.$store.state.user.token || this.$storage.getStorageSync('anyringToken') || '';
     if (!token) {
       this.$ui.showToast('获取用户信息失败, 请登录');
       // TODO: 跳转登录界面
       return;
+    } else {
+      this.$store.commit('user/setToken', token);
     }
+
+    // await this.syncLocalDataToStore(options.query.u); // 将localStorage里的数据同步到store里
+    // token = await this.getToken();
+
     this.noPhone(this.$store.state.user.phone);
     this.$store.dispatch('socket/initSocket');
   },
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b3a447a..df23cbb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,7 @@
  - | 项目列表 | [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)
+ - | 注册、用户协议 | [68e9189](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/68e9189)
  - | 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)
diff --git a/apis/tall.js b/apis/tall.js
index 7a11375..8ab591c 100644
--- a/apis/tall.js
+++ b/apis/tall.js
@@ -1,15 +1,16 @@
 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`;
+// const apiUrl = Config.apiUrl;
+const apiUrl = Config.apiUrlNew;
+// const tall = `${apiUrl}/tall3/v3.0`;
+const tall = `${apiUrl}/ptostall`;
 
 export function setupTall(app) {
 	uni.$u.api = { ...uni.$u.api } || {};
 	// 登录
-  uni.$u.api.signin = params => uni.$u.http.post(`${tall}/users/signin`, params); // 登录
+  uni.$u.api.signin = params => uni.$u.http.post(`${tall}/users/signin`, params);
   // 注册
-  uni.$u.api.signup = params => uni.$u.http.post(`${tall}/users/signup`, params); // 登录
+  // uni.$u.api.signup = params => uni.$u.http.post(`${tall}/users/signup`, params);
 	// 获取图片验证码
 	uni.$u.api.getImageCode = () => uni.$u.get(`${tall}/users/code`);
 	// 获取短信验证码
diff --git a/common/js/config.js b/common/js/config.js
index 8f556e0..02846b1 100644
--- a/common/js/config.js
+++ b/common/js/config.js
@@ -2,14 +2,19 @@ var config = {
 	baseUrl: 'https://test.tall.wiki',
 	apiUrl: 'https://test.tall.wiki/gateway',
 	msgUrl: 'wss://test.tall.wiki/websocket/message/v4.0/ws',
-	projectPath: 'https://test.tall.wiki/tall-project',
-	
+	projectPath: 'https://test.tall.wiki/tall-project',
+
+  baseUrlNew: 'http://101.201.226.163',
+  apiUrlNew: 'http://101.201.226.163/gateway',
+  msgUrlNew: 'wss://101.201.226.163/websocket/message/v4.0/ws',
+  projectPathNew: 'https://101.201.226.163/tall-project',
+
 	// baseUrl: 'https://www.tall.wiki',
 	// apiUrl: 'https://www.tall.wiki/gateway',
 	// msgUrl: 'wss://www.tall.wiki/websocket/message/v4.0/ws';
 	// projectPath: 'https://www.tall.wiki/tall-project',
-	
+
 	version: 'v4.0.0'
 };
 
-export default config;
\ No newline at end of file
+export default config;
diff --git a/components/PrettyExchange/PrettyExchange.vue b/components/PrettyExchange/PrettyExchange.vue
index 10e5feb..792528d 100644
--- a/components/PrettyExchange/PrettyExchange.vue
+++ b/components/PrettyExchange/PrettyExchange.vue
@@ -1,480 +1,476 @@
 <template>
-	<view>
-		<scroll-view scroll-y="true">
-			<view v-if="!data.changeEvent">
-				<view :id="'cu-' + index" :key="item.id" class="cu-item flex-col" v-for="(item, index) in data.itemList">
-					<ProjectItem 
-						class="w-full" 
-						:index="index" 
-						:item="item" 
-						:menuList="data.menuList"
-						@setData="setData"
-						@openSubProject="openSubProject" 
-					/>
-				</view>
-			</view>
-
-			<view v-else>
-				<view 
-					:id="'cu-' + index" 
-					:key="index" 
-					:style="{ 'background-color': item.color }"
-					@touchend="stops($event, index)" 
-					@touchmove.stop.prevent="move" 
-					@touchstart="start($event, index)"
-					class="cu-item flex-col" v-for="(item, index) in data.itemList"
-				>
-					<view class="border-100 bg-blue-500" v-if="item.showTopBorder"></view>
-
-					<!-- 内容区 -->
-					<!-- 父项目 -->
-					<view class="w-full">
-						<view class="flex items-center justify-between p-3">
-							<u-icon class="mover" name="https://www.tall.wiki/staticrec/drag.svg" size="48"></u-icon>
-
-							<view class="flex-1 px-3">
-								<view class="flex items-center mb-1">
-									<view class="mr-2">{{ item.name }}</view>
-									<!-- 状态 TODO:-->
-									<view class="px-2 text-xs text-green-400 bg-green-100 rounded-full flex-shrink-0">进行中</view>
-								</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="pl-2">{{ dayjs(+item.endTime).format('MM-DD HH:mm') }}</view>
-								</view>
-							</view>
-
-							<!-- 箭头 -->
-							<view v-if="item.sonProjectList && item.sonProjectList.length">
-								<u-icon @click="openSubProject(item.sonProjectList.length, index)" class="text-gray-400" name="arrow-up" size="14px" v-if="item.show"></u-icon>
-								<u-icon @click="openSubProject(item.sonProjectList.length, index)" class="text-gray-400" name="arrow-down" size="14px" v-else></u-icon>
-							</view>
-							<u-icon class="text-gray-400" name="arrow-right" size="14px" v-else></u-icon>
-						</view>
-						<!-- 父项目 end -->
-
-						<!-- 子项目 -->
-						<view class="ml-8" v-if="item.show">
-							<view :id="'cu-' + index + '-' + subIndex" :key="subIndex"
-								@touchend.stop.prevent="stops($event, index + '-' + subIndex, item.sonProjectList.length)"
-								@touchmove.stop.prevent="move($event, item.sonProjectList.length)"
-								@touchstart.stop.prevent="start($event, index + '-' + subIndex)"
-								class="cu-item flex-col" v-for="(subItem, subIndex) in item.sonProjectList">
-								<view class="flex items-center justify-between p-3 w-full">
-									<u-icon class="mover" name="https://www.tall.wiki/staticrec/drag.svg" size="48">
-									</u-icon>
-
-									<view class="flex-1 px-3">
-										<view class="flex items-center">
-											<view class="mr-2">{{ subItem.name }}</view>
-											<!-- 状态 -->
-											<view
-												:class="
-													subItem.status === 0 
-													? 'text-blue-400 bg-blue-100' 
-													: subItem.status === 1 
-													? 'text-green-400 bg-green-100' 
-													: subItem.status === 2 
-													? 'text-red-400 bg-red-100' 
+  <view>
+    <scroll-view scroll-y="true">
+      <view v-if="!data.changeEvent">
+        <view :id="'cu-' + index" :key="item.id" class="cu-item flex-col" v-for="(item, index) in data.itemList">
+          <ProjectItem class="w-full" :index="index" :item="item" :menuList="data.menuList" @setData="setData"
+            @openSubProject="openSubProject" />
+        </view>
+      </view>
+
+      <view v-else>
+        <view :id="'cu-' + index" :key="index" :style="{ 'background-color': item.color }"
+          @touchend="stops($event, index)" @touchmove.stop.prevent="move" @touchstart="start($event, index)"
+          class="cu-item flex-col" v-for="(item, index) in data.itemList">
+          <view class="border-100 bg-blue-500" v-if="item.showTopBorder"></view>
+111111111111
+          <!-- 内容区 -->
+          <!-- 父项目 -->
+          <view class="w-full">
+            <view class="flex items-center justify-between p-3">
+              <u-icon class="mover" name="https://www.tall.wiki/staticrec/drag.svg" size="48"></u-icon>
+
+              <view class="flex-1 px-3">
+                <view class="flex items-center mb-1">
+                  <view class="mr-2">{{ item.name }}</view>
+                  <!-- 状态 TODO:-->
+                  <view class="px-2 text-xs text-green-400 bg-green-100 rounded-full flex-shrink-0">进行中</view>
+                </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="pl-2">{{ dayjs(+item.endTime).format('MM-DD HH:mm') }}</view>
+                </view>
+              </view>
+
+              <!-- 箭头 -->
+              <view v-if="item.sonProjectList && item.sonProjectList.length">
+                <u-icon @click="openSubProject(item.sonProjectList.length, index)" class="text-gray-400" name="arrow-up"
+                  size="14px" v-if="item.show"></u-icon>
+                <u-icon @click="openSubProject(item.sonProjectList.length, index)" class="text-gray-400"
+                  name="arrow-down" size="14px" v-else></u-icon>
+              </view>
+              <u-icon class="text-gray-400" name="arrow-right" size="14px" v-else></u-icon>
+            </view>
+            <!-- 父项目 end -->
+
+            <!-- 子项目 -->
+            <view class="ml-8" v-if="item.show">
+              <view :id="'cu-' + index + '-' + subIndex" :key="subIndex"
+                @touchend.stop.prevent="stops($event, index + '-' + subIndex, item.sonProjectList.length)"
+                @touchmove.stop.prevent="move($event, item.sonProjectList.length)"
+                @touchstart.stop.prevent="start($event, index + '-' + subIndex)" class="cu-item flex-col"
+                v-for="(subItem, subIndex) in item.sonProjectList">
+                <view class="flex items-center justify-between p-3 w-full">
+                  <u-icon class="mover" name="https://www.tall.wiki/staticrec/drag.svg" size="48">
+                  </u-icon>
+
+                  <view class="flex-1 px-3">
+                    <view class="flex items-center">
+                      <view class="mr-2">{{ subItem.name }}</view>
+                      <!-- 状态 -->
+                      <view :class="
+													subItem.status === 0
+													? 'text-blue-400 bg-blue-100'
+													: subItem.status === 1
+													? 'text-green-400 bg-green-100'
+													: subItem.status === 2
+													? 'text-red-400 bg-red-100'
 													: 'text-gray-400 bg-gray-100'
-												"
-												class="px-2 text-xs text-gray-400 bg-gray-100 rounded-full flex-shrink-0">
-												{{ subItem.status === 0 ? '未开始' : subItem.status === 1 ? '进行中' : subItem.status === 2 ? '暂停' : '已完成' }}
-											</view>
-										</view>
-									</view>
-
-									<!-- 箭头 -->
-									<u-icon class="text-gray-400" name="arrow-right" size="14px"></u-icon>
-								</view>
-							</view>
-						</view>
-					</view>
-					<!-- 内容区 end -->
-
-					<view class="border-100 bg-blue-500" v-if="item.showBorder"></view>
-					<view class="border-80 bg-blue-500" v-if="item.showSubBorder"></view>
-				</view>
-			</view>
-		</scroll-view>
-
-		<!-- 移动悬浮 begin -->
-		<view v-if="data.showMoveImage">
-			<view :style="{ left: moveLeft + 'px', top: moveTop + 'px' }" class="cu-item absolute">
-				<ProjectItem class="w-full" :item="moveItem" />
-			</view>
-		</view>
-		<!-- 移动悬浮 end -->
-
-		<!-- 项目操作面板 -->
-		<u-action-sheet :list="data.menuList" :tips="data.tips" @click="chooseAction" v-model="data.showMenu"></u-action-sheet>
-	</view>
+												" class="px-2 text-xs text-gray-400 bg-gray-100 rounded-full flex-shrink-0">
+                        {{ subItem.status === 0 ? '未开始' : subItem.status === 1 ? '进行中' : subItem.status === 2 ? '暂停' : '已完成' }}
+                      </view>
+                    </view>
+                  </view>
+
+                  <!-- 箭头 -->
+                  <u-icon class="text-gray-400" name="arrow-right" size="14px"></u-icon>
+                </view>
+              </view>
+            </view>
+          </view>
+          <!-- 内容区 end -->
+
+          <view class="border-100 bg-blue-500" v-if="item.showBorder"></view>
+          <view class="border-80 bg-blue-500" v-if="item.showSubBorder"></view>
+        </view>
+      </view>
+    </scroll-view>
+
+    <!-- 移动悬浮 begin -->
+    <view v-if="data.showMoveImage">
+      <view :style="{ left: moveLeft + 'px', top: moveTop + 'px' }" class="cu-item absolute">
+        <ProjectItem class="w-full" :item="moveItem" />
+      </view>
+    </view>
+    <!-- 移动悬浮 end -->
+
+    <!-- 项目操作面板 -->
+    <u-action-sheet :list="data.menuList" :tips="data.tips" @click="chooseAction" v-model="data.showMenu"></u-action-sheet>
+  </view>
 </template>
 
 <script setup>
-	import { ref, onMounted, watch, computed } from 'vue';
-	import ProjectItem from '@/components/Projects/ProjectItem.vue';
-	import { useStore } from 'vuex';
-	import dayjs from 'dayjs';
-	
-	const store = useStore();
-	const projects = computed(() => store.state.project.projects);
-	const data = ref({
-		itemTop: 0,
-		itemLeft: 0,
-		itemHeight: 0, // 移动元素的高度
-		subItemHeight: 0, // 移动子元素的高度
-		itemWidth: 0, // 移动元素的宽度
-		showMoveImage: false,
-		moveItem: '',
-		moveLeft: 0,
-		moveTop: 0,
-		deltaLeft: 0,
-		deltaTop: 0,
-		beginleft: 0,
-		begintop: 0,
-		itemList: [],
-		setSubItem: false,
-		changeEvent: false,
-		
-		showMenu: false,
-		tips: {
-			text: '',
-			color: '#909399',
-			fontSize: 28,
-		},
-		projectId: 0,
-		menuList: [{ text: '复制' }, { text: '编辑' }, { text: '删除' }, { text: '置顶' }, { text: '排序' }],
-		// show: false,
-		border: 'border border-blue-500 shadow rounded-md',
-		showBorder: false,
-		showItemIndex: undefined,
-	});
-	
-	watch(projects, (val) => {
-		data.value.itemList = val;
-		data.value.itemList.forEach(item => {
-			item.showBorder = false;
-			item.showSubBorder = false;
-			item.showTopBorder = false;
-		});
-	})
-	
-	onMounted(() => {
-		data.value.itemList = projects.value;
-		data.value.itemList.forEach(item => {
-			item.showBorder = false;
-			item.showSubBorder = false;
-			item.showTopBorder = false;
-		});
-	});
-	
-	// 展开子项目
-	function openSubProject(length, index) {
-		setProjectItemShow({ index, show: data.value.itemList[index].show ? false : true });
-		if (length && index) {
-			this.$emit('changeHeight', length, index);
-		}
-		data.value.showItemIndex = index;
-	}
-	
-	// 获取项目列表距离顶部的距离
-	function getDate() {
-		const query = uni.createSelectorQuery().in(this);
-		query.select(`#cu-0`).boundingClientRect(res => {
-			console.log('data: ', res);
-			data.value.begintop = res.top;
-			data.value.beginleft = res.left;
-	    }).exec();
-	}
-	
-	function setData(flag, projectId, tips) {
-		data.value.showMenu = flag;
-		data.value.projectId = projectId;
-		data.value.tips = tips;
-	}
-	
-	function chooseAction(e) {
-		let obj = { index: e, projectId: data.value.projectId };
-		// this.$emit('chooseAction', data);
-		actionFun(obj);
+  import { reactive, onMounted, watch, computed } from 'vue';
+  import ProjectItem from '@/components/Projects/ProjectItem.vue';
+  import { useStore } from 'vuex';
+  import dayjs from 'dayjs';
+
+  const store = useStore();
+  const projects = computed(() => store.state.project.projects);
+  const data = reactive({
+    // itemTop: 0,
+    itemLeft: 0,
+    itemHeight: 0, // 移动元素的高度
+    subItemHeight: 0, // 移动子元素的高度
+    itemWidth: 0, // 移动元素的宽度
+    showMoveImage: false,
+    moveItem: '',
+    moveLeft: 0,
+    moveTop: 0,
+    deltaLeft: 0,
+    deltaTop: 0,
+    beginleft: 0,
+    begintop: 0,
+    itemList: [], // 项目列表
+    setSubItem: false,
+    changeEvent: false, // 是否点击过操作面板
+    showMenu: false,
+    tips: { text: '', color: '#909399', fontSize: 28, },
+    projectId: 0,
+    menuList: [{ text: '复制' }, { text: '编辑' }, { text: '删除' }, { text: '置顶' }, { text: '排序' }],
+    // show: false,
+    // border: 'border border-blue-500 shadow rounded-md',
+    showBorder: false, // 一级项目底部边框是否显示
+    showItemIndex: undefined,
+  });
+
+  const emit = defineEmits(['changeHeight']);
+
+  watch(projects, (val) => {
+    data.itemList = val;
+    data.itemList.forEach(item => {
+      item.showBorder = false; // 一级项目底部边框是否显示
+      item.showSubBorder = false; // 一级项目底部边框是否显示
+      item.showTopBorder = false; // 一级项目顶部边框是否显示
+    });
+  })
+
+  onMounted(() => {
+    data.itemList = projects.value;
+    data.itemList.forEach(item => {
+      item.showBorder = false; // 一级项目底部边框是否显示
+      item.showSubBorder = false; // 一级项目底部边框是否显示
+      item.showTopBorder = false; // 一级项目顶部边框是否显示
+    });
+  });
+
+  // 展开子项目
+  function openSubProject(length, index) {
+    store.commit('project/setProjectItemShow', {
+      index,
+      show: data.itemList[index].show ? false : true
+    });
+    if (length && index) {
+      emit('changeHeight', length, index);
     }
-	
-	// 操作
-    function actionFun(obj) {
-		let action = data.value.menuList[obj.index].text;
-		if (action === '排序') {
-			data.value.changeEvent = true;
-			uni.$ui.showToast('请移动进行排序');
-		}
-
-		if (action === '删除') {
-			data.value.changeEvent = false;
-			delProject(obj.projectId);
-		}
-
-		if (data.value.showItemIndex !== undefined) {
-			setProjectItemShow({ index: data.value.showItemIndex, show: true });
-		}
+    data.showItemIndex = index;
+  }
+
+  // 获取项目列表距离顶部的距离
+  function getDate() {
+    const query = uni.createSelectorQuery().in(this);
+    query.select(`#cu-0`).boundingClientRect(res => {
+      console.log('data: ', res);
+      data.begintop = res.top;
+      data.beginleft = res.left;
+    }).exec();
+  }
+
+  function setData(flag, projectId, tips) {
+    data.showMenu = flag;
+    data.projectId = projectId;
+    data.tips = tips;
+  }
+
+  function chooseAction(e) {
+    let obj = {
+      index: e,
+      projectId: data.projectId
+    };
+    // this.$emit('chooseAction', data);
+    actionFun(obj);
+  }
+
+  // 操作
+  function actionFun(obj) {
+    let action = data.menuList[obj.index].text;
+    if (action === '排序') {
+      data.changeEvent = true;
+      uni.$ui.showToast('请移动进行排序');
     }
-	
-	function isNumber(val) {
-		return val === +val;
-	}
-	
-	function start(e, index) {
-		console.log('开始', e);
-		setTimeout(() => {
-			getDate();
-		}, 300);
-	
-		if (isNumber(index)) {
-			data.value.setSubItem = false;
-			const query = uni.createSelectorQuery().in(this);
-			console.log('2222', query)
-			query.select(`#cu-${index}`).boundingClientRect(res => {
-				data.value.moveTop = res.top;
-				data.value.moveLeft = res.left;
-				data.value.moveItem = data.value.itemList[index];
-				data.value.itemWidth = res.width;
-				data.value.itemHeight = res.height;
-			}).exec();
-		} else {
-			let arr = index.split('-');
-			data.value.setSubItem = true;
-			const query = uni.createSelectorQuery().in(this);
-			query.select(`#cu-${arr[0] - 0}`).boundingClientRect(res => {
-				data.value.itemHeight = res.height;
-			}).exec();
-	
-			query.select(`#cu-${index}`).boundingClientRect(res => {
-				data.value.moveTop = res.top;
-				data.value.moveLeft = res.left;
-				data.value.moveItem = data.value.itemList[arr[0] - 0].sonProjectList[arr[1] - 0];
-				data.value.itemWidth = res.width;
-				data.value.subItemHeight = res.height;
-			}).exec();
-		}
-	}
-	
-	function move(e, length) {
-		console.log('移动');
-		data.value.showMoveImage = true; //悬浮开始
-		const touch = e.touches[0];
-		if (data.value.deltaLeft == 0) {
-			// 获得本身的移动
-			data.value.deltaLeft = touch.pageX - data.value.moveLeft;
-			data.value.deltaTop = touch.pageY - data.value.moveTop;
-		}
-		data.value.moveLeft = touch.pageX - data.value.deltaLeft;
-		data.value.moveTop = touch.pageY - data.value.deltaTop;
-	
-		let lastIndex = (lastIndex = findOverIndex(touch.pageY, length));
-		console.log('111111', lastIndex);
-		// 显示下划线
-		for (let i = 0; i < data.value.itemList.length; i++) {
-			if (data.value.moveLeft > 35) {
-				data.value.itemList[i].showBorder = false;
-				data.value.itemList[i].showTopBorder = false;
-				if (i === lastIndex) {
-					data.value.itemList[i].showSubBorder = true;
-				} else {
-					data.value.itemList[i].showSubBorder = false;
-				}
-			} else {
-				if (lastIndex === -1) {
-					data.value.itemList[0].showTopBorder = true;
-					data.value.itemList[i].showSubBorder = false;
-					data.value.itemList[i].showBorder = false;
-				} else {
-					data.value.itemList[i].showSubBorder = false;
-					data.value.itemList[i].showTopBorder = false;
-					if (i === lastIndex) {
-						data.value.itemList[i].showBorder = true;
-					} else {
-						data.value.itemList[i].showBorder = false;
-					}
-				}
-			}
-		}
+
+    if (action === '删除') {
+      data.changeEvent = false;
+      delProject(obj.projectId);
     }
-	
-	function stops(e, index, length) {
-		console.log('结束');
-		const touch = e.mp.changedTouches[0];
-		let lastIndex = (lastIndex = findOverIndex(touch.pageY, length));
-
-		// 交换两个值
-		for (let i = 0; i < data.value.itemList.length; i++) {
-			// 插入顶部
-			if (data.value.itemList[i].showTopBorder) {
-				if (isNumber(index)) {
-					let Value = data.value.itemList[index];
-					data.value.itemList.unshift(Value);
-					data.value.itemList.splice(index + 1, 1);
-				} else {
-					let arr = index.split('-');
-					let Value = data.value.itemList[arr[0] - 0].sonProjectList[arr[1] - 0];
-					data.value.itemList.unshift(Value);
-					data.value.itemList[arr[0] - 0].sonProjectList.splice([arr[1] - 0], 1);
-					const options = {
-						id: Value.id,
-						parentId: 0,
-					};
-					this.$emit('change', options);
-				}
-				// 清空
-				clearSet(i);
-				this.$emit('change', data.value.itemList);
-				return;
-			}
-			// 插入一级项目
-			if (data.value.itemList[i].showBorder) {
-				if (isNumber(index)) {
-					let Value = data.value.itemList[index];
-					data.value.itemList.splice(i + 1, 0, Value);
-					if (i < index) {
-						data.value.itemList.splice(index + 1, 1);
-					} else {
-						data.value.itemList.splice(index, 1);
-					}
-				} else {
-					let arr = index.split('-');
-					let Value = data.value.itemList[arr[0] - 0].sonProjectList[arr[1] - 0];
-					data.value.itemList.splice(i + 1, 0, Value);
-					data.value.itemList[arr[0] - 0].sonProjectList.splice([arr[1] - 0], 1);
-					const options = {
-						id: Value.id,
-						parentId: 0,
-					};
-					this.$emit('change', options);
-				}
-				// 清空
-				clearSet(i);
-				this.$emit('change', data.value.itemList);
-				return;
-			}
-			// 插入二级项目
-			if (data.value.itemList[i].showSubBorder) {
-				if (isNumber(index)) {
-					let Value = data.value.itemList[index];
-					if (data.value.itemList[lastIndex - 1].sonProjectList && data.value.itemList[lastIndex - 1].sonProjectList.length) {
-						data.value.itemList[lastIndex - 1].sonProjectList.push(Value);
-					} else {
-						data.value.itemList[lastIndex].sonProjectList = [Value];
-					}
-					data.value.itemList.splice(index, 1);
-					// 清空
-					clearSet(i);
-					const options = {
-						id: Value.id,
-						parentId: data.value.itemList[lastIndex - 1].id,
-					};
-					this.$emit('change', options);
-				} else {
-					let arr = index.split('-');
-					let Value = data.value.itemList[arr[0] - 0].sonProjectList[arr[1] - 0];
-					if (data.value.itemList[lastIndex].sonProjectList && data.value.itemList[lastIndex].sonProjectList.length) {
-						data.value.itemList[lastIndex].sonProjectList.push(Value);
-					} else {
-						data.value.itemList[lastIndex].sonProjectList = [Value];
-					}
-					data.value.itemList[arr[0] - 0].sonProjectList.splice([arr[1] - 0], 1);
-					// 清空
-					clearSet(i);
-					const options = {
-						id: Value.id,
-						parentId: data.value.itemList[lastIndex].id,
-					};
-					this.$emit('change', options);
-
-					const options1 = {
-						id: Value.id,
-						parentId: 0,
-					};
-					this.$emit('change', options1);
-				}
-				return;
-			}
-		}
+
+    if (data.showItemIndex !== undefined) {
+      store.commit('project/setProjectItemShow', {
+        index: data.showItemIndex,
+        show: true
+      });
     }
-	
-	// 还原初始数据
-	function clearSet(i) {
-		data.value.itemList[i].showBorder = false;
-		data.value.itemList[i].showSubBorder = false;
-		data.value.itemList[i].showTopBorder = false;
-		data.value.deltaLeft == 0;
-		data.value.showMoveImage = false;
-		data.value.setSubItem = false;
-		data.value.changeEvent = false;
-		data.value.showItemIndex = undefined;
-	}
-	
-	// 找到停下的元素的下标
-	function findOverIndex(posY) {
-		// 如果有子项目展开着
-		let leng = data.value.itemList.length * data.value.itemHeight; // 最后一个元素距离顶部的距离
-		if (posY < data.value.begintop) {
-			return -1;
-		}
-		for (var i = 0; i < data.value.itemList.length; i++) {
-			let begin = data.value.itemHeight * i + data.value.begintop;
-			let end = data.value.itemHeight * i + data.value.begintop + data.value.itemHeight;
-			if (begin <= posY && end >= posY) {
-				return i;
-			}
-		}
-		if (posY > leng) {
-			// 交换最后一个
-			return data.value.itemList.length - 1;
-		} else if (posY < data.value.begintop) {
-			return 0;
-		}
-	}
-	
-	// 删除项目
-	function delProject(id) {
-		uni.showModal({
-			title: '',
-			content: '是否删除项目？',
-			showCancel: true,
-			success: async ({ confirm }) => {
-				if (confirm) {
-					await this.$u.api.delProject(id);
-					let flag_index = 0;
-					data.value.itemList.forEach((item, index) => {
-						if (item.id == id) {
-							flag_index = index;
-						}
-					});
-			
-					data.value.itemList.splice(flag_index, 1);
-					setProjects(data.value.itemList);
-				}
-			},
-		});
-	}
+  }
+
+  function isNumber(val) {
+    return val === +val;
+  }
+
+  function start(e, index) {
+    console.log('开始', e);
+    setTimeout(() => {
+      getDate();
+    }, 300);
+
+    if (isNumber(index)) {
+      data.setSubItem = false;
+      const query = uni.createSelectorQuery().in(this);
+      console.log('2222', query)
+      query.select(`#cu-${index}`).boundingClientRect(res => {
+        data.moveTop = res.top;
+        data.moveLeft = res.left;
+        data.moveItem = data.itemList[index];
+        data.itemWidth = res.width;
+        data.itemHeight = res.height;
+      }).exec();
+    } else {
+      let arr = index.split('-');
+      data.setSubItem = true;
+      const query = uni.createSelectorQuery().in(this);
+      query.select(`#cu-${arr[0] - 0}`).boundingClientRect(res => {
+        data.itemHeight = res.height;
+      }).exec();
+
+      query.select(`#cu-${index}`).boundingClientRect(res => {
+        data.moveTop = res.top;
+        data.moveLeft = res.left;
+        data.moveItem = data.itemList[arr[0] - 0].sonProjectList[arr[1] - 0];
+        data.itemWidth = res.width;
+        data.subItemHeight = res.height;
+      }).exec();
+    }
+  }
+
+  function move(e, length) {
+    console.log('移动');
+    data.showMoveImage = true; //悬浮开始
+    const touch = e.touches[0];
+    if (data.deltaLeft == 0) {
+      // 获得本身的移动
+      data.deltaLeft = touch.pageX - data.moveLeft;
+      data.deltaTop = touch.pageY - data.moveTop;
+    }
+    data.moveLeft = touch.pageX - data.deltaLeft;
+    data.moveTop = touch.pageY - data.deltaTop;
+
+    let lastIndex = (lastIndex = findOverIndex(touch.pageY, length));
+    console.log('111111', lastIndex);
+    // 显示下划线
+    for (let i = 0; i < data.itemList.length; i++) {
+      if (data.moveLeft > 35) {
+        data.itemList[i].showBorder = false;
+        data.itemList[i].showTopBorder = false;
+        if (i === lastIndex) {
+          data.itemList[i].showSubBorder = true;
+        } else {
+          data.itemList[i].showSubBorder = false;
+        }
+      } else {
+        if (lastIndex === -1) {
+          data.itemList[0].showTopBorder = true;
+          data.itemList[i].showSubBorder = false;
+          data.itemList[i].showBorder = false;
+        } else {
+          data.itemList[i].showSubBorder = false;
+          data.itemList[i].showTopBorder = false;
+          if (i === lastIndex) {
+            data.itemList[i].showBorder = true;
+          } else {
+            data.itemList[i].showBorder = false;
+          }
+        }
+      }
+    }
+  }
+
+  function stops(e, index, length) {
+    console.log('结束');
+    const touch = e.mp.changedTouches[0];
+    let lastIndex = (lastIndex = findOverIndex(touch.pageY, length));
+
+    // 交换两个值
+    for (let i = 0; i < data.itemList.length; i++) {
+      // 插入顶部
+      if (data.itemList[i].showTopBorder) {
+        if (isNumber(index)) {
+          let Value = data.itemList[index];
+          data.itemList.unshift(Value);
+          data.itemList.splice(index + 1, 1);
+        } else {
+          let arr = index.split('-');
+          let Value = data.itemList[arr[0] - 0].sonProjectList[arr[1] - 0];
+          data.itemList.unshift(Value);
+          data.itemList[arr[0] - 0].sonProjectList.splice([arr[1] - 0], 1);
+          const options = {
+            id: Value.id,
+            parentId: 0,
+          };
+          this.$emit('change', options);
+        }
+        // 清空
+        clearSet(i);
+        this.$emit('change', data.itemList);
+        return;
+      }
+      // 插入一级项目
+      if (data.itemList[i].showBorder) {
+        if (isNumber(index)) {
+          let Value = data.itemList[index];
+          data.itemList.splice(i + 1, 0, Value);
+          if (i < index) {
+            data.itemList.splice(index + 1, 1);
+          } else {
+            data.itemList.splice(index, 1);
+          }
+        } else {
+          let arr = index.split('-');
+          let Value = data.itemList[arr[0] - 0].sonProjectList[arr[1] - 0];
+          data.itemList.splice(i + 1, 0, Value);
+          data.itemList[arr[0] - 0].sonProjectList.splice([arr[1] - 0], 1);
+          const options = {
+            id: Value.id,
+            parentId: 0,
+          };
+          this.$emit('change', options);
+        }
+        // 清空
+        clearSet(i);
+        this.$emit('change', data.itemList);
+        return;
+      }
+      // 插入二级项目
+      if (data.itemList[i].showSubBorder) {
+        if (isNumber(index)) {
+          let Value = data.itemList[index];
+          if (data.itemList[lastIndex - 1].sonProjectList && data.itemList[lastIndex - 1].sonProjectList.length) {
+            data.itemList[lastIndex - 1].sonProjectList.push(Value);
+          } else {
+            data.itemList[lastIndex].sonProjectList = [Value];
+          }
+          data.itemList.splice(index, 1);
+          // 清空
+          clearSet(i);
+          const options = {
+            id: Value.id,
+            parentId: data.itemList[lastIndex - 1].id,
+          };
+          this.$emit('change', options);
+        } else {
+          let arr = index.split('-');
+          let Value = data.itemList[arr[0] - 0].sonProjectList[arr[1] - 0];
+          if (data.itemList[lastIndex].sonProjectList && data.itemList[lastIndex].sonProjectList.length) {
+            data.itemList[lastIndex].sonProjectList.push(Value);
+          } else {
+            data.itemList[lastIndex].sonProjectList = [Value];
+          }
+          data.itemList[arr[0] - 0].sonProjectList.splice([arr[1] - 0], 1);
+          // 清空
+          clearSet(i);
+          const options = {
+            id: Value.id,
+            parentId: data.itemList[lastIndex].id,
+          };
+          this.$emit('change', options);
+
+          const options1 = {
+            id: Value.id,
+            parentId: 0,
+          };
+          this.$emit('change', options1);
+        }
+        return;
+      }
+    }
+  }
+
+  // 还原初始数据
+  function clearSet(i) {
+    data.itemList[i].showBorder = false;
+    data.itemList[i].showSubBorder = false;
+    data.itemList[i].showTopBorder = false;
+    data.deltaLeft == 0;
+    data.showMoveImage = false;
+    data.setSubItem = false;
+    data.changeEvent = false;
+    data.showItemIndex = undefined;
+  }
+
+  // 找到停下的元素的下标
+  function findOverIndex(posY) {
+    // 如果有子项目展开着
+    let leng = data.itemList.length * data.itemHeight; // 最后一个元素距离顶部的距离
+    if (posY < data.begintop) {
+      return -1;
+    }
+    for (var i = 0; i < data.itemList.length; i++) {
+      let begin = data.itemHeight * i + data.begintop;
+      let end = data.itemHeight * i + data.begintop + data.itemHeight;
+      if (begin <= posY && end >= posY) {
+        return i;
+      }
+    }
+    if (posY > leng) {
+      // 交换最后一个
+      return data.itemList.length - 1;
+    } else if (posY < data.begintop) {
+      return 0;
+    }
+  }
+
+  // 删除项目
+  function delProject(id) {
+    uni.showModal({
+      title: '',
+      content: '是否删除项目？',
+      showCancel: true,
+      success: async ({
+        confirm
+      }) => {
+        if (confirm) {
+          await this.$u.api.delProject(id);
+          let flag_index = 0;
+          data.itemList.forEach((item, index) => {
+            if (item.id == id) {
+              flag_index = index;
+            }
+          });
+
+          data.itemList.splice(flag_index, 1);
+          store.commit('project/setProjects', data.itemList);
+        }
+      },
+    });
+  }
 </script>
 
 <style lang="scss" scoped>
-	.cu-item {
-		width: 100%;
-		display: flex;
-		align-items: center;
-		font-size: 14px;
-	}
-
-	.border-100 {
-		width: 92%;
-		height: 4rpx;
-	}
-
-	.border-80 {
-		width: 84%;
-		height: 2px;
-		margin-left: 30px;
-	}
+  .cu-item {
+    width: 100%;
+    display: flex;
+    align-items: center;
+    font-size: 14px;
+  }
+
+  .border-100 {
+    width: 92%;
+    height: 4rpx;
+  }
+
+  .border-80 {
+    width: 84%;
+    height: 2px;
+    margin-left: 30px;
+  }
 </style>
diff --git a/components/Projects/ProjectItem.vue b/components/Projects/ProjectItem.vue
index e6c5f03..3ae7d79 100644
--- a/components/Projects/ProjectItem.vue
+++ b/components/Projects/ProjectItem.vue
@@ -20,8 +20,8 @@
 
       <!-- 箭头 -->
       <view v-if="item.sonProjectList && item.sonProjectList.length">
-        <u-icon @click="$emit('openSubProject', item.sonProjectList.length, index)" class="text-gray-400" name="arrow-up" size="14px" v-if="item.show"></u-icon>
-        <u-icon @click="$emit('openSubProject', item.sonProjectList.length, index)" class="text-gray-400" name="arrow-down" size="14px" v-else></u-icon>
+        <u-icon @click="emit('openSubProject', item.sonProjectList.length, index)" class="text-gray-400" name="arrow-up" size="14px" v-if="item.show"></u-icon>
+        <u-icon @click="emit('openSubProject', item.sonProjectList.length, index)" class="text-gray-400" name="arrow-down" size="14px" v-else></u-icon>
       </view>
       <u-icon @click="openProject(item)" class="text-gray-400" name="arrow-right" size="14px" v-else></u-icon>
     </view>
@@ -63,7 +63,7 @@
 </template>
 
 <script setup>
-import { ref, computed } from 'vue';
+import { reactive, computed } from 'vue';
 import dayjs from 'dayjs';
 import { useStore } from 'vuex';
 import config from '@/common/js/config.js';
@@ -82,12 +82,12 @@ defineProps({
   //   default: () => [],
   // },
 });
-const emit = defineEmits(['setData']);
+const emit = defineEmits(['setData', 'openSubProject']);
 
 const store = useStore();
 const userId = computed(() => store.getters['user/userId']);
 
-const data = ref({
+const data = reactive({
   showMenu: false,
   tips: {
     text: '',
@@ -102,7 +102,7 @@ const data = ref({
 
 // 打开项目详情
 function openProject(project) {
-  const gateway = config.apiUrl;
+  const gateway = config.apiUrlNew;
   const url = `${gateway}/defaultwbs`;
   const { name, id } = project;
   uni.navigateTo({ url: `/pages/project/project?u=${userId.value}&p=${id}&pname=${name}&url=${encodeURIComponent(url)}` });
@@ -117,7 +117,6 @@ function openMenu(project) {
   data.tips.text = project.name;
 
   emit('setData', data.showMenu, data.projectId, data.tips);
-  // this.$emit('setData', data.showMenu, data.projectId, data.tips);
 }
 </script>
 
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 7daadb6..733ef06 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -108,7 +108,7 @@ function onMove(event) {
 }
 
 function toLogin() {
-  uni.navigateTo({ url: '/pages/user/accountLogin' })
+  uni.navigateTo({ url: '/pages/user/login' })
 }
 </script>
 
diff --git a/pages/user/login.vue b/pages/user/login.vue
index d44648c..fa1fa73 100644
--- a/pages/user/login.vue
+++ b/pages/user/login.vue
@@ -68,9 +68,7 @@
 
   // 表单验证
   const submitLogin = () => {
-    console.log('111111')
     phoneLoginForm.value.validate(valid => {
-      console.log('2222', valid)
       if (valid) {
         login()
       }
@@ -100,6 +98,7 @@
       });
 
       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 || '');
@@ -112,7 +111,7 @@
       });
     } catch (error) {
       uni.$ui.hideLoading();
-      uni.$ui.showToast(error);
+      uni.$ui.showToast(error.msg);
     }
   }
 
diff --git a/store/socket/actions.js b/store/socket/actions.js
index c769bf3..708aed4 100644
--- a/store/socket/actions.js
+++ b/store/socket/actions.js
@@ -202,7 +202,7 @@ const actions = {
 			dispatch('sendHeart');
 		} else {
 			uni.$u.toast('消息系统认证失败, 请退出重新登录');
-			uni.$t.removeStorageSync('anyringToken');
+			uni.$storage.removeStorageSync('anyringToken');
 			commit('setSocket', null);
 		}
 	},
diff --git a/utils/request.js b/utils/request.js
index 9c4888f..49bb8a7 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -14,23 +14,28 @@ export function setupHttp(app) {
 			'content-type': 'application/json;charset=UTF-8'
 		},
 	});
-	
+
 	// 请求拦截部分，如配置，每次请求前都会执行
 	app.config.globalProperties.$u.http.interceptor.request = config => {
 		const token = store.state.user.token || storage.getStorageSync('anyringToken');
 		if (token) {
 			config.header.Authorization = `Bearer ${token}`;
 		}
-	
+
 		return config;
 	};
-	
+
 	// 响应拦截，如配置，每次请求结束都会执行本方法
 	app.config.globalProperties.$u.http.interceptor.response = res => {
 		if (res.code === 200) {
 			// res为服务端返回值，可能有code，result等字段
 			// 这里对res.result进行返回，将会在this.$u.post(url).then(res => {})的then回调中的res的到
-			// 如果配置了originalData为true，请留意这里的返回值
+			// 如果配置了originalData为true，请留意这里的返回值
+      if (res.tokenObj.token) {
+        storage.setStorageSync('anyringToken', res.tokenObj.token || '');
+        store.commit('user/setToken', res.tokenObj.token);
+      }
+
 			return res.data;
 		} else if (res.code === 401) {
 			// 假设201为token失效，这里跳转登录
@@ -48,7 +53,7 @@ export function setupHttp(app) {
 			return false;
 		}
 	};
-	
+
 	app.config.globalProperties.$u.post = (url, param = {}, header = {}) => {
 		return app.config.globalProperties.$u.http.request({
 			url,
@@ -59,4 +64,4 @@ export function setupHttp(app) {
 			},
 		});
 	};
-}
\ No newline at end of file
+}

From 84390d5f97167f0320683942c0bd1ba04ece9d5b Mon Sep 17 00:00:00 2001
From: Min5203 <2318556978@qq.com>
Date: Thu, 13 Jan 2022 15:23:56 +0800
Subject: [PATCH 05/10] =?UTF-8?q?feat:=20=E6=8F=92=E4=BB=B6=E7=9A=84?=
 =?UTF-8?q?=E5=A1=AB=E5=86=99=E6=8F=90=E4=BA=A4=EF=BC=8C=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E4=B8=8E=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f4b3d05..9c9a79d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 --|--|--
  - | 表单验证 | [8f3bc1e](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8f3bc1e)
  - | 插件的填写与提交，修改与删除 | [d461252](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/d461252)
+ - | 插件面板分开显示 | [fb5e86b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/fb5e86b)
  - | 更新代码 | [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)
  - | 日历页添加 | [1b46a91](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/1b46a91)
@@ -12,10 +13,15 @@
  - | 时间轴页面 | [e926b75](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/e926b75)
  - | 时间轴展示 | [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)
+ - | 手机号登录 | [a198527](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/a198527)
+ - | 手机号登录 | [8f455da](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8f455da)
+ - | 手机号登录 | [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)
  - | 项目操作面板 | [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)
+ - | 注册、用户协议 | [68e9189](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/68e9189)
  - | 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)
@@ -26,6 +32,7 @@
 ### 🎨 代码样式
 范围|描述|commitId
 --|--|--
+ - | 更新代码 | [aa6093a](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/aa6093a)
  - | 细节调整 | [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)
 
@@ -33,14 +40,39 @@
 ### 🐛 Bug 修复
 范围|描述|commitId
 --|--|--
+ - | 插件接口修改 | [53c6b90](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/53c6b90)
+ - | 解决warning | [dcb0079](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/dcb0079)
+ - | 删除多余的引入 | [050b12a](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/050b12a)
+ - | 时间轴任务 | [98abdf6](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/98abdf6)
  - | 修复一些内容 | [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)
+ - | defineExpose, defineEmits不需要引入 | [902cacc](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/902cacc)
+
+
+### 📦 持续集成
+范围|描述|commitId
+--|--|--
+ - | 测试ci | [6ab95f8](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/6ab95f8)
+ - | 测试ci' | [d25f2a7](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/d25f2a7)
+ - | 更新drone.yml | [63ec5a3](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/63ec5a3)
+ - | 更新drone.yml | [a57d598](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/a57d598)
+ - | 添加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)
+ - | ci update | [d38262e](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/d38262e)
+ - | drone | [8cddc7b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8cddc7b)
+
+
+### 🔧 测试
+范围|描述|commitId
+--|--|--
+ - | 手机号登录 | [5ede115](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/5ede115)
 
 
 ### 🔨 代码重构
 范围|描述|commitId
 --|--|--
+ - | 项目列表 | [0486e98](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/0486e98)
  - | 重构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)
 

From 7524b24e11d3004165605fed7687b411e59353ad Mon Sep 17 00:00:00 2001
From: wally <18603454788@163.com>
Date: Thu, 13 Jan 2022 15:31:54 +0800
Subject: [PATCH 06/10] =?UTF-8?q?fix:=20=E4=B8=8A=E4=B8=AA=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4=E5=AF=BC=E8=87=B4=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                   | 60 ++++++++++++++++++----------------
 components/Globals/Globals.vue |  4 ---
 2 files changed, 31 insertions(+), 33 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9c9a79d..753ae14 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,64 +3,66 @@
 ### 🌟 新功能
 范围|描述|commitId
 --|--|--
- - | 表单验证 | [8f3bc1e](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8f3bc1e)
+ - | 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)
+ - | 手机号登录 | [a198527](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/a198527)
+ - | 手机号登录 | [8f455da](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8f455da)
+ - | 手机号登录 | [565585b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/565585b)
  - | 插件的填写与提交，修改与删除 | [d461252](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/d461252)
+ - | 插件的填写提交，编辑与删除 | [84390d5](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/84390d5)
  - | 插件面板分开显示 | [fb5e86b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/fb5e86b)
- - | 更新代码 | [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)
  - | 日历页添加 | [1b46a91](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/1b46a91)
+ - | 日历页首页 | [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)
  - | 时间轴接口 | [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)
- - | 时间轴展示 | [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)
- - | 手机号登录 | [a198527](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/a198527)
- - | 手机号登录 | [8f455da](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8f455da)
- - | 手机号登录 | [565585b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/565585b)
+ - | 更新代码 | [392c8cc](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/392c8cc)
+ - | 注册、用户协议 | [68e9189](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/68e9189)
  - | 添加 timeline | [72dad2b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/72dad2b)
- - | 项目操作面板 | [3beb05e](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/3beb05e)
+ - | 登录、日历页小绿点、二级项目列表 | [e676cf0](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/e676cf0)
+ - | 表单验证 | [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)
  - | 项目列表新 | [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)
- - | 注册、用户协议 | [68e9189](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/68e9189)
- - | 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)
+ - | 项目操作面板 | [3beb05e](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/3beb05e)
 
 
 ### 🎨 代码样式
 范围|描述|commitId
 --|--|--
+ - | calender格式及细节调整 | [db9602b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/db9602b)
  - | 更新代码 | [aa6093a](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/aa6093a)
  - | 细节调整 | [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
 --|--|--
- - | 插件接口修改 | [53c6b90](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/53c6b90)
- - | 解决warning | [dcb0079](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/dcb0079)
- - | 删除多余的引入 | [050b12a](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/050b12a)
- - | 时间轴任务 | [98abdf6](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/98abdf6)
- - | 修复一些内容 | [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)
  - | defineExpose, defineEmits不需要引入 | [902cacc](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/902cacc)
+ - | 修复一些内容 | [3cdb1ce](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/3cdb1ce)
+ - | 删除多余的引入 | [050b12a](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/050b12a)
+ - | 插件接口修改 | [53c6b90](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/53c6b90)
+ - | 时间轴任务 | [98abdf6](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/98abdf6)
+ - | 解决warning | [dcb0079](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/dcb0079)
 
 
 ### 📦 持续集成
 范围|描述|commitId
 --|--|--
- - | 测试ci | [6ab95f8](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/6ab95f8)
- - | 测试ci' | [d25f2a7](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/d25f2a7)
+ - | ci update | [d38262e](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/d38262e)
+ - | drone | [8cddc7b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8cddc7b)
+ - | 修改.drone.yml | [f5b52e3](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/f5b52e3)
  - | 更新drone.yml | [63ec5a3](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/63ec5a3)
  - | 更新drone.yml | [a57d598](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/a57d598)
+ - | 测试ci | [6ab95f8](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/6ab95f8)
+ - | 测试ci' | [d25f2a7](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/d25f2a7)
  - | 添加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)
- - | ci update | [d38262e](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/d38262e)
- - | drone | [8cddc7b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8cddc7b)
 
 
 ### 🔧 测试
@@ -72,9 +74,9 @@
 ### 🔨 代码重构
 范围|描述|commitId
 --|--|--
- - | 项目列表 | [0486e98](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/0486e98)
- - | 重构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)
+ - | 重构project init 部分 | [c7bf2df](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/c7bf2df)
+ - | 项目列表 | [0486e98](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/0486e98)
 
 
 ### 🚀 性能优化
diff --git a/components/Globals/Globals.vue b/components/Globals/Globals.vue
index e7f5116..c33b355 100644
--- a/components/Globals/Globals.vue
+++ b/components/Globals/Globals.vue
@@ -11,12 +11,8 @@
     >
       <template v-slot:body>
         <scroll-view :scrollY="true" :style="{ 'max-height': globalsHeight - 30 + 'px' }">
-<<<<<<< HEAD
           <!-- <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>
->>>>>>> 68e9189bbf20721e757578b15d349abd9ef295d0
           <view class="grid gap-2">
             <view v-for="item in globals" :key="item.id">
              <template v-if="item.plugins && item.plugins.length">

From ad0ce75f5ae2f4605c362d5c0e3d2c1d33f1402a Mon Sep 17 00:00:00 2001
From: xuesinan <1404152492@qq.com>
Date: Thu, 13 Jan 2022 17:25:28 +0800
Subject: [PATCH 07/10] =?UTF-8?q?fix:=20=E9=A1=B9=E7=9B=AE=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                 |   1 +
 components/PrettyExchange/PrettyExchange.vue | 193 +++++++++++--------
 2 files changed, 113 insertions(+), 81 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index df23cbb..ab08cec 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 --|--|--
  - | 表单验证 | [8f3bc1e](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8f3bc1e)
  - | 插件面板分开显示 | [fb5e86b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/fb5e86b)
+ - | 登录、日历页小绿点、二级项目列表 | [e676cf0](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/e676cf0)
  - | 更新代码 | [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)
  - | 日历页添加 | [1b46a91](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/1b46a91)
diff --git a/components/PrettyExchange/PrettyExchange.vue b/components/PrettyExchange/PrettyExchange.vue
index 792528d..101cdec 100644
--- a/components/PrettyExchange/PrettyExchange.vue
+++ b/components/PrettyExchange/PrettyExchange.vue
@@ -3,17 +3,31 @@
     <scroll-view scroll-y="true">
       <view v-if="!data.changeEvent">
         <view :id="'cu-' + index" :key="item.id" class="cu-item flex-col" v-for="(item, index) in data.itemList">
-          <ProjectItem class="w-full" :index="index" :item="item" :menuList="data.menuList" @setData="setData"
-            @openSubProject="openSubProject" />
+          <ProjectItem
+            class="w-full"
+            :index="index"
+            :item="item"
+            :menuList="data.menuList"
+            @setData="setData"
+            @openSubProject="openSubProject"
+          />
         </view>
       </view>
 
       <view v-else>
-        <view :id="'cu-' + index" :key="index" :style="{ 'background-color': item.color }"
-          @touchend="stops($event, index)" @touchmove.stop.prevent="move" @touchstart="start($event, index)"
-          class="cu-item flex-col" v-for="(item, index) in data.itemList">
+        <view
+          :id="'cu-' + index"
+          :key="index"
+          :style="{ 'background-color': item.color }"
+          @touchend="stops($event, index)"
+          @touchmove.stop.prevent="move"
+          @touchstart="start($event, index)"
+          class="cu-item flex-col"
+          v-for="(item, index) in data.itemList"
+        >
+
           <view class="border-100 bg-blue-500" v-if="item.showTopBorder"></view>
-111111111111
+
           <!-- 内容区 -->
           <!-- 父项目 -->
           <view class="w-full">
@@ -36,10 +50,8 @@
 
               <!-- 箭头 -->
               <view v-if="item.sonProjectList && item.sonProjectList.length">
-                <u-icon @click="openSubProject(item.sonProjectList.length, index)" class="text-gray-400" name="arrow-up"
-                  size="14px" v-if="item.show"></u-icon>
-                <u-icon @click="openSubProject(item.sonProjectList.length, index)" class="text-gray-400"
-                  name="arrow-down" size="14px" v-else></u-icon>
+                <u-icon @click="openSubProject(item.sonProjectList.length, index)" class="text-gray-400" name="arrow-up" size="14px" v-if="item.show"></u-icon>
+                <u-icon @click="openSubProject(item.sonProjectList.length, index)" class="text-gray-400" name="arrow-down" size="14px" v-else></u-icon>
               </view>
               <u-icon class="text-gray-400" name="arrow-right" size="14px" v-else></u-icon>
             </view>
@@ -47,28 +59,33 @@
 
             <!-- 子项目 -->
             <view class="ml-8" v-if="item.show">
-              <view :id="'cu-' + index + '-' + subIndex" :key="subIndex"
+              <view
+                :id="'cu-' + index + '-' + subIndex"
+                :key="subIndex"
                 @touchend.stop.prevent="stops($event, index + '-' + subIndex, item.sonProjectList.length)"
                 @touchmove.stop.prevent="move($event, item.sonProjectList.length)"
                 @touchstart.stop.prevent="start($event, index + '-' + subIndex)" class="cu-item flex-col"
-                v-for="(subItem, subIndex) in item.sonProjectList">
+                v-for="(subItem, subIndex) in item.sonProjectList"
+              >
+
                 <view class="flex items-center justify-between p-3 w-full">
-                  <u-icon class="mover" name="https://www.tall.wiki/staticrec/drag.svg" size="48">
-                  </u-icon>
+                  <u-icon class="mover" name="https://www.tall.wiki/staticrec/drag.svg" size="48"></u-icon>
 
                   <view class="flex-1 px-3">
                     <view class="flex items-center">
                       <view class="mr-2">{{ subItem.name }}</view>
                       <!-- 状态 -->
-                      <view :class="
-													subItem.status === 0
-													? 'text-blue-400 bg-blue-100'
-													: subItem.status === 1
-													? 'text-green-400 bg-green-100'
-													: subItem.status === 2
-													? 'text-red-400 bg-red-100'
-													: 'text-gray-400 bg-gray-100'
-												" class="px-2 text-xs text-gray-400 bg-gray-100 rounded-full flex-shrink-0">
+                      <view
+                        :class="
+                            subItem.status === 0
+                            ? 'text-blue-400 bg-blue-100'
+                            : subItem.status === 1
+                            ? 'text-green-400 bg-green-100'
+                            : subItem.status === 2
+                            ? 'text-red-400 bg-red-100'
+                            : 'text-gray-400 bg-gray-100'
+                          "
+                          class="px-2 text-xs text-gray-400 bg-gray-100 rounded-full flex-shrink-0">
                         {{ subItem.status === 0 ? '未开始' : subItem.status === 1 ? '进行中' : subItem.status === 2 ? '暂停' : '已完成' }}
                       </view>
                     </view>
@@ -90,8 +107,8 @@
 
     <!-- 移动悬浮 begin -->
     <view v-if="data.showMoveImage">
-      <view :style="{ left: moveLeft + 'px', top: moveTop + 'px' }" class="cu-item absolute">
-        <ProjectItem class="w-full" :item="moveItem" />
+      <view :style="{ left: data.moveLeft + 'px', top: data.moveTop + 'px' }" class="cu-item absolute">
+        <ProjectItem class="w-full" :item="data.moveItem" />
       </view>
     </view>
     <!-- 移动悬浮 end -->
@@ -111,20 +128,20 @@
   const projects = computed(() => store.state.project.projects);
   const data = reactive({
     // itemTop: 0,
-    itemLeft: 0,
+    // itemLeft: 0,
     itemHeight: 0, // 移动元素的高度
+    itemWidth: 0, // 移动元素的宽度
     subItemHeight: 0, // 移动子元素的高度
-    itemWidth: 0, // 移动元素的宽度
     showMoveImage: false,
-    moveItem: '',
-    moveLeft: 0,
-    moveTop: 0,
+    moveItem: '', // 当前选中的项目信息
+    moveLeft: 0, // 当前选中项目距左侧的距离
+    moveTop: 0, // 当前选中项目距顶部的距离
     deltaLeft: 0,
     deltaTop: 0,
-    beginleft: 0,
-    begintop: 0,
+    beginleft: 0, // 项目列表中第一个项目初始时距离左侧的距离
+    begintop: 0, // 项目列表中第一个项目初始时距离顶部的距离
     itemList: [], // 项目列表
-    setSubItem: false,
+    setSubItem: false, // 选中的是否是二级项目
     changeEvent: false, // 是否点击过操作面板
     showMenu: false,
     tips: { text: '', color: '#909399', fontSize: 28, },
@@ -136,8 +153,9 @@
     showItemIndex: undefined,
   });
 
-  const emit = defineEmits(['changeHeight']);
-
+  const emit = defineEmits(['changeHeight', 'change']);
+
+  // 监听项目列表
   watch(projects, (val) => {
     data.itemList = val;
     data.itemList.forEach(item => {
@@ -158,10 +176,7 @@
 
   // 展开子项目
   function openSubProject(length, index) {
-    store.commit('project/setProjectItemShow', {
-      index,
-      show: data.itemList[index].show ? false : true
-    });
+    store.commit('project/setProjectItemShow', { index, show: data.itemList[index].show ? false : true });
     if (length && index) {
       emit('changeHeight', length, index);
     }
@@ -169,12 +184,15 @@
   }
 
   // 获取项目列表距离顶部的距离
-  function getDate() {
-    const query = uni.createSelectorQuery().in(this);
-    query.select(`#cu-0`).boundingClientRect(res => {
-      console.log('data: ', res);
-      data.begintop = res.top;
-      data.beginleft = res.left;
+  function getDate() {
+    const query = uni.createSelectorQuery().select(`#cu-0`).fields({
+      id: true,
+      dataset: true,
+      rect: true,
+      size: true
+    }, res => {
+      data.begintop = res.top;
+      data.beginleft = res.left;
     }).exec();
   }
 
@@ -189,7 +207,7 @@
       index: e,
       projectId: data.projectId
     };
-    // this.$emit('chooseAction', data);
+    // emit('chooseAction', data);
     actionFun(obj);
   }
 
@@ -219,36 +237,50 @@
   }
 
   function start(e, index) {
-    console.log('开始', e);
+    console.log('开始');
     setTimeout(() => {
       getDate();
     }, 300);
 
-    if (isNumber(index)) {
-      data.setSubItem = false;
-      const query = uni.createSelectorQuery().in(this);
-      console.log('2222', query)
-      query.select(`#cu-${index}`).boundingClientRect(res => {
-        data.moveTop = res.top;
-        data.moveLeft = res.left;
-        data.moveItem = data.itemList[index];
-        data.itemWidth = res.width;
-        data.itemHeight = res.height;
+    if (isNumber(index)) { // 选中一级项目
+      data.setSubItem = false;
+      const query = uni.createSelectorQuery().select(`#cu-${index}`).fields({
+        id: true,
+        dataset: true,
+        rect: true,
+        size: true
+      }, res => {
+        data.moveTop = res.top;
+        data.moveLeft = res.left;
+        data.moveItem = data.itemList[index];
+        data.itemWidth = res.width;
+        data.itemHeight = res.height;
       }).exec();
-    } else {
+    } else { // 选中二级项目
       let arr = index.split('-');
       data.setSubItem = true;
-      const query = uni.createSelectorQuery().in(this);
-      query.select(`#cu-${arr[0] - 0}`).boundingClientRect(res => {
-        data.itemHeight = res.height;
-      }).exec();
-
-      query.select(`#cu-${index}`).boundingClientRect(res => {
-        data.moveTop = res.top;
-        data.moveLeft = res.left;
-        data.moveItem = data.itemList[arr[0] - 0].sonProjectList[arr[1] - 0];
-        data.itemWidth = res.width;
-        data.subItemHeight = res.height;
+
+      const query = uni.createSelectorQuery();
+      query.select(`#cu-${arr[0] - 0}`).fields({
+        id: true,
+        dataset: true,
+        rect: true,
+        size: true
+      }, res => {
+        data.itemHeight = res.height;
+      }).exec();
+
+      query.select(`#cu-${index}`).fields({
+        id: true,
+        dataset: true,
+        rect: true,
+        size: true
+      }, res => {
+        data.moveTop = res.top;
+        data.moveLeft = res.left;
+        data.moveItem = data.itemList[arr[0] - 0].sonProjectList[arr[1] - 0];
+        data.itemWidth = res.width;
+        data.subItemHeight = res.height;
       }).exec();
     }
   }
@@ -265,8 +297,7 @@
     data.moveLeft = touch.pageX - data.deltaLeft;
     data.moveTop = touch.pageY - data.deltaTop;
 
-    let lastIndex = (lastIndex = findOverIndex(touch.pageY, length));
-    console.log('111111', lastIndex);
+    let lastIndex = findOverIndex(touch.pageY, length);
     // 显示下划线
     for (let i = 0; i < data.itemList.length; i++) {
       if (data.moveLeft > 35) {
@@ -297,8 +328,8 @@
 
   function stops(e, index, length) {
     console.log('结束');
-    const touch = e.mp.changedTouches[0];
-    let lastIndex = (lastIndex = findOverIndex(touch.pageY, length));
+    const touch = e.changedTouches[0];
+    let lastIndex = findOverIndex(touch.pageY, length);
 
     // 交换两个值
     for (let i = 0; i < data.itemList.length; i++) {
@@ -317,11 +348,11 @@
             id: Value.id,
             parentId: 0,
           };
-          this.$emit('change', options);
+          emit('change', options);
         }
         // 清空
         clearSet(i);
-        this.$emit('change', data.itemList);
+        emit('change', data.itemList);
         return;
       }
       // 插入一级项目
@@ -343,11 +374,11 @@
             id: Value.id,
             parentId: 0,
           };
-          this.$emit('change', options);
+          emit('change', options);
         }
         // 清空
         clearSet(i);
-        this.$emit('change', data.itemList);
+        emit('change', data.itemList);
         return;
       }
       // 插入二级项目
@@ -366,7 +397,7 @@
             id: Value.id,
             parentId: data.itemList[lastIndex - 1].id,
           };
-          this.$emit('change', options);
+          emit('change', options);
         } else {
           let arr = index.split('-');
           let Value = data.itemList[arr[0] - 0].sonProjectList[arr[1] - 0];
@@ -382,13 +413,13 @@
             id: Value.id,
             parentId: data.itemList[lastIndex].id,
           };
-          this.$emit('change', options);
+          emit('change', options);
 
           const options1 = {
             id: Value.id,
             parentId: 0,
           };
-          this.$emit('change', options1);
+          emit('change', options1);
         }
         return;
       }
@@ -439,7 +470,7 @@
         confirm
       }) => {
         if (confirm) {
-          await this.$u.api.delProject(id);
+          await uni.$u.api.delProject(id);
           let flag_index = 0;
           data.itemList.forEach((item, index) => {
             if (item.id == id) {

From 489e218f6cbdd112498b5f288d7f0ef42b659ed9 Mon Sep 17 00:00:00 2001
From: xuesinan <1404152492@qq.com>
Date: Fri, 14 Jan 2022 09:33:43 +0800
Subject: [PATCH 08/10] =?UTF-8?q?fix:=20=E5=AD=90=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E4=BC=A0=E5=8F=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                     | 5 ++++-
 components/Projects/Projects.vue | 8 +++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b85a90d..c7020c5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,9 +1,11 @@
-# 1.0.0 (2022-01-13)
+# 1.0.0 (2022-01-14)
 
 ### 🌟 新功能
 范围|描述|commitId
 --|--|--
  - | 表单验证 | [8f3bc1e](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8f3bc1e)
+ - | 插件的填写提交，编辑与删除 | [84390d5](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/84390d5)
+ - | 插件的填写与提交，修改与删除 | [d461252](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/d461252)
  - | 插件面板分开显示 | [fb5e86b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/fb5e86b)
  - | 登录、日历页小绿点、二级项目列表 | [e676cf0](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/e676cf0)
  - | 更新代码 | [392c8cc](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/392c8cc)
@@ -43,6 +45,7 @@
  - | 插件接口修改 | [53c6b90](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/53c6b90)
  - | 解决warning | [dcb0079](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/dcb0079)
  - | 删除多余的引入 | [050b12a](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/050b12a)
+ - | 上个提交导致的bug | [7524b24](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/7524b24)
  - | 时间轴任务 | [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)
diff --git a/components/Projects/Projects.vue b/components/Projects/Projects.vue
index edd0c07..240b15b 100644
--- a/components/Projects/Projects.vue
+++ b/components/Projects/Projects.vue
@@ -4,7 +4,9 @@
 	</view>
 </template>
 
-<script setup>
+<script setup>
+  const emit = defineEmits(['getProjects']);
+  
 	function change(options) {
 		if (options instanceof Array) {
 			let projectIdList = [];
@@ -32,7 +34,7 @@
 			console.log('error: ', error);
 			uni.$ui.showToast(error.msg || '排序修改失败');
 		}
-		this.$emit('getProjects');
+		emit('getProjects');
 	}
 
 	/**
@@ -49,7 +51,7 @@
 			console.error('error: ', error);
 			uni.$ui.showToast(error.msg || '排序修改失败');
 		}
-		this.$emit('getProjects');
+		emit('getProjects');
 	}
 </script>
 

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 09/10] =?UTF-8?q?feat:=20=E8=8E=B7=E5=8F=96=E6=89=8B?=
 =?UTF-8?q?=E6=9C=BA=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;
 	};

From aab6489113ce1863b9055a15b340ac5affdbd75b Mon Sep 17 00:00:00 2001
From: xuesinan <1404152492@qq.com>
Date: Fri, 14 Jan 2022 14:32:03 +0800
Subject: [PATCH 10/10] =?UTF-8?q?feat:=20=E6=9C=AA=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E8=B0=83=E7=94=A8=E9=A1=B9=E7=9B=AE=E5=88=97=E8=A1=A8=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                  |  2 +-
 CHANGELOG.md             |  1 +
 manifest.json            |  8 +++++++-
 pages.json               |  3 ++-
 pages/index/index.vue    | 33 ++++++++++++++++++---------------
 utils/cacheAndRequest.js | 37 ++++++++++++++++++++++++-------------
 6 files changed, 53 insertions(+), 31 deletions(-)

diff --git a/App.vue b/App.vue
index eeb3868..d38a695 100644
--- a/App.vue
+++ b/App.vue
@@ -14,7 +14,7 @@ export default {
 
   async onLaunch(options) {
     // this.loadTheme();
-    console.log('onLaunch options: ', options);
+    // console.log('onLaunch options: ', options);
     this.checkNetwork(); // 监听网络状态
     this.getSystemInfo(); // 获取系统设备信息、
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a2d7530..866d6e1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@
  - | 插件面板分开显示 | [fb5e86b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/fb5e86b)
  - | 登录、日历页小绿点、二级项目列表 | [e676cf0](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/e676cf0)
  - | 更新代码 | [392c8cc](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/392c8cc)
+ - | 获取手机唯一码 | [3f60cf8](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/3f60cf8)
  - | 日历页首页 | [561c8e6](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/561c8e6)
  - | 日历页添加 | [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)
diff --git a/manifest.json b/manifest.json
index 2c13e4f..46b8281 100644
--- a/manifest.json
+++ b/manifest.json
@@ -77,6 +77,9 @@
                         "spotlight@3x" : "unpackage/res/icons/120x120.png"
                     }
                 }
+            },
+            "splashscreen" : {
+                "androidStyle" : "common"
             }
         }
     },
@@ -102,5 +105,8 @@
     "uniStatistics" : {
         "enable" : false
     },
-    "vueVersion" : "3"
+    "vueVersion" : "3",
+    "h5" : {
+        "title" : "时物链"
+    }
 }
diff --git a/pages.json b/pages.json
index 611bd70..6671771 100644
--- a/pages.json
+++ b/pages.json
@@ -3,7 +3,8 @@
 		{
 			"path": "pages/index/index",
 			"style": {
-				"navigationBarText": "TALL"
+				"navigationBarText": "TALL",
+				"navigationStyle": "custom"
 			}
 		},
 		{
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 66aa3e2..0869824 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,13 +1,15 @@
 <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">
+    <view class="relative">
+    <!-- <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>
+    </view>
+
+    <u-button class="mt-4" @click="toLogin">登录</u-button>
     <!-- 项目列表 -->
     <Projects @getProjects="getProjects" class="flex-1 overflow-y-auto" />
 
@@ -96,18 +98,19 @@
   };
 
   // 监听触摸滑动 切换日历的模式 月/周
-  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 onMove(event) {
+  //   const y = event.changedTouches[0].pageY;
+  //   const prevY = 0;
+  //   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({
diff --git a/utils/cacheAndRequest.js b/utils/cacheAndRequest.js
index 9709027..b0938d4 100644
--- a/utils/cacheAndRequest.js
+++ b/utils/cacheAndRequest.js
@@ -22,6 +22,7 @@ export default {
    */
   getProjects(startTime, endTime, fn) {
     let remote = false;
+    
     if (store.getters.useStorage) {
       // 有缓存 且 服务端数据未返回 就先返回缓存
       uni.$cache
@@ -31,19 +32,29 @@ export default {
         })
         .catch(err => !remote && fn(err));
     }
-    
-    waitTokenRequest(() => {
-      // 拿到api数据后 再用api的数据
-      uni.$u.api
-        .getProjects(startTime, endTime)
-        .then(data => {
-          remote = true;
-          fn(null, data);
-          // 存api到cache里
-          uni.$cache.putProjects(data);
-        })
-        .catch(err => fn(err));
-    });
+
+    uni.$u.api
+      .getProjects(startTime, endTime)
+      .then(data => {
+        remote = true;
+        fn(null, data);
+        // 存api到cache里
+        uni.$cache.putProjects(data);
+      })
+      .catch(err => fn(err));
+
+    // waitTokenRequest(() => {
+    //   // 拿到api数据后 再用api的数据
+    //   uni.$u.api
+    //     .getProjects(startTime, endTime)
+    //     .then(data => {
+    //       remote = true;
+    //       fn(null, data);
+    //       // 存api到cache里
+    //       uni.$cache.putProjects(data);
+    //     })
+    //     .catch(err => fn(err));
+    // });
   },
 
   /**