From b535e21e2fa2ce382cebe238efb9fc20d44f9f7d Mon Sep 17 00:00:00 2001
From: linxi <linxi.jiang@jeeyor.com>
Date: Fri, 13 Dec 2024 16:04:25 +0800
Subject: [PATCH] =?UTF-8?q?Feat=EF=BC=9A=20=E5=AF=BB=E8=B6=A3=E5=91=B3?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=AF=B9=E6=8E=A5=EF=BC=88=E7=BC=BA=E5=88=86?=
 =?UTF-8?q?=E4=BA=AB=E6=8E=A5=E5=8F=A3=EF=BC=8C=E5=BA=97=E4=BD=8F=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0=E5=AD=97=E6=AE=B5=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/inn.js                            |  5 +++
 pages.json                            |  1 +
 pages/cloud/haveFun.vue               |  2 +-
 pages/town/components/culture.vue     |  6 +--
 pages/town/components/information.vue | 34 ++++++----------
 pages/town/components/projects.vue    | 52 ++++++++++++++++++++----
 pages/town/components/service.vue     |  8 +++-
 pages/town/index.vue                  | 58 ++++++++++++++++++++++++---
 8 files changed, 124 insertions(+), 42 deletions(-)

diff --git a/api/inn.js b/api/inn.js
index 089c259..3ad1d82 100644
--- a/api/inn.js
+++ b/api/inn.js
@@ -258,4 +258,9 @@ export function getAncientTownActive(params) {
     return request.get("/ancientTown/activity", params)
 }
 
+export function watchTownActive(data) {
+    return request.post("/ancientTown/activity/view", data, {login: true})
+}
+
+
 
diff --git a/pages.json b/pages.json
index b27049c..eff8a24 100644
--- a/pages.json
+++ b/pages.json
@@ -109,6 +109,7 @@
     {
       "path": "pages/town/index",
       "style": {
+        "navigationBarTextStyle": "white",
         "navigationStyle": "custom",
         "navigationBarTitleText": "探索生活好去处"
       }
diff --git a/pages/cloud/haveFun.vue b/pages/cloud/haveFun.vue
index 49f1d9a..734b8b5 100644
--- a/pages/cloud/haveFun.vue
+++ b/pages/cloud/haveFun.vue
@@ -92,7 +92,7 @@
     </view>
     <view class="body" v-if="typeIndex === -1">
       <view class="town-card" v-for="(town, i) in townList" :key="i" @click="toTown(town)">
-        <view class="town-title">{{ town.name }}</view>
+        <!-- <view class="town-title">{{ town.name }}</view> -->
         <image :src="town.frontImage" mode="scaleToFill"/>
         <view class="v12-primary enter-btn">点击进入
           <view class="icon-box"><u-icon name="arrow-rightward" color="#fff" size="8"></u-icon></view>
diff --git a/pages/town/components/culture.vue b/pages/town/components/culture.vue
index d6a633e..d84f23a 100644
--- a/pages/town/components/culture.vue
+++ b/pages/town/components/culture.vue
@@ -1,6 +1,6 @@
 <template>
- <view>
-  <view class="culture v12-d-grid-columns-2">
+ <view class="v12-pa-2">
+  <view class="culture v12-d-grid-columns-2" v-if="list.length > 0">
     <view class="img-item " v-for="(item, index) in list" :key="index" @click="viewImg(item)">
       <image class="img-item" :src="item" mode="widthFix|heightFix" lazy-load="false"></image>
     </view>
@@ -48,7 +48,7 @@ export default {
 <style lang="scss" scoped>
 .culture{
   grid-gap: 20rpx 20rpx;
-  padding: 20rpx;
+  padding: 20rpx 10rpx;
   background: #fff;
   border-radius: 30rpx;
   margin-top: 20rpx;
diff --git a/pages/town/components/information.vue b/pages/town/components/information.vue
index 47e2551..6cbf584 100644
--- a/pages/town/components/information.vue
+++ b/pages/town/components/information.vue
@@ -1,8 +1,8 @@
 <template>
   <view>
-    <view v-if="infoArray.length > 0" class="info-wrapper">
+    <view v-if="actives.length > 0" class="info-wrapper">
       <view class="info-list">
-        <view v-for="(item, index) in infoArray" :key="index" class="info-item">
+        <view v-for="(item, index) in actives" :key="index" class="info-item">
           <view
             :class="item.isTop === 1 ? 'info-item-top' : ''"
             :style="{
@@ -56,7 +56,7 @@
       />
     </view>
     <image
-      v-if="infoArray.length === 0"
+      v-if="actives.length === 0"
       :src="webUrl + '/orderIcon/wu.png'"
       class="img-nodata"
       mode="scaleToFill"
@@ -65,11 +65,7 @@
 </template>
 
 <script>
-import {
-  getNews,
-  hadLike,
-  hadView
-} from "@/api/product"
+import { watchTownActive } from "@/api/inn.js"
 import imgBox from '@/components/imageTypeSet/imagebox.vue'
 export default {
   props: {
@@ -84,25 +80,19 @@ export default {
   data() {
     return {
       webUrl: this.$VUE_APP_RESOURCES_URL,
+      actives: this.infoArray
+    }
+  },
+  watch: {
+    infoArray(val) {
+      this.actives = val
     }
   },
   methods: {
-    likeInfoItemHandle(item, index, value, voValue) {
-      hadLike({ landmarkNewsId: item.id }).then(res => {
-        const { success } = res
-        if (success) {
-          this.$dialog.toast({
-            mes: '操作成功!'
-          })
-          this.$set(this.infoArray[index], 'zan', value)
-          this.$set(this.infoArray[index], 'hasZan', voValue)
-        }
-      })
-    },
     infoItemViewClick(item) {
       uni.$u.debounce(() => {
-        hadView({ landmarkNewsId: item.id }).finally(() => {
-          this.infoArray.map(info => {
+        watchTownActive({ id: item.id }).finally(() => {
+          this.actives.forEach(info => {
             if (info.id === item.id) {
               info.pv += 1
             }
diff --git a/pages/town/components/projects.vue b/pages/town/components/projects.vue
index b21985d..b6b37b1 100644
--- a/pages/town/components/projects.vue
+++ b/pages/town/components/projects.vue
@@ -23,30 +23,43 @@
       </view>
     </view>
     <view 
+      v-if="tabs.length > 0"
       class="content v12-justify-center"
       :class="{
         'first-one': actived === 1,
         'last-one': actived === 3
        }"
-      
     >
-      <view class="v12-d-grid-columns-2 v12-gap-10">
-        <view v-for="(item, index) in items" :key="index" class="store-card">
+      <view v-if="items.length > 0" class="v12-d-grid-columns-2 v12-gap-10">
+        <view v-for="(item, index) in items" :key="index" class="store-card" @click="toStore(item.hotelId)">
           <view>
             <image class="town-cover" :src="item.cover" mode="aspectFit|aspectFill|widthFix"></image>
           </view>
-          <view class="v12-pa-2">
-            <view class="v12-dark-text v12-font-bold v12-font-30 v12-py-1 more-t">昆明小吃</view>
+          <view class="v12-pa-2 card-bottom">
+            <view class="v12-dark-text v12-font-bold v12-font-30 v12-py-1 more-t">{{ item.hotelName }}</view>
             <view class="v12-align-center">
               <view class="avtor">
-                <image class="avtor"></image>
+                <image class="avtor" :src="item.logo" mode="scaleToFill"></image>
               </view>
-              <view class="v12-secondary-dark-text v12-font-28 v12-ml-3 one-t">刘欢小吃</view>
+              <view class="v12-secondary-dark-text v12-font-28 v12-ml-3 one-t">{{ item.hotelName }}</view>
             </view>
           </view>
         </view>
       </view>
+      <image
+        v-if="items.length === 0"
+        :src="webUrl + '/orderIcon/wu.png'"
+        class="img-nodata"
+        style="left: 25%;"
+        mode="scaleToFill"
+      />
     </view>
+    <image
+      v-if="tabs.length === 0"
+      :src="webUrl + '/orderIcon/wu.png'"
+      class="img-nodata"
+      mode="scaleToFill"
+    />
   </view>
 </template>
 
@@ -93,12 +106,35 @@ export default {
   methods: {
     handleTab(value) {
       this.actived = value
-    }
+    },
+    toStore(id) {
+      if (!id) {
+        return
+      }
+      uni.navigateTo({
+        url: '/pagesInn/inn/innHome?id=' + id 
+      })
+    },
   }
 }
 </script>
 
 <style lang="scss" scoped>
+.img-nodata {
+  position: relative;
+  top: 0;
+  left: 50%;
+  transform: translate(-50%, 0);
+  width: 352rpx;
+  height: 338rpx;
+  margin-bottom: 60rpx;
+}
+.card-bottom{
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  height: calc(100% - 356rpx);
+}
 .avtor{
   width: 52rpx;
   height: 52rpx;
diff --git a/pages/town/components/service.vue b/pages/town/components/service.vue
index 2fb34de..a236cb8 100644
--- a/pages/town/components/service.vue
+++ b/pages/town/components/service.vue
@@ -13,7 +13,10 @@
       <view>
         <view class="v12-font-28 v12-mb-1 v12-dark1-text">{{ info.openTime || '' }}</view>
         <view class="v12-font-28 v12-mb-1 v12-dark1-text">{{ info.address || '' }}</view>
-        <view class="v12-font-28 v12-mb-1 v12-dark1-text">{{ info.announcement || '' }}</view>
+        <view class="v12-font-28 v12-mb-1 v12-dark1-text v12-d-flex">
+          <u-icon size="16" :name="webUrl + '/orderIcon/laba.png'"></u-icon>
+          {{ info.announcement || '' }}
+        </view>
       </view>
       <view class="action-wrap">
         <view  @click="showLocation">
@@ -36,7 +39,7 @@
         简介
       </view>
       <view class="intro-text">
-        {{ info.desc || '' }}
+        <rich-text class="" :nodes="info.desc"></rich-text>
       </view>
     </view>
   </view>
@@ -84,6 +87,7 @@ export default {
   background: #fff;
   margin-top: 20rpx;
   border-radius: 30rpx;
+  padding: 20rpx;
 }
 .intro-text{
   color: #999;
diff --git a/pages/town/index.vue b/pages/town/index.vue
index 21b14ba..9ca230f 100644
--- a/pages/town/index.vue
+++ b/pages/town/index.vue
@@ -1,7 +1,18 @@
 <template>
   <view class="town">
+    <hx-navbar :back="true" :fixed="true" color="#fff" :statusBar="true" transparent="hidden" barPlaceholder="hidden" />
     <view class="top-img">
-      <image :src="townInfo.cover" mode="scaleToFill" class="img"></image>
+      <image v-if="townInfo.coverType === 1" :src="townInfo.cover" mode="scaleToFill" class="img"></image>
+      <video 
+        v-if="townInfo.coverType === 2"
+        class="img" 
+        :src="townInfo.cover"  
+        autoplay
+        :play-btn-position="center" 
+        :show-fullscreen-btn="false"
+        :show-play-btn="false"
+        :show-center-play-btn="flase"
+        > </video>
     </view>
     <view class="top-intro">
       <view class="intro-title v12-pa-3">
@@ -10,9 +21,12 @@
           4A
         </text>
       </view>
+      <view class="shareBtn"><u-icon name="share-square" color="#C52733"></u-icon>分享给好友</view>
       <u-line dashed></u-line>
-      <view class="v12-pa-3 intro-content">
-        {{ townInfo.intro }}
+      <view v-if="townInfo.intro" class="v12-pa-3 intro-content">
+        <u-read-more :toggle="true" showHeight="200">
+          {{ townInfo.intro }}
+        </u-read-more>
       </view>
     </view>
     <view class="tabs-wrap">
@@ -93,6 +107,21 @@ export default {
 </script>
 
 <style lang="less" scoped>
+.shareBtn{
+  width: fit-content;
+  padding: 5rpx 15rpx;
+  background: #edbfc2;
+  box-shadow: 0rpx 4rpx 4rpx rgba(0,0,0,0.16);
+  border-radius: 24rpx 0rpx 0rpx 24rpx;
+  color: #C52733;
+  font-weight: bold;
+  font-size: 28rpx;
+  position: absolute;
+  right: 0;
+  top: 0;
+  display: flex;
+  align-items: center;
+}
 .town{
   min-height: 100vh;
   background: #f0f0f0;
@@ -113,7 +142,7 @@ export default {
   font-size: 36rpx;
 }
 .intro-content{
-  letter-spacing: 100px;
+  letter-spacing: 2.5px;
   line-height: 40rpx;
   font-size: 28rpx;
   color: #666;
@@ -134,15 +163,32 @@ export default {
   border-radius: 30rpx;
   margin-top: -30rpx;
   position: relative;
-  z-index: 2;
+  z-index: 11;
 }
 .top-img{
   width: 100%;
+  background: #fff;
   height: 560rpx;
-  background: rgba(180,18,18,0.39);
+  position: relative;
   .img{
     height: inherit;
     width: 100%;
   }
+  .img1{
+    z-index: 10;
+    position: absolute;
+    top: 0;
+    left: 0;
+    border-radius: 30rpx;
+  }
+  .bg{
+    height: 100%;
+    width: 50%;
+    background: #fff;
+    position: absolute;
+    top: -30rpx;
+    right: 0;
+    z-index: 9;
+  }
 }
 </style>
\ No newline at end of file