From 9bd88d1ef5e99ddb410bb38542dfed80d04d8722 Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Sun, 6 Apr 2025 11:37:32 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=AD=E7=89=A9=E8=BD=A6=E4=B8=8D=E5=88=86?=
 =?UTF-8?q?=E5=8C=85=EF=BC=8C=E9=A6=96=E9=A1=B5=E5=8A=A0=E8=BD=BDdiy?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                                          |  4 ++--
 .../cart/components => components}/cart/cart.vue |  0
 components/no-data/no-data.vue                   |  6 +++++-
 pages.json                                       | 16 ++--------------
 pages/cart-page/cart-page.vue                    |  2 +-
 pages/cart/cart.vue                              |  4 ++--
 pages/index/index.vue                            |  2 ++
 7 files changed, 14 insertions(+), 20 deletions(-)
 rename {pages/cart/components => components}/cart/cart.vue (100%)

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 @@
         <view v-else>
             <!-- 1 加载中(0loog, 1名称) -->
             <view v-if="propStatus == 1 && network_type_value != 'none'" :class="'no-data-box tc no-data-loading '+(is_loading_use_skeleton == 1 && (propPage || null) != null ? 'skeleton' : '')">
-                <block v-if="is_loading_use_skeleton == 1 && (propPage || null) != null">
+                <block v-if="(is_loading_use_skeleton == 1 || propLoadingUseSkeleton) && (propPage || null) != null">
                     <!-- 是否展示头站位 -->
                     <view v-if="propIsHeader" class="skeleton-header"></view>
                     <!-- 首页 -->
@@ -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 @@
 <script>
     const app = getApp();
     import componentCommon from '@/components/common/common';
-    import componentCart from "@/pages/cart/components/cart/cart";
+    import componentCart from "@/components/cart/cart";
     export default {
         data() {
             return {
@@ -46,7 +46,7 @@
 
                 // 公共onshow事件
                 if ((this.$refs.common || null) != null) {
-                    this.$refs.common.on_show({object: this, method: 'init'});
+                    this.$refs.common.on_show();
                 }
             },
 
diff --git a/pages/index/index.vue b/pages/index/index.vue
index b6eb6ded..59ea53fe 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -5,6 +5,8 @@
             <block v-if="data_mode == 3">
                 <block v-if="(data_list || null) != null && (data_list.config || null) != null">
                     <component-diy :propValue="data_list.config" :propDataId="data_list.id" :propKey="random_value" @onLocationBack="user_back_choice_location">
+                        <!-- 由于diy组件异步加载、默认先加载骨架屏展示 -->
+                        <component-no-data propStatus="1" :propLoadingUseSkeleton="true" propPage="home"></component-no-data>
                         <!-- 底部内容 -->
                         <template slot="diy-bottom-content">
                             <!-- 结尾 -->