From d300e9aaa53169652442bacba60d753c1929879f Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Sat, 21 Dec 2024 23:10:23 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E7=AD=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                              |  4 ++--
 pages.json                           |  7 -------
 pages/plugins/ask/detail/detail.vue  | 12 ++++++------
 pages/plugins/blog/detail/detail.vue |  2 +-
 4 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/App.vue b/App.vue
index 79b838d1..125ee705 100644
--- a/App.vue
+++ b/App.vue
@@ -7,10 +7,10 @@
             data: {
                 // 基础配置
                 // 数据接口请求地址
-                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/',
 
                 // 系统类型（默认default、如额外独立小程序、可与程序分身插件实现不同主体小程序及支付独立）
                 system_type: 'default',
diff --git a/pages.json b/pages.json
index 197cc4e3..43b8e217 100644
--- a/pages.json
+++ b/pages.json
@@ -1371,13 +1371,6 @@
                 {
                     "path": "user-detail/user-detail",
                     "style": {
-                        // #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-KUAISHOU || APP
-                        "navigationStyle": "custom",
-                        // #endif
-                        // #ifdef MP-ALIPAY
-                        "transparentTitle": "auto",
-                        "titlePenetrate": "YES",
-                        // #endif
                         "enablePullDownRefresh": true,
                         "navigationBarTitleText": ""
                     }
diff --git a/pages/plugins/ask/detail/detail.vue b/pages/plugins/ask/detail/detail.vue
index 6c6c9ae1..5a9085a5 100644
--- a/pages/plugins/ask/detail/detail.vue
+++ b/pages/plugins/ask/detail/detail.vue
@@ -13,19 +13,19 @@
                     <view v-if="info.title != info.content">
                         <mp-html :content="info.content" />
                     </view>
-                    <block v-if="(info.goods_data || null) !== null">
-                        <view :data-value="info.goods_data.goods_url" @tap="url_event" class="cp">
+                    <block v-if="(info.goods || null) !== null">
+                        <view :data-value="info.goods.goods_url" @tap="url_event" class="cp">
                             <view class="goods-link spacing-mt bg-grey-f9 padding-main border-radius-sm">
                                 <view class="flex-row jc-sb">
                                     <view class="img border-radius-sm oh margin-right-main">
-                                        <image :src="info.goods_data.images" mode="widthFix" class="wh-auto"></image>
+                                        <image :src="info.goods.images" mode="widthFix" class="wh-auto"></image>
                                     </view>
                                     <view class="flex-1 flex-width flex-row jc-sb align-c">
                                         <view class="flex-1 flex-width padding-right-sm">
-                                            <view class="title multi-text">{{ info.goods_data.title }}</view>
+                                            <view class="title multi-text">{{ info.goods.title }}</view>
                                             <view class="flex-row align-c margin-top-xs">
-                                                <text class="cr-red fw-b margin-right-main">{{ currency_symbol }}{{ info.goods_data.price }}</text>
-                                                <text class="text-size-xs cr-grey-9 original-price">{{ currency_symbol }}{{ info.goods_data.original_price }}</text>
+                                                <text class="cr-red fw-b margin-right-main">{{ currency_symbol }}{{ info.goods.price }}</text>
+                                                <text class="text-size-xs cr-grey-9 original-price">{{ currency_symbol }}{{ info.goods.original_price }}</text>
                                             </view>
                                         </view>
                                         <iconfont name="icon-arrow-right" color="#999"></iconfont>
diff --git a/pages/plugins/blog/detail/detail.vue b/pages/plugins/blog/detail/detail.vue
index d4e6e4db..e67da9a5 100644
--- a/pages/plugins/blog/detail/detail.vue
+++ b/pages/plugins/blog/detail/detail.vue
@@ -191,7 +191,7 @@
                             this.setData({
                                 data_bottom_line_status: true,
                                 data_list_loding_msg: '',
-                                data_list_loding_status: 0,
+                                data_list_loding_status: 3,
                                 data_base: base,
                                 info: info,
                                 right_list: data.right_list || [],