Browse Source

perf: 解决冲突

project
song 4 years ago
parent
commit
7b0a54876e
  1. 1
      CHANGELOG.md
  2. 4
      src/components/Title/Title.vue
  3. 64
      src/components/Title/components/NewProjects.vue

1
CHANGELOG.md

@ -23,6 +23,7 @@
- | 任务状态时间显示 | [56f5183](https://dd.tall.wiki/gitea/wally/tall-mui-3-project/commits/56f5183)
- | 任务进行中状态数字 | [27b7326](https://dd.tall.wiki/gitea/wally/tall-mui-3-project/commits/27b7326)
- | 全局插件及默认插件位置修改 | [6c80d08](https://dd.tall.wiki/gitea/wally/tall-mui-3-project/commits/6c80d08)
- | 分享项目和点击分享的项目链接 | [032d83c](https://dd.tall.wiki/gitea/wally/tall-mui-3-project/commits/032d83c)
- | 向右箭头图标变化 | [8e9ca55](https://dd.tall.wiki/gitea/wally/tall-mui-3-project/commits/8e9ca55)
- | 字体大小更改 | [82cfdd4](https://dd.tall.wiki/gitea/wally/tall-mui-3-project/commits/82cfdd4)
- | 存token | [b8a178d](https://dd.tall.wiki/gitea/wally/tall-mui-3-project/commits/b8a178d)

4
src/components/Title/Title.vue

@ -21,7 +21,7 @@
<view class="popup border shadow-md" v-if="show">
<view class="flex pb-3 border-b-1">
<u-icon name="plus-circle" size="36" style="margin: 0 15px 3px 0"></u-icon>
<view @click="newprojects">新建项目</view>
<view @click="newprojects">新建任务</view>
</view>
<view class="flex pt-3">
<u-icon name="share" size="32" style="margin: 0 15px 3px 0"></u-icon>
@ -133,9 +133,9 @@ export default {
position: fixed;
left: 50%;
top: 50%;
transform: translate(-50%, -50%);
z-index: 33;
border-radius: 5px;
transform: translate(-50%, -50%);
}
.popup {

64
src/components/Title/components/NewProjects.vue

@ -1,7 +1,8 @@
<template>
<div style="padding: 15px; width: 330px">
<div class="new-projects-box" :style="{ height: arrow ? '330px' : '580px' }">
<div class="form">
<!-- 项目名称 -->
<view class="popupTitle flex justify-center">新建任务</view>
<div class="flex items-center">
<div>名称</div>
<u-input v-model="nameValue" :type="type" :border="border" />
@ -14,12 +15,12 @@
<!-- 多选框 -->
<div class="flex justify-between items-center">
<div>负责人</div>
<div class="" label="负责人" style="width: 85%">
<div label="负责人" style="width: 85%">
<u-dropdown ref="uDropdown">
<u-dropdown-item :title="dropTitle" style="border: none">
<view class="slot-content" style="background-color: #ffffff; height: auto">
<u-dropdown-item :title="dropTitle">
<view class="slot-content bg-white">
<div
class="multiple-choice flex flex-row justify-between"
class="multiple-choice flex flex-row justify-between mb-1"
v-for="(option, optionIndex) in options"
:key="optionIndex"
@click="change(optionIndex)"
@ -27,7 +28,6 @@
<view v-model="option.value">{{ option.label }}</view>
<u-icon v-if="option.dropdownShow" name="checkbox-mark" color="#2979ff" size="28"></u-icon>
</div>
<u-button type="primary" @click="closeDropdown">确定</u-button>
</view>
</u-dropdown-item>
</u-dropdown>
@ -46,21 +46,14 @@
<u-input v-model="decripeValue" :type="type" :border="border" />
</div>
<!-- 所属项目 -->
<div class="flex items-center">
<div class="w flex items-center">
<div>所属项目</div>
<div class="" style="position: relative; background: #fff">
<u-input v-model="projectValue" :type="type" :border="border" @click="isProjectShow" />
<div v-if="projectShow" class="projectBelong" @blur="projectShow = false">
<div v-for="project in projects" :key="project">
{{ project }}
</div>
</div>
</div>
<div class="xiangmu" style="position: relative; background: #fff">当前项目</div>
</div>
<!-- 所属任务 -->
<div class="flex items-center">
<div class="w flex items-center">
<div>所属任务</div>
<u-input v-model="taskValue" :type="type" :border="border" />
<div class="renwu">当前任务</div>
</div>
<!-- 上道工序 -->
<div class="flex items-center">
@ -73,9 +66,9 @@
<div class="" label="检查人" style="width: 85%">
<u-dropdown ref="dropdown">
<u-dropdown-item :title="secondDropTitle" style="border: none">
<view class="slot-content" style="background-color: #ffffff; height: auto">
<view class="slot-content bg-white">
<div
class="multiple-choice flex flex-row justify-between"
class="mb-1 multiple-choice flex flex-row justify-between"
v-for="(checkoutOption, Index) in checkoutOptions"
:key="Index"
@click="choose(Index)"
@ -83,7 +76,6 @@
<view v-model="checkoutOption.value">{{ checkoutOption.label }}</view>
<u-icon v-if="checkoutOption.dropdownShow" name="checkbox-mark" color="#2979ff" size="28"></u-icon>
</div>
<u-button type="primary" @click="dropdownClosed">确定</u-button>
</view>
</u-dropdown-item>
</u-dropdown>
@ -100,7 +92,10 @@
<u-input style="border-bottom: 1px solid #dcdfe6" placeholder="交付物名称2" :type="type" :border="border" />
</div>
</div>
<u-button class="btn flex justify-center" type="primary" shape="circle" size="medium">提交</u-button>
<div class="flex justify-between items-center btns">
<u-button class="btn flex justify-center" type="primary" shape="circle" size="medium" @click="$emit('closeMask')">提交</u-button>
<u-button class="btn flex justify-center" shape="circle" size="medium" @click="$emit('closeMask')">取消</u-button>
</div>
</div>
</div>
</template>
@ -284,6 +279,7 @@ export default {
/deep/.u-input--border {
border: none;
border-radius: 0;
}
/deep/.u-dropdown__menu__item > uni-view {
border: none !important;
@ -295,4 +291,30 @@ export default {
.btn {
margin-top: 20px;
}
.popupTitle {
font-size: 16px;
font-weight: bold;
margin-bottom: 5px;
}
.new-projects-box {
margin-top: 20px;
padding: 15px;
width: 330px;
overflow: hidden;
}
.btns {
padding: 0 30px;
}
.xiangmu {
margin-left: 11px;
color: rgb(192, 196, 204);
}
.renwu {
margin-left: 11px;
color: rgb(192, 196, 204);
}
.w {
width: 300px;
height: 39px;
}
</style>

Loading…
Cancel
Save