From 4d876890e128ddf90f3cffdca1e51a99541692d8 Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Mon, 30 Sep 2024 18:44:42 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E9=97=A8=E5=BA=97=E8=B4=AD=E7=89=A9?=
 =?UTF-8?q?=E8=BD=A6=E5=AF=BC=E8=88=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                                      |   4 +-
 components/realstore-cart/realstore-cart.vue | 138 ++++++++++---------
 2 files changed, 72 insertions(+), 70 deletions(-)

diff --git a/App.vue b/App.vue
index 1dc12c0e..40037452 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/components/realstore-cart/realstore-cart.vue b/components/realstore-cart/realstore-cart.vue
index 3d6ab7e7..65d6f095 100644
--- a/components/realstore-cart/realstore-cart.vue
+++ b/components/realstore-cart/realstore-cart.vue
@@ -5,92 +5,94 @@
             <view v-if="cart_status" class="plugins-realstore-cart-mask wh-auto ht-auto pf" @tap="cart_switch_event"></view>
             <!-- 购物车列表 -->
             <view class="plugins-realstore-cart-content pf wh-auto" :style="realstore_cart_content_style">
-                <view v-if="cart_status" class="bg-white border-radius-main pr oh margin-main margin-bottom-xxxl">
-                    <block v-if="(cart || null) != null && (cart.data || null) != null && cart.data.length > 0">
-                        <view class="oh br-b padding-vertical-main padding-horizontal-main text-size-xs">
-                            <text class="va-m cr-base">{{$t('goods-category.goods-category.ico62g')}}</text>
-                            <view v-if="(info.buy_use_type_list || null) != null && info.buy_use_type_list.length > 0" class="dis-inline-block margin-left-xl">
-                                <text class="cr-red">{{$t('realstore-cart.realstore-cart.v437n6')}}</text>
-                                <view class="va-m dis-inline-block br-green cr-green round padding-horizontal-sm padding-vertical-xs cp" @tap="buy_use_type_event">
-                                    <text class="va-m">{{$t('realstore-cart.realstore-cart.6bmc34')}}{{info.buy_use_type_list[buy_use_type_index]['name']}})</text>
-                                    <view class="va-m dis-inline-block margin-left-xs">
-                                        <iconfont name="icon-arrow-bottom" size="24rpx" propClass="cr-green"></iconfont>
+                <view class="bottom-line-exclude">
+                    <view v-if="cart_status" class="bg-white border-radius-main pr oh margin-horizontal-main margin-bottom-xxxl">
+                        <block v-if="(cart || null) != null && (cart.data || null) != null && cart.data.length > 0">
+                            <view class="oh br-b padding-vertical-main padding-horizontal-main text-size-xs">
+                                <text class="va-m cr-base">{{$t('goods-category.goods-category.ico62g')}}</text>
+                                <view v-if="(info.buy_use_type_list || null) != null && info.buy_use_type_list.length > 0" class="dis-inline-block margin-left-xl">
+                                    <text class="cr-red">{{$t('realstore-cart.realstore-cart.v437n6')}}</text>
+                                    <view class="va-m dis-inline-block br-green cr-green round padding-horizontal-sm padding-vertical-xs cp" @tap="buy_use_type_event">
+                                        <text class="va-m">{{$t('realstore-cart.realstore-cart.6bmc34')}}{{info.buy_use_type_list[buy_use_type_index]['name']}})</text>
+                                        <view class="va-m dis-inline-block margin-left-xs">
+                                            <iconfont name="icon-arrow-bottom" size="24rpx" propClass="cr-green"></iconfont>
+                                        </view>
                                     </view>
                                 </view>
-                            </view>
-                            <view class="fr cp" @tap="cart_all_delete_event">
-                                <view class="dis-inline-block va-m">
-                                    <uni-icons type="trash" size="24rpx" color="#f00"></uni-icons>
+                                <view class="fr cp" @tap="cart_all_delete_event">
+                                    <view class="dis-inline-block va-m">
+                                        <uni-icons type="trash" size="24rpx" color="#f00"></uni-icons>
+                                    </view>
+                                    <text class="cr-red va-m margin-left-xs">{{$t('common.clear')}}</text>
                                 </view>
-                                <text class="cr-red va-m margin-left-xs">{{$t('common.clear')}}</text>
                             </view>
-                        </view>
-                        <scroll-view :scroll-y="true" class="cart-list goods-list">
-                            <view v-for="(goods, index) in cart.data" :key="index" class="item padding-main oh spacing-mb">
-                                <view :data-index="index" :data-value="'/pages/goods-detail/goods-detail?id=' + goods.goods_id + '&is_opt_back=1&buy_use_type_index=' + buy_use_type_index + '&realstore_id=' + info.id" @tap="goods_event">
-                                    <view class="flex-row jc-sb">
-                                        <image :src="goods.images" mode="widthFix" class="goods-img radius br"></image>
-                                        <view class="goods-base flex-1 flex-width padding-left-main flex-col jc-sb">
-                                            <view class="goods-base-content">
-                                                <view class="goods-title text-size-sm single-text">{{ goods.title }}</view>
-                                                <view v-if="goods.spec != null" class="text-size-xs cr-grey margin-top-sm">
-                                                    <block v-for="(sv, si) in goods.spec" :key="si">
-                                                        <text v-if="si > 0" class="padding-left-xs padding-right-xs">;</text>
-                                                        <text>{{ sv.value }}</text>
-                                                    </block>
-                                                </view>
-                                            </view>
-                                            <view class="margin-top-sm">
-                                                <view class="sales-price text-size-sm single-text dis-inline-block va-m">{{ propCurrencySymbol }}{{ goods.price }}</view>
-                                                <view class="tc fr flex-row align-c">
-                                                    <view v-if="(goods.stock || 0) > 0" class="cp pr top-sm" :data-index="index" data-type="0" @tap.stop="cart_stock_event">
-                                                        <iconfont name="icon-cart-dec" size="40rpx" :color="theme_color"></iconfont>
+                            <scroll-view :scroll-y="true" class="cart-list goods-list">
+                                <view v-for="(goods, index) in cart.data" :key="index" class="item padding-main oh spacing-mb">
+                                    <view :data-index="index" :data-value="'/pages/goods-detail/goods-detail?id=' + goods.goods_id + '&is_opt_back=1&buy_use_type_index=' + buy_use_type_index + '&realstore_id=' + info.id" @tap="goods_event">
+                                        <view class="flex-row jc-sb">
+                                            <image :src="goods.images" mode="widthFix" class="goods-img radius br"></image>
+                                            <view class="goods-base flex-1 flex-width padding-left-main flex-col jc-sb">
+                                                <view class="goods-base-content">
+                                                    <view class="goods-title text-size-sm single-text">{{ goods.title }}</view>
+                                                    <view v-if="goods.spec != null" class="text-size-xs cr-grey margin-top-sm">
+                                                        <block v-for="(sv, si) in goods.spec" :key="si">
+                                                            <text v-if="si > 0" class="padding-left-xs padding-right-xs">;</text>
+                                                            <text>{{ sv.value }}</text>
+                                                        </block>
                                                     </view>
-                                                    <view v-if="(goods.stock || 0) > 0" class="buy-number dis-inline-block cr-black text-size-sm padding-left-xs padding-right-xs va-m">{{ goods.stock }} </view>
-                                                    <view class="cp pr top-sm" :data-index="index" data-type="1" @tap.stop="cart_stock_event">
-                                                        <iconfont name="icon-cart-inc" size="40rpx" :color="theme_color"></iconfont>
+                                                </view>
+                                                <view class="margin-top-sm">
+                                                    <view class="sales-price text-size-sm single-text dis-inline-block va-m">{{ propCurrencySymbol }}{{ goods.price }}</view>
+                                                    <view class="tc fr flex-row align-c">
+                                                        <view v-if="(goods.stock || 0) > 0" class="cp pr top-sm" :data-index="index" data-type="0" @tap.stop="cart_stock_event">
+                                                            <iconfont name="icon-cart-dec" size="40rpx" :color="theme_color"></iconfont>
+                                                        </view>
+                                                        <view v-if="(goods.stock || 0) > 0" class="buy-number dis-inline-block cr-black text-size-sm padding-left-xs padding-right-xs va-m">{{ goods.stock }} </view>
+                                                        <view class="cp pr top-sm" :data-index="index" data-type="1" @tap.stop="cart_stock_event">
+                                                            <iconfont name="icon-cart-inc" size="40rpx" :color="theme_color"></iconfont>
+                                                        </view>
                                                     </view>
                                                 </view>
                                             </view>
                                         </view>
                                     </view>
                                 </view>
-                            </view>
-                        </scroll-view>
-                    </block>
-                    <block v-else>
-                        <component-no-data propStatus="0" :propMsg="$t('realstore-cart.realstore-cart.2dc65q')"></component-no-data>
-                        <view v-if="(info.buy_use_type_list || null) != null && info.buy_use_type_list.length > 0" class="padding-vertical-xxxl margin-vertical-xxxl tc text-size-xs">
-                            <text class="cr-red va-m">{{$t('realstore-cart.realstore-cart.v437n6')}}</text>
-                            <view class="va-m dis-inline-block br-green cr-green round padding-horizontal padding-vertical-xs cp" @tap="buy_use_type_event">
-                                <text class="va-m">{{$t('realstore-cart.realstore-cart.6bmc34')}}{{info.buy_use_type_list[buy_use_type_index]['name']}})</text>
-                                <view class="va-m dis-inline-block margin-left-xs">
-                                    <iconfont name="icon-arrow-bottom" size="24rpx" propClass="cr-green"></iconfont>
+                            </scroll-view>
+                        </block>
+                        <block v-else>
+                            <component-no-data propStatus="0" :propMsg="$t('realstore-cart.realstore-cart.2dc65q')"></component-no-data>
+                            <view v-if="(info.buy_use_type_list || null) != null && info.buy_use_type_list.length > 0" class="padding-vertical-xxxl margin-vertical-xxxl tc text-size-xs">
+                                <text class="cr-red va-m">{{$t('realstore-cart.realstore-cart.v437n6')}}</text>
+                                <view class="va-m dis-inline-block br-green cr-green round padding-horizontal padding-vertical-xs cp" @tap="buy_use_type_event">
+                                    <text class="va-m">{{$t('realstore-cart.realstore-cart.6bmc34')}}{{info.buy_use_type_list[buy_use_type_index]['name']}})</text>
+                                    <view class="va-m dis-inline-block margin-left-xs">
+                                        <iconfont name="icon-arrow-bottom" size="24rpx" propClass="cr-green"></iconfont>
+                                    </view>
                                 </view>
                             </view>
-                        </view>
-                    </block>
-                </view>
+                        </block>
+                    </view>
 
-                <!-- 购物车底部导航 -->
-                <view class="plugins-realstore-cart-botton-nav pr round oh bg-white">
-                    <view class="wh-auto flex-row jc-sb align-c">
-                        <view class="flex-row align-c flex-1 flex-width padding-bottom-xs">
-                            <view class="cart-icon-total pr cp top-sm padding-left-main" @tap="cart_switch_event">
-                                <iconfont name="icon-applet-shop-acquiesce" size="36rpx" color="#666"></iconfont>
-                                <view v-if="(cart || null) != null && (cart.buy_number || 0) > 0" class="badge-icon pa">
-                                    <component-badge :propNumber="cart.buy_number"></component-badge>
+                    <!-- 购物车底部导航 -->
+                    <view class="plugins-realstore-cart-botton-nav pr round oh bg-white">
+                        <view class="wh-auto flex-row jc-sb align-c">
+                            <view class="flex-row align-c flex-1 flex-width padding-bottom-xs">
+                                <view class="cart-icon-total pr cp top-sm padding-left-main" @tap="cart_switch_event">
+                                    <iconfont name="icon-applet-shop-acquiesce" size="36rpx" color="#666"></iconfont>
+                                    <view v-if="(cart || null) != null && (cart.buy_number || 0) > 0" class="badge-icon pa">
+                                        <component-badge :propNumber="cart.buy_number"></component-badge>
+                                    </view>
+                                </view>
+                                <view class="cart-total-price single-text fw-b cr-red padding-left-sm" @tap="cart_switch_event">
+                                    <text class="text-size-xss">{{ propCurrencySymbol }}</text>
+                                    <text class="text-size-lg">{{ (cart || null) == null ? '0.00' : (cart.total_price || '0.00') }}</text>
                                 </view>
                             </view>
-                            <view class="cart-total-price single-text fw-b cr-red padding-left-sm" @tap="cart_switch_event">
-                                <text class="text-size-xss">{{ propCurrencySymbol }}</text>
-                                <text class="text-size-lg">{{ (cart || null) == null ? '0.00' : (cart.total_price || '0.00') }}</text>
+                            <view class="padding-right-main padding-top-main padding-bottom-sm">
+                                <button v-if="params.source == 'goods'" type="default" size="mini" hover-class="none" @tap="cart_submit_event" :loading="realstore_goods_data_cart_loading" :class="'btn text-size-md round margin-right-main ' + (realstore_goods_data_cart_status ? 'bg-main-pair cr-white' : 'bg-grey-disabled cr-grey')" :disabled="!realstore_goods_data_cart_status">{{ realstore_goods_data_cart_text }}</button>
+                                <button type="default" size="mini" hover-class="none" @tap="buy_submit_event" :loading="settlement_btn_loading" :class="'btn text-size-md round ' + (settlement_btn_status ? 'bg-main cr-white' : 'bg-grey-disabled cr-grey')">{{ settlement_btn_text }}</button>
                             </view>
                         </view>
-                        <view class="padding-right-main padding-top-main padding-bottom-sm">
-                            <button v-if="params.source == 'goods'" type="default" size="mini" hover-class="none" @tap="cart_submit_event" :loading="realstore_goods_data_cart_loading" :class="'btn text-size-md round margin-right-main ' + (realstore_goods_data_cart_status ? 'bg-main-pair cr-white' : 'bg-grey-disabled cr-grey')" :disabled="!realstore_goods_data_cart_status">{{ realstore_goods_data_cart_text }}</button>
-                            <button type="default" size="mini" hover-class="none" @tap="buy_submit_event" :loading="settlement_btn_loading" :class="'btn text-size-md round ' + (settlement_btn_status ? 'bg-main cr-white' : 'bg-grey-disabled cr-grey')">{{ settlement_btn_text }}</button>
-                        </view>
                     </view>
                 </view>
             </view>

From 8336b667e293a4c8e5c8b258ea16b5561fa27fb0 Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Mon, 30 Sep 2024 19:51:02 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E7=BB=86=E8=8A=82=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/plugins/binding/detail/detail.css | 12 ++++--------
 pages/plugins/binding/detail/detail.vue |  4 ++--
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/pages/plugins/binding/detail/detail.css b/pages/plugins/binding/detail/detail.css
index a172e791..f3224f00 100644
--- a/pages/plugins/binding/detail/detail.css
+++ b/pages/plugins/binding/detail/detail.css
@@ -46,24 +46,20 @@
 /**
  * 导航
  */
-.nav-button.bottom-fixed {
-    padding: 24rpx !important;
-}
-
-.nav-button .left-price {
+.bottom-fixed .left-price {
     width: calc(100% - 270rpx);
 }
 
-.nav-button .right-button {
+.bottom-fixed .right-button {
     width: 240rpx;
 }
 
-.nav-button .right-button button {
+.bottom-fixed .right-button .btn {
     height: 80rpx;
     line-height: 78rpx;
 }
 
-.nav-button .left-price .discount-icon {
+.bottom-fixed .left-price .discount-icon {
     border-top-right-radius: 30rpx;
     border-bottom-left-radius: 30rpx;
     background-image: linear-gradient(45deg, #a3f9a3, #248828, #8bc34a, #d2374c, #9c27b0);
diff --git a/pages/plugins/binding/detail/detail.vue b/pages/plugins/binding/detail/detail.vue
index 9b0c4aaa..b5c229fd 100644
--- a/pages/plugins/binding/detail/detail.vue
+++ b/pages/plugins/binding/detail/detail.vue
@@ -59,7 +59,7 @@
                     </view>
 
                     <!-- 导航 -->
-                    <view class="nav-button bottom-fixed pr">
+                    <view class="bottom-fixed br-top-shadow pr bg-white bt">
                         <view class="bottom-line-exclude oh flex-row jc-sb align-c">
                             <view class="left-price">
                                 <view class="sales-price single-text">
@@ -81,7 +81,7 @@
                                 </view>
                             </view>
                             <view class="right-button">
-                                <button type="default" size="mini" class="bg-main br-main cr-white round text-size fw-b wh-auto" @tap="buy_event">{{$t('detail.detail.27pmj3')}}</button>
+                                <button type="default" size="mini" class="btn bg-main br-main cr-white round text-size fw-b wh-auto" @tap="buy_event">{{$t('detail.detail.27pmj3')}}</button>
                             </view>
                         </view>
                     </view>

From 44f9dd1dfe7c0bc38fca9443fc963881bf76c248 Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Tue, 8 Oct 2024 15:53:30 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index.vue | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pages/index/index.vue b/pages/index/index.vue
index 20e9b30f..063416d8 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -11,6 +11,9 @@
 
                             <!-- 版权信息 -->
                             <component-copyright></component-copyright>
+
+                            <!-- 公共 -->
+                            <component-common ref="common" :propIsGrayscale="plugins_mourning_data_is_app"></component-common>
                         </template>
                     </componentDiy>
                 </block>
@@ -286,10 +289,10 @@
 
             <!-- 快捷导航 -->
             <component-quick-nav :propIsNav="true" :propIsBar="true" :propIsGrayscale="plugins_mourning_data_is_app"></component-quick-nav>
-        </block>
 
-        <!-- 公共 -->
-        <component-common ref="common" :propIsGrayscale="plugins_mourning_data_is_app"></component-common>
+            <!-- 公共 -->
+            <component-common ref="common" :propIsGrayscale="plugins_mourning_data_is_app"></component-common>
+        </block>
     </view>
 </template>
 <script>

From 1d3516e318df5631487120742bd546821d66fe1e Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Tue, 8 Oct 2024 16:09:52 +0800
Subject: [PATCH 4/4] dev

---
 App.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/App.vue b/App.vue
index 40037452..1dc12c0e 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',