From 9ed9c2a9c75c40b8b490b4b44a0e9aa63a670158 Mon Sep 17 00:00:00 2001
From: sws <1141121512@qq.com>
Date: Thu, 2 Nov 2023 18:46:28 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=B5=8B=E8=AF=95=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/css/page.css                           |  3 ++
 components/binding-list/binding-list.vue      |  6 +--
 components/magic-list/magic-list.vue          | 40 ++++++++++++++++---
 components/realstore-list/realstore-list.vue  |  6 +--
 .../profit/profit.vue                         |  2 +-
 .../member-code/member-code.vue               |  6 +--
 .../wallet/payment-code/payment-code.vue      |  6 +--
 pages/user-address/user-address.css           |  2 +-
 pages/user-order/user-order.vue               |  2 +-
 pages/user/user.vue                           |  2 +-
 10 files changed, 54 insertions(+), 21 deletions(-)

diff --git a/common/css/page.css b/common/css/page.css
index d5d3ab9f..c1b8d2cb 100644
--- a/common/css/page.css
+++ b/common/css/page.css
@@ -594,6 +594,9 @@ button:before {
 .br-grey-9 {
     border: solid 1px #999999 !important;
 }
+.br-grey-c {
+    border: solid 1px #cccccc !important;
+}
 
 .br-blue {
     border: solid 1px #2196F3 !important;
diff --git a/components/binding-list/binding-list.vue b/components/binding-list/binding-list.vue
index 8bf0f8be..1638348b 100644
--- a/components/binding-list/binding-list.vue
+++ b/components/binding-list/binding-list.vue
@@ -31,10 +31,10 @@
                             <button type="default" size="mini" class="br-main bg-main cr-white round buy-submit self-e margin-0 text-size-xs">{{ item.type_name }}购买</button>
                         </view>
                     </view>
-                    <view class="binding-goods-list border-radius-main margin-top-main oh" :style="'height: ' + ((item.is_home_show_goods || 0) == 1 ? Math.ceil(item.goods.length / 2) * 146 + 36 : '0') + 'rpx'">
-                        <view class="padding-horizontal-main padding-top-lg padding-bottom-sm oh">
+                    <view class="binding-goods-list border-radius-main margin-top-main oh" :style="'height: ' + ((item.is_home_show_goods || 0) == 1 ? Math.ceil(item.goods.length / 2) * 134 + 12 : '0') + 'rpx'">
+                        <view class="padding-horizontal-main padding-top-main padding-bottom-main oh">
                             <block v-for="(gv, gi) in item.goods" :key="gi">
-                                <view class="goods-item oh margin-top-sm margin-bottom-lg" :data-value="gv.goods_url" @tap="url_event">
+                                <view class="goods-item oh margin-bottom-lg" :data-value="gv.goods_url" @tap="url_event">
                                     <image :src="gv.images" mode="aspectFit" class="goods-images fl dis-block radius"></image>
                                     <view class="goods-right fr bs-bb">
                                         <view class="single-text text-size-sm">{{ gv.title }}</view>
diff --git a/components/magic-list/magic-list.vue b/components/magic-list/magic-list.vue
index 88c31a8b..13e690c7 100644
--- a/components/magic-list/magic-list.vue
+++ b/components/magic-list/magic-list.vue
@@ -14,12 +14,19 @@
                                 </view>
                             </view>
                             <view class="cr-grey-9 text-size-xs margin-bottom-sm">{{ item.describe }}</view>
-                            <swiper class="swiper" circular :autoplay="(item.rolling_time || null) !== null ? true : false" :vertical="propVertical" :interval="(item.rolling_time || null) !== null ? Number(item.rolling_time) * 1000 : '6000'" :duration="propDuration">
+                            <swiper
+                                :class="items.data.length % 2 == 0 ? 'swiper-2' : items.data.length === index + 1 ? 'swiper-1' : 'swiper-2'"
+                                circular
+                                :autoplay="(item.rolling_time || null) !== null ? true : false"
+                                :vertical="propVertical"
+                                :interval="(item.rolling_time || null) !== null ? Number(item.rolling_time) * 1000 : '6000'"
+                                :duration="propDuration"
+                            >
                                 <swiper-item v-for="(swiperItem, swiperIndex) in item.data" :key="swiperIndex">
                                     <view class="swiper-item">
                                         <view class="flex-row">
                                             <view v-for="(listItem, listIndex) in swiperItem" :key="listIndex" :class="items.data.length % 2 == 0 ? 'flex-width-half' : items.data.length === index + 1 ? 'flex-width-half-2' : 'flex-width-half'">
-                                                <view class="padding-main" :data-value="(listItem.goods_url || null) !== null ? listItem.goods_url : ''" @tap="url_event">
+                                                <view class="padding-horizontal-main" :data-value="(listItem.goods_url || null) !== null ? listItem.goods_url : ''" @tap="url_event">
                                                     <image :src="(listItem.images || null) !== null ? listItem.images : ''" mode="widthFix" class="wh-auto border-radius-sm"> </image>
                                                     <view class="price">
                                                         <text class="sales-price va-m text-size-xss va-b">{{ currency_symbol }}</text>
@@ -103,11 +110,34 @@
 
 <style scoped>
     .hot-list > .flex-width-half {
-        margin-bottom: 12rpx;
+        margin-bottom: 24rpx;
+    }
+    .hot-list > .flex-width-half:nth-last-of-type(1),
+    .hot-list > .flex-width-half:nth-last-of-type(2) {
+        margin-bottom: 0;
+    }
+    .hot-list > .flex-width-half:nth-child(even) {
+        position: relative;
     }
 
-    .hot-list .swiper {
-        height: 214rpx;
+    .hot-list > .flex-width-half:nth-child(even)::before {
+        content: '';
+        height: 80%;
+        width: 2rpx;
+        border-left: 2rpx dashed #eeeeee;
+        position: absolute;
+        left: 0;
+        top: 50%;
+        transform: translateY(-50%);
+    }
+
+
+    .hot-list .swiper-2 {
+        height: 158rpx;
+    }
+
+    .hot-list .swiper-1 {
+        height: 169rpx;
     }
 
     .hot-go {
diff --git a/components/realstore-list/realstore-list.vue b/components/realstore-list/realstore-list.vue
index 75e8fd3e..6eb3713f 100644
--- a/components/realstore-list/realstore-list.vue
+++ b/components/realstore-list/realstore-list.vue
@@ -2,7 +2,7 @@
     <view>
         <view v-if="(data_list || null) != null && data_list.length > 0" class="plugins-realstore-data-list oh">
             <block v-for="(item, index) in data_list" :key="index">
-                <view class="item bg-white padding-vertical-xl padding-horizontal-main border-radius-main pr spacing-mb" :class="item.status_info.type === 2 ? 'opacity' : ''" :data-value="item.url" @tap="url_event">
+                <view class="item bg-white padding-top-xl padding-bottom-sm padding-horizontal-main border-radius-main pr spacing-mb" :class="item.status_info.type === 2 ? 'opacity' : ''" :data-value="item.url" @tap="url_event">
                     <view class="base oh flex-row">
                         <!-- 基础内容 -->
                         <image :src="item.logo" mode="widthFix" class="logo circle br"></image>
@@ -24,9 +24,9 @@
                     </view>
                     <view class="flex-row jc-sb align-c br-t-dashed margin-top-main padding-top-sm">
                         <!-- 地址 -->
-                        <view class="padding-top-xs address-content single-text cr-base margin-left-xs dis-inline-block text-size-xs oh cp" :data-value="item.province_name + item.city_name + item.county_name + item.address" @tap.stop="text_copy_event">
+                        <view class="address-content single-text cr-base margin-left-xs dis-inline-block text-size-xs oh cp" :data-value="item.province_name + item.city_name + item.county_name + item.address" @tap.stop="text_copy_event">
                             <view class="dis-inline-block va-m cr-grey-9 margin-top-sm">
-                                <iconfont name="icon-mendian-dingwei"></iconfont>
+                                <iconfont name="icon-index-zxmd-dress"></iconfont>
                             </view>
                             <text class="va-m margin-left-xs">{{ item.province_name }}{{ item.city_name }}{{ item.county_name }}{{ item.address }}</text>
                         </view>
diff --git a/pages/plugins/excellentbuyreturntocash/profit/profit.vue b/pages/plugins/excellentbuyreturntocash/profit/profit.vue
index 4701b517..1ec8fa97 100644
--- a/pages/plugins/excellentbuyreturntocash/profit/profit.vue
+++ b/pages/plugins/excellentbuyreturntocash/profit/profit.vue
@@ -3,7 +3,7 @@
         <!-- 导航 -->
         <view class="nav-base bg-white">
             <block v-for="(item, index) in nav_status_list" :key="index">
-                <view :class="'item fl tc cr-grey ' + (nav_status_index == index ? 'cr-main' : '')" :data-index="index" @tap="nav_event">{{ item.name }}</view>
+                <view :class="'item fl tc cr-grey ' + (nav_status_index == index ? 'cr-main nav-active-line' : '')" :data-index="index" @tap="nav_event">{{ item.name }}</view>
             </block>
         </view>
 
diff --git a/pages/plugins/membershiplevelvip/member-code/member-code.vue b/pages/plugins/membershiplevelvip/member-code/member-code.vue
index 61fa3179..ce208299 100644
--- a/pages/plugins/membershiplevelvip/member-code/member-code.vue
+++ b/pages/plugins/membershiplevelvip/member-code/member-code.vue
@@ -19,9 +19,9 @@
             <!-- 导航 -->
             <view v-if="(plugins_wallet || null) != null" class="bottom-fixed padding-main br-0">
                 <view class="bottom-line-exclude oh">
-                    <view class="bg-grey round oh">
-                        <button type="default" class="bg-main br-main cr-white round text-size fl" size="mini">会员码</button>
-                        <button type="default" class="bg-grey br-grey cr-base round text-size fr" size="mini" :data-value="'/pages/plugins/wallet/payment-code/payment-code?screen_brightness_value=' + screen_brightness_value" data-redirect="1" @tap="url_event">钱包付款码</button>
+                    <view class="bg-white br-grey-d round oh">
+                        <button type="default" class="bg-main cr-white round text-size fl br-0" size="mini">会员码</button>
+                        <button type="default" class="bg-white round text-size fr br-0" size="mini" :data-value="'/pages/plugins/wallet/payment-code/payment-code?screen_brightness_value=' + screen_brightness_value" data-redirect="1" @tap="url_event">钱包付款码</button>
                     </view>
                 </view>
             </view>
diff --git a/pages/plugins/wallet/payment-code/payment-code.vue b/pages/plugins/wallet/payment-code/payment-code.vue
index b91520f2..faf3c64f 100644
--- a/pages/plugins/wallet/payment-code/payment-code.vue
+++ b/pages/plugins/wallet/payment-code/payment-code.vue
@@ -22,9 +22,9 @@
             <!-- 导航 -->
             <view v-if="(plugins_membershiplevelvip || null) != null" class="bottom-fixed padding-main br-0">
                 <view class="bottom-line-exclude oh">
-                    <view class="bg-grey round oh">
-                        <button type="default" class="bg-grey br-grey cr-base round text-size fl" size="mini" :data-value="'/pages/plugins/membershiplevelvip/member-code/member-code?screen_brightness_value=' + screen_brightness_value" data-redirect="1" @tap="url_event">会员码</button>
-                        <button type="default" class="bg-main br-main cr-white round text-size fr" size="mini">钱包付款码</button>
+                    <view class="bg-white br-grey-d round oh">
+                        <button type="default" class="bg-white round text-size fl br-0" size="mini" :data-value="'/pages/plugins/membershiplevelvip/member-code/member-code?screen_brightness_value=' + screen_brightness_value" data-redirect="1" @tap="url_event">会员码</button>
+                        <button type="default" class="bg-main cr-white round text-size fr br-0" size="mini">钱包付款码</button>
                     </view>
                 </view>
             </view>
diff --git a/pages/user-address/user-address.css b/pages/user-address/user-address.css
index 952d85d4..9038893f 100644
--- a/pages/user-address/user-address.css
+++ b/pages/user-address/user-address.css
@@ -23,7 +23,7 @@
 
 .btn-bottom button {
     height: 88rpx;
-    line-height: 88rpox;
+    line-height: 88rpx;
 }
 
 .submit-list button {
diff --git a/pages/user-order/user-order.vue b/pages/user-order/user-order.vue
index 04cc2c57..5b839b56 100644
--- a/pages/user-order/user-order.vue
+++ b/pages/user-order/user-order.vue
@@ -3,7 +3,7 @@
         <!-- 导航 -->
         <view class="nav-base bg-white">
             <block v-for="(item, index) in nav_status_list" :key="index">
-                <view v-if="nav_status_index == index" class="item fl tc cr-main" :data-index="index" @tap="nav_event">{{ item.name }}</view>
+                <view v-if="nav_status_index == index" class="item fl tc cr-main nav-active-line" :data-index="index" @tap="nav_event">{{ item.name }}</view>
                 <view v-else class="item fl tc" :data-index="index" @tap="nav_event">{{ item.name }}</view>
             </block>
         </view>
diff --git a/pages/user/user.vue b/pages/user/user.vue
index d0b7b5dc..aeca6ec8 100644
--- a/pages/user/user.vue
+++ b/pages/user/user.vue
@@ -12,7 +12,7 @@
                             <view class="va-m dis-inline-block margin-left-lg">
                                 <view class="flex-col align-b" data-value="/pages/personal/personal" @tap="url_event">
                                     <text class="va-m fw-b text-size">{{ nickname }}</text>
-                                    <view v-if="(user_id || null) != null" class="head-id border-radius-sm padding-vertical-xsss padding-horizontal-sm margin-top-sm dis-inline-block fw-b">
+                                    <view v-if="(user_id || null) != null" class="head-id border-radius-sm padding-horizontal-sm margin-top-sm dis-inline-block fw-b">
                                         <text class="text-size-xs">ID </text>
                                         <text class="text-size-xss padding-left-xs">{{ user_id }}</text>
                                     </view>