diff --git a/App.vue b/App.vue index 65a2d728..5349dbde 100644 --- a/App.vue +++ b/App.vue @@ -7,10 +7,10 @@ data: { // 基础配置 // 数据接口请求地址 - request_url:'https://new.shopxo.vip/', + request_url:'http://shopxo.com/', // 静态资源地址(如系统根目录不在public目录下面请在静态地址后面加public目录、如:https://d1.shopxo.vip/public/) - static_url:'https://new.shopxo.vip/', + static_url:'http://shopxo.com/', // 系统类型(默认default、如额外独立小程序、可与程序分身插件实现不同主体小程序及支付独立) system_type: 'default', diff --git a/pages/cart/components/cart/cart.vue b/components/cart/cart.vue similarity index 100% rename from pages/cart/components/cart/cart.vue rename to components/cart/cart.vue diff --git a/components/no-data/no-data.vue b/components/no-data/no-data.vue index bfc6778a..b2c8249a 100644 --- a/components/no-data/no-data.vue +++ b/components/no-data/no-data.vue @@ -11,7 +11,7 @@ - + @@ -141,6 +141,10 @@ propLoadingLogoTop: { type: String, default: '50%', + }, + propLoadingUseSkeleton: { + type: Boolean, + default: false, } }, // 页面被展示 diff --git a/pages.json b/pages.json index 2b6aab4b..70dac49e 100644 --- a/pages.json +++ b/pages.json @@ -67,13 +67,7 @@ "enablePullDownRefresh": false, // 禁止页面下拉 "disableScroll": true, - "navigationBarTitleText": "", - "usingComponents": { - "component-cart": "/pages/cart/components/cart/cart" - }, - "componentPlaceholder": { - "component-cart": "view" - } + "navigationBarTitleText": "" } }, { @@ -172,13 +166,7 @@ "enablePullDownRefresh": false, // 禁止页面下拉 "disableScroll": true, - "navigationBarTitleText": "", - "usingComponents": { - "component-cart": "/pages/cart/components/cart/cart" - }, - "componentPlaceholder": { - "component-cart": "view" - } + "navigationBarTitleText": "" } } ] diff --git a/pages/cart-page/cart-page.vue b/pages/cart-page/cart-page.vue index 780bb566..8c027e1c 100644 --- a/pages/cart-page/cart-page.vue +++ b/pages/cart-page/cart-page.vue @@ -14,7 +14,7 @@ const app = getApp(); import componentCommon from '@/components/common/common'; import componentQuickNav from '@/components/quick-nav/quick-nav'; - import componentCart from '@/pages/cart/components/cart/cart'; + import componentCart from '@/components/cart/cart'; export default { data() { return { diff --git a/pages/cart/cart.vue b/pages/cart/cart.vue index 25dbe3ce..10b2997b 100644 --- a/pages/cart/cart.vue +++ b/pages/cart/cart.vue @@ -10,7 +10,7 @@