From 171bf1d416bd2cac1762c955651b73e9283c43c3 Mon Sep 17 00:00:00 2001
From: lifizer <913626195@qq.com>
Date: Mon, 22 Apr 2024 10:42:39 +0800
Subject: [PATCH] =?UTF-8?q?Fix(=E6=90=9C=E7=B4=A2):[#1197,=20#1206]?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=98=BE=E7=A4=BA=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/good/NoData.vue     | 19 ++++++++++++--
 pages/shop/GoodsList/index.vue | 47 ++++++++++++++++++++++++----------
 2 files changed, 50 insertions(+), 16 deletions(-)

diff --git a/components/good/NoData.vue b/components/good/NoData.vue
index 4562662..f00a2cb 100644
--- a/components/good/NoData.vue
+++ b/components/good/NoData.vue
@@ -1,13 +1,28 @@
 <template>
     <view class="noCommodity">
       <view class="noPictrue">
-        <image :src="webUrl+'/20210203153900181449.png'" class="image"/>
+        <image
+          v-if="type === 'good'"
+          :src=" webUrl + '/20210203153900181449.png'"
+          class="image"
+        />
+        <image
+          v-if="type === 'hotel'"
+          :src=" webUrl + '/no-hotel.png'"
+          class="image"
+        />
       </view>
     </view>
 </template>
 <script>
 export default {
-  name: "NoGoodData",
+  name: 'NoGoodData',
+  props: {
+    type: {
+      type: String,
+      default: 'good'
+    }
+  },
   data: function() {
     return {
       webUrl: this.$VUE_APP_RESOURCES_URL
diff --git a/pages/shop/GoodsList/index.vue b/pages/shop/GoodsList/index.vue
index aec91fa..74675a0 100644
--- a/pages/shop/GoodsList/index.vue
+++ b/pages/shop/GoodsList/index.vue
@@ -32,7 +32,10 @@
         </view>
       </view>
     </view>
-    <view class="nav acea-row row-middle">
+    <view
+      v-if="searchType === 'good'"
+      class="nav acea-row row-middle"
+    >
       <view class="item">
         <text class="tag">
           综合
@@ -52,10 +55,6 @@
       </view>
     </view>
     <view v-if="searchType === 'good'">
-      <goo-skeleton
-        v-if="loading"
-        :show-avatar="false"
-      />
       <view class="list acea-row row-between-wrapper">
         <view
           v-for="(item, listIndex) in list"
@@ -82,6 +81,10 @@
           </view>
         </view>
       </view>
+      <goo-skeleton
+        v-if="loading"
+        :show-avatar="false"
+      />
       <u-loadmore
         v-if="loadend && list.length > 0"
         :line="true"
@@ -91,9 +94,6 @@
     </view>
     <view v-else>
       <view class="hotel-wrap">
-        <goo-skeleton
-          v-if="loading"
-        />
         <view class="list">
           <view
             v-for="(item, index) in list"
@@ -136,6 +136,9 @@
             </view>
           </view>
         </view>
+        <goo-skeleton
+          v-if="loading"
+        />
         <u-loadmore
           v-if="loadend && list.length > 0"
           :line="true"
@@ -144,7 +147,10 @@
         />
       </view>
     </view>
-    <no-good-data v-if="list.length === 0 && query.page > 1" />
+    <no-good-data
+      v-if="list.length === 0 && query.page > 1"
+      :type="searchType"
+    />
   </view>
 </template>
 
@@ -280,6 +286,15 @@ export default {
 </script>
 
 <style scoped lang="less">
+.productList {
+  min-height: 100vh;
+  background-color: #fff;
+  .list {
+    margin: 0;
+    padding: 172rpx 20rpx 0 20rpx;
+    background-color: #f7f7f7;
+  }
+}
 .noCommodity {
   display: flex;
   justify-content: center;
@@ -340,12 +355,12 @@ export default {
     top: 80rpx;
     left: 23rpx;
     z-index: 5;
-    width: 90px;
-    padding: 10rpx;
+    width: 70px;
+    padding: 10rpx 20rpx;
     border-radius: 4px;
     background-color: #fff;
     .item + .item {
-      border-top: 1px solid #707070;
+      border-top: 1px solid #eee;
     }
     .item {
       text-align: center;
@@ -406,11 +421,15 @@ export default {
   }
 }
 .hotel-wrap {
-  padding: 23rpx 0;
+  padding: 0 0 23rpx 0;
+  .list {
+    padding-top: 86rpx;
+    background-color: #f7f7f7;
+  }
 }
 .hotel-item {
   padding: 15rpx;
-  margin: 0 0 23rpx;
+  margin: 23rpx 0 0 0;
   border-radius: 4px;
   background-color: #fff;
   box-shadow: 0px 3px 6px rgba(0,0,0,0.16);