From 3b430be6ed43e9e246815e9004d949bdb64b2991 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E4=B8=91=E8=B7=AF=E4=BA=BA?= <2278757482@qq.com>
Date: Tue, 25 May 2021 11:51:59 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=85=B3=E9=97=AD=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=99=A8=E6=97=B6=EF=BC=8C=E4=B8=8D=E8=A7=A6?=
 =?UTF-8?q?=E5=8F=91=E6=95=B0=E6=8D=AE=E5=9B=9E=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../vue-element-admin/components/FilesSelect/index.vue    | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/app/Modules/Admin/Resources/vue-element-admin/components/FilesSelect/index.vue b/app/Modules/Admin/Resources/vue-element-admin/components/FilesSelect/index.vue
index a18dc8d..0f83eaa 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/components/FilesSelect/index.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/components/FilesSelect/index.vue
@@ -298,12 +298,7 @@
                 })
             },
             onSelectGroup(val) {
-                console.log(val);
-
                 this.select_group_id = this.listQuery.group_id = val.group_id;
-
-                console.log(this.select_group_id);
-
                 this.select_group_name = val.group_name;
                 this.selectedIndexs = [];
                 this.initData();
@@ -432,8 +427,7 @@
             },
             // 弹窗关闭时
             closeHandle() {
-                console.log(12312132)
-                this.$emit('handleSubmit', []);
+                // this.$emit('handleSubmit', []);
                 this.visible = false;
 
                 this.fileList = [];
-- 
Gitee


From a990635f202d42c5ee882cccbc83e9df1d6814d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E4=B8=91=E8=B7=AF=E4=BA=BA?= <2278757482@qq.com>
Date: Tue, 25 May 2021 12:08:37 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E5=A4=B4?=
 =?UTF-8?q?=E5=83=8F=EF=BC=8C=E9=80=9A=E8=BF=87=E6=96=87=E4=BB=B6=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E5=99=A8=E8=8E=B7=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/admins/components/detail.vue        | 70 ++++++-------------
 app/Modules/Admin/Services/AuthService.php    |  1 +
 2 files changed, 23 insertions(+), 48 deletions(-)

diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/admins/components/detail.vue b/app/Modules/Admin/Resources/vue-element-admin/views/admins/components/detail.vue
index e24d108..837fd7a 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/views/admins/components/detail.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/views/admins/components/detail.vue
@@ -21,31 +21,16 @@
                 />
             </el-form-item>
             <el-form-item label="头像：" prop="admin_head">
-                <pan-thumb :image="image_url"/>
+                <pan-thumb :image="form.admin_head"/>
 
                 <el-button
-                    id="img-btn"
                     type="primary"
                     icon="el-icon-upload"
-                    @click="show=true"
+                    style="position: absolute;bottom: 15px;margin-left: 40px;"
+                    @click="openSelectFiles"
                 >
-                    头像
+                    选择图标
                 </el-button>
-
-                <my-upload
-                        v-model="show"
-                        img-format="png"
-                        :size="size"
-                        :width="50"
-                        :height="50"
-                        lang-type="zh"
-                        :no-rotate="false"
-                        field="file"
-                        :url="upload_url"
-                        @crop-success="cropSuccess"
-                        @crop-upload-success="cropUploadSuccess"
-                        @crop-upload-fail="cropUploadFail"
-                />
             </el-form-item>
             <el-form-item label="密码：">
                 <el-input v-model="form.password" placeholder="登录密码"/>
@@ -82,17 +67,17 @@
             <el-button type="danger" @click="close">取 消</el-button>
             <el-button type="primary" @click="save">确 定</el-button>
         </div>
+        <file-select v-if="show_files" ref="file" :batch_select="false" @handleSubmit="selectImageSubmit" />
     </el-dialog>
 </template>
 
 <script>
     import {create, update} from '@/api/admins';
-    import {getUploadUrl} from '@/api/common';
     import {validEmail} from '@/utils/validate';
     import {getRolesSelect} from '@/api/admin_roles';
 
-    import myUpload from '@/components/Uploads/image/index';
     import PanThumb from '@/components/PanThumb';
+    import FileSelect from '@/components/FilesSelect/index';
 
     // 定义一个全局的变量，谁用谁知道
     var _validEmail = (rule, value, callback) => {
@@ -106,8 +91,8 @@
     export default {
         name: '',
         components: {
-            'my-upload': myUpload,
-            PanThumb
+            PanThumb,
+            FileSelect
         },
         data() {
             return {
@@ -147,42 +132,33 @@
                 // 角色列表
                 roles: [],
 
-                // 图片上传
-                show: false,
-                size: 2.1,
-
-                // 图片上传
-                upload_url: '',
-                image_url: '',
+                // 是否展示图片选择器
+                show_files:false,
             }
         },
         created() {
-            this.upload_url = getUploadUrl();
             // 获取菜单列表
             this.getRolesSelect();
         },
         methods: {
+            // 打开文件选择器
+            openSelectFiles(){
+                this.show_files = true;
+                this.$nextTick(() => {
+                    this.$refs.file.init();
+                });
+            },
+            // 选择指定文件之后，点击’确认‘，获取到的文件信息
+            selectImageSubmit(e){
+                this.form.admin_head = e.file_url;
+            },
             // 获取菜单列表
             async getRolesSelect() {
                 const res = await getRolesSelect();
                 this.roles = res.data;
             },
             toggleShow() {
-                this.show = !this.show
-            },
-            cropSuccess(imgDataUrl, field) {
-                // console.log('-------- crop success --------', imgDataUrl, field)
-            },
-            // 上传成功回调
-            cropUploadSuccess(result, field) {
-                this.image_url = result.path_url;
-                this.form.admin_head = result.data;
-            },
-            // 上传失败回调
-            cropUploadFail(status, field) {
-                // console.log('-------- upload fail --------');
-                console.log('上传失败状态' + status);
-                console.log('field: ' + field)
+                this.show = !this.show;
             },
             showEdit(row) {
                 const detail = Object.assign({}, row);
@@ -196,8 +172,6 @@
                             this.form.role_ids.push(detail.roles[key].role_id);
                         }
                     }
-                    // 设置展示的图标
-                    this.image_url = this.form.admin_head;
                 }
                 this.dialogFormVisible = true
             },
diff --git a/app/Modules/Admin/Services/AuthService.php b/app/Modules/Admin/Services/AuthService.php
index a7058c7..9aebc8a 100644
--- a/app/Modules/Admin/Services/AuthService.php
+++ b/app/Modules/Admin/Services/AuthService.php
@@ -7,6 +7,7 @@ use App\Exceptions\Admin\AuthTokenException;
 use App\Exceptions\InvalidRequestException;
 use App\Modules\Admin\Entities\Log\AdminLoginLog;
 use App\Modules\Admin\Entities\Rabc\Admin;
+use App\Modules\Admin\Entities\Rabc\AdminMenu;
 use App\Services\Service;
 use Illuminate\Support\Facades\Auth;
 
-- 
Gitee