From 75212defd0e099de70d42ce71bdf29492680bdd8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8E=E8=82=96=E7=A3=8A?= <18851179580@163.com>
Date: Mon, 25 Nov 2024 17:01:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=BC=E8=88=AA=E7=BB=84?=
 =?UTF-8?q?=E7=9A=84=E8=A7=92=E6=A0=87=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                                    | 4 ++--
 components/diy/goods-list.vue              | 4 ++--
 components/diy/modules/subscript/index.vue | 8 ++++++--
 components/diy/nav-group.vue               | 2 +-
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/App.vue b/App.vue
index d5dea266..7fef10f5 100644
--- a/App.vue
+++ b/App.vue
@@ -7,10 +7,10 @@
             data: {
                 // 基础配置
                 // 数据接口请求地址
-                request_url:'http://new.shopxo.vip/',
+                request_url:'http://shopxo.com/',
 
                 // 静态资源地址（如系统根目录不在public目录下面请在静态地址后面加public目录、如：https://d1.shopxo.vip/public/）
-                static_url:'http://new.shopxo.vip/',
+                static_url:'http://shopxo.com/',
 
                 // 系统类型（默认default、如额外独立小程序、可与程序分身插件实现不同主体小程序及支付独立）
                 system_type: 'default',
diff --git a/components/diy/goods-list.vue b/components/diy/goods-list.vue
index 38a0d592..bc217bfb 100644
--- a/components/diy/goods-list.vue
+++ b/components/diy/goods-list.vue
@@ -17,7 +17,7 @@
                             </block>
                             <block v-else>
                                 <block v-if="!isEmpty(item)">
-                                    <view class="oh re" :class="img_size">
+                                    <view class="oh pr" :class="img_size">
                                         <view v-if="!isEmpty(item.new_cover)" :style="img_size">
                                             <imageEmpty :propImageSrc="item.new_cover[0]" :propStyle="content_img_radius" propErrorStyle="width: 100rpx;height: 100rpx;"></imageEmpty>
                                         </view>
@@ -117,7 +117,7 @@
                                 <view v-for="(item, index) in item1.split_list" :key="index" class="pr oh" :style="layout_style" :data-index="index1" :data-split-index="index" :data-value="item.goods_url" @tap.stop="url_event">
                                     <view :class="layout_type" :style="layout_img_style">
                                         <block v-if="!isEmpty(item)">
-                                            <view class="oh re" :class="'flex-img' + theme">
+                                            <view class="oh pr" :class="'flex-img' + theme">
                                                 <view v-if="!isEmpty(item.new_cover)" :class="'flex-img' + theme">
                                                     <imageEmpty :propImageSrc="item.new_cover[0]" :propStyle="content_img_radius" propErrorStyle="width: 100rpx;height: 100rpx;"></imageEmpty>
                                                 </view>
diff --git a/components/diy/modules/subscript/index.vue b/components/diy/modules/subscript/index.vue
index eb98c510..c828aca8 100644
--- a/components/diy/modules/subscript/index.vue
+++ b/components/diy/modules/subscript/index.vue
@@ -28,6 +28,10 @@
                 type: Object,
                 default: () => ({}),
             },
+            propType: {
+                type: String,
+                default: 'outer',
+            },
         },
         data() {
             return {
@@ -45,9 +49,9 @@
             isEmpty,
             // 初始化数据
             init() {
-                if (!isEmpty(this.propValue) && !isEmpty(this.propValue.style.subscript_style)) {
+                if (!isEmpty(this.propValue)) {
                     const new_content = this.propValue.content || {};
-                    const new_style = this.propValue.style || {};
+                    const new_style = this.propType == 'outer' ? this.propValue.style || {} : { subscript_style: this.propValue.style || {} };
                     
                     // 视频比例
                     this.setData({
diff --git a/components/diy/nav-group.vue b/components/diy/nav-group.vue
index 60ab1352..3dfc4a91 100644
--- a/components/diy/nav-group.vue
+++ b/components/diy/nav-group.vue
@@ -10,7 +10,7 @@
                                     <imageEmpty :propImageSrc="item1.img[0]" :propStyle="img_style" propErrorStyle="width: 60rpx;height: 60rpx;"></imageEmpty>
                                 </view>
                                 <!-- 角标 -->
-                                <subscriptIndex :propValue="propValue"></subscriptIndex>
+                                <subscriptIndex :propValue="item1.subscript" propType="nav-group"></subscriptIndex>
                             </view>
                             <view v-if="['image_with_text', 'text'].includes(nav_style)" class="wh-auto size-12 ma-0 nowrap oh tc" :style="text_style">{{ item1.title }}</view>
                         </view>