Browse Source

fix: 修改样式

tall
xuesinan 4 years ago
parent
commit
f0ddc90285
  1. 1
      CHANGELOG.md
  2. 4
      src/common/styles/app.scss
  3. 7
      src/components/PrettyExchange/PrettyExchange.vue
  4. 6
      src/components/Projects/ProjectItem.vue

1
CHANGELOG.md

@ -27,6 +27,7 @@
- | 任务状态时间显示 | 56f5183 - | 任务状态时间显示 | 56f5183
- | 日常任务插件调整 | c1881f9 - | 日常任务插件调整 | c1881f9
- | 日历定位;合并 | ea3f937 - | 日历定位;合并 | ea3f937
- | 删除项目 | 00b886c
- | 上传逻辑变化 | 3ff1dc2 - | 上传逻辑变化 | 3ff1dc2
- | 设置小红点 | 9316bcb - | 设置小红点 | 9316bcb
- | 升级版本v3.1.0;tailwindcss添加class | 9ef05e1 - | 升级版本v3.1.0;tailwindcss添加class | 9ef05e1

4
src/common/styles/app.scss

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

7
src/components/PrettyExchange/PrettyExchange.vue

@ -35,7 +35,7 @@
<view class="flex items-center mb-1"> <view class="flex items-center mb-1">
<view class="mr-2">{{ item.name }}</view> <view class="mr-2">{{ item.name }}</view>
<!-- 状态 TODO:--> <!-- 状态 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>
<view class="flex items-center text-xs text-gray-400"> <view class="flex items-center text-xs text-gray-400">
@ -93,7 +93,7 @@
? 'text-red-400 bg-red-100' ? 'text-red-400 bg-red-100'
: 'text-gray-400 bg-gray-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 ? '暂停' : '已完成' }} {{ subItem.status === 0 ? '未开始' : subItem.status === 1 ? '进行中' : subItem.status === 2 ? '暂停' : '已完成' }}
</view> </view>
@ -225,8 +225,6 @@ export default {
// //
chooseAction(obj) { chooseAction(obj) {
console.log(obj, '操作返回的数据', this.menuList[obj.index].text);
let action = this.menuList[obj.index].text; let action = this.menuList[obj.index].text;
if (action === '排序') { if (action === '排序') {
this.changeEvent = true; this.changeEvent = true;
@ -235,7 +233,6 @@ export default {
if (action === '删除') { if (action === '删除') {
this.changeEvent = false; this.changeEvent = false;
// this.$t.ui.showToast('...');
this.delProject(obj.projectId); this.delProject(obj.projectId);
} }

6
src/components/Projects/ProjectItem.vue

@ -8,7 +8,7 @@
<view class="flex items-center mb-1"> <view class="flex items-center mb-1">
<view class="mr-2">{{ item.name }}</view> <view class="mr-2">{{ item.name }}</view>
<!-- 状态 TODO:--> <!-- 状态 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>
<view class="flex items-center text-xs text-gray-400"> <view class="flex items-center text-xs text-gray-400">
@ -63,7 +63,7 @@
? 'text-red-400 bg-red-100' ? 'text-red-400 bg-red-100'
: 'text-gray-400 bg-gray-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 ? '暂停' : '已完成' }} {{ subItem.status === 0 ? '未开始' : subItem.status === 1 ? '进行中' : subItem.status === 2 ? '暂停' : '已完成' }}
</view> </view>
@ -136,11 +136,9 @@ export default {
this.showMenu = true; this.showMenu = true;
this.projectId = project.id; this.projectId = project.id;
this.tips.text = project.name; this.tips.text = project.name;
console.log(this.projectId, '点击的项目');
}, },
chooseAction(e) { chooseAction(e) {
console.log(e, '点击操作');
let data = { index: e, projectId: this.projectId }; let data = { index: e, projectId: this.projectId };
this.$emit('chooseAction', data); this.$emit('chooseAction', data);
}, },

Loading…
Cancel
Save