diff --git a/App.vue b/App.vue index f9ebf908..1c1e2dc8 100644 --- a/App.vue +++ b/App.vue @@ -7,12 +7,12 @@ data: { // 基础配置 // 数据接口请求地址 - //request_url: 'http://shopxo.com/', - request_url:'https://new.shopxo.vip/', + 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:'https://new.shopxo.vip/', + static_url: 'http://shopxo.com/', + // static_url:'https://new.shopxo.vip/', // 系统类型(默认default、如额外独立小程序、可与程序分身插件实现不同主体小程序及支付独立) system_type: 'default', diff --git a/components/diy/header.vue b/components/diy/header.vue index 1bac0056..35fdc678 100644 --- a/components/diy/header.vue +++ b/components/diy/header.vue @@ -105,7 +105,7 @@ export default { props: { propValue: { - type: [String,Number,Object], + type: [String, Number, Object], default: '', }, // 滚动距离 @@ -114,7 +114,7 @@ default: 0, }, propKey: { - type: [String,Number], + type: [String, Number], default: '', }, }, @@ -215,11 +215,13 @@ // 小程序下,获取小程序胶囊的宽度 let menu_button_info = 'max-width:100%'; let new_text_style = `font-weight:${new_style.header_background_title_typeface}; font-size: ${new_style.header_background_title_size * 2}rpx; color: ${new_style.header_background_title_color};`; + // #ifndef MP-TOUTIAO // #ifdef MP const custom = uni.getMenuButtonBoundingClientRect(); menu_button_info = `max-width:calc(100% - ${custom.width + 10}px);`; new_text_style += `right:-${custom.width + 10}px;`; // #endif + // #endif this.setData({ form: this.propValue, position: new_style.up_slide_display == '1' ? 'position:fixed;' : 'position:relative;', @@ -288,7 +290,7 @@ height: 66rpx; overflow: hidden; top: -1rpx; - /* #ifdef H5 */ + /* #ifdef H5 || MP-TOUTIAO */ top: 4rpx; /* #endif */ } diff --git a/pages/diy/diy.vue b/pages/diy/diy.vue index a9f9d53f..8412ea6c 100644 --- a/pages/diy/diy.vue +++ b/pages/diy/diy.vue @@ -2,7 +2,7 @@ - +