diff --git a/App.vue b/App.vue
index 363ee42d..6d0fc390 100644
--- a/App.vue
+++ b/App.vue
@@ -1985,7 +1985,7 @@
// #ifdef H5 || APP
// 是有效的url地址则通过#号分割处理参数
if(this.is_url(result['url'])) {
- result['url'] = this.page_url_protocol(result.url.split('#')[0] + '#' + (result.path.substr(0, 1) == '/' ? '' : '/') + result.path + result.query);
+ result['url'] = this.page_url_protocol(result.url.split('#')[0] + '#' + (result.path == null || result.path.substr(0, 1) == '/' ? '' : '/') + result.path + result.query);
}
// #endif
return result;
diff --git a/components/diy/carousel.vue b/components/diy/carousel.vue
index 47e1adca..3aac6f15 100644
--- a/components/diy/carousel.vue
+++ b/components/diy/carousel.vue
@@ -4,11 +4,13 @@
-
+
-
+
+
+
@@ -20,11 +22,13 @@
-
+
-
+
+
+
@@ -291,11 +295,6 @@
transform: scale(1.1);
}
}
-
- .img {
- width: 100%;
- height: 100%;
- }
.video_img {
max-width: 120rpx;
height: 28rpx;
diff --git a/components/diy/data-magic.vue b/components/diy/data-magic.vue
index f20340c2..31fd7508 100644
--- a/components/diy/data-magic.vue
+++ b/components/diy/data-magic.vue
@@ -52,8 +52,8 @@
- {{ item.actived_index + 1 }}/{{ item.data_content.list.length }}
+ {{ item.actived_index + 1 }}
+ /{{ item.data_content.list.length }}
diff --git a/components/diy/diy.vue b/components/diy/diy.vue
index b73e7f7a..244d6775 100644
--- a/components/diy/diy.vue
+++ b/components/diy/diy.vue
@@ -1,15 +1,15 @@
-
@@ -142,22 +142,20 @@
return {
// 基础配置
currency_symbol: app.globalData.currency_symbol(),
- // 底部菜单导航高度计算
- footer_height_value: 140,
// 是否有选项卡
is_tabs: false,
// 是否是模块数据或者是九宫格商品分类样式数据, 默认模块数据
is_tabs_type: true,
- // 5,7,0 是误差,, 12 是下边距,60是高度,bar_height是不同小程序下的导航栏距离顶部的高度
+ // 5,7,0 是误差,, 12 是下边距,66是高度,bar_height是不同小程序下的导航栏距离顶部的高度
// #ifdef MP
- header_top: 'padding-top:' + (bar_height + 34 + 5 + 12) + 'px;',
+ header_top: 'padding-top:calc(' + (bar_height + 5 + 12) + 'px + 66rpx);',
// #endif
// #ifdef H5 || MP-TOUTIAO
- header_top: 'padding-top:' + (bar_height + 34 + 7 + 12) + 'px;',
+ header_top: 'padding-top:calc(' + (bar_height + 7 + 12) + 'px + 66rpx);',
// #endif
// #ifdef APP
- header_top: 'padding-top:' + (bar_height + 34 + 0 + 12) + 'px;',
+ header_top: 'padding-top:calc(' + (bar_height + 0 + 12) + 'px + 66rpx);',
// #endif
header_data: {},
@@ -188,11 +186,6 @@
cache_key: app.globalData.data.cache_diy_data_key,
};
},
- computed: {
- diy_content_style() {
- return this.header_top + `padding-bottom:${this.footer_height_value}rpx;`;
- },
- },
created() {
// 初始化配置
this.init_config();
@@ -208,7 +201,7 @@
var is_show_footer = this.propValue.header.com_data.content.bottom_navigation_show;
var is_tabbar = app.globalData.is_tabbar_pages();
this.setData({
- is_show_footer: is_show_footer && !is_tabbar
+ is_show_footer: is_show_footer && !is_tabbar,
});
} else {
app.globalData.is_config(this, 'init_config');
@@ -228,13 +221,6 @@
uni.setStorageSync(this.cache_key + this.tabs_home_id, this.propValue.diy_data);
},
- // 底部菜单高度
- footer_height_value_event(number) {
- this.setData({
- footer_height_value: number * 2
- });
- },
-
// 选项卡回调更新数据
tabs_click_event(tabs_id, bool, params = {}) {
let new_data = [];
@@ -399,13 +385,9 @@
});
},
});
- }
+ },
},
};
-
+
diff --git a/components/diy/float-window.vue b/components/diy/float-window.vue
index 5b6cb7f6..7ee332ad 100644
--- a/components/diy/float-window.vue
+++ b/components/diy/float-window.vue
@@ -6,7 +6,9 @@
-
+
+
+
diff --git a/components/diy/footer.vue b/components/diy/footer.vue
index 43eeb2ab..d21ec049 100644
--- a/components/diy/footer.vue
+++ b/components/diy/footer.vue
@@ -4,7 +4,7 @@
-
-
-
-
-
-
+
+
+
+
+
+
@@ -105,12 +105,12 @@
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/components/diy/header.vue b/components/diy/header.vue
index 2e808bf9..df99c88e 100644
--- a/components/diy/header.vue
+++ b/components/diy/header.vue
@@ -1,7 +1,7 @@