diff --git a/App.vue b/App.vue index 64c2429..2d11f95 100644 --- a/App.vue +++ b/App.vue @@ -371,7 +371,6 @@ @import 'static/css/base.css'; @import 'static/iconfont/iconfont.css'; @import 'static/css/unocss.css'; - @import 'static/fonts/font.scss'; view { box-sizing: border-box; diff --git a/pages/annex/web_view/index.vue b/pages/annex/web_view/index.vue index c8ca5ce..3e0c641 100644 --- a/pages/annex/web_view/index.vue +++ b/pages/annex/web_view/index.vue @@ -156,43 +156,44 @@ export default { /** * 太阳码 scene 解析:调 box_app /api/mp/apps 找 url,找到后注入到 option.url * 然后调用 _initWebView(option) 走标准 web_view 加载流程 - _resolveAppScene(identifier, option) { - const appToken = store.state.app.token || ''; - uni.request({ - url: 'https://mp.yizhezhe.com/api/mp/apps?identifier=' + encodeURIComponent(identifier) + '&isPublished=1&pageSize=1', - method: 'GET', - header: appToken ? { 'Authorization': 'Bearer ' + appToken } : {}, - success: (res) => { - console.log('[web_view] 太阳码 scene 解析响应:', JSON.stringify(res.statusCode)); - const items = res.data && res.data.result && res.data.result.items; - if (res.statusCode === 200 && items && items.length > 0) { - const app = items.find(it => it.identifier === identifier) || items[0]; - if (app && app.url) { - const appUrl = app.url; - let finalUrl = appUrl; - if (option._channel) { - const separator = finalUrl.includes('?') ? '&' : '?'; - finalUrl += separator + 'ch=' + option._channel; - } - console.log('[web_view] 解析到 H5 url:', appUrl, option._channel ? ' ch=' + option._channel : ''); - option.url = encodeURIComponent(finalUrl); - } else { - console.warn('[DEBUG 太阳码] 降级到 CRMEB 首页'); - option.url = encodeURIComponent('https://shop.douba.top'); - } - } else { - console.warn('[web_view] 太阳码 scene 解析响应异常,降级到 CRMEB 首页'); - option.url = encodeURIComponent('https://shop.douba.top'); - } - this._initWebView(option); - }, - fail: (err) => { - console.error('[web_view] 太阳码 scene 网络请求失败:', err); - option.url = encodeURIComponent('https://shop.douba.top'); - this._initWebView(option); - } - }); - }, + */ + _resolveAppScene(identifier, option) { + const appToken = store.state.app.token || ''; + uni.request({ + url: 'https://mp.yizhezhe.com/api/mp/apps?identifier=' + encodeURIComponent(identifier) + '&isPublished=1&pageSize=1', + method: 'GET', + header: appToken ? { 'Authorization': 'Bearer ' + appToken } : {}, + success: (res) => { + console.log('[web_view] 太阳码 scene 解析响应:', JSON.stringify(res.statusCode)); + const items = res.data && res.data.result && res.data.result.items; + if (res.statusCode === 200 && items && items.length > 0) { + const app = items.find(it => it.identifier === identifier) || items[0]; + if (app && app.url) { + const appUrl = app.url; + let finalUrl = appUrl; + if (option._channel) { + const separator = finalUrl.includes('?') ? '&' : '?'; + finalUrl += separator + 'ch=' + option._channel; + } + console.log('[web_view] 解析到 H5 url:', appUrl, option._channel ? ' ch=' + option._channel : ''); + option.url = encodeURIComponent(finalUrl); + } else { + console.warn('[DEBUG 太阳码] 降级到 CRMEB 首页'); + option.url = encodeURIComponent('https://shop.douba.top'); + } + } else { + console.warn('[web_view] 太阳码 scene 解析响应异常,降级到 CRMEB 首页'); + option.url = encodeURIComponent('https://shop.douba.top'); + } + this._initWebView(option); + }, + fail: (err) => { + console.error('[web_view] 太阳码 scene 网络请求失败:', err); + option.url = encodeURIComponent('https://shop.douba.top'); + this._initWebView(option); + } + }); + }, _initWebView(option) { try { diff --git a/static/css/base.css b/static/css/base.css index c4a2a43..7afd404 100644 --- a/static/css/base.css +++ b/static/css/base.css @@ -437,11 +437,11 @@ checkbox .uni-checkbox-input.uni-checkbox-input-checked::before { .coupon-list .item .money .num { font-size: 60rpx; - font-family: SemiBold; + font-family: -apple-system, "PingFang SC", "Helvetica Neue", sans-serif; font-weight: 600; } .num-fa-semi { - font-family: SemiBold; + font-family: -apple-system, "PingFang SC", "Helvetica Neue", sans-serif; font-weight: 600; } .coupon-list .item .text { diff --git a/static/css/unocss.css b/static/css/unocss.css index fddcf06..c432d91 100644 --- a/static/css/unocss.css +++ b/static/css/unocss.css @@ -2779,11 +2779,11 @@ } .Regular { - font-family: Regular; + font-family: -apple-system, "PingFang SC", "Helvetica Neue", sans-serif; } .SemiBold { - font-family: SemiBold; + font-family: -apple-system, "PingFang SC", "Helvetica Neue", sans-serif; font-weight: 600; } .space-line { diff --git a/static/fonts/D-DIN-PRO-400-Regular.ttf b/static/fonts/D-DIN-PRO-400-Regular.ttf deleted file mode 100644 index 446a1bf..0000000 Binary files a/static/fonts/D-DIN-PRO-400-Regular.ttf and /dev/null differ diff --git a/static/fonts/D-DIN-PRO-600-SemiBold.ttf b/static/fonts/D-DIN-PRO-600-SemiBold.ttf deleted file mode 100644 index 6a237f6..0000000 Binary files a/static/fonts/D-DIN-PRO-600-SemiBold.ttf and /dev/null differ diff --git a/static/fonts/font.scss b/static/fonts/font.scss deleted file mode 100644 index 3de45c0..0000000 --- a/static/fonts/font.scss +++ /dev/null @@ -1,8 +0,0 @@ -@font-face { - font-family: SemiBold; - src: url('static/fonts/D-DIN-PRO-600-SemiBold.ttf'); -} -@font-face { - font-family: Regular; - src: url('static/fonts/D-DIN-PRO-400-Regular.ttf'); -} \ No newline at end of file