From 6c379da5a5e102f4226fb8cc195b009130ed6a57 Mon Sep 17 00:00:00 2001
From: sws <1141121512@qq.com>
Date: Mon, 21 Oct 2024 10:21:31 +0800
Subject: [PATCH] =?UTF-8?q?1.=E8=A7=A3=E5=86=B3=E5=9B=BE=E7=89=87=E9=AD=94?=
 =?UTF-8?q?=E6=96=B9=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98=202.=E8=A7=A3?=
 =?UTF-8?q?=E5=86=B3=E8=A7=86=E9=A2=91=E5=B0=81=E9=9D=A2=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E5=8D=A0=E6=BB=A1=E7=9A=84=E9=97=AE=E9=A2=98=203.=E8=A7=A3?=
 =?UTF-8?q?=E5=86=B3=E9=80=89=E9=A1=B9=E5=8D=A1=E6=B8=B2=E6=9F=93=E4=BC=A0?=
 =?UTF-8?q?=E5=8F=82=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                              |  4 ++--
 components/diy/img-magic.vue         | 18 +++++++++---------
 components/diy/modules/tabs-view.vue | 10 +++++-----
 components/diy/video.vue             |  2 +-
 components/popup/popup.vue           | 20 ++++++++++----------
 5 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/App.vue b/App.vue
index 54573284..5b0f39eb 100644
--- a/App.vue
+++ b/App.vue
@@ -7,11 +7,11 @@
             data: {
                 // 基础配置
                 // 数据接口请求地址
-                //request_url: 'http://shopxo.com/',
+                // request_url: 'http://shopxo.com/',
                    request_url:'https://new.shopxo.vip/',
 
                 // 静态资源地址（如系统根目录不在public目录下面请在静态地址后面加public目录、如：https://d1.shopxo.vip/public/）
-                //static_url: 'http://shopxo.com/',
+                // static_url: 'http://shopxo.com/',
                    static_url:'https://new.shopxo.vip/',
 
                 // 系统类型（默认default、如额外独立小程序、可与程序分身插件实现不同主体小程序及支付独立）
diff --git a/components/diy/img-magic.vue b/components/diy/img-magic.vue
index 4ee38cb1..d595bbf6 100644
--- a/components/diy/img-magic.vue
+++ b/components/diy/img-magic.vue
@@ -6,7 +6,7 @@
                 <!-- 风格3 -->
                 <template v-if="form.style_actived == 2">
                     <view class="flex-row align-c jc-c style-size">
-                        <view v-for="(item, index) in form.img_magic_list" :key="index" class="three" :style="img_spacing" :data-value="item.img_link.page" @tap="url_event">
+                        <view v-for="(item, index) in form.img_magic_list" :key="index" class="three" :style="img_spacing" :data-value="item.img_link ? item.img_link.page : ''" @tap="url_event">
                             <image v-if="item.img.length > 0" :src="item.img[0].url" class="dis-block wh-auto ht-auto" :mode="img_fit" :style="content_img_radius"></image>
                         </view>
                     </view>
@@ -14,25 +14,25 @@
                 <!-- 风格9 -->
                 <template v-else-if="form.style_actived == 8">
                     <view class="flex-row align-c jc-c style-size flex-wrap">
-                        <view v-for="(item, index) in form.img_magic_list" :key="index" :class="[{ 'style9-top': [0, 1].includes(index), 'style9-bottom': ![0, 1].includes(index) }]" :style="img_spacing" :data-value="item.img_link.page" @tap="url_event">
+                        <view v-for="(item, index) in form.img_magic_list" :key="index" :class="[{ 'style9-top': [0, 1].includes(index), 'style9-bottom': ![0, 1].includes(index) }]" :style="img_spacing" :data-value="item.img_link ? item.img_link.page : ''" @tap="url_event">
                             <image v-if="item.img.length > 0" :src="item.img[0].url" class="dis-block wh-auto ht-auto" :mode="img_fit" :style="content_img_radius"></image>
                         </view>
                     </view>
                 </template>
                 <template v-else-if="form.style_actived == 10">
                     <template v-if="form.limit_size == '0'">
-                        <view v-for="(item, index) in form.img_magic_list" :key="index" class="cr-main" :style="img_spacing + selected_style(item)" :data-value="item.img_link.page" @tap="url_event">
+                        <view v-for="(item, index) in form.img_magic_list" :key="index" class="cr-main" :style="img_spacing + selected_style(item)" :data-value="item.img_link ? item.img_link.page : ''" @tap="url_event">
                             <image v-if="item.img.length > 0" :src="item.img[0].url" class="dis-block wh-auto" mode="widthFix" :style="content_img_radius"></image>
                         </view>
                     </template>
                     <template v-else>
-                        <view v-for="(item, index) in form.img_magic_list" :key="index" class="cr-main" :style="img_spacing + selected_style(item) + ';height:' + form.image_height * 2 + 'rpx;'" :data-value="item.img_link.page" @tap="url_event">
+                        <view v-for="(item, index) in form.img_magic_list" :key="index" class="cr-main" :style="img_spacing + selected_style(item) + ';height:' + form.image_height * 2 + 'rpx;'" :data-value="item.img_link ? item.img_link.page : ''" @tap="url_event">
                             <image v-if="item.img.length > 0" :src="item.img[0].url" class="dis-block wh-auto ht-auto" :mode="img_fit" :style="content_img_radius"></image>
                         </view>
                     </template>
                 </template>
                 <template v-else>
-                    <view v-for="(item, index) in form.img_magic_list" :key="index" class="cube-selected cr-main" :style="img_spacing + selected_style(item)" :data-value="item.img_link.page" @tap="url_event">
+                    <view v-for="(item, index) in form.img_magic_list" :key="index" class="cube-selected cr-main" :style="img_spacing + selected_style(item)" :data-value="item.img_link ? item.img_link.page : ''" @tap="url_event">
                         <image v-if="item.img.length > 0" :src="item.img[0].url" class="dis-block wh-auto ht-auto" :mode="img_fit" :style="content_img_radius"></image>
                     </view>
                 </template>
@@ -50,7 +50,7 @@
                 default: () => ({}),
             },
             propKey: {
-                type: [String,Number],
+                type: [String, Number],
                 default: '',
             },
             // 组件渲染的下标
@@ -99,7 +99,7 @@
                 const new_content = this.propValue.content || {};
                 const new_style = this.propValue.style || {};
                 // 外部样式
-                const outer_spacing = `calc(100% + ${new_style.image_spacing * 2}rpx)`;
+                const outer_spacing = `calc(100% + ${new_style.image_spacing * 4}rpx)`;
                 const outer_sx = `-${new_style.image_spacing}rpx`;
                 // 图片间距设置
                 const spacing = `${new_style.image_spacing}rpx`;
@@ -107,11 +107,11 @@
                 let fit = '';
                 if (new_content.img_fit == 'contain') {
                     fit = 'aspectFit';
-                } else if (new_content.img_fit =='fill') {
+                } else if (new_content.img_fit == 'fill') {
                     fit = 'scaleToFill';
                 } else if (new_content.img_fit == 'cover') {
                     fit = 'aspectFill';
-                } 
+                }
                 const density = 4;
                 this.setData({
                     form: this.propValue.content,
diff --git a/components/diy/modules/tabs-view.vue b/components/diy/modules/tabs-view.vue
index 45d3bc48..50e584a5 100644
--- a/components/diy/modules/tabs-view.vue
+++ b/components/diy/modules/tabs-view.vue
@@ -91,7 +91,7 @@
             },
             // 置顶距离顶部高度
             propTop: {
-                type: [String,Number],
+                type: [String, Number],
                 default: '0',
             },
         },
@@ -160,10 +160,10 @@
             // 获取选项卡主题
             get_tabs_theme(data) {
                 let arr = {
-                    '1': 'tabs-style-2',
-                    '2': 'tabs-style-3',
-                    '3': 'tabs-style-4',
-                    '4': 'tabs-style-5',
+                    1: 'tabs-style-2',
+                    2: 'tabs-style-3',
+                    3: 'tabs-style-4',
+                    4: 'tabs-style-5',
                 };
                 let value = arr[data.tabs_theme];
                 return value === undefined ? 'tabs-style-1' : value;
diff --git a/components/diy/video.vue b/components/diy/video.vue
index 302e8805..42d41813 100644
--- a/components/diy/video.vue
+++ b/components/diy/video.vue
@@ -3,7 +3,7 @@
     <view :style="style_container">
         <view :style="style_img_container">
             <view class="video pr" :style="style">
-                <video :src="video" class="wh-auto ht-auto" :poster="video_img"></video>
+                <video :src="video" class="wh-auto ht-auto" :poster="video_img" objectFit="cover" style="object-fit: cover"></video>
             </view>
         </view>
     </view>
diff --git a/components/popup/popup.vue b/components/popup/popup.vue
index 8a4f0eeb..1722f9f8 100644
--- a/components/popup/popup.vue
+++ b/components/popup/popup.vue
@@ -2,7 +2,7 @@
     <view :class="theme_view + ' ' + propMostClass">
         <view :class="'popup ' + (propClassname || '') + ' ' + (propShow ? 'popup-show' : 'popup-hide') + ' ' + (propAnimation ? 'animation' : '')" :disable-scroll="propDisablescroll">
             <view class="popup-mask" :style="'z-index: ' + propIndex + ';'" v-if="propMask" @tap="on_mask_tap"></view>
-            <view :class="'popup-content popup-' + (propPosition || 'bottom') + ' ' + (propIsRadius ? '' : 'popup-radius-0') + ' ' + (propIsBar ? 'popup-bar' : '') + ' ' + (propPosition === 'bottom' ? 'bottom-line-exclude' : '')" :style="popup_content_style+this.propStyle">
+            <view :class="'popup-content popup-' + (propPosition || 'bottom') + ' ' + (propIsRadius ? '' : 'popup-radius-0') + ' ' + (propIsBar ? 'popup-bar' : '') + ' ' + (propPosition === 'bottom' ? 'bottom-line-exclude' : '')" :style="popup_content_style + this.propStyle">
                 <slot></slot>
             </view>
         </view>
@@ -13,7 +13,7 @@
     export default {
         data() {
             return {
-                theme_view: app.globalData.get_theme_value_view(),
+                theme_view: app.globalData.get_theme_value_view(),
                 popup_content_style: '',
             };
         },
@@ -64,7 +64,7 @@
             },
             // 需要携带单位后缀
             propTop: {
-                type: String,
+                type: [String, Number],
                 default: '',
             },
             propBottom: {
@@ -99,10 +99,10 @@
                 );
             },
             // 初初始化处理
-            init_handle() {
-                // 弹窗从底部弹出，获取底部菜单高度、如果当前为底部菜单页面则增加底部间距
-                var tabbar_height = (app.globalData.data.is_use_native_tabbar != 1 && this.propPosition == 'bottom' && app.globalData.is_tabbar_pages()) ? ((app.globalData.app_tabbar_height_value()*2)+20) : 0;
-
+            init_handle() {
+                // 弹窗从底部弹出，获取底部菜单高度、如果当前为底部菜单页面则增加底部间距
+                var tabbar_height = app.globalData.data.is_use_native_tabbar != 1 && this.propPosition == 'bottom' && app.globalData.is_tabbar_pages() ? app.globalData.app_tabbar_height_value() * 2 + 20 : 0;
+
                 // 左边距位置处理
                 var left = 0;
                 // #ifdef H5
@@ -111,9 +111,9 @@
                 if (width > 800) {
                     left = (width - 800) / 2;
                 }
-                // #endif
-                this.setData({
-                    popup_content_style: 'left:' + left + 'px;' + (this.propTop ? 'top:' + this.propTop : '') + ';' + (this.propBottom ? 'bottom:' + this.propBottom : '') + ';padding-bottom:'+tabbar_height+'rpx;',
+                // #endif
+                this.setData({
+                    popup_content_style: 'left:' + left + 'px;' + (this.propTop ? 'top:' + this.propTop : '') + ';' + (this.propBottom ? 'bottom:' + this.propBottom : '') + ';padding-bottom:' + tabbar_height + 'rpx;',
                 });
             },
         },