feat: 删除项目

CHANGELOG.md

@@ -1,4 +1,4 @@
-# 1.0.0 (2022-03-22)
+# 1.0.0 (2022-03-23)
 
 ### 🌟 新功能
 范围|描述|commitId
@@ -56,6 +56,7 @@
  - | 手机号登录 | [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)
+ - | 首页下拉刷新 | [fb65511](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/fb65511)
  - | 刷新页面store数据清空 | [17869db](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/17869db)
  - | 刷新token重新运行api | [02fb4bf](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/02fb4bf)
  - | 添加 timeline | [72dad2b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/72dad2b)

apis/tall.js

@@ -39,5 +39,5 @@ export function setupTall(app) {
 	// 设置项目父子结构
 	uni.$u.api.setProjectRelation = params => uni.$u.post(`${tall}/project/setProjectRelation`, params);
 	// 删除某个项目
-	uni.$u.api.delProject = projectId => uni.$u.post(`${tall}/project/deleteProject`, { projectId });
+	uni.$u.api.delProject = (projectId, url) => uni.$u.post(`${url}/tall/project/delete`, { projectId });
 }

components/PrettyExchange/PrettyExchange.vue

@@ -261,7 +261,7 @@ function actionFun(obj) {
 
   if (action === '删除') {
     data.changeEvent = false;
-    delProject(obj.projectId);
+    delProject(obj.projectId, obj.url);
   }
 
   if (action === '导出') {
@@ -526,14 +526,14 @@ function findOverIndex(posY) {
 }
 
 // 删除项目
-function delProject(id) {
+function delProject(id, url) {
   uni.showModal({
     title: '',
     content: '是否删除项目？',
     showCancel: true,
     success: async ({ confirm }) => {
       if (confirm) {
-        await uni.$u.api.delProject(id);
+        await uni.$u.api.delProject(id, url);
         let flag_index = 0;
         data.itemList.forEach((item, index) => {
           if (item.id == id) {

components/Projects/ProjectItem.vue

@@ -5,13 +5,13 @@
       <u-icon @click="openMenu(item, index)" class="mover" name="https://www.tall.wiki/staticrec/drag.svg" size="48"></u-icon>
 
       <view @click="openProject(item)" class="flex-1 px-3">
-        <view class="flex items-center mb-1">
+        <view class="flex items-center" :class="{'mb-1': index > 0}">
           <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  v-if="index > 0" 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>
@@ -166,9 +166,9 @@ function openMenu(project, index) {
 .workbench-btn {
   margin-right: 10px;
   width: 80px;
-  height: 36px;
+  height: 30px;
-  line-height: 36px;
+  line-height: 30px;
-  border-radius: 18px;
+  border-radius: 15px;
   overflow: hidden;
   border: 1px solid #2b85e4;
   background-color: #1890ff;