From 03432fc43f6d0f225de0efe181131ac213b56cd6 Mon Sep 17 00:00:00 2001 From: sws <1141121512@qq.com> Date: Wed, 9 Oct 2024 14:28:04 +0800 Subject: [PATCH 1/2] =?UTF-8?q?1.=E8=A7=A3=E5=86=B3=E8=A7=86=E9=A2=91?= =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/diy/diy.vue | 12 ++---------- components/diy/header.vue | 2 +- components/diy/modules/image-empty.vue | 5 +++++ 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/components/diy/diy.vue b/components/diy/diy.vue index 2ee7f622..c100a2d9 100644 --- a/components/diy/diy.vue +++ b/components/diy/diy.vue @@ -2,7 +2,7 @@ - + @@ -63,7 +63,7 @@ - + @@ -210,8 +210,6 @@ data_is_loading: 0, // 缓存key cache_key: app.globalData.data.cache_diy_data_key, - // 重置 - hack_reset: false, // 底部导航高度 footer_height_value: 0, }; @@ -248,7 +246,6 @@ init() { // tabs选项卡数据过滤 this.setData({ - hack_reset: false, header_data: this.propValue.header, footer_data: this.propValue.footer, diy_data: this.propValue.diy_data, @@ -258,11 +255,6 @@ temp_sticky_top: this.sticky_top, temp_header_top: this.header_top, }); - this.$nextTick(() => { - this.setData({ - hack_reset: true, - }); - }); uni.setStorageSync(this.cache_key + this.tabs_home_id, this.propValue.diy_data); }, // 顶部导航沉浸模式回调 diff --git a/components/diy/header.vue b/components/diy/header.vue index b7c24893..98be946a 100644 --- a/components/diy/header.vue +++ b/components/diy/header.vue @@ -32,7 +32,7 @@ - + diff --git a/components/diy/modules/image-empty.vue b/components/diy/modules/image-empty.vue index b76b6cd8..eef10d2d 100644 --- a/components/diy/modules/image-empty.vue +++ b/components/diy/modules/image-empty.vue @@ -37,6 +37,11 @@ defaultImage: '/static/images/common/image-empty.png', }; }, + watch: { + propImageSrc(val) { + this.init(); + }, + }, mounted() { this.init(); }, From 17216cbcaea3e7db618af5f88829862977ee9b1e Mon Sep 17 00:00:00 2001 From: sws <1141121512@qq.com> Date: Wed, 9 Oct 2024 16:24:29 +0800 Subject: [PATCH 2/2] =?UTF-8?q?1.=E6=9B=B4=E6=96=B0icon?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.vue | 8 +- components/diy/notice.vue | 8 +- static/icon/iconfont.css | 332 +++++++++++++++++++++++++++++++++++++- static/icon/iconfont.ttf | Bin 24132 -> 40848 bytes 4 files changed, 338 insertions(+), 10 deletions(-) diff --git a/App.vue b/App.vue index c0ae5a28..e3a9bff7 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/notice.vue b/components/diy/notice.vue index c30dd9c6..e6bb135a 100644 --- a/components/diy/notice.vue +++ b/components/diy/notice.vue @@ -8,7 +8,7 @@ - +