github/dootask
1
0
Fork 0
mirror of https://github.com/kuaifan/dootask.git synced 2025-12-12 03:01:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

no message

Browse Source
This commit is contained in:
kuaifan 2025-04-22 12:35:41 +08:00
parent ae5ccfd775
commit ec8e144655
6 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Api/UsersController.php
View File

@ -2555,7 +2555,7 @@ class UsersController extends AbstractController
{ {
User::auth(); User::auth();
// //
$detail = Base::json2array(Request::input('detail')); $detail = Request::input();
$detail = array_intersect_key($detail, array_flip([ 'device_name', 'app_brand', 'app_model','app_os'])); $detail = array_intersect_key($detail, array_flip([ 'device_name', 'app_brand', 'app_model','app_os']));
if (empty($detail)) { if (empty($detail)) {
return Base::retError('参数错误'); return Base::retError('参数错误');

23
resources/assets/js/components/DrawerOverlay/index.vue
View File

@ -9,7 +9,7 @@
:transition-names="[$A.isAndroid() ? '' : `drawer-slide-${transitionName}`, '']" :transition-names="[$A.isAndroid() ? '' : `drawer-slide-${transitionName}`, '']"
:beforeClose="beforeClose" :beforeClose="beforeClose"
fullscreen fullscreen
:class-name="modalClass"> :class-name="className">
<div v-if="isFullscreen" class="overlay-body"> <div v-if="isFullscreen" class="overlay-body">
<slot/> <slot/>
</div> </div>
@ -61,7 +61,10 @@ export default {
type: Boolean, type: Boolean,
default: true default: true
}, },
className: { drawerClass: {
type: String
},
modalClass: {
type: String type: String
}, },
beforeClose: Function beforeClose: Function
@ -87,16 +90,22 @@ export default {
transitionName(){ transitionName(){
return this.isFullscreen ? 'bottom' : this.placement return this.isFullscreen ? 'bottom' : this.placement
}, },
modalClass() { className() {
const array = []
if (this.isFullscreen) { if (this.isFullscreen) {
return "common-drawer-modal" array.push("common-drawer-modal")
if (this.modalClass) {
array.push(this.modalClass)
} }
if (this.className) {
return `common-drawer-overlay ${this.className} ${this.transitionName}`
} else { } else {
return `common-drawer-overlay ${this.transitionName}` array.push("common-drawer-overlay")
if (this.drawerClass) {
array.push(this.drawerClass)
} }
array.push(this.transitionName)
} }
return array.join(" ");
},
}, },
mounted() { mounted() {
this.isFullscreen = this.windowWidth < 500 && this.placement != 'bottom' this.isFullscreen = this.windowWidth < 500 && this.placement != 'bottom'

4
resources/assets/js/pages/manage/components/DialogWrapper.vue
View File

@ -566,7 +566,7 @@
<DrawerOverlay <DrawerOverlay
v-model="replyListShow" v-model="replyListShow"
placement="right" placement="right"
class-name="dialog-wrapper-drawer-list" modal-class="dialog-wrapper-modal-list"
:size="500"> :size="500">
<DialogWrapper <DialogWrapper
v-if="replyListShow" v-if="replyListShow"
@ -602,7 +602,7 @@
<DrawerOverlay <DrawerOverlay
v-model="todoViewShow" v-model="todoViewShow"
placement="right" placement="right"
class-name="dialog-wrapper-drawer-list" modal-class="dialog-wrapper-modal-list"
:size="500"> :size="500">
<div class="dialog-wrapper inde-list"> <div class="dialog-wrapper inde-list">
<div class="dialog-nav"> <div class="dialog-nav">

7
resources/assets/sass/pages/components/dialog-wrapper.scss vendored
View File

@ -2467,9 +2467,10 @@ body:not(.window-touch) {
} }
} }
.dialog-wrapper-drawer-list { .dialog-wrapper-modal-list {
position: absolute !important; .ivu-modal-fullscreen {
overflow: hidden !important; background-color: #f8f8f8;
}
} }
@keyframes head-box-loading-animation { @keyframes head-box-loading-animation {

2
resources/mobile

@ -1 +1 @@
Subproject commit 5596d130c5f73f0b8143a3734261f5d3df0c6410 Subproject commit 65c178f6d6994922bd0a9e05ef79c9655a3dbb49