diff --git a/App.vue b/App.vue index 81de2564..f337e990 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/cart/cart.vue b/components/cart/cart.vue index 40c8dd60..0472dd47 100644 --- a/components/cart/cart.vue +++ b/components/cart/cart.vue @@ -87,11 +87,11 @@ - + {{ item.show_price_symbol }} - {{ item.price }} - + {{ item.price }} + {{ item.show_price_unit }} @@ -318,7 +318,7 @@ import componentNavBack from '../../components/nav-back/nav-back'; import componentRealstoreCart from '../../components/realstore-cart/realstore-cart'; import componentBottomLine from '../../components/bottom-line/bottom-line'; - import componentPopup from '../../components/popup/popup'; + import componentPopup from '@/components/popup/popup'; var common_static_url = app.globalData.get_static_url('common'); var status_bar_height = parseInt(app.globalData.get_system_info('statusBarHeight', 0, true)); diff --git a/components/emoji-popup/emoji-popup.vue b/components/emoji-popup/emoji-popup.vue index a2d17747..eeda676b 100644 --- a/components/emoji-popup/emoji-popup.vue +++ b/components/emoji-popup/emoji-popup.vue @@ -21,7 +21,7 @@