diff --git a/app/Http/Controllers/Api/UsersController.php b/app/Http/Controllers/Api/UsersController.php index 6aa44aadb..cfae1001d 100755 --- a/app/Http/Controllers/Api/UsersController.php +++ b/app/Http/Controllers/Api/UsersController.php @@ -2555,7 +2555,7 @@ class UsersController extends AbstractController { 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'])); if (empty($detail)) { return Base::retError('参数错误'); diff --git a/resources/assets/js/components/DrawerOverlay/index.vue b/resources/assets/js/components/DrawerOverlay/index.vue index 58f1a36dc..6c7c57077 100644 --- a/resources/assets/js/components/DrawerOverlay/index.vue +++ b/resources/assets/js/components/DrawerOverlay/index.vue @@ -9,7 +9,7 @@ :transition-names="[$A.isAndroid() ? '' : `drawer-slide-${transitionName}`, '']" :beforeClose="beforeClose" fullscreen - :class-name="modalClass"> + :class-name="className">
@@ -61,7 +61,10 @@ export default { type: Boolean, default: true }, - className: { + drawerClass: { + type: String + }, + modalClass: { type: String }, beforeClose: Function @@ -87,16 +90,22 @@ export default { transitionName(){ return this.isFullscreen ? 'bottom' : this.placement }, - modalClass() { + className() { + const array = [] if (this.isFullscreen) { - return "common-drawer-modal" - } - if (this.className) { - return `common-drawer-overlay ${this.className} ${this.transitionName}` + array.push("common-drawer-modal") + if (this.modalClass) { + array.push(this.modalClass) + } } 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() { this.isFullscreen = this.windowWidth < 500 && this.placement != 'bottom' diff --git a/resources/assets/js/pages/manage/approve/setting.vue b/resources/assets/js/pages/manage/approve/setting.vue index 55e5d0f7b..7b880e654 100644 --- a/resources/assets/js/pages/manage/approve/setting.vue +++ b/resources/assets/js/pages/manage/approve/setting.vue @@ -21,7 +21,7 @@ -