Browse Source

Merge pull request 'del' (#49) from del into develop

Reviewed-on: https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/pulls/49
tall
song 4 years ago
parent
commit
29d8187f57
  1. 1
      .eslintignore
  2. 6
      CHANGELOG.md
  3. 2
      src/apis/tall.js
  4. 4
      src/common/styles/app.scss
  5. 39
      src/components/PrettyExchange/PrettyExchange.vue
  6. 14
      src/components/Projects/ProjectItem.vue

1
.eslintignore

@ -10,3 +10,4 @@ postcss.config.js
vue.config.js
src/common/styles/index.css
src/pages.json
manifest.json

6
CHANGELOG.md

@ -23,8 +23,8 @@
- | 上传逻辑变化 | 3ff1dc2
- | 任务状态时间显示 | 56f5183
- | 任务进行中状态数字 | 27b7326
- | 修改小程序id | 4206bf2
- | 全局插件及默认插件位置修改 | 6c80d08
- | 删除项目 | 00b886c
- | 升级版本v3.1.0;tailwindcss添加class | 9ef05e1
- | 向右箭头图标变化 | 8e9ca55
- | 字体大小更改 | 82cfdd4
@ -55,7 +55,6 @@
- | 细节调整,添加project-webview | 4d9050b
- | 绑定手机号 | 52e0352
- | 缓存修改 | 63e1f0d
- | 获取用户收取那,提交用户信息 | a3c54f1
- | 角色栏实现 | 94cd671
- | 设置小红点 | 9316bcb
- | 距调整pc端 | 5069aa1
@ -116,6 +115,7 @@
- | 修改小红点传参 | 87b20fd
- | 修改报错 | 531c14d
- | 修改接口路径 | df6acf2
- | 修改样式 | f0ddc90
- | 修改角色栏组件 | a54c601
- | 切换到默认项目角色没有激活状态的bug | 438d448
- | 切换日历时查询小红点 | 7091789
@ -195,8 +195,8 @@
- | 修改代码格式 | 14123d7
- | 修改定期任务骨架屏高度 | 909a734
- | 小红点api缓存修改 | e992343
- | 提交本地代码 | e0cf2ed
- | 插件查询及展示 | 4dba770
- | 数据存储,避免重复调用接口 | d22308a
- | 整理代码 | 7a55315
- | 日历的更改 | 7353ac8
- | 测试接口 | 215e074

2
src/apis/tall.js

@ -41,6 +41,8 @@ const install = (Vue, vm) => {
vm.$u.api.setProjectSort = params => vm.$u.post(`${tall}/project/setProjectSort`, params);
// 设置项目父子结构
vm.$u.api.setProjectRelation = params => vm.$u.post(`${tall}/project/setProjectRelation`, params);
// 删除某个项目
vm.$u.api.delProject = projectId => vm.$u.post(`${tall}/project/deleteProject`, { projectId });
};
export default { install };

4
src/common/styles/app.scss

@ -1,3 +1,7 @@
.min-0 {
min-width: 0;
}
.flex-shrink-0 {
flex-shrink: 0;
}

39
src/components/PrettyExchange/PrettyExchange.vue

@ -35,7 +35,7 @@
<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">进行中</view>
<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">
@ -93,7 +93,7 @@
? '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"
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>
@ -200,7 +200,7 @@ export default {
},
methods: {
...mapMutations('project', ['setProjectItemShow']),
...mapMutations('project', ['setProjectItemShow', 'setProjects']),
//
openSubProject(length, index) {
this.setProjectItemShow({ index, show: this.itemList[index].show ? false : true });
@ -224,12 +224,18 @@ export default {
},
//
chooseAction(index) {
if (this.menuList[index].text === '排序') {
chooseAction(obj) {
let action = this.menuList[obj.index].text;
if (action === '排序') {
this.changeEvent = true;
this.$t.ui.showToast('请移动进行排序');
}
if (action === '删除') {
this.changeEvent = false;
this.delProject(obj.projectId);
}
if (this.showItemIndex !== undefined) {
this.setProjectItemShow({ index: this.showItemIndex, show: true });
}
@ -456,6 +462,29 @@ export default {
return 0;
}
},
//
delProject(id) {
uni.showModal({
title: '',
content: '是否删除项目?',
showCancel: true,
success: async ({ confirm }) => {
if (confirm) {
await this.$u.api.delProject(id);
let flag_index = 0;
this.itemList.forEach((item, index) => {
if (item.id == id) {
flag_index = index;
}
});
this.itemList.splice(flag_index, 1);
this.setProjects(this.itemList);
}
},
});
},
},
};
</script>

14
src/components/Projects/ProjectItem.vue

@ -8,7 +8,7 @@
<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">进行中</view>
<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">
@ -63,7 +63,7 @@
? '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"
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>
@ -76,7 +76,8 @@
</view>
</view>
<!-- 项目操作面板 -->
<u-action-sheet :list="menuList" :tips="tips" @click="$emit('chooseAction', $event)" v-model="showMenu"></u-action-sheet>
<!-- <u-action-sheet :list="menuList" :tips="tips" @click="$emit('chooseAction', $event)" v-model="showMenu"></u-action-sheet> -->
<u-action-sheet :list="menuList" :tips="tips" @click="chooseAction" v-model="showMenu"></u-action-sheet>
</view>
</template>
@ -109,6 +110,7 @@ export default {
show: false,
border: 'border border-blue-500 shadow rounded-md',
showBorder: false,
projectId: 0,
};
},
@ -132,8 +134,14 @@ export default {
*/
openMenu(project) {
this.showMenu = true;
this.projectId = project.id;
this.tips.text = project.name;
},
chooseAction(e) {
let data = { index: e, projectId: this.projectId };
this.$emit('chooseAction', data);
},
},
};
</script>

Loading…
Cancel
Save