diff --git a/App.vue b/App.vue
index 8f5e9cda..d3d2f178 100644
--- a/App.vue
+++ b/App.vue
@@ -7,10 +7,10 @@
data: {
// 基础配置
// 数据接口请求地址
- request_url:'https://d1.shopxo.vip/',
+ request_url:'http://shopxo.com/',
// 静态资源地址（如系统根目录不在public目录下面请在静态地址后面加public目录、如：https://d1.shopxo.vip/public/）
- static_url:'https://d1.shopxo.vip/',
+ static_url:'http://shopxo.com/',
// 系统类型（默认default、如额外独立小程序、可与程序分身插件实现不同主体小程序及支付独立）
system_type: 'default',
diff --git a/components/choice-location/choice-location.vue b/components/choice-location/choice-location.vue
index 0436458a..d4b614a0 100644
--- a/components/choice-location/choice-location.vue
+++ b/components/choice-location/choice-location.vue
@@ -7,16 +7,16 @@
-
+
- {{ location.text || '' }}
+ {{ location.text || '' }}
-
+
@@ -109,7 +109,11 @@
propContainerDisplay: {
type: String,
default: 'inline-block',
- }
+ },
+ propUpSlideStyle: {
+ type: String,
+ default: '',
+ },
},
// 页面被展示
created: function () {
diff --git a/pages/diy/components/diy/header.vue b/pages/diy/components/diy/header.vue
index 0228f932..4668cb63 100644
--- a/pages/diy/components/diy/header.vue
+++ b/pages/diy/components/diy/header.vue
@@ -15,14 +15,14 @@
-
+
-
+
@@ -51,7 +51,7 @@
-
+
@@ -181,6 +181,9 @@
up_slide_style: '',
up_slide_img_style: '',
up_slide_icon_style: '',
+ up_slide_title_style: '',
+ up_slide_location_style: '',
+ up_slide_left_back_btn_style: '',
// 当前页面是否在底部菜单中
is_tabbar_pages: app.globalData.is_tabbar_pages(),
is_left_back_btn_show: '0',
@@ -205,7 +208,7 @@
watch: {
// 监听滚动距离
propScrollTop(newVal) {
- const { up_slide_background_color_list, up_slide_background_direction, up_slide_background_img, up_slide_background_img_style, up_slide_display, img_color = '', up_slide_icon_color = '' } = this.propValue.style || {};
+ const { up_slide_background_color_list, up_slide_background_direction, up_slide_background_img, up_slide_background_img_style, up_slide_display, img_color = '', up_slide_icon_color = '', header_background_title_color = '', up_slide_title_color = '', location_color = '', up_slide_location_color = '', left_back_btn_color = '#333', up_slide_left_back_btn_color = '' } = this.propValue.style || {};
if (up_slide_display == '1') {
// 渐变
const gradient = { color_list: up_slide_background_color_list, direction: up_slide_background_direction };
@@ -220,10 +223,14 @@
// =0是大小误差
this.up_slide_style = gradient_computer(gradient) + up_slide_opacity;
// 图标更换
- this.up_slide_icon_style = up_slide_icon_color == '' || opacity <= 0 ? `color: ${ img_color };` : `color: ${ up_slide_icon_color };${ this.up_slide_opacity }`;
+ this.up_slide_icon_style = this.get_up_slide_style(img_color, up_slide_icon_color, opacity);
+ // 标题更换
+ this.up_slide_title_style = this.get_up_slide_style(header_background_title_color, up_slide_title_color, opacity);
+ // 定位更换
+ this.up_slide_location_style = this.get_up_slide_style(location_color, up_slide_location_color, opacity);
+ // 返回图标更换
+ this.up_slide_left_back_btn_style = this.get_up_slide_style(left_back_btn_color, up_slide_left_back_btn_color, opacity);
this.up_slide_img_style = background_computer(back);
- } else {
- this.up_slide_icon_style = `color: ${ img_color };`
}
},
propKey(val) {
@@ -314,6 +321,12 @@
return `${(100 + width) * 2}rpx;`;
}
},
+ // 封装公共逻辑函数
+ get_up_slide_style(defaultColor, customColor, opacityValue) {
+ const opacityStr = opacityValue > 0 ? `opacity: ${opacityValue};` : '';
+ const color = (customColor === '' || opacityValue <= 0) ? defaultColor : customColor;
+ return `color: ${color};${opacityStr}`;
+ },
// 定位设置
get_style_location_container(new_style) {
const { location_margin = this.old_margin, location_radius = this.old_radius } = new_style;