diff --git a/App.vue b/App.vue index 38f91fa0..a3ec498d 100644 --- a/App.vue +++ b/App.vue @@ -69,9 +69,11 @@ "/pages/user/user" ], // 请求地址 - request_url: 'https://d1.shopxo.vip/', + // 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: 'https://d1.shopxo.vip/', + static_url: 'http://shopxo.com/', // 系统类型（默认default、如额外独立小程序、可与程序分身插件实现不同主体小程序及支付独立） system_type: 'default', // 基础信息 diff --git a/components/iconfont/iconfont.css b/components/iconfont/iconfont.css new file mode 100644 index 00000000..c1a55f66 --- /dev/null +++ b/components/iconfont/iconfont.css @@ -0,0 +1,40 @@ +@font-face { + font-family: "iconfont"; /* Project id 4227145 */ + src: url('iconfont.woff2?t=1693277237003') format('woff2'), + url('iconfont.woff?t=1693277237003') format('woff'), + url('iconfont.ttf?t=1693277237003') format('truetype'), + url('iconfont.svg?t=1693277237003#iconfont') format('svg'); +} + +.iconfont { + font-family: "iconfont" !important; + font-size: 16px; + font-style: normal; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} + +.icon-icon-applet-me-settings-acquiesce:before { + content: "\e6a6"; +} + +.icon-icon-applet-me-message-acquiesce:before { + content: "\e6a7"; +} + +.icon-icon-applet-me-acquiesce:before { + content: "\e6a2"; +} + +.icon-icon-applet-sort-acquiesce:before { + content: "\e6a5"; +} + +.icon-icon-applet-index-acquiesce:before { + content: "\e6a4"; +} + +.icon-icon-applet-shop-acquiesce:before { + content: "\e6a3"; +} + diff --git a/components/iconfont/iconfont.js b/components/iconfont/iconfont.js new file mode 100644 index 00000000..572ab6f8 --- /dev/null +++ b/components/iconfont/iconfont.js @@ -0,0 +1 @@ +window._iconfont_svg_string_4227145='',function(t){var e=(e=document.getElementsByTagName("script"))[e.length-1],c=e.getAttribute("data-injectcss"),e=e.getAttribute("data-disable-injectsvg");if(!e){var i,a,n,o,l,s=function(e,c){c.parentNode.insertBefore(e,c)};if(c&&!t.__iconfont__svg__cssinject__){t.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(e){console&&console.log(e)}}i=function(){var e,c=document.createElement("div");c.innerHTML=t._iconfont_svg_string_4227145,(c=c.getElementsByTagName("svg")[0])&&(c.setAttribute("aria-hidden","true"),c.style.position="absolute",c.style.width=0,c.style.height=0,c.style.overflow="hidden",c=c,(e=document.body).firstChild?s(c,e.firstChild):e.appendChild(c))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(i,0):(a=function(){document.removeEventListener("DOMContentLoaded",a,!1),i()},document.addEventListener("DOMContentLoaded",a,!1)):document.attachEvent&&(n=i,o=t.document,l=!1,d(),o.onreadystatechange=function(){"complete"==o.readyState&&(o.onreadystatechange=null,h())})}function h(){l||(l=!0,n())}function d(){try{o.documentElement.doScroll("left")}catch(e){return void setTimeout(d,50)}h()}}(window); \ No newline at end of file diff --git a/components/iconfont/iconfont.json b/components/iconfont/iconfont.json new file mode 100644 index 00000000..8501679b --- /dev/null +++ b/components/iconfont/iconfont.json @@ -0,0 +1,51 @@ +{ + "id": "4227145", + "name": "shopxo-小程序", + "font_family": "iconfont", + "css_prefix_text": "icon-", + "description": "", + "glyphs": [ + { + "icon_id": "37113110", + "name": "icon-applet-me-settings-acquiesce", + "font_class": "icon-applet-me-settings-acquiesce", + "unicode": "e6a6", + "unicode_decimal": 59046 + }, + { + "icon_id": "37113109", + "name": "icon-applet-me-message-acquiesce", + "font_class": "icon-applet-me-message-acquiesce", + "unicode": "e6a7", + "unicode_decimal": 59047 + }, + { + "icon_id": "37112559", + "name": "icon-applet-me-acquiesce", + "font_class": "icon-applet-me-acquiesce", + "unicode": "e6a2", + "unicode_decimal": 59042 + }, + { + "icon_id": "37112562", + "name": "icon-applet-sort-acquiesce", + "font_class": "icon-applet-sort-acquiesce", + "unicode": "e6a5", + "unicode_decimal": 59045 + }, + { + "icon_id": "37112561", + "name": "icon-applet-index-acquiesce", + "font_class": "icon-applet-index-acquiesce", + "unicode": "e6a4", + "unicode_decimal": 59044 + }, + { + "icon_id": "37112560", + "name": "icon-applet-shop-acquiesce", + "font_class": "icon-applet-shop-acquiesce", + "unicode": "e6a3", + "unicode_decimal": 59043 + } + ] +} diff --git a/components/iconfont/iconfont.svg b/components/iconfont/iconfont.svg new file mode 100644 index 00000000..75558b44 --- /dev/null +++ b/components/iconfont/iconfont.svg @@ -0,0 +1,31 @@ + + + + Created by iconfont + + + + + + + + + + + + + + + + + + + + diff --git a/components/iconfont/iconfont.ttf b/components/iconfont/iconfont.ttf new file mode 100644 index 00000000..27b025e6 Binary files /dev/null and b/components/iconfont/iconfont.ttf differ diff --git a/components/iconfont/iconfont.vue b/components/iconfont/iconfont.vue new file mode 100644 index 00000000..1450e68d --- /dev/null +++ b/components/iconfont/iconfont.vue @@ -0,0 +1,23 @@ + + + + + \ No newline at end of file diff --git a/components/iconfont/iconfont.woff b/components/iconfont/iconfont.woff new file mode 100644 index 00000000..ae90f5d9 Binary files /dev/null and b/components/iconfont/iconfont.woff differ diff --git a/components/iconfont/iconfont.woff2 b/components/iconfont/iconfont.woff2 new file mode 100644 index 00000000..595aef70 Binary files /dev/null and b/components/iconfont/iconfont.woff2 differ diff --git a/components/search/search.vue b/components/search/search.vue index 997c0672..713ae7e0 100644 --- a/components/search/search.vue +++ b/components/search/search.vue @@ -1,153 +1,176 @@ - - \ No newline at end of file diff --git a/components/slider/slider.vue b/components/slider/slider.vue index e6273e16..18c59d65 100644 --- a/components/slider/slider.vue +++ b/components/slider/slider.vue @@ -1,63 +1,71 @@ - \ No newline at end of file diff --git a/main.js b/main.js index 7d4c30b4..805fac8c 100644 --- a/main.js +++ b/main.js @@ -2,16 +2,19 @@ import Vue from 'vue'; import App from './App'; // 全局mixins -import base from './common/js/common/base'; +import base from './common/js/common/base'; import share from './common/js/common/share'; -Vue.mixin(base); + +import iconfont from './components/iconfont/iconfont' +Vue.mixin(base); Vue.mixin(share); Vue.config.productionTip = false; - +// 注册到全局 +Vue.component("iconfont", iconfont); App.mpType = 'app'; const app = new Vue({ - ...App + ...App }); app.$mount(); \ No newline at end of file diff --git a/pages.json b/pages.json index 074dd5c1..55ed88d0 100644 --- a/pages.json +++ b/pages.json @@ -282,7 +282,16 @@ "navigationBarTitleText": "账号注销" } } - ], + ,{ + "path" : "components/iconfont/iconfont/iconfont", + "style" : + { + "navigationBarTitleText": "", + "enablePullDownRefresh": false + } + + } + ], "subPackages": [ { "root": "pages/plugins/seckill", diff --git a/pages/index/index.vue b/pages/index/index.vue index b6bfbe3a..8c35ef1a 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -1,577 +1,670 @@ \ No newline at end of file