From 1725ee69ced5cc0ca3cb4c3d230c10f2797bbcb2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8E=E8=82=96=E7=A3=8A?= <18851179580@163.com>
Date: Mon, 9 Sep 2024 15:48:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=82=AC=E6=B5=AE=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/diy/diy.vue          |  3 +++
 components/diy/float-window.vue | 34 ++++++++++++------------------
 pages/diy/init_data.js          | 37 +++++++++++++++++++++++++++++++++
 3 files changed, 53 insertions(+), 21 deletions(-)

diff --git a/components/diy/diy.vue b/components/diy/diy.vue
index cd117e4e..fc3fcd39 100644
--- a/components/diy/diy.vue
+++ b/components/diy/diy.vue
@@ -5,6 +5,7 @@
             <view v-for="(item, index) in value.diy_data" :key="index">
                 <componentDiySearch></componentDiySearch>
                 <componentDiyAuxiliaryLine v-if="item.key == 'row-line'" :value="item.com_data"></componentDiyAuxiliaryLine>
+                <componentFloatWindow v-if="item.key == 'float-window'" :value="item.com_data"></componentFloatWindow>
             </view>
         </view>
         <componentDiyFooter :value="value.footer.com_data"></componentDiyFooter>
@@ -16,6 +17,7 @@
     import componentDiyFooter from '@/components/diy/footer';
     import componentDiySearch from '@/components/diy/search';
     import componentDiyAuxiliaryLine from '@/components/diy/auxiliary-line';
+    import componentFloatWindow from '@/components/diy/float-window';
     export default {
         name: 'diy',
         props: {
@@ -29,6 +31,7 @@
             componentDiyFooter,
             componentDiySearch,
             componentDiyAuxiliaryLine,
+            componentFloatWindow,
         },
         data() {
             return {};
diff --git a/components/diy/float-window.vue b/components/diy/float-window.vue
index 1b3dc522..76757edf 100644
--- a/components/diy/float-window.vue
+++ b/components/diy/float-window.vue
@@ -2,12 +2,11 @@
     <view v-if="form.button_img.length > 0" class="pa" :style="style">
         <view class="flex-row align-c jc-c suspension">
             <view class="spread flex-row align-c jc-c">
-                {{ new_style.float_style }}
                 <block v-if="new_style.float_style == 'diffuse'">
-                    <view class="ring"></view>
-                    <view class="ring"></view>
+                    <view class="ring" :style="`background-color: ${ color }`"></view>
+                    <view class="ring" :style="`background-color: ${ color }`"></view>
                 </block>
-                <image :src="form.button_img[0].url" :class="{'shadow': new_style.float_style == 'shadow'}"></image>
+                <image :src="form.button_img[0].url" class="img" :style="color" fit="cover"></image>
             </view>
         </view>
     </view>
@@ -34,8 +33,8 @@
         created() {
             this.form = this.value.content;
             this.new_style = this.value.style;
-            const { float_style_color, display_location, offset_number } = this.value.style;
-            this.color = float_style_color;
+            const { float_style, float_style_color, display_location, offset_number } = this.value.style;
+            this.color = float_style == 'shadow' ? `box-shadow: 0 5px 20px ${ float_style_color }` : float_style_color;
             let location = `right: 10px;`;
             if (display_location == 'left') {
                 location = `left: 10px;`;
@@ -49,17 +48,10 @@
 </script>
 
 <style scoped lang="scss">
-:deep(.el-image) {
-    width: 4.5rem;
-    height: 4.5rem;
+.img {
+    width: 100rpx;
+    height: 100rpx;
     border-radius: 50%;
-    .image-slot img {
-        width: 3rem;
-        height: 3rem
-    }
-}
-.shadow {
-    box-shadow: 0 5px 20px v-bind(color);
 }
 /**
 * 呼吸灯
@@ -67,16 +59,16 @@
 .spread {
     position: relative;
     z-index: 1;
-    width: 6rem;
-    height: 6rem;
+    width: 100rpx;
+    height: 100rpx;
+    border-radius: 50%;
 }
 .spread .ring {
     /* 速度为1.5 * 层数 = 实际运行速度，速度修改则 animation-delay 属性也修改相同速度 */
     animation: pulsing 1.5s ease-out infinite;
-    background-color: v-bind(color);
     border-radius: 100%;
-    width: 5rem;
-    height: 5rem;
+    width: 100rpx;
+    height: 100rpx;
     position: absolute;
 }
 /* 速度为1*层数 */
diff --git a/pages/diy/init_data.js b/pages/diy/init_data.js
index ce30a938..5c2ecb5b 100644
--- a/pages/diy/init_data.js
+++ b/pages/diy/init_data.js
@@ -293,6 +293,43 @@ const initData = {
                 }
             }
         }
+    },{
+        "name": "悬浮按钮",
+        "show_tabs": "0",
+        "is_enable": "1",
+        "id": "wgqned1dfip",
+        "key": "float-window",
+        "com_data": {
+            "content": {
+                "button_jump": "link",
+                "button_img": [
+                    {
+                        "id": 2781,
+                        "category_id": 75,
+                        "title": "1713931511719969.png",
+                        "original": "背景1 4@2x.png",
+                        "size": "161.39KB",
+                        "ext": ".png",
+                        "type": "image",
+                        "url": "http://shopxo.com/public/static/upload/images/plugins_magic/2024/04/24/1713931511719969.png",
+                        "hash": "7a06b18f74cf937f7ad2ea95ee47a6cbee7a08897c29b79ee494f6505c6e73fe",
+                        "add_time": "2024-04-24 12:05:11",
+                        "category_name": "plugins_magic",
+                        "type_name": "图片"
+                    }
+                ],
+                "button_link": {
+                    "name": "我的积分",
+                    "page": "/pages/user-integral/user-integral"
+                }
+            },
+            "style": {
+                "display_location": "right",
+                "offset_number": 120,
+                "float_style": "shadow",
+                "float_style_color": "#32373a1a"
+            }
+        }
     }]
 };
 export default initData;
\ No newline at end of file