diff --git a/components/cs-emty/index.vue b/components/cs-emty/index.vue index fb7cf69..ea92fe0 100644 --- a/components/cs-emty/index.vue +++ b/components/cs-emty/index.vue @@ -1,5 +1,5 @@ diff --git a/sub/invite/addEnterprise.vue b/sub/invite/addEnterprise.vue index c7626a0..4c3a19a 100644 --- a/sub/invite/addEnterprise.vue +++ b/sub/invite/addEnterprise.vue @@ -499,6 +499,7 @@ export default { } }) const load = this.$util.loading('上传中...') + if (this.form.id) { updateEnterprise(data).then(res => { load.close() @@ -552,6 +553,13 @@ export default { }) return false } + if (this.form.photo.length == 0) { + uni.showToast({ + icon: 'none', + title: '请上传企业照片' + }) + return false + } return true }, /** diff --git a/sub/task/detail.vue b/sub/task/detail.vue index b70eb8e..4953d1e 100644 --- a/sub/task/detail.vue +++ b/sub/task/detail.vue @@ -1,721 +1,740 @@ + .detail-container { + position: relative; + color: $cs-color-grey; + + .box { + margin: 12px; + background-color: #fff; + border-radius: $cs-border-radius; + padding: 16px; + } + + .detail { + display: flex; + flex-flow: column nowrap; + gap: 12px; + position: relative; + overflow: hidden; + + .audit { + position: absolute; + right: 0; + top: 0; + transform: translateX(58rpx) translateY(24rpx) rotateZ(45deg); + transform-origin: 50% 50%; + } + + .file-list { + border-radius: 4px; + background: var(--LightMode-Grey-Grey-100, #F9F9F9); + padding: 8rpx 16rpx; + display: flex; + flex-wrap: wrap; + gap: 24rpx; + width: 100%; + + .file { + display: flex; + flex-flow:row nowarp; + gap:8rpx; + .name { + color: var(--LightMode-Grey-Grey-900, #071437); + font-family: "PingFang SC"; + font-size: 24rpx; + font-style: normal; + font-weight: 400; + line-height: normal; + text-decoration-line: underline; + text-decoration-style: solid; + text-decoration-skip-ink: auto; + text-decoration-thickness: auto; + text-underline-offset: auto; + text-underline-position: from-font; + } + } + } + } + + .record { + background-color: #fff; + display: flex; + padding: 24rpx 32rpx; + align-items: center; + border-radius: var(--Number-8px, 8px); + border: 2rpx solid var(--LightMode-Grey-Grey-100, #f9f9f9); + margin: 24rpx; + margin-top: 0; + position: relative; + overflow: hidden; + + .audit { + position: absolute; + right: 0; + top: 0; + transform-origin: 50% 50%; + transform: translateX(64rpx) translateY(18rpx) rotateZ(45deg); + } + + .select { + width: 44rpx; + height: 44rpx; + border: 4rpx solid $cs-color-main; + border-radius: 12rpx; + display: flex; + align-items: center; + justify-content: center; + transition: 0.2s all; + margin-right: 32rpx; + } + + .disable { + width: 44rpx; + height: 44rpx; + border: 4rpx solid #dbdfe9; + margin-right: 32rpx; + border-radius: 100%; + position: relative; + + &::after { + content: ''; + position: absolute; + inset: 0; + border-left: 4rpx solid #dbdfe9; + transform-origin: 0 50%; + transform: translateX(calc(50% - 2rpx)) rotateZ(45deg); + } + } + + .isSelect { + background-color: $cs-color-main; + } + + .info { + font-size: 26rpx; + + .name { + font-size: 32rpx; + font-weight: 600; + color: #071437; + margin-bottom: 8rpx; + white-space: nowrap; + text-overflow: ellipsis; + width: 480rpx; + overflow: hidden; + } + } + + &:active { + background-color: $cs-color-touch; + } + } + + .btn-box { + width: 100%; + display: flex; + align-items: center; + justify-content: center; + padding-bottom: 30px; + position: fixed; + bottom: 0; + left: 0; + } + + .confirm-btn { + background-color: $cs-color-main; + padding: 12px 40px; + color: #fff; + font-size: 16px; + font-weight: 600; + border-radius: 120px; + } + + .header { + display: flex; + flex-flow: column nowrap; + justify-content: center; + align-items: center; + gap: 4px; + + .row-1 { + font-size: 16px; + font-weight: 600; + color: #071437; + + .num { + color: $cs-color-main; + padding: 0 4px; + } + } + + .row-2 { + color: $cs-color-grey; + } + } + + .staff-list { + width: 70vw; + display: flex; + flex-flow: row wrap; + gap: 12px; + max-height: 30vh; + overflow-y: scroll; + + .staff { + width: calc(50% - 6px); + padding: 12px; + border-radius: 6px; + border: 1px solid var(--select-color, #dbdfe9); + position: relative; + gap: 8px; + display: flex; + + .info { + .name { + font-size: 30rpx; + font-weight: bold; + } + + .dept { + color: $cs-color-grey; + } + } + + .isSelect { + position: absolute; + right: 0; + top: 0; + width: 30px; + height: 30px; + background-image: linear-gradient(45deg, + rgba(255, 255, 255, 0) 50%, + var(--select-color, #f1f1f4) 50%); + display: flex; + justify-content: flex-end; + align-items: flex-start; + } + } + } + } + + .options-container { + overflow: hidden; + margin: 12px; + border-radius: 8px; + transition: 0.1s all; + display: flex; + padding: 0 12px; + flex-flow: row nowrap; + justify-content: center; + align-items: center; + background-color: #fff; + border-bottom: 1px solid #f1f1f4; + color: #071437; + + ::v-deep .van-dropdown-menu { + background-color: transparent; + box-shadow: none; + --dropdown-menu-title-font-size: 13px; + --dropdown-menu-title-text-color: #071437; + + .van-dropdown-menu__item { + flex: 0; + + .van-dropdown-menu__title { + width: 80px; + } + } + } + } + + .isTop { + margin: 12px 0; + border-radius: 0px; + } + + ::v-deep .u-popup__content { + border-radius: 32rpx; + } + \ No newline at end of file