From e66098285ca16a0d590a6ebc3003df66283ce10e Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Wed, 17 Nov 2021 18:07:15 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BC=98=E5=8C=96=EF=BC=8C?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E8=AF=A6=E6=83=85=E5=AF=BC=E8=88=AA=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E9=80=82=E9=85=8D=E7=99=BE=E5=BA=A6=E5=B0=8F=E7=A8=8B?=
 =?UTF-8?q?=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/search/search.vue                         | 9 +++------
 pages/goods-detail/goods-detail.vue                  | 4 +++-
 pages/plugins/blog/search/search.css                 | 2 +-
 pages/plugins/blog/search/search.vue                 | 2 +-
 pages/plugins/membershiplevelvip/order/order.vue     | 2 +-
 pages/plugins/wallet/user-recharge/user-recharge.vue | 2 +-
 pages/user-order/user-order.vue                      | 2 +-
 7 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/components/search/search.vue b/components/search/search.vue
index b1334bf9..3fca3ab5 100644
--- a/components/search/search.vue
+++ b/components/search/search.vue
@@ -1,7 +1,7 @@
 <template>
     <view>
-        <view class="search-content">
-            <icon type="search" size="12"></icon>
+        <view class="search-content pr">
+            <icon type="search" size="12" class="pa"></icon>
             <input type="text" confirm-type="search" :placeholder="propPlaceholder" placeholder-class="cr-grey" class="cr-base round wh-auto dis-block" @confirm="search_input_event" :style="'background:'+propBgColor+';'+((propBrColor || null) != null ? 'border:1px solid '+propBrColor+';' : '')">
         </view>
     </view>
@@ -53,13 +53,10 @@
     };
 </script>
 <style>
-    .search-content {
-        position: relative;
-    }
     .search-content icon {
-        position: absolute;
         left: 30rpx;
         top: calc(50% - 6px);
+        z-index: 1;
     }
     .search-content input {
         font-size: 26rpx;
diff --git a/pages/goods-detail/goods-detail.vue b/pages/goods-detail/goods-detail.vue
index 25145515..f8bca132 100644
--- a/pages/goods-detail/goods-detail.vue
+++ b/pages/goods-detail/goods-detail.vue
@@ -2,12 +2,14 @@
     <view>
         <!-- 顶部导航 -->
         <view v-if="goods != null" class="page">
-            <!-- #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-TOUTIAO -->
+            <!-- #ifdef MP-WEIXIN || MP-QQ || MP-TOUTIAO -->
             <!-- 小导航 -->
             <view class="top-nav-left-icon" :style="'top:'+(status_bar_height+8)+'px;'">
                 <uni-icons type="arrowleft" size="20" color="#333" class="icon round" @tap="top_nav_left_back_event"></uni-icons>
                 <uni-icons v-if="nav_more_list.length > 0" type="list" size="20" color="#333" class="icon round margin-left-lg" @tap="top_nav_left_more_event"></uni-icons>
             </view>
+            <!-- #endif -->
+            <!-- #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-TOUTIAO -->
             <!-- 更多导航 -->
             <view v-if="nav_more_list.length > 0 && nav_more_status" class="nav-more-view tc" :style="'top:'+(status_bar_height+48)+'px;'">
                 <view class="triangle dis-inline-block pa"></view>
diff --git a/pages/plugins/blog/search/search.css b/pages/plugins/blog/search/search.css
index 88763876..fd152dfe 100644
--- a/pages/plugins/blog/search/search.css
+++ b/pages/plugins/blog/search/search.css
@@ -2,9 +2,9 @@
  * 搜索
  */
 .search-keywords icon {
-    position: absolute;
     left: 30rpx;
     top: calc(50% - 6px);
+    z-index: 1;
 }
 .search-keywords input {
     font-size: 26rpx;
diff --git a/pages/plugins/blog/search/search.vue b/pages/plugins/blog/search/search.vue
index 8cf27c55..299ecd64 100644
--- a/pages/plugins/blog/search/search.vue
+++ b/pages/plugins/blog/search/search.vue
@@ -4,7 +4,7 @@
             <!-- 搜索关键字 -->
             <view class="padding-horizontal-main padding-top-main padding-bottom-sm bg-white">
                 <view class="search-keywords pr">
-                    <icon type="search" size="12"></icon>
+                    <icon type="search" size="12" class="pa"></icon>
                     <input type="text" confirm-type="search" placeholder="其实搜索很简单^_^ !" :value="search_keywords_value" @confirm="search_keywords_event" class="cr-base round wh-auto" placeholder-class="cr-grey">
                 </view>
             </view>
diff --git a/pages/plugins/membershiplevelvip/order/order.vue b/pages/plugins/membershiplevelvip/order/order.vue
index 5820b5b3..cae4e0bd 100644
--- a/pages/plugins/membershiplevelvip/order/order.vue
+++ b/pages/plugins/membershiplevelvip/order/order.vue
@@ -52,7 +52,7 @@
                     </view>
                 </view>
             </view>
-            <view v-else class="payment-list oh bg-white tc cr-gray">没有支付方式</view>
+            <view v-else class="padding-top-xxxl padding-bottom-xxxl oh bg-white tc cr-gray">没有支付方式</view>
         </component-popup>
     </view>
 </template>
diff --git a/pages/plugins/wallet/user-recharge/user-recharge.vue b/pages/plugins/wallet/user-recharge/user-recharge.vue
index e5b3d24f..447cb01f 100644
--- a/pages/plugins/wallet/user-recharge/user-recharge.vue
+++ b/pages/plugins/wallet/user-recharge/user-recharge.vue
@@ -51,7 +51,7 @@
                     </view>
                 </view>
             </view>
-            <view v-else class="payment-list oh bg-white tc cr-gray">没有支付方式</view>
+            <view v-else class="padding-top-xxxl padding-bottom-xxxl oh bg-white tc cr-gray">没有支付方式</view>
         </component-popup>
     </view>
 </template>
diff --git a/pages/user-order/user-order.vue b/pages/user-order/user-order.vue
index 6002563a..7648dd19 100644
--- a/pages/user-order/user-order.vue
+++ b/pages/user-order/user-order.vue
@@ -80,7 +80,7 @@
                     </view>
                 </view>
             </view>
-            <view v-else class="payment-list oh bg-white tc cr-gray">没有支付方式</view>
+            <view v-else class="padding-top-xxxl padding-bottom-xxxl oh bg-white tc cr-gray">没有支付方式</view>
         </component-popup>
     </view>
 </template>