From 3500482767f853e80beebb67970addc1f76a2ae5 Mon Sep 17 00:00:00 2001
From: pushuo <229102104@qq.com>
Date: Thu, 14 Jul 2022 14:37:33 +0800
Subject: [PATCH] wip

---
 public/build/beike/admin/css/design.css             |  6 ++++++
 resources/beike/admin/css/design/app.scss           |  8 +++++++-
 .../builder/component/image_selector.blade.php      | 13 +++++++++----
 .../views/pages/design/builder/index.blade.php      |  5 +++--
 .../views/pages/design/module/slideshow.blade.php   |  4 ++--
 5 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/public/build/beike/admin/css/design.css b/public/build/beike/admin/css/design.css
index 7ee22520..7b6b8611 100644
--- a/public/build/beike/admin/css/design.css
+++ b/public/build/beike/admin/css/design.css
@@ -227,6 +227,12 @@ body.page-design .pb-images-selector .pb-images-list .el-input-group__prepend {
   padding: 0 10px;
 }
 
+.file-manager-box .layui-layer-title {
+  background-color: #293042;
+  color: #fff;
+  border-color: #404e72;
+}
+
 .link-selector-wrap > .title {
   margin-bottom: 6px;
   position: relative;
diff --git a/resources/beike/admin/css/design/app.scss b/resources/beike/admin/css/design/app.scss
index bde61aad..e59741bb 100644
--- a/resources/beike/admin/css/design/app.scss
+++ b/resources/beike/admin/css/design/app.scss
@@ -266,7 +266,13 @@ body.page-design {
   }
 }
 
-
+.file-manager-box {
+  .layui-layer-title {
+    background-color: #293042;
+    color: #fff;
+    border-color: #404e72;
+  }
+}
 
 .link-selector-wrap {
   > .title {
diff --git a/resources/beike/admin/views/pages/design/builder/component/image_selector.blade.php b/resources/beike/admin/views/pages/design/builder/component/image_selector.blade.php
index b52e1444..9539bb86 100644
--- a/resources/beike/admin/views/pages/design/builder/component/image_selector.blade.php
+++ b/resources/beike/admin/views/pages/design/builder/component/image_selector.blade.php
@@ -2,11 +2,16 @@
     <div class="pb-image-selector">
       <el-tabs v-if="isLanguage" @tab-click="tabClick" value="language-{{ current_language_id() }}" :stretch="languages.length > 5 ? true : false" type="card" :class="languages.length <= 1 ? 'languages-a' : ''">
         <el-tab-pane v-for="(item, index) in languages" :key="index" :label="item.name" :name="'language-' + item.id">
-          <span slot="label" style="padding: 0 2px">@{{ item.name }}</span>
+          <span slot="label" style="padding: 0 4px; font-size: 12px">@{{ item.name }}</span>
 
           <div class="i18n-inner">
             <div class="img">
-              <img :src="type == 'image' ? thumbnail(value[item.id]) : 'image/video.png'" :id="'thumb-' + id" @click="selectButtonClicked">
+              {{-- <img :src="type == 'image' ? thumbnail(value[item.id]) : 'image/video.png'" :id="'thumb-' + id" @click="selectButtonClicked"> --}}
+              <el-image :src="type == 'image' ? thumbnail(value[item.id]) : 'image/video.png'" :id="'thumb-' + id" @click="selectButtonClicked">
+                <div slot="error" class="image-slot">
+                  <i class="el-icon-picture-outline"></i>
+                </div>
+              </el-image>
             </div>
             <div class="btns">
               <el-button type="primary" size="mini" plain @click="selectButtonClicked">选择</el-button>
@@ -96,6 +101,7 @@
             type: 2,
             title: '图片管理器',
             shadeClose: false,
+            skin: 'file-manager-box',
             scrollbar: false,
             shade: 0.8,
             area: ['80%', '80%'],
@@ -164,8 +170,7 @@
     }
 
     .pb-image-selector .i18n-inner {
-      margin-top: 5px;
-
+      /*margin-top: 5px;*/
       display: flex;
       align-items: center;
       background: whitesmoke;
diff --git a/resources/beike/admin/views/pages/design/builder/index.blade.php b/resources/beike/admin/views/pages/design/builder/index.blade.php
index 5f34a9d0..91885646 100644
--- a/resources/beike/admin/views/pages/design/builder/index.blade.php
+++ b/resources/beike/admin/views/pages/design/builder/index.blade.php
@@ -81,13 +81,13 @@
       data: {
         form: {
           modules: [
-            {"content":{"style":{"background_color":""},"full":true,"floor":{"2":"","3":""},"images":[{"image":{"2":"catalog/demo/slideshow/2.jpg","3":"catalog/demo/slideshow/2.jpg"},"show":true,"link":{"type":"product","value":"","link":""}},{"image":{"2":"catalog/demo/slideshow/1.jpg","3":"catalog/demo/slideshow/1.jpg"},"show":false,"link":{"type":"product","value":"","link":""}}]},"code":"slideshow","name":"幻灯片","module_id":"b0448efb0989"}
+            // {"content":{"style":{"background_color":""},"full":true,"floor":{"2":"","3":""},"images":[{"image":{"2":"catalog/demo/slideshow/2.jpg","3":"catalog/demo/slideshow/2.jpg"},"show":true,"link":{"type":"product","value":"","link":""}},{"image":{"2":"catalog/demo/slideshow/1.jpg","3":"catalog/demo/slideshow/1.jpg"},"show":false,"link":{"type":"product","value":"","link":""}}]},"code":"slideshow","name":"幻灯片","module_id":"b0448efb0989"}
           ]
         },
 
         design: {
           type: 'pc',
-          editType: 'module',
+          editType: 'add',
           sidebar: false,
           editingModuleIndex: 0,
           ready: false,
@@ -144,6 +144,7 @@
         }
       },
       created () {
+        this.form = @json($design_settings)
       },
       mounted () {
       },
diff --git a/resources/beike/admin/views/pages/design/module/slideshow.blade.php b/resources/beike/admin/views/pages/design/module/slideshow.blade.php
index 0e781bf0..3cbc54bb 100644
--- a/resources/beike/admin/views/pages/design/module/slideshow.blade.php
+++ b/resources/beike/admin/views/pages/design/module/slideshow.blade.php
@@ -28,7 +28,7 @@
               <el-tooltip class="" effect="dark" content="删除" placement="left">
                 <div class="remove-item" @click.stop="removeImage(index)"><i class="iconfont">&#xe63a;</i></div>
               </el-tooltip>
-              <i :class="'fa fa-angle-'+(item.show ? 'up' : 'down')"></i>
+              <i :class="'el-icon-arrow-'+(item.show ? 'up' : 'down')"></i>
             </div>
           </div>
           <div :class="'pb-images-list ' + (item.show ? 'active' : '')">
@@ -89,7 +89,7 @@ Vue.component('module-editor-slideshow', {
 
     addImage() {
       this.module.images.find(e => e.show = false);
-      this.module.images.push({image: 'catalog/demo/slideshow/2.jpg', show: true, link: {type: 'product', value:''}});
+      this.module.images.push({image: '', show: true, link: {type: 'product', value:''}});
     }
   }
 });