From 07bccb8b68aca61b6c163f1b9efb6ca265a21b1f Mon Sep 17 00:00:00 2001
From: linxi <linxi.jiang@jeeyor.com>
Date: Wed, 4 Dec 2024 14:39:26 +0800
Subject: [PATCH 01/54] =?UTF-8?q?Feat=EF=BC=9A=E8=A7=A3=E9=99=A4=E5=BA=97?=
 =?UTF-8?q?=E9=93=BA=E5=85=A5=E4=BD=8F=E5=9B=BE=E7=89=87=E6=95=B0=E9=87=8F?=
 =?UTF-8?q?=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg_join/views/shop.vue     | 2 +-
 pkg_join/views/supplier.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg_join/views/shop.vue b/pkg_join/views/shop.vue
index 24d785e..d5525e2 100644
--- a/pkg_join/views/shop.vue
+++ b/pkg_join/views/shop.vue
@@ -119,7 +119,7 @@
           <template #label>
             <u-upload
               :fileList="pics"
-              :maxCount="9"
+              :maxCount="99999"
               :disabled="reviewing"
               name="pics"
               multiple
diff --git a/pkg_join/views/supplier.vue b/pkg_join/views/supplier.vue
index 881f1a3..278da64 100644
--- a/pkg_join/views/supplier.vue
+++ b/pkg_join/views/supplier.vue
@@ -297,7 +297,7 @@
             <template #title>
               <u-upload
                 :fileList="pics"
-                :maxCount="9"
+                :maxCount="99999"
                 :disabled="reviewing"
                 name="pics"
                 multiple

From 50cbe66332481be6cbcbe5371b69c6287a263ff1 Mon Sep 17 00:00:00 2001
From: linxi <linxi.jiang@jeeyor.com>
Date: Thu, 12 Dec 2024 18:06:03 +0800
Subject: [PATCH 02/54] =?UTF-8?q?Feat=EF=BC=9A=20=E5=AF=BB=E8=B6=A3?=
 =?UTF-8?q?=E5=91=B3=E6=94=B9=E7=89=88=EF=BC=88=E6=96=B0=E5=A2=9E=E5=8F=A4?=
 =?UTF-8?q?=E9=95=87=E6=A8=A1=E5=9D=97=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/inn.js                            |  18 ++
 assets/css/v12-style.less             |   4 +-
 pages.json                            |   7 +
 pages/cloud/haveFun.vue               | 163 ++++++++++++++---
 pages/town/components/culture.vue     |  70 +++++++
 pages/town/components/information.vue | 254 ++++++++++++++++++++++++++
 pages/town/components/projects.vue    | 186 +++++++++++++++++++
 pages/town/components/service.vue     | 127 +++++++++++++
 pages/town/index.vue                  | 148 +++++++++++++++
 9 files changed, 955 insertions(+), 22 deletions(-)
 create mode 100644 pages/town/components/culture.vue
 create mode 100644 pages/town/components/information.vue
 create mode 100644 pages/town/components/projects.vue
 create mode 100644 pages/town/components/service.vue
 create mode 100644 pages/town/index.vue

diff --git a/api/inn.js b/api/inn.js
index 9af877d..089c259 100644
--- a/api/inn.js
+++ b/api/inn.js
@@ -241,3 +241,21 @@ export function hotelNewsView(data) {
 export function getFarmerShop(id) {
     return request.get("/api/countyFamous/farmerShop/" + id)
 }
+
+export function getAncientTownIcon() {
+    return request.get("/ancientTown/icon")
+}
+
+export function getAncientTownList(params) {
+    return request.get("/ancientTown", params)
+}
+
+export function getAncientTownInfo(id) {
+    return request.get("/ancientTown/" + id)
+}
+
+export function getAncientTownActive(params) {
+    return request.get("/ancientTown/activity", params)
+}
+
+
diff --git a/assets/css/v12-style.less b/assets/css/v12-style.less
index 3191b86..a27ff1f 100644
--- a/assets/css/v12-style.less
+++ b/assets/css/v12-style.less
@@ -169,7 +169,9 @@ each(@colors, {
   display: grid;
   grid-template-columns: 1fr 1fr;
 }
-
+.v12-gap-10{
+  grid-gap: 20rpx 20rpx;
+}
 
 .v12-text-right{
   text-align: right;
diff --git a/pages.json b/pages.json
index c5c74ee..b27049c 100644
--- a/pages.json
+++ b/pages.json
@@ -106,6 +106,13 @@
         "navigationBarTitleText": "探索生活好去处"
       }
     },
+    {
+      "path": "pages/town/index",
+      "style": {
+        "navigationStyle": "custom",
+        "navigationBarTitleText": "探索生活好去处"
+      }
+    },
     {
       "path": "pages/user/User/index",
       "style": {
diff --git a/pages/cloud/haveFun.vue b/pages/cloud/haveFun.vue
index dee9ee6..49f1d9a 100644
--- a/pages/cloud/haveFun.vue
+++ b/pages/cloud/haveFun.vue
@@ -26,20 +26,39 @@
           </view>
         </view>
       </view>
-      <scroll-view class="type-box flex" scroll-x enable-flex>
-        <view
-          v-for="(item, index) in typeList"
-          :key="index"
-          :class="{
-            'active': typeIndex === index
-          }"
-          class="item flex-0 flex flex-col jc-center ai-center"
-          @click="tapType(index)"
-        >
-          <image :src="item.icon" mode="scaleToFill"/>
-          <view class="name">{{ item.name }}</view>
-        </view>
-      </scroll-view>
+      <view>
+        
+        <scroll-view class="type-box flex" scroll-x enable-flex>
+          <view class="first-box">
+            <view class="first-box__inner">
+              <view
+                :class="{
+                  'active': typeIndex === -1
+                }"
+                class="item flex-0 flex flex-col jc-center ai-center"
+                @click="tapType(-1)"
+              >
+                <image :src="townConfig.icon" mode="scaleToFill"/>
+                <view class="name">{{ townConfig.label }}</view>
+              </view>
+            </view>
+          </view>
+          <view class="scroll-box">
+            <view
+              v-for="(item, index) in typeList"
+              :key="index"
+              :class="{
+                'active': typeIndex === index
+              }"
+              class="item flex-0 flex flex-col jc-center ai-center"
+              @click="tapType(index)"
+            >
+              <image :src="item.icon" mode="scaleToFill"/>
+              <view class="name">{{ item.name }}</view>
+            </view>
+          </view>
+        </scroll-view>
+      </view>
     </view>
     <view class="type-banner-wrap">
       <view v-if="currType.titleImage" class="title">
@@ -71,7 +90,16 @@
         </swiper>
       </view>
     </view>
-    <view class="body">
+    <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>
+        <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>
+        </view>
+      </view>
+    </view>
+    <view class="body" v-else>
       <view>
         <text class="v12-font-bold" v-if="currType.carousel">推荐</text>
       </view>
@@ -114,7 +142,7 @@
   </view>
 </template>
 <script>
-import { getHotelList, getHotelTypeList } from "@/api/inn.js"
+import { getHotelList, getHotelTypeList, getAncientTownIcon, getAncientTownList } from "@/api/inn.js"
 import { getCurAddress, getLocation } from "@/utils/common"
 import FunHotelItem from './components/HotelItem'
 import { pageListenMixins } from '@/mixins/pageListenMixins'
@@ -131,14 +159,16 @@ export default {
       name: '',
       page: 1,
       typeList: [],
-      typeIndex: 0,
+      typeIndex: -1,
       // 当前选中的类型
       currType: {},
       cityName: '',
       hotelList: [],
       isLoad: false,
       pageKeyId: Object.freeze('findFunIndex'),
-      isNext: false
+      isNext: false,
+      townConfig: {},
+      townList: []
     }
   },
   computed: {
@@ -162,10 +192,10 @@ export default {
     this.currType = {}
     getHotelTypeList().then(({data}) => {
       this.typeList = data
-      this.currType = data[this.typeIndex]
+      this.currType = this.typeIndex === -1 ? {} : data[this.typeIndex]
       this.getMapData()
     })
-    
+    this.getIcon()
   },
   onShow() {
     const memCityName = uni.getStorageSync('cityName')
@@ -190,6 +220,16 @@ export default {
     }
   },
   methods: {
+    toTown(town) {
+      uni.navigateTo({
+        url: `/pages/town/index?id=${town.id}`
+      })
+    },
+    getIcon() {
+      getAncientTownIcon().then(res => {
+        this.townConfig = res.data
+      })
+    },
     goCity() {
       uni.navigateTo({
         url: `/pages/chose-city/chose-city?type=2&city=${this.cityName}`
@@ -212,9 +252,11 @@ export default {
       }
     },
     tapType(index) {
+      
       if (this.typeIndex === index) return
       this.typeIndex = index
-      this.currType = this.typeList[index]
+      
+      this.currType = index === -1 ? {} : this.typeList[index]
       this.name = ''
       this.search()
     },
@@ -225,6 +267,17 @@ export default {
       this.fetchList()
     },
     fetchList() {
+      if(this.typeIndex === -1) {
+        const params = {
+          cityName: this.name,
+          page: 1,
+          limit: 999
+        }
+        getAncientTownList(params).then(res => {
+          this.townList = res.data.records
+        })
+        return
+      }
       const param = {
         page: this.page,
         type: this.typeList[this.typeIndex].id,
@@ -267,6 +320,74 @@ export default {
 }
 </script>
 <style scoped lang="less">
+.icon-box{
+  border: 1rpx solid #fff;
+  border-radius: 100%;
+  width: 16rpx;
+  height: 16rpx;
+  margin-left: 5rpx;
+  padding: 2rpx;
+}
+.enter-btn{
+  color: #fff;
+  width: fit-content;
+  display: flex;
+  align-items: center;
+  padding: 10rpx 16rpx;
+  position: absolute;
+  right: 0;
+  bottom: 0;
+  border-radius: 30rpx 0;
+  font-size: 24rpx;
+}
+.town-title{
+  border-radius: 100rpx;
+  /* border-color: #333; */
+  // mix-blend-mode: difference;
+  width: fit-content;
+  padding: 5rpx 20rpx;
+  border: 1rpx solid #fff;
+  color: #fff;
+  position: absolute;
+  margin: auto;
+  top: 20rpx;
+  left: 0;
+  right: 0;
+}
+.town-card{
+  width: 100%;
+  height: 400rpx;
+  background: #fff;
+  border-radius: 30rpx;
+  position: relative;
+  overflow: hidden;
+  margin-bottom: 30rpx;
+  image{
+    width: -webkit-fit-content;
+    width: inherit;
+    height: -webkit-fit-content;
+    height: inherit;
+  }
+}
+.first-box{
+  padding-right: 15rpx;
+  position: sticky;
+  left: 0;
+  background-color: #f5f5f5;
+  z-index: 9;
+}
+.first-box__inner{
+  padding: 10rpx;
+  background: #fff;
+  border-radius: 30rpx;
+}
+.scroll-box{
+  display: flex;
+  height: fit-content;
+  background: #fff;
+  padding: 10rpx;
+  border-radius: 30rpx;
+}
 .search-btn{
   position: absolute;
     top: 2rpx;
diff --git a/pages/town/components/culture.vue b/pages/town/components/culture.vue
new file mode 100644
index 0000000..d6a633e
--- /dev/null
+++ b/pages/town/components/culture.vue
@@ -0,0 +1,70 @@
+<template>
+ <view>
+  <view class="culture v12-d-grid-columns-2">
+    <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>
+  </view>
+  <image
+    v-if="list.length === 0"
+    :src="webUrl + '/orderIcon/wu.png'"
+    class="img-nodata"
+    mode="scaleToFill"
+  />
+ </view>
+</template>
+
+<script>
+export default {
+  props: {
+    list: {
+      type: Array,
+      default: () => []
+    }
+  },
+  data() {
+    return {
+      webUrl: this.$VUE_APP_RESOURCES_URL,
+    }
+  },
+  watch: {
+    landmarkDataId(value) {
+      if(value) {
+        this.getData()
+      }
+    }
+  },
+  methods: {
+    viewImg(item) {
+      uni.previewImage({
+        current: item, // 当前显示图片的http链接
+        urls: this.list || [] // 需要预览的图片http链接列表
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.culture{
+  grid-gap: 20rpx 20rpx;
+  padding: 20rpx;
+  background: #fff;
+  border-radius: 30rpx;
+  margin-top: 20rpx;
+}
+.img-item{
+  width: 340rpx;
+  height: 340rpx;
+  border-radius: 30rpx;
+}
+.img-nodata {
+  position: relative;
+  top: 0;
+  left: 50%;
+  transform: translate(-50%, 0);
+  width: 352rpx;
+  height: 338rpx;
+  margin-bottom: 60rpx;
+}
+</style>
\ No newline at end of file
diff --git a/pages/town/components/information.vue b/pages/town/components/information.vue
new file mode 100644
index 0000000..47e2551
--- /dev/null
+++ b/pages/town/components/information.vue
@@ -0,0 +1,254 @@
+<template>
+  <view>
+    <view v-if="infoArray.length > 0" class="info-wrapper">
+      <view class="info-list">
+        <view v-for="(item, index) in infoArray" :key="index" class="info-item">
+          <view
+            :class="item.isTop === 1 ? 'info-item-top' : ''"
+            :style="{
+              'background-image': item.isTop
+                ? 'url(' + webUrl + '/page/hotel/info-top-bg.png)'
+                : 'none',
+            }"
+            class="info-item-header"
+          >
+            <view class="name">
+              {{ item.name }}
+            </view>
+            <view class="intro">
+              {{ item.intro }}
+            </view>
+          </view>
+          <view class="info-item-body">
+            <img-box
+              :imgList="item.images"
+              :num="item.images.length"
+              :img-radius="10"
+              style="width: 100%"
+              @click="infoItemViewClick(item)"
+            />
+          </view>
+          <view class="info-item-bottom">
+            <view class="time">
+              {{
+                item.createTime
+                  ? item.createTime.replace(/-/g, ".").substr(0, 10)
+                  : ""
+              }}
+            </view>
+            <view class="btns">
+              <view class="flex">
+                <image
+                  :src="webUrl + '/20230803152147141807.png'"
+                  class="icon"
+                />
+                <text class="seeNum-txt v12-font-28">{{ item.pv }}</text>
+              </view>
+            </view>
+          </view>
+        </view>
+      </view>
+      <image
+        :src="webUrl + '/home/no-data-bg.png'"
+        mode="widthFix"
+        class="no-data-loadend"
+        style="width: 100%;"
+      />
+    </view>
+    <image
+      v-if="infoArray.length === 0"
+      :src="webUrl + '/orderIcon/wu.png'"
+      class="img-nodata"
+      mode="scaleToFill"
+    />
+  </view>
+</template>
+
+<script>
+import {
+  getNews,
+  hadLike,
+  hadView
+} from "@/api/product"
+import imgBox from '@/components/imageTypeSet/imagebox.vue'
+export default {
+  props: {
+    infoArray: {
+      type: Array,
+      default: () => []
+    }
+  },
+  components: {
+    imgBox
+  },
+  data() {
+    return {
+      webUrl: this.$VUE_APP_RESOURCES_URL,
+    }
+  },
+  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 => {
+            if (info.id === item.id) {
+              info.pv += 1
+            }
+          })
+        })
+      }, 500)
+    },
+  }
+};
+</script>
+<style lang="scss" scoped>
+.info-wrapper{
+  padding: 20px 10px;
+}
+
+.info-item + .info-item {
+  margin: 22rpx 0 0 0;
+}
+.info-item {
+  border-radius: 10rpx;
+  background-color: #fff;
+  .info-item-header {
+    position: relative;
+    padding: 20rpx 20rpx 0 20rpx;
+    &.info-item-top {
+      padding-top: 60rpx;
+      background-size: 100% 80rpx;
+      background-repeat: no-repeat;
+      background-image: url();
+    }
+    .name {
+      font-size: 16px;
+      color: #333;
+      font-weight: bold;
+    }
+    .intro {
+      margin: 10rpx 0 0 0;
+      color: #666;
+      font-size: 14px;
+    }
+  }
+  .info-item-body {
+    padding: 0 20rpx 20rpx 20rpx;
+    .video {
+      padding: 20rpx 0 0 0;
+      .video-item {
+        width: 100%;
+        height: 400rpx;
+        border-radius: 10rpx;
+      }
+    }
+  }
+  .info-item-bottom {
+    display: flex;
+    align-items: center;
+    padding: 20rpx;
+    border-top: 1px solid #f1f1f1;
+    font-size: 16px;
+    .time {
+      flex: 1;
+      color: #999999;
+      font-size: 28rpx;
+    }
+    .btns {
+      display: flex;
+      color: #999;
+      .flex + .flex {
+        margin: 0 0 0 32rpx;
+      }
+      .flex {
+        align-items: center;
+      }
+      .icon {
+        width: 32rpx;
+        height: 32rpx;
+        margin: 0 8rpx 0 0;
+      }
+      .zan-off-icon {
+        width: 32rpx;
+        height: 32rpx;
+      }
+      .zan-on-icon {
+        width: 32rpx;
+        height: 32rpx;
+      }
+      .seeNum-txt {
+        &.on {
+          color: #D81E06;
+        }
+      }
+      .more-btn {
+        position: relative;
+        .more-wrapper {
+          position: absolute;
+          right: -20rpx;
+          top: -150rpx;
+          z-index: 5;
+          width: 200rpx;
+          border-radius: 12rpx;
+          background-color: #fff;
+          box-shadow: 0px 1px 6px rgba(0,0,0,0.16);
+          .more-item + .more-item {
+            border-top: 1px solid #d5d5d5;
+          }
+          .more-item {
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            height: 70rpx;
+            font-size: 14px;
+            color: #333;
+            .more-icon {
+              width: 36rpx;
+              height: 36rpx;
+              margin: 0 10rpx 0 0;
+            }
+          }
+        }
+      }
+    }
+  }
+}
+.info-item-top {
+  padding-top: 60rpx;
+  background-size: 100% 80rpx;
+  background-repeat: no-repeat;
+  background-image: url();
+}
+.name {
+  font-size: 16px;
+  color: #333;
+  font-weight: bold;
+}
+.intro {
+  margin: 10rpx 0 0 0;
+  color: #666;
+  font-size: 14px;
+}
+.img-nodata {
+  position: relative;
+  top: 0;
+  left: 50%;
+  transform: translate(-50%, 0);
+  width: 352rpx;
+  height: 338rpx;
+  margin-bottom: 60rpx;
+}
+</style>
+
diff --git a/pages/town/components/projects.vue b/pages/town/components/projects.vue
new file mode 100644
index 0000000..b21985d
--- /dev/null
+++ b/pages/town/components/projects.vue
@@ -0,0 +1,186 @@
+<template>
+  <view class="projects">
+    <view class="tabs-wrap">
+      <view 
+        @click="handleTab(item.value)" 
+        class="tab-item" 
+        :class="{
+          'tab-isActived': actived === item.value
+        }" 
+        v-for="(item, index) in tabs" 
+        :key="index">
+        <view 
+          :class="{
+            'tab-isActived': actived === item.value,
+            'no-actived-1': actived === 2 && item.value === 1,
+            'no-actived-2': actived === 1 && item.value === 2,
+            'no-actived-3': actived === 3 && item.value === 2,
+            'no-actived-4': actived === 2 && item.value === 3,
+          }"
+        >
+          {{ item.name }}
+      </view>
+      </view>
+    </view>
+    <view 
+      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>
+            <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-align-center">
+              <view class="avtor">
+                <image class="avtor"></image>
+              </view>
+              <view class="v12-secondary-dark-text v12-font-28 v12-ml-3 one-t">刘欢小吃</view>
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+export default {
+  props: {
+    info: {
+      default:() => {}
+    }
+  },
+  data() {
+    return {
+      webUrl: this.$VUE_APP_RESOURCES_URL,
+      actived: 1,
+      items: [],
+      itemsMap: {
+        1: 'project1Hotels',
+        2: 'project2Hotels',
+        3: 'project3Hotels'
+      }
+    }
+  },
+  watch: {
+    info(value) {
+      this.items = value && value[this.itemsMap[this.actived]]
+    },
+    actived: {
+      handler(value) {
+        this.items = this.info && this.info[this.itemsMap[value]]
+      },
+      deep: true,
+      immediate: true
+    }
+  },
+  computed: {
+    tabs() {
+      return this.info && [
+        {name: this.info.project1Name, value: 1},
+        {name: this.info.project2Name, value: 2},
+        {name: this.info.project3Name, value: 3},
+      ] || []
+    }
+  },
+  methods: {
+    handleTab(value) {
+      this.actived = value
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.avtor{
+  width: 52rpx;
+  height: 52rpx;
+  background: #eee;
+  border-radius: 50%;
+}
+.town-cover{
+  height: 316rpx;
+  width: 316rpx;
+  border-radius: 30rpx;
+  background: rgba(77,39,39,0.1);
+}
+.store-card{
+  width: 316rpx;
+  border-radius: 30rpx;
+}
+.tab-icon{
+  height: 30rpx;
+  width: 30rpx;
+  margin-right: 10rpx;
+}
+.fit-box-inner{
+  background: #f0f0f0;
+  width: initial;
+  height: inherit;
+  width: 40rpx;
+}
+.first-one{
+  border-radius: 0 24rpx 24rpx 24rpx !important;
+}
+.last-one{
+  border-radius: 24rpx 0  24rpx 24rpx !important;
+}
+.fit-box{
+  width: 40rpx;
+  height: initial;
+  background: #fff;
+  display: flex;
+}
+.projects{
+  padding: 20rpx;
+}
+.tabs-wrap{
+  display: flex;
+  justify-content: space-between;
+}
+.tab-item{
+  text-align: center;
+  flex: 1;
+  font-size: 32rpx;
+  font-weight: bold;
+  background: #fff;
+  view{
+    padding: 20rpx 0;
+    background: #f0f0f0;
+    width: inherit;
+    height: inherit;
+    display: flex;
+    justify-content: center;
+    align-items: center
+  }
+}
+.no-actived-1{
+  border-radius: 0 0 24rpx 0 !important;
+}
+.no-actived-2{
+  border-radius: 0 0  0 24rpx !important;
+}
+.no-actived-3{
+  border-radius: 0 0 24rpx 0 !important;
+}
+.no-actived-4{
+  border-radius: 0 0  0 24rpx !important;
+}
+.tab-isActived{
+  background: #fff !important;
+  border-radius: 24rpx 24rpx 0 0 !important;
+  position: relative;
+}
+.content{
+  background: #fff;
+  padding: 20rpx 10rpx;
+  border-radius: 24rpx;
+}
+</style>
\ No newline at end of file
diff --git a/pages/town/components/service.vue b/pages/town/components/service.vue
new file mode 100644
index 0000000..2fb34de
--- /dev/null
+++ b/pages/town/components/service.vue
@@ -0,0 +1,127 @@
+<template>
+  <view class="service">
+    <view class="map-cont">
+      <map
+        :longitude="info.longitude"
+        :latitude="info.latitude"
+        :markers="[{id:1, latitude: info.latitude,longitude: info.longitude,width: 20, height: 25, iconPath: webUrl + '/page/qianxian/icon-location.png'}]"
+        style="width: 100%;height: 100%; border-radius: 20rpx;"
+      />
+    </view>
+    <view class="v12-px-3 v12-font-32 v12-font-bold">{{ info.name || '' }}</view>
+    <view class="info-wrap">
+      <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>
+      <view class="action-wrap">
+        <view  @click="showLocation">
+          <view>
+            <image :src="webUrl + '/page/qianxian/icon-addr.png'" class="img" />
+          </view>
+          <view class="text-center">导航</view>
+        </view>
+        <view @click="call">
+          <view>
+            <image :src="webUrl + '/page/qianxian/icon-phone.png'" class="img" />
+          </view>
+          <view class="text-center">咨询</view>
+        </view>
+      </view>
+    </view>
+    <view style="padding: 0 20rpx;"><u-divider></u-divider></view>
+    <view class="intro-wrap">
+      <view class="v12-dark-text v12-font-bold">
+        简介
+      </view>
+      <view class="intro-text">
+        {{ info.desc || '' }}
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+export default {
+  props: {
+    info: {
+      default: () => {}
+    }
+  },
+  data() {
+    return {
+      webUrl: this.$VUE_APP_RESOURCES_URL,
+    }
+  },
+  methods: {
+    showLocation() {
+      
+      if (!this.info.latitude || !this.info.longitude) {
+        this.$dialog.error('暂无位置信息')
+      } else {
+        uni.openLocation({
+          latitude: this.info.latitude,
+          longitude: this.info.longitude
+        })
+      }
+    },
+    call() {
+      if (this.info.tel) {
+        uni.makePhoneCall({
+          phoneNumber: this.info.tel
+        })
+      } else {
+        this.$dialog.error('电话为空')
+      }
+    },
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.service {
+  background: #fff;
+  margin-top: 20rpx;
+  border-radius: 30rpx;
+}
+.intro-text{
+  color: #999;
+  font-size: 24rpx;
+  margin-top: 20rpx;
+}
+.intro-wrap{
+  padding: 0 20rpx 20rpx;
+}
+.action-wrap{
+  display: flex;
+  align-items: center;
+  .text-center{
+    text-align: center;
+    font-size: 24rpx;
+    color: #666;
+  }
+}
+.info-wrap{
+  display: flex;
+  justify-content: space-between;
+  padding: 20rpx 20rpx 0;
+}
+.service{
+  position: relative;
+}
+.map-cont {
+  height: 400rpx;
+  border-radius: 20rpx;
+  background: #fff;
+  padding: 20rpx;
+  box-sizing: border-box;
+  overflow: hidden;
+}
+.img{
+  display: block;
+  width: 64rpx;
+  height: 64rpx;
+  margin: 0 0 16rpx 16rpx;
+}
+</style>
\ No newline at end of file
diff --git a/pages/town/index.vue b/pages/town/index.vue
new file mode 100644
index 0000000..21b14ba
--- /dev/null
+++ b/pages/town/index.vue
@@ -0,0 +1,148 @@
+<template>
+  <view class="town">
+    <view class="top-img">
+      <image :src="townInfo.cover" mode="scaleToFill" class="img"></image>
+    </view>
+    <view class="top-intro">
+      <view class="intro-title v12-pa-3">
+        <text class="v12-font-bold v12-font-40">{{ townInfo.name }}</text>
+        <text class="aaaa" v-if="townInfo.isFourA === 1">
+          4A
+        </text>
+      </view>
+      <u-line dashed></u-line>
+      <view class="v12-pa-3 intro-content">
+        {{ townInfo.intro }}
+      </view>
+    </view>
+    <view class="tabs-wrap">
+      <view @click="handleTab(item.value)" :class="{ 'tab-actived' : item.value === actived }" class="tab-item"  v-for="(item, index) in tabs" :key="index">{{ item.name }}</view>
+    </view>
+    <view  class="list-wrap">
+        <view v-if="actived === 1">
+          <projects :info="townInfo.projectInfo"></projects>
+        </view>
+        <view v-if="actived === 2">
+          <culture :list="townInfo.cultureInfo.cultureImages"></culture>
+        </view>
+        <view v-if="actived === 3">
+          <information :infoArray="activeties"></information>
+        </view>
+        <view v-if="actived === 4">
+          <service :info="{...townInfo.serviceInfo, name:  townInfo.name}"></service>
+        </view>
+          
+      </view>
+  </view>
+</template>
+
+<script>
+import { getAncientTownInfo, getAncientTownActive } from "@/api/inn.js"
+import culture from './components/culture.vue'
+import information from './components/information.vue'
+import service from './components/service.vue'
+import projects from './components/projects.vue'
+export default {
+  components: {
+    culture,
+    information,
+    service,
+    projects
+  },
+  data() {
+    return {
+      townInfo: {},
+      activeties: [],
+      id: '',
+      actived: 1,
+      tabs: [
+        {name: '项目', value: 1},
+        {name: '文化', value: 2},
+        {name: '活动', value: 3},
+        {name: '服务', value: 4},
+      ],
+    }
+  },
+  onLoad(opts) {
+    this.id = opts.id
+    this.getInfo()
+    this.getActive()
+  },
+  methods: {
+    getInfo() {
+      uni.showLoading()
+      getAncientTownInfo(this.id).then(res => {
+        this.townInfo = res.data
+      }).finally(() => {
+        uni.hideLoading()
+      })
+    },
+    getActive() {
+      const params = {
+        ancientTownId: this.id
+      }
+      getAncientTownActive(params).then(res => {
+        this.activeties = res.data.records || []
+      })
+    },
+    handleTab(value) {
+      this.actived = value
+    },
+  }
+}
+</script>
+
+<style lang="less" scoped>
+.town{
+  min-height: 100vh;
+  background: #f0f0f0;
+}
+.tab-actived{
+  color: #fff;
+  font-weight: bold;
+  background: linear-gradient(to right, #C52733 0%, rgba(211,92,101,0.91) 54%, rgba(255,255,255,0.62) 100%);
+  border-radius: 38rpx 0rpx 0 38rpx;
+  padding: 0 20rpx;
+}
+.tabs-wrap{
+  display: flex;
+  justify-content: space-around;
+  padding: 20rpx 20rpx 0;
+  color: #333;
+  font-weight: bold;
+  font-size: 36rpx;
+}
+.intro-content{
+  letter-spacing: 100px;
+  line-height: 40rpx;
+  font-size: 28rpx;
+  color: #666;
+}
+.aaaa{
+  background: #F1B61A;
+  color: #fff;
+  border-radius: 100px;
+  padding: 0 10rpx;
+  font-size: 24rpx;
+  margin-left: 10rpx;
+}
+.top-intro{
+  width: 100%;
+  min-height: 360rpx;
+  background: #fff;
+  box-shadow: 0rpx 0rpx 12rpx rgba(0,0,0,0.13);
+  border-radius: 30rpx;
+  margin-top: -30rpx;
+  position: relative;
+  z-index: 2;
+}
+.top-img{
+  width: 100%;
+  height: 560rpx;
+  background: rgba(180,18,18,0.39);
+  .img{
+    height: inherit;
+    width: 100%;
+  }
+}
+</style>
\ No newline at end of file

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 03/54] =?UTF-8?q?Feat=EF=BC=9A=20=E5=AF=BB=E8=B6=A3?=
 =?UTF-8?q?=E5=91=B3=E6=8E=A5=E5=8F=A3=E5=AF=B9=E6=8E=A5=EF=BC=88=E7=BC=BA?=
 =?UTF-8?q?=E5=88=86=E4=BA=AB=E6=8E=A5=E5=8F=A3=EF=BC=8C=E5=BA=97=E4=BD=8F?=
 =?UTF-8?q?=E5=90=8D=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

From eddb02d2cf71def7e56700b46d87782c441c1e76 Mon Sep 17 00:00:00 2001
From: modendeveloper <modendeveloper@163.com>
Date: Sat, 14 Dec 2024 21:56:37 +0800
Subject: [PATCH 04/54] =?UTF-8?q?Feat=EF=BC=9A=E5=88=86=E4=BA=AB=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E5=AF=B9=E6=8E=A5&&=E6=8D=A2=E4=B8=80=E6=8D=A2?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/inn.js                         |   4 +
 pages/cloud/haveFun.vue            |  28 +++++--
 pages/town/components/projects.vue |  54 ++++++++++++-
 pages/town/index.vue               | 118 ++++++++++++++++++++++++++++-
 4 files changed, 193 insertions(+), 11 deletions(-)

diff --git a/api/inn.js b/api/inn.js
index 3ad1d82..928a72f 100644
--- a/api/inn.js
+++ b/api/inn.js
@@ -262,5 +262,9 @@ export function watchTownActive(data) {
     return request.post("/ancientTown/activity/view", data, {login: true})
 }
 
+export function shareTown(id) {
+    return request.get("/ancientTown/poster/" + id, {login: true})
+}
+
 
 
diff --git a/pages/cloud/haveFun.vue b/pages/cloud/haveFun.vue
index 734b8b5..595382e 100644
--- a/pages/cloud/haveFun.vue
+++ b/pages/cloud/haveFun.vue
@@ -100,8 +100,12 @@
       </view>
     </view>
     <view class="body" v-else>
-      <view>
+      <view class="v12-justify-between v12-align-center">
         <text class="v12-font-bold" v-if="currType.carousel">推荐</text>
+        <view class="v12-dark1-text v12-font-28 v12-align-center" @click="handleRefresh">
+          <u-icon name="reload"></u-icon>
+          换一换
+        </view>
       </view>
       <view v-if="isLoad">
         <view v-if="hotelList.length > 0">
@@ -159,7 +163,7 @@ export default {
       name: '',
       page: 1,
       typeList: [],
-      typeIndex: -1,
+      typeIndex: 0,
       // 当前选中的类型
       currType: {},
       cityName: '',
@@ -168,7 +172,8 @@ export default {
       pageKeyId: Object.freeze('findFunIndex'),
       isNext: false,
       townConfig: {},
-      townList: []
+      townList: [],
+      randomSeed: null
     }
   },
   computed: {
@@ -220,6 +225,10 @@ export default {
     }
   },
   methods: {
+    handleRefresh() {
+      uni.showLoading()
+      this.fetchList(1, this.randomSeed)
+    },
     toTown(town) {
       uni.navigateTo({
         url: `/pages/town/index?id=${town.id}`
@@ -266,7 +275,7 @@ export default {
       this.hotelList = []
       this.fetchList()
     },
-    fetchList() {
+    fetchList(random = 0, randomSeed) {
       if(this.typeIndex === -1) {
         const params = {
           cityName: this.name,
@@ -281,15 +290,21 @@ export default {
       const param = {
         page: this.page,
         type: this.typeList[this.typeIndex].id,
-        cityName: this.cityName
+        cityName: this.cityName,
+        random: random,
+        randomSeed: randomSeed
       }
       const name = this.name.trim()
       if (name.length > 0) {
         param.name = name
       }
       getHotelList(param).then(res => {
-        const { success, data } = res
+        const { success, data, msg } = res
         if (success) {
+          if(random === 1) {
+            this.randomSeed = msg
+            this.hotelList = []
+          }
           for (let i = 0; i < data.length; i++) {
             const cover = data[i].cover
             data[i].hide = true
@@ -310,6 +325,7 @@ export default {
         }
       }).finally(() => {
         this.isLoad = true
+        uni.hideLoading()
       })
     },
     typeBannerItemClick(item) {
diff --git a/pages/town/components/projects.vue b/pages/town/components/projects.vue
index b6b37b1..cb7a4b6 100644
--- a/pages/town/components/projects.vue
+++ b/pages/town/components/projects.vue
@@ -32,11 +32,20 @@
     >
       <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>
+          <view class="cover-box">
             <image class="town-cover" :src="item.cover" mode="aspectFit|aspectFill|widthFix"></image>
+            <view class="name-box">
+              <image
+                :src="webUrl + '/home/icon-location.png'"
+                class="icon"
+              />
+              <view class="one-t">
+                {{ item.cityName }}
+              </view>
+            </view>
           </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-dark-text v12-font-bold v12-font-30 more-t v12-pb-1 v12-mb-2">{{ item.content }}</view>
             <view class="v12-align-center">
               <view class="avtor">
                 <image class="avtor" :src="item.logo" mode="scaleToFill"></image>
@@ -120,6 +129,47 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.icon {
+  display: block;
+  width: 28rpx;
+  height: 28rpx;
+  margin: 0 10rpx 0 0;
+}
+.name-box{
+  color: #fff;
+  position: absolute;
+  left: 20rpx;
+  bottom: 20rpx;
+  font-size: 28rpx;
+  position: absolute;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  z-index: 5;
+  display: flex;
+  align-items: flex-end;
+  height: 60rpx;
+  padding: 0 16rpx 16rpx 16rpx;
+  border-radius: 0rpx 0rpx 16rpx 16rpx;
+  box-sizing: border-box;
+  font-size: 24rpx;
+  line-height: 28rpx;
+  color: #fff;
+  background: linear-gradient(180deg, rgba(0,0,0,0) 0%, #000000 100%);
+  .icon {
+    display: block;
+    width: 28rpx;
+    height: 28rpx;
+    margin: 0 10rpx 0 0;
+  }
+  .one-t{
+    width: 240rpx !important;
+  }
+}
+.cover-box{
+  position: relative;
+  height: 316rpx;
+}
 .img-nodata {
   position: relative;
   top: 0;
diff --git a/pages/town/index.vue b/pages/town/index.vue
index 9ca230f..aa1390e 100644
--- a/pages/town/index.vue
+++ b/pages/town/index.vue
@@ -21,7 +21,7 @@
           4A
         </text>
       </view>
-      <view class="shareBtn"><u-icon name="share-square" color="#C52733"></u-icon>分享给好友</view>
+      <view class="shareBtn" @click="shareImg"><u-icon name="share-square" color="#C52733"></u-icon>分享给好友</view>
       <u-line dashed></u-line>
       <view v-if="townInfo.intro" class="v12-pa-3 intro-content">
         <u-read-more :toggle="true" showHeight="200">
@@ -47,11 +47,35 @@
         </view>
           
       </view>
+      <!-- 分享 -->
+    <u-popup
+    :show="showShare"
+      mode="center"
+      bgColor="transparent"
+    >
+      <view class="box-share">
+        <view class="box-img">
+          <image
+            :src="webUrl + '/20230608112219219303.png'"
+            class="icon"
+            @click="closeShare"
+          />
+          <image :src="posterUrl" class="main-img" mode="widthFix" />
+        </view>
+        <image
+          :src="webUrl + '/20230608112210135038.png'"
+          mode="widthFix"
+          class="btn"
+          @click="saveImg"
+        />
+      </view>
+    </u-popup>
   </view>
 </template>
 
 <script>
-import { getAncientTownInfo, getAncientTownActive } from "@/api/inn.js"
+import { getAncientTownInfo, getAncientTownActive, shareTown } from "@/api/inn.js"
+import {getUrlParam} from '@/utils/common.js'
 import culture from './components/culture.vue'
 import information from './components/information.vue'
 import service from './components/service.vue'
@@ -65,7 +89,10 @@ export default {
   },
   data() {
     return {
+      webUrl: this.$VUE_APP_RESOURCES_URL,
+      showShare: false,
       townInfo: {},
+      posterUrl: '',
       activeties: [],
       id: '',
       actived: 1,
@@ -78,11 +105,95 @@ export default {
     }
   },
   onLoad(opts) {
-    this.id = opts.id
+      this.id = opts.id
+      const obj = uni.getEnterOptionsSync()
+      if(opts.scene || obj.query.scene) {
+      const query = opts ? decodeURIComponent(opts.scene) : decodeURIComponent(obj.query.scene)
+      this.id = getUrlParam(query, 'id') || null
+    }
     this.getInfo()
     this.getActive()
   },
   methods: {
+    shareImg() {
+      uni.showLoading()
+      shareTown(this.id).then(res => {
+        this.posterUrl = res.data
+        this.showShare = !this.showShare
+      }).finally(() => {
+        uni.hideLoading()
+      })
+    },
+    closeShare() {
+      this.showShare = false
+    },
+    saveImg() {
+      const _this = this
+      uni.getSetting({
+        success: getRes => {
+          if (getRes.authSetting["scope.writePhotosAlbum"]) {
+            _this.downloadImage()
+          } else {
+            uni.authorize({
+              scope: "scope.writePhotosAlbum",
+              success: () => {
+                _this.downloadImage()
+              },
+              fail: () => {
+                uni.openSetting({
+                  success: openRes => {
+                    console.log(typeof openRes, openRes)
+                  },
+                  fail: () => {
+                    uni.showToast({
+                      title: "请在设置中打开对应权限",
+                      icon: "none"
+                    })
+                  }
+                })
+              }
+            })
+          }
+        },
+        fail: (err) => {
+          console.log(err, 2)
+        }
+      })
+    },
+    downloadImage() {
+      const _this = this
+      const randomID = () => Math.random().toString(36).substring(2)
+      uni.downloadFile({
+        url: this.posterUrl, // 网络图片的地址
+        filePath: wx.env.USER_DATA_PATH + "/share_" + randomID() + ".png",  // 指定的本地文件路径
+        success: downRes => {
+          uni.saveImageToPhotosAlbum({
+            filePath: downRes.filePath, // 临时文件地址
+            success: function () {
+              uni.showToast({
+                title: "保存成功",
+                icon: "success",
+                success() {
+                  _this.showShare = false
+                }
+              })
+            },
+            fail: function (err) {
+              uni.showToast({
+                title: err,
+                icon: "none"
+              })
+            }
+          })
+        },
+        fail: function (err) {
+          uni.showToast({
+            title: err.errMsg,
+            icon: "error"
+          })
+        }
+      })
+    },
     getInfo() {
       uni.showLoading()
       getAncientTownInfo(this.id).then(res => {
@@ -107,6 +218,7 @@ export default {
 </script>
 
 <style lang="less" scoped>
+@import "@/assets/css/store.less";
 .shareBtn{
   width: fit-content;
   padding: 5rpx 15rpx;

From 8e8ca5a261ba655989118bf5f2585b01890550f8 Mon Sep 17 00:00:00 2001
From: modendeveloper <modendeveloper@163.com>
Date: Tue, 17 Dec 2024 22:10:14 +0800
Subject: [PATCH 05/54] =?UTF-8?q?Fix=EF=BC=9A2797=20=E3=80=90=E5=95=86?=
 =?UTF-8?q?=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E6=A0=B9=E6=8D=AE?=
 =?UTF-8?q?=E8=BF=90=E8=90=A5=E8=AE=BE=E8=AE=A1=E7=9A=84=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=EF=BC=8C=E9=9D=9E=E9=81=97=E4=B8=BB=E9=A1=B5=E7=9A=84=E7=9C=81?=
 =?UTF-8?q?=E5=90=8D=E5=88=A0=E9=99=A4=EF=BC=8C=E5=8F=AA=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg_product/views/heritage.vue | 101 +++++++++++++++++++--------------
 1 file changed, 57 insertions(+), 44 deletions(-)

diff --git a/pkg_product/views/heritage.vue b/pkg_product/views/heritage.vue
index 5046d00..dacff13 100644
--- a/pkg_product/views/heritage.vue
+++ b/pkg_product/views/heritage.vue
@@ -1,50 +1,81 @@
+<template>
+  <view class="pkg-product-heritage">
+    <image style="width: 100%" :src="topImage" mode="widthFix" />
+    <view class="main-box">
+      <image style="width: 100%" :src="backgroundImage" mode="widthFix" />
+      <view
+        class="item"
+        :style="{ left: item.gx + 'rpx', top: item.gy + 'rpx' }"
+        v-for="(item, index) in contents"
+        :key="index"
+        @click="goDetails(item)"
+      >
+        <image
+          class="img-item"
+          :src="item.image"
+          :class="{ unlink: !item.isLink }"
+        />
+        <!-- <view
+          class="v12-text-center v12-white-text v12-radius-80 v12-px-1 title"
+          :class="{
+            'v12-primary': item.isLink,
+            'un-actived': !item.isLink,
+          }"
+        >
+          {{ item.title }}</view
+        > -->
+      </view>
+    </view>
+  </view>
+</template>
+
 <script>
-import {getICH} from '@/api/product'
-import { pageListenMixins } from '@/mixins/pageListenMixins'
+import { getICH } from "@/api/product";
+import { pageListenMixins } from "@/mixins/pageListenMixins";
 
 export default {
-  name: 'HeritagePage',
+  name: "HeritagePage",
   mixins: [pageListenMixins],
   data() {
     return {
       contents: [],
-      topImage: '',
-      backgroundImage: '',
+      topImage: "",
+      backgroundImage: "",
       bgImgWidth: 0,
-      pageKeyId: Object.freeze('ichIndex')
-    }
+      pageKeyId: Object.freeze("ichIndex"),
+    };
   },
   computed: {
     scale() {
-      return 750 / this.bgImgWidth
-    }
+      return 750 / this.bgImgWidth;
+    },
   },
   onLoad() {
-    this.init()
+    this.init();
   },
   methods: {
     init() {
-      getICH().then(({data}) => {
+      getICH().then(({ data }) => {
         this.contents = data.contents;
         this.topImage = data.topImage;
         this.backgroundImage = data.backgroundImage;
         this.bgImgWidth = data.backgroundImageWidth;
         this.calcPosition();
-      })
+      });
     },
     // 计算位置
     calcPosition() {
-      this.contents?.forEach(item => {
-        item.gx = item.x * this.scale
-        item.gy = item.y * this.scale
-      })
+      this.contents?.forEach((item) => {
+        item.gx = item.x * this.scale;
+        item.gy = item.y * this.scale;
+      });
     },
     goDetails(item) {
-      if (!item.isLink) return
+      if (!item.isLink) return;
       // 1-视频，2-图文(可配置商品)，3-商品+视频
       uni.navigateTo({
-        url: '/pkg_product/views/heritage/index?id=' + item.id
-      })
+        url: "/pkg_product/views/heritage/index?id=" + item.id,
+      });
       // if (item.type === 1) {
       //   uni.navigateTo({
       //     url: '/pkg_product/views/heritage/index?id=' + item.id
@@ -58,36 +89,18 @@ export default {
       //     url: '/pkg_product/views/heritage/index?id=' + item.id
       //   })
       // }
-    }
-  }
-}
+    },
+  },
+};
 </script>
 
-<template>
-  <view class="pkg-product-heritage">
-    <image style="width: 100%" :src="topImage" mode="widthFix"/>
-    <view class="main-box">
-      <image style="width: 100%" :src="backgroundImage" mode="widthFix"/>
-      <view class="item" :style="{'left':item.gx+'rpx','top':item.gy+'rpx'}" v-for="(item,index) in contents"
-            :key="index" @click="goDetails(item)">
-        <image class="img-item" :src="item.image" :class="{'unlink': !item.isLink}"/>
-        <view 
-          class=" v12-text-center v12-white-text  v12-radius-80 v12-px-1 title" 
-        :class="{
-          'v12-primary': item.isLink,
-          'un-actived': !item.isLink
-        }">
-        {{ item.title }}</view>
-      </view>
-    </view>
-  </view>
-</template>
+
 
 <style scoped lang="less">
-.unlink{
+.unlink {
   filter: grayscale(100%);
 }
-.un-actived{
+.un-actived {
   background: #494949 !important;
   background-color: #494949 !important;
 }
@@ -119,4 +132,4 @@ export default {
     }
   }
 }
-</style>
\ No newline at end of file
+</style>

From 9092d0d73d75aec534282f6429e217e66296c19e Mon Sep 17 00:00:00 2001
From: modendeveloper <modendeveloper@163.com>
Date: Tue, 17 Dec 2024 22:12:14 +0800
Subject: [PATCH 06/54] =?UTF-8?q?Fix=EF=BC=9A2851=20=E3=80=90=E5=95=86?=
 =?UTF-8?q?=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E9=9D=9E=E9=81=97?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E5=88=86=E7=B1=BB1=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87=E5=90=8D=E7=A7=B0=E5=8E=BB=E9=99=A4=E4=B9=A6=E5=90=8D?=
 =?UTF-8?q?=E5=8F=B7=EF=BC=8C=E6=96=87=E5=AD=97=E8=BF=87=E9=95=BF=E6=97=B6?=
 =?UTF-8?q?=E6=8D=A2=E8=A1=8C=E6=98=BE=E7=A4=BA=EF=BC=8C=E6=9C=80=E5=A4=9A?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA2=E8=A1=8C=E6=96=87=E5=AD=97=EF=BC=8C?=
 =?UTF-8?q?=E8=B6=85=E5=87=BA...?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg_product/views/heritage/details.vue | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkg_product/views/heritage/details.vue b/pkg_product/views/heritage/details.vue
index d0135b6..cc95ee0 100644
--- a/pkg_product/views/heritage/details.vue
+++ b/pkg_product/views/heritage/details.vue
@@ -28,11 +28,9 @@
         <view class="card-item" v-for="(item, i) in details.pageA.images" :key="i" @click="viewImg(item)">
           <image  class="card-item-img" :src="item.image" mode="aspectFit|aspectFill|widthFix" lazy-load="false"></image>
           <view class="v12-justify-center">
-            《
-            <view class="one-t p-name">
+            <view class="more-t p-name">
               {{ item.imageText }}
             </view>
-            》
           </view>
         </view>
       </view>

From 9d2c99507ca5caf118f6ca09558da4be5f6faa4e Mon Sep 17 00:00:00 2001
From: modendeveloper <modendeveloper@163.com>
Date: Wed, 18 Dec 2024 21:17:44 +0800
Subject: [PATCH 07/54] =?UTF-8?q?Fix=EF=BC=9A2890=20=E3=80=90=E5=95=86?=
 =?UTF-8?q?=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E9=A1=B6=E9=83=A8?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=E6=9B=B4=E6=8D=A2=E2=80=9C=E9=9D=9E=E9=81=97?=
 =?UTF-8?q?=E6=8A=80=E8=89=BA=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pages.json b/pages.json
index eff8a24..6530222 100644
--- a/pages.json
+++ b/pages.json
@@ -617,7 +617,7 @@
         {
           "path": "views/heritage",
           "style": {
-            "navigationBarTitleText": "非遗文化"
+            "navigationBarTitleText": "非遗技艺"
           }
         },
         {
@@ -629,14 +629,14 @@
         {
           "path": "views/heritage/index",
           "style": {
-            "navigationBarTitleText": "非遗文化",
+            "navigationBarTitleText": "非遗技艺",
             "navigationBarBackgroundColor": "#FAEED8"
           }
         },
         {
           "path": "views/heritage/details",
           "style": {
-            "navigationBarTitleText": "非遗文化",
+            "navigationBarTitleText": "非遗技艺",
             "navigationBarBackgroundColor": "#FAEED8"
           }
         },

From f2f2528316ae347d8f8bf703c8b0040de79681e6 Mon Sep 17 00:00:00 2001
From: modendeveloper <modendeveloper@163.com>
Date: Wed, 18 Dec 2024 22:10:26 +0800
Subject: [PATCH 08/54] =?UTF-8?q?Fix=EF=BC=9A2891=20=E3=80=90=E5=95=86?=
 =?UTF-8?q?=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E5=B0=81=E9=9D=A2?=
 =?UTF-8?q?=E3=80=90=E6=92=AD=E6=94=BE/=E6=9A=82=E5=81=9C=E9=94=AE?=
 =?UTF-8?q?=E3=80=91=E7=82=B9=E5=87=BB=E8=8C=83=E5=9B=B4=E4=B8=8D=E6=98=8E?=
 =?UTF-8?q?=E7=A1=AE=EF=BC=8C=E5=93=8D=E5=BA=94=E4=B8=8D=E7=81=B5=E6=95=8F?=
 =?UTF-8?q?=EF=BC=8C=E6=8A=8A=E6=92=AD=E6=94=BE/=E6=9A=82=E5=81=9C?=
 =?UTF-8?q?=E8=A7=A6=E6=8E=A7=E5=8C=BA=E5=9F=9F=E5=86=8D=E5=8A=A0=E5=A4=A7?=
 =?UTF-8?q?=E4=B8=80=E4=BA=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mixins/pageListenMixins.js |  2 ++
 pages/home/index.vue       | 23 ++++++++++++++++++-----
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/mixins/pageListenMixins.js b/mixins/pageListenMixins.js
index 3a2bee5..1f1ed59 100644
--- a/mixins/pageListenMixins.js
+++ b/mixins/pageListenMixins.js
@@ -13,6 +13,8 @@ export const pageListenMixins = {
   onShow() {
     this.pageViewDateTime = getCurrDateTime()
     this.pageToWatchShowCount(this.pageKeyId)
+    this.videoContext = uni.createVideoContext('indexVideo', this);
+    
   },
   onUnload() {
     this.pageToHideHandle()
diff --git a/pages/home/index.vue b/pages/home/index.vue
index 9df4813..92c1bc7 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -166,16 +166,16 @@
             </swiper-item>
           </swiper> -->
           <view class="new-zone-wrap">
-            <view class="kd" @click="toKD">
+            <view class="kd" >
               <view class="img-wrap" style="padding-top: 10rpx; box-sizing:border-box">
                 <image  style="width: 112rpx; height:26rpx" :src="webUrl + '/orderIcon/kd.png'" mode="heightFix|widthFix"></image>
               </view>
               <view class="tip-img">
                 <image style="width: 142rpx; height:66.11rpx;border-radius: 0" :src="webUrl + '/orderIcon/dot.png'" mode="heightFix|widthFix"></image>
               </view>
-              <view class="kd-cover">
-                <video play-btn-position="center" v-if="indexVideo" :show-fullscreen-btn="false" class="kd-cover v12-mt-0" :src="indexVideo" controls autoplay :poster="indexVideo + '?vframe/jpg/offset/1'"></video>
-                <view class="enter-btn">点击进入</view>
+              <view class="kd-cover" @click.stop="played">
+                <video play-btn-position="center" id="indexVideo" v-if="indexVideo" :show-fullscreen-btn="false" class="kd-cover v12-mt-0" :src="indexVideo" controls autoplay :poster="indexVideo + '?vframe/jpg/offset/1'"></video>
+                <view class="enter-btn" >点击进入</view>
               </view>
             </view>
             <view class="xpsx">
@@ -383,7 +383,9 @@ export default {
       contentFestival: {},
       pageKeyId: Object.freeze('appIndex'),
       scrollTop: 0,
-      lotteryCanDraw: false
+      lotteryCanDraw: false,
+      videoContext: null,
+      isPlay: true,
     }
   },
   onLoad() {
@@ -417,6 +419,17 @@ export default {
     this.scrollTop = e.scrollTop
   },
   methods: {
+    played() {
+      this.isPlay = !this.isPlay
+      if(this.isPlay) {
+        this.videoContext.play()
+      } else {
+        this.videoContext.pause()
+      }
+      this.toKD()
+    },
+    pause() {
+    },
     toKD() {
       this.$yrouter.push('/pages/VideoPlayBackList/VideoPlayBackList')
     },

From 99676adb480f58b554f26ac715c42c69bd8b87b5 Mon Sep 17 00:00:00 2001
From: modendeveloper <modendeveloper@163.com>
Date: Wed, 18 Dec 2024 22:17:58 +0800
Subject: [PATCH 09/54] =?UTF-8?q?Fix=EF=BC=9A2879=20=E3=80=90=E5=AF=BB?=
 =?UTF-8?q?=E8=B6=A3=E5=91=B3=E3=80=91=E5=8F=A4=E9=95=87=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E9=A1=B5--=E6=B4=BB=E5=8A=A8=E5=86=85=E5=AE=B9=E4=B8=BA?=
 =?UTF-8?q?=E8=A7=86=E9=A2=91=E6=97=B6=E6=97=A0=E6=B3=95=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E8=A7=86=E9=A2=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/town/components/information.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pages/town/components/information.vue b/pages/town/components/information.vue
index 6cbf584..c2967d5 100644
--- a/pages/town/components/information.vue
+++ b/pages/town/components/information.vue
@@ -19,7 +19,7 @@
               {{ item.intro }}
             </view>
           </view>
-          <view class="info-item-body">
+          <view class="info-item-body" v-if="item.contentType === 1">
             <img-box
               :imgList="item.images"
               :num="item.images.length"
@@ -28,6 +28,9 @@
               @click="infoItemViewClick(item)"
             />
           </view>
+          <view class="info-item-body" v-if="item.contentType === 2">
+            <video play-btn-position="center" :show-fullscreen-btn="false" class="kd-cover v12-mt-0" :src="item.images[0]" controls autoplay :poster="item.images[0] + '?vframe/jpg/offset/1'"></video>
+          </view>
           <view class="info-item-bottom">
             <view class="time">
               {{

From 0b0abdfad8fb3ac23cfbf1b790c8907ec7204e2e Mon Sep 17 00:00:00 2001
From: modendeveloper <modendeveloper@163.com>
Date: Wed, 18 Dec 2024 22:21:47 +0800
Subject: [PATCH 10/54] =?UTF-8?q?Fix=EF=BC=9A2880=20=E3=80=90=E5=AF=BB?=
 =?UTF-8?q?=E8=B6=A3=E5=91=B3=E3=80=91=E5=8F=A4=E9=95=87=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E9=A1=B5--=E5=88=86=E4=BA=AB=E6=8C=89=E9=92=AE=E4=BD=8D?=
 =?UTF-8?q?=E7=BD=AE=E8=B0=83=E6=95=B4=EF=BC=8C=E5=BE=80=E4=B8=8B=E7=A7=BB?=
 =?UTF-8?q?=E4=B8=80=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/town/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/town/index.vue b/pages/town/index.vue
index aa1390e..16e7688 100644
--- a/pages/town/index.vue
+++ b/pages/town/index.vue
@@ -230,7 +230,7 @@ export default {
   font-size: 28rpx;
   position: absolute;
   right: 0;
-  top: 0;
+  top: 24rpx;
   display: flex;
   align-items: center;
 }

From b687d3737ab38a918ad5d71cbea16bf0df844a57 Mon Sep 17 00:00:00 2001
From: modendeveloper <modendeveloper@163.com>
Date: Wed, 18 Dec 2024 22:28:47 +0800
Subject: [PATCH 11/54] =?UTF-8?q?Fix=EF=BC=9A2877=20=E3=80=90=E5=AF=BB?=
 =?UTF-8?q?=E8=B6=A3=E5=91=B3=E3=80=91=E5=8F=A4=E9=95=87=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E9=A1=B5--=E9=A1=B9=E7=9B=AE--=E5=BA=97=E9=93=BA=E5=B0=81?=
 =?UTF-8?q?=E9=9D=A2=E4=B8=BA=E8=A7=86=E9=A2=91=E6=97=B6=EF=BC=8C=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=88=97=E8=A1=A8=E5=BA=97=E9=93=BA=E6=9C=AA=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E5=B0=81=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/town/components/projects.vue | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/pages/town/components/projects.vue b/pages/town/components/projects.vue
index cb7a4b6..31bfb25 100644
--- a/pages/town/components/projects.vue
+++ b/pages/town/components/projects.vue
@@ -33,12 +33,26 @@
       <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 class="cover-box">
-            <image class="town-cover" :src="item.cover" mode="aspectFit|aspectFill|widthFix"></image>
+            <image 
+              v-if="item.coverType === 1"
+              class="town-cover" 
+              :src="item.cover" 
+              mode="aspectFit|aspectFill|widthFix"></image>
+              <video 
+                v-if="item.coverType === 2"
+                play-btn-position="center" 
+                :show-fullscreen-btn="false" 
+                class="town-cover" 
+                :src="item.cover" 
+                controls 
+                autoplay 
+                :poster="item.cover + '?vframe/jpg/offset/1'"></video>
             <view class="name-box">
               <image
                 :src="webUrl + '/home/icon-location.png'"
                 class="icon"
               />
+              
               <view class="one-t">
                 {{ item.cityName }}
               </view>

From 426ca24f51d0b4723ed1ad41db67c7e13b14c977 Mon Sep 17 00:00:00 2001
From: modendeveloper <modendeveloper@163.com>
Date: Wed, 18 Dec 2024 22:29:49 +0800
Subject: [PATCH 12/54] =?UTF-8?q?Fix=EF=BC=9A2878=20=E3=80=90=E5=AF=BB?=
 =?UTF-8?q?=E8=B6=A3=E5=91=B3=E3=80=91=E5=8F=A4=E9=95=87=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E9=A1=B5--=E5=8E=BB=E9=99=A4=E5=8F=A4=E9=95=87=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0=E4=B8=8B=E6=96=B9=E8=99=9A=E7=BA=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/town/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/town/index.vue b/pages/town/index.vue
index 16e7688..a68f076 100644
--- a/pages/town/index.vue
+++ b/pages/town/index.vue
@@ -22,7 +22,7 @@
         </text>
       </view>
       <view class="shareBtn" @click="shareImg"><u-icon name="share-square" color="#C52733"></u-icon>分享给好友</view>
-      <u-line dashed></u-line>
+      <!-- <u-line dashed></u-line> -->
       <view v-if="townInfo.intro" class="v12-pa-3 intro-content">
         <u-read-more :toggle="true" showHeight="200">
           {{ townInfo.intro }}

From c2901522acc9eac32d3bfdacfc95f7799084ff47 Mon Sep 17 00:00:00 2001
From: modendeveloper <modendeveloper@163.com>
Date: Wed, 18 Dec 2024 22:34:02 +0800
Subject: [PATCH 13/54] =?UTF-8?q?Fix=EF=BC=9A2884=20=E3=80=90=E5=95=86?=
 =?UTF-8?q?=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E5=85=BB=E7=94=9F?=
 =?UTF-8?q?=E5=9C=A3=E5=9C=B0=EF=BC=8C=E8=BD=AE=E6=92=AD=E6=8E=A8=E8=8D=90?=
 =?UTF-8?q?=E8=A7=A6=E6=8E=A7=E5=8C=BA=E5=9F=9F=E6=94=B9=E4=B8=BA=E6=95=B4?=
 =?UTF-8?q?=E5=BC=A0=E5=9B=BE=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg_product/views/healthSanctum.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg_product/views/healthSanctum.vue b/pkg_product/views/healthSanctum.vue
index e52dcdb..3f3e212 100644
--- a/pkg_product/views/healthSanctum.vue
+++ b/pkg_product/views/healthSanctum.vue
@@ -17,12 +17,12 @@
     </view>
     <swiper v-if="traveItems.length > 0" class="v12-justify-between swap" autoplay circular next-margin="300rpx" duration="10000" interval="3000" >
       <swiper-item v-for="(item, index) in traveItems" :key="index" >
-        <view class="trave-item v12-mr-3 v12-mt-3">
+        <view class="trave-item v12-mr-3 v12-mt-3" @click="toStore(item.hotelId)">
           <view class="trave-item">
             <image class="trave-item" :src="item.cover"  v-if="item.coverType === 1"></image>
             <video class="trave-item" :src="item.cover" :show-fullscreen-btn="false" :show-center-play-btn="flase" :show-play-btn="false" v-if="item.coverType === 2"></video>
           </view>
-          <view class="trave-btn" @click="toStore(item.hotelId)">
+          <view class="trave-btn">
             <text>旅居预约</text>
             <image  :src="webUrl + '/orderIcon/arrow.png'" class="arrow-icon v12-ml-1"></image>
           </view>

From e0dac0207bc1b69de2f83533c1d8468d9cda9993 Mon Sep 17 00:00:00 2001
From: modendeveloper <modendeveloper@163.com>
Date: Wed, 18 Dec 2024 22:34:14 +0800
Subject: [PATCH 14/54] =?UTF-8?q?Fix=EF=BC=9A2885=20=E3=80=90=E5=95=86?=
 =?UTF-8?q?=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E5=85=BB=E7=94=9F?=
 =?UTF-8?q?=E9=A3=9F=E6=9D=90=EF=BC=8C=E8=BD=AE=E6=92=AD=E6=8E=A8=E8=8D=90?=
 =?UTF-8?q?=E8=A7=A6=E6=8E=A7=E5=8C=BA=E5=9F=9F=E6=94=B9=E4=B8=BA=E6=95=B4?=
 =?UTF-8?q?=E5=BC=A0=E5=9B=BE=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg_product/views/healthFoods.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg_product/views/healthFoods.vue b/pkg_product/views/healthFoods.vue
index 1ac6b0d..1d5095f 100644
--- a/pkg_product/views/healthFoods.vue
+++ b/pkg_product/views/healthFoods.vue
@@ -38,7 +38,7 @@
       duration="10000"
       interval="3000"
     >
-      <swiper-item v-for="(item, index) in foodItems" :key="index">
+      <swiper-item v-for="(item, index) in foodItems" :key="index" @click="toDetails(item.id)">
         <view class="trave-item-wrap v12-mr-3 v12-mt-3">
           <view class="trave-item">
             <image
@@ -47,7 +47,7 @@
               :src="item.indexImage"
             ></image>
           </view>
-          <view class="trave-btn" @click="toDetails(item.id)">
+          <view class="trave-btn">
             <text class="one-t">{{ item.name }}</text>
             <image
               :src="webUrl + '/orderIcon/arrow.png'"

From 01dc1711ca8f12cccc46837fe9a4305a3844a119 Mon Sep 17 00:00:00 2001
From: modendeveloper <modendeveloper@163.com>
Date: Wed, 18 Dec 2024 22:38:35 +0800
Subject: [PATCH 15/54] =?UTF-8?q?Fix=EF=BC=9A2882=20=E3=80=90=E9=9D=9E?=
 =?UTF-8?q?=E9=81=97=E6=96=87=E5=8C=96=E3=80=91=E9=9D=9E=E9=81=97=E4=B8=BB?=
 =?UTF-8?q?=E6=8E=A8=E8=8D=90=EF=BC=8C=E9=9C=80=E8=A6=81=E8=BF=9B=E8=A1=8C?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=BE=80=E5=8F=B3=E6=8C=81=E7=BB=AD=E8=BD=AE?=
 =?UTF-8?q?=E6=92=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg_product/views/heritage/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg_product/views/heritage/index.vue b/pkg_product/views/heritage/index.vue
index 88e6770..2f3abd6 100644
--- a/pkg_product/views/heritage/index.vue
+++ b/pkg_product/views/heritage/index.vue
@@ -27,7 +27,7 @@
       </view>
     </view>
     <view class="wiper-wrap v12-mt-3">
-      <swiper  v-if="contents.length > 0" class="" style="width: 100%;height: 400rpx" :autoplay="contents.length > 2" circular next-margin="400rpx">
+      <swiper  v-if="contents.length > 0" class="" style="width: 100%;height: 400rpx" :autoplay="contents.length > 2" circular next-margin="400rpx" duration="10000" interval="3000">
         <swiper-item v-for="(item, index) in contents" :key="index" @click="toDetails(item.ichContentId)">
           <view class="wiper-item">
             <image class="wiper-item" :src="item.cover" mode="aspectFit|aspectFill|widthFix" lazy-load="false"> </image>

From f174a83ac02bfb69f483fb3621e5e29f00bacc73 Mon Sep 17 00:00:00 2001
From: modendeveloper <modendeveloper@163.com>
Date: Wed, 18 Dec 2024 22:48:08 +0800
Subject: [PATCH 16/54] =?UTF-8?q?Fix=EF=BC=9A2889=20=E3=80=90=E5=95=86?=
 =?UTF-8?q?=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E5=BD=93=E5=AF=BB=E8=B6=A3=E5=91=B3=E5=BA=97=E9=93=BA=E5=B0=81?=
 =?UTF-8?q?=E9=9D=A2=E4=B8=BA=E8=A7=86=E9=A2=91=E6=97=B6=EF=BC=8C=E8=A7=86?=
 =?UTF-8?q?=E9=A2=91=E8=B5=84=E8=AE=AF=E5=92=8C=E8=A7=86=E9=A2=91=E5=B0=81?=
 =?UTF-8?q?=E9=9D=A2=E4=B8=8D=E8=83=BD=E5=90=8C=E6=97=B6=E6=92=AD=E6=94=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/town/index.vue     | 2 +-
 pagesInn/inn/innHome.vue | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/pages/town/index.vue b/pages/town/index.vue
index a68f076..986813d 100644
--- a/pages/town/index.vue
+++ b/pages/town/index.vue
@@ -95,7 +95,7 @@ export default {
       posterUrl: '',
       activeties: [],
       id: '',
-      actived: 1,
+      actived: -1,
       tabs: [
         {name: '项目', value: 1},
         {name: '文化', value: 2},
diff --git a/pagesInn/inn/innHome.vue b/pagesInn/inn/innHome.vue
index d306a40..1fea1e6 100644
--- a/pagesInn/inn/innHome.vue
+++ b/pagesInn/inn/innHome.vue
@@ -232,6 +232,7 @@
                         controls
                         play-btn-position="center"
                         class="video-item"
+                        :autoplay="inn.coverType !== 2"
                         @play="infoItemViewClick(item)"
                       />
                     </view>

From f64f87546ecff2b720159aec4defc9e163400da0 Mon Sep 17 00:00:00 2001
From: modendeveloper <modendeveloper@163.com>
Date: Wed, 18 Dec 2024 23:18:12 +0800
Subject: [PATCH 17/54] =?UTF-8?q?Fix=EF=BC=9A2889=20=E3=80=90=E5=95=86?=
 =?UTF-8?q?=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E5=BD=93=E5=AF=BB=E8=B6=A3=E5=91=B3=E5=BA=97=E9=93=BA=E5=B0=81?=
 =?UTF-8?q?=E9=9D=A2=E4=B8=BA=E8=A7=86=E9=A2=91=E6=97=B6=EF=BC=8C=E8=A7=86?=
 =?UTF-8?q?=E9=A2=91=E8=B5=84=E8=AE=AF=E5=92=8C=E8=A7=86=E9=A2=91=E5=B0=81?=
 =?UTF-8?q?=E9=9D=A2=E4=B8=8D=E8=83=BD=E5=90=8C=E6=97=B6=E6=92=AD=E6=94=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pagesInn/inn/innHome.vue | 26 +++++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/pagesInn/inn/innHome.vue b/pagesInn/inn/innHome.vue
index 1fea1e6..9010c98 100644
--- a/pagesInn/inn/innHome.vue
+++ b/pagesInn/inn/innHome.vue
@@ -31,6 +31,7 @@
             :autoplay="true"
             :controls="true"
             :loop="false"
+            id="coverVideo"
             object-fit="contain"
             play-btn-position="center"
             class="video"
@@ -232,8 +233,8 @@
                         controls
                         play-btn-position="center"
                         class="video-item"
-                        :autoplay="inn.coverType !== 2"
-                        @play="infoItemViewClick(item)"
+                        :id="'video-item' + index"
+                        @play="infoItemViewClick(item, index)"
                       />
                     </view>
                     <view v-else>
@@ -666,7 +667,26 @@ export default {
     infoClick: function (info) {
       // this.$yrouter.push('/pagesInn/inn/innInfoDetail?id=' + info.id)
     },
-    infoItemViewClick(item) {
+    infoItemViewClick(item, index) {
+      if(item.type === 'NT_VIDEO') {
+        const coverCtx = uni.createVideoContext('coverVideo', this)
+        coverCtx.pause()
+        const playerId = 'video-item' + index
+        if(this.videoPlayers.includes(playerId)) {
+          this.videoPlayers.forEach(player => {
+            if(player === playerId) return
+            const playerCtx = uni.createVideoContext(player, this)
+            playerCtx.pause()
+          })
+        } {
+          this.videoPlayers.push(playerId)
+          this.videoPlayers.forEach(player => {
+            if(player === playerId) return
+            const playerCtx = uni.createVideoContext(player, this)
+            playerCtx.pause()
+          })
+        }
+      }
       uni.$u.debounce(() => {
         hotelNewsView({ id: item.id }).finally(() => {
           this.infoArray.map(info => {

From 40431f03fc1ce3094bb29927b1167b3225ff0607 Mon Sep 17 00:00:00 2001
From: modendeveloper <modendeveloper@163.com>
Date: Wed, 18 Dec 2024 23:18:33 +0800
Subject: [PATCH 18/54] =?UTF-8?q?Fix=EF=BC=9A2886=20=E3=80=90=E5=95=86?=
 =?UTF-8?q?=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E5=86=9C=E6=B0=91?=
 =?UTF-8?q?=E5=BA=97=E9=93=BA-=E5=A4=9A=E4=B8=AA=E8=A7=86=E9=A2=91?=
 =?UTF-8?q?=E8=B5=84=E8=AE=AF=E5=8F=AF=E5=90=8C=E6=97=B6=E6=92=AD=E6=94=BE?=
 =?UTF-8?q?=EF=BC=88=E4=BC=98=E5=8C=96=E4=B8=BA=E7=82=B9=E5=87=BB=E4=B8=8B?=
 =?UTF-8?q?=E4=B8=80=E4=B8=AA=E8=A7=86=E9=A2=91=E6=92=AD=E6=94=BE=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E4=B8=8A=E4=B8=80=E4=B8=AA=E8=A7=86=E9=A2=91=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E5=81=9C=E6=AD=A2=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/cloud/haveFun.vue      |  2 +-
 pages/town/index.vue         |  2 +-
 pagesInn/inn/farmerStore.vue | 28 +++++++++++++++++++++++++---
 3 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/pages/cloud/haveFun.vue b/pages/cloud/haveFun.vue
index 595382e..ca2466e 100644
--- a/pages/cloud/haveFun.vue
+++ b/pages/cloud/haveFun.vue
@@ -163,7 +163,7 @@ export default {
       name: '',
       page: 1,
       typeList: [],
-      typeIndex: 0,
+      typeIndex: -1,
       // 当前选中的类型
       currType: {},
       cityName: '',
diff --git a/pages/town/index.vue b/pages/town/index.vue
index 986813d..a68f076 100644
--- a/pages/town/index.vue
+++ b/pages/town/index.vue
@@ -95,7 +95,7 @@ export default {
       posterUrl: '',
       activeties: [],
       id: '',
-      actived: -1,
+      actived: 1,
       tabs: [
         {name: '项目', value: 1},
         {name: '文化', value: 2},
diff --git a/pagesInn/inn/farmerStore.vue b/pagesInn/inn/farmerStore.vue
index 89b5e42..b2366e1 100644
--- a/pagesInn/inn/farmerStore.vue
+++ b/pagesInn/inn/farmerStore.vue
@@ -32,6 +32,7 @@
             :loop="false"
             object-fit="contain"
             play-btn-position="center"
+            id="coverVideo"
             class="video"
           />
         </view>
@@ -230,7 +231,8 @@
                         play-btn-position="center"
                         :show-fullscreen-btn="false"
                         class="video-item"
-                        @play="infoItemViewClick(item)"
+                        :id="'video-item' + index"
+                        @play="infoItemViewClick(item, index)"
                       />
                     </view>
                     <view v-else>
@@ -363,7 +365,8 @@ export default {
       activeIndex: 0,
       isLoadInfoListSuccess: false,
       picColumnWidth: '325rpx',
-      infoArray: []
+      infoArray: [],
+      videoPlayers: []
     }
   },
   onPageScroll(e) {
@@ -440,7 +443,26 @@ export default {
         }
       })
     },
-    infoItemViewClick(item) {
+    infoItemViewClick(item, index) {
+      if(item.type === 2) {
+        const coverCtx = uni.createVideoContext('coverVideo', this)
+        coverCtx.pause()
+        const playerId = 'video-item' + index
+        if(this.videoPlayers.includes(playerId)) {
+          this.videoPlayers.forEach(player => {
+            if(player === playerId) return
+            const playerCtx = uni.createVideoContext(player, this)
+            playerCtx.pause()
+          })
+        } {
+          this.videoPlayers.push(playerId)
+          this.videoPlayers.forEach(player => {
+            if(player === playerId) return
+            const playerCtx = uni.createVideoContext(player, this)
+            playerCtx.pause()
+          })
+        }
+      }
       const params = {
         countyFamousNewsId: item.id
       }

From 27c95042d48942a24c95d0b9c6cd8889046eed91 Mon Sep 17 00:00:00 2001
From: modendeveloper <modendeveloper@163.com>
Date: Wed, 18 Dec 2024 23:23:47 +0800
Subject: [PATCH 19/54] =?UTF-8?q?Fix=EF=BC=9A2887=20=E3=80=90=E5=95=86?=
 =?UTF-8?q?=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E6=9D=91=E5=B1=8B?=
 =?UTF-8?q?=E8=B5=84=E8=AE=AF-=E5=A4=9A=E4=B8=AA=E8=A7=86=E9=A2=91?=
 =?UTF-8?q?=E8=B5=84=E8=AE=AF=E5=8F=AF=E5=90=8C=E6=97=B6=E6=92=AD=E6=94=BE?=
 =?UTF-8?q?=EF=BC=88=E4=BC=98=E5=8C=96=E4=B8=BA=E7=82=B9=E5=87=BB=E4=B8=8B?=
 =?UTF-8?q?=E4=B8=80=E4=B8=AA=E8=A7=86=E9=A2=91=E6=92=AD=E6=94=BE=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E4=B8=8A=E4=B8=80=E4=B8=AA=E8=A7=86=E9=A2=91=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E5=81=9C=E6=AD=A2=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pagesInn/inn/innHome.vue                      |  3 ++-
 .../views/famousQianxianVillageShop.vue       | 27 ++++++++++++++++++-
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/pagesInn/inn/innHome.vue b/pagesInn/inn/innHome.vue
index 9010c98..b6dace8 100644
--- a/pagesInn/inn/innHome.vue
+++ b/pagesInn/inn/innHome.vue
@@ -484,7 +484,8 @@ export default {
       isLoadGoodListoSuccess: false,
       isLoadInfoListSuccess: false,
       pageKeyId: '',
-      shareImg: ''
+      shareImg: '',
+      videoPlayers: []
     }
   },
   // 必须在页面加 onPageScroll(e){} ，才能滑动显示背景
diff --git a/pkg_product/views/famousQianxianVillageShop.vue b/pkg_product/views/famousQianxianVillageShop.vue
index f56a084..56a11ad 100644
--- a/pkg_product/views/famousQianxianVillageShop.vue
+++ b/pkg_product/views/famousQianxianVillageShop.vue
@@ -33,6 +33,7 @@
             object-fit="contain"
             play-btn-position="center"
             class="video"
+            id="coverVideo"
           />
         </view>
       </view>
@@ -175,6 +176,8 @@
                         controls
                         play-btn-position="center"
                         class="video-item"
+                        :id='"video-item" + index'
+                        @play="handleVideo(item, index)"
                       />
                     </view>
                     <view v-else>
@@ -239,7 +242,8 @@ export default {
       // 资讯
       infoArray: [],
       isLoadInfoListSuccess: false,
-      pageKeyId: ''
+      pageKeyId: '',
+      videoPlayers: []
     }
   },
   onPageScroll(e) {
@@ -252,6 +256,27 @@ export default {
     this.getInfoReq()
   },
   methods: {
+    handleVideo(item, index) {
+      if(item.type === 2) {
+        const coverCtx = uni.createVideoContext('coverVideo', this)
+        coverCtx.pause()
+        const playerId = 'video-item' + index
+        if(this.videoPlayers.includes(playerId)) {
+          this.videoPlayers.forEach(player => {
+            if(player === playerId) return
+            const playerCtx = uni.createVideoContext(player, this)
+            playerCtx.pause()
+          })
+        } {
+          this.videoPlayers.push(playerId)
+          this.videoPlayers.forEach(player => {
+            if(player === playerId) return
+            const playerCtx = uni.createVideoContext(player, this)
+            playerCtx.pause()
+          })
+        }
+      }
+    },
     getShopDetailReq() {
       const _this = this
       getCountyFamousVillageDetail(_this.id).then((res) => {

From 78e0937fca2bda9516e80559f10a6963a9b845b6 Mon Sep 17 00:00:00 2001
From: modendeveloper <modendeveloper@163.com>
Date: Wed, 18 Dec 2024 23:34:57 +0800
Subject: [PATCH 20/54] =?UTF-8?q?Fix=EF=BC=9A=E5=A4=9A=E8=A7=86=E9=A2=91?=
 =?UTF-8?q?=E5=8F=AA=E8=83=BD=E6=92=AD=E6=94=BE=E4=B8=80=E4=B8=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/town/components/information.vue | 35 ++++++++++++++++++++++++---
 pages/town/index.vue                  |  7 +++++-
 2 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/pages/town/components/information.vue b/pages/town/components/information.vue
index c2967d5..50dc03f 100644
--- a/pages/town/components/information.vue
+++ b/pages/town/components/information.vue
@@ -29,7 +29,15 @@
             />
           </view>
           <view class="info-item-body" v-if="item.contentType === 2">
-            <video play-btn-position="center" :show-fullscreen-btn="false" class="kd-cover v12-mt-0" :src="item.images[0]" controls autoplay :poster="item.images[0] + '?vframe/jpg/offset/1'"></video>
+            <video 
+              @play="infoItemViewClick(item, index)"
+              play-btn-position="center" 
+              :show-fullscreen-btn="false" 
+              class="kd-cover v12-mt-0" 
+              :src="item.images[0]" 
+              controls 
+              :id="'video-item' + index"
+              :poster="item.images[0] + '?vframe/jpg/offset/1'"></video>
           </view>
           <view class="info-item-bottom">
             <view class="time">
@@ -83,7 +91,8 @@ export default {
   data() {
     return {
       webUrl: this.$VUE_APP_RESOURCES_URL,
-      actives: this.infoArray
+      actives: this.infoArray,
+      videoPlayers: []
     }
   },
   watch: {
@@ -92,7 +101,27 @@ export default {
     }
   },
   methods: {
-    infoItemViewClick(item) {
+    infoItemViewClick(item, index) {
+      if(item.contentType === 2) {
+        // const coverCtx = uni.createVideoContext('coverVideo', this)
+        // coverCtx.pause()
+        const playerId = 'video-item' + index
+        if(this.videoPlayers.includes(playerId)) {
+          this.videoPlayers.forEach(player => {
+            if(player === playerId) return
+            const playerCtx = uni.createVideoContext(player, this)
+            playerCtx.pause()
+          })
+        } {
+          this.videoPlayers.push(playerId)
+          this.videoPlayers.forEach(player => {
+            if(player === playerId) return
+            const playerCtx = uni.createVideoContext(player, this)
+            playerCtx.pause()
+          })
+        }
+        this.$emit('video')
+      }
       uni.$u.debounce(() => {
         watchTownActive({ id: item.id }).finally(() => {
           this.actives.forEach(info => {
diff --git a/pages/town/index.vue b/pages/town/index.vue
index a68f076..22931b8 100644
--- a/pages/town/index.vue
+++ b/pages/town/index.vue
@@ -5,6 +5,7 @@
       <image v-if="townInfo.coverType === 1" :src="townInfo.cover" mode="scaleToFill" class="img"></image>
       <video 
         v-if="townInfo.coverType === 2"
+        id="videoCover"
         class="img" 
         :src="townInfo.cover"  
         autoplay
@@ -40,7 +41,7 @@
           <culture :list="townInfo.cultureInfo.cultureImages"></culture>
         </view>
         <view v-if="actived === 3">
-          <information :infoArray="activeties"></information>
+          <information :infoArray="activeties" @video="handleVideo"></information>
         </view>
         <view v-if="actived === 4">
           <service :info="{...townInfo.serviceInfo, name:  townInfo.name}"></service>
@@ -115,6 +116,10 @@ export default {
     this.getActive()
   },
   methods: {
+    handleVideo() {
+      const videoCtx = uni.createVideoContext('videoCover', this)
+      videoCtx.pause()
+    },
     shareImg() {
       uni.showLoading()
       shareTown(this.id).then(res => {

From 97c7fda9bb490e84208f572b905583f5afcdf88a Mon Sep 17 00:00:00 2001
From: modendeveloper <modendeveloper@163.com>
Date: Wed, 18 Dec 2024 23:41:43 +0800
Subject: [PATCH 21/54] =?UTF-8?q?Fix;2883=20=E3=80=90=E5=AF=BB=E8=B6=A3?=
 =?UTF-8?q?=E5=91=B3=E3=80=91=E6=B4=BB=E5=8A=A8=E6=97=B6=E9=97=B4=E8=A6=81?=
 =?UTF-8?q?=E5=8F=A6=E8=B5=B7=E4=B8=80=E8=A1=8C=EF=BC=8C=E4=B8=8D=E8=83=BD?=
 =?UTF-8?q?=E8=B7=9F=E8=B5=84=E8=AE=AF=E8=BF=9E=E5=9C=A8=E4=B8=80=E8=B5=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/town/components/information.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pages/town/components/information.vue b/pages/town/components/information.vue
index 50dc03f..7999222 100644
--- a/pages/town/components/information.vue
+++ b/pages/town/components/information.vue
@@ -18,6 +18,7 @@
             <view class="intro">
               {{ item.intro }}
             </view>
+            <view class="intro v12-dark-text">活动时间: {{ item.startTime }} - {{ item.endTime }}</view>
           </view>
           <view class="info-item-body" v-if="item.contentType === 1">
             <img-box

From 6a3445a0ccd5898334fc2850f1e6d756cfefa0f6 Mon Sep 17 00:00:00 2001
From: modendeveloper <modendeveloper@163.com>
Date: Thu, 19 Dec 2024 00:14:12 +0800
Subject: [PATCH 22/54] =?UTF-8?q?Fix=EF=BC=9A2881=20=E3=80=90=E5=8D=83?=
 =?UTF-8?q?=E5=8E=BF=E5=90=8D=E5=93=81=E3=80=91=E5=8D=83=E5=8E=BF=EF=BC=8C?=
 =?UTF-8?q?=E5=8E=BF=E5=9F=8E=E8=B5=84=E8=AE=AF=E9=9C=80=E8=A6=81=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E4=B8=8A=E4=BC=A0=E8=A7=86=E9=A2=91=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg_product/views/famousQianxianShop.vue | 41 +++++++++++++++++++++++-
 1 file changed, 40 insertions(+), 1 deletion(-)

diff --git a/pkg_product/views/famousQianxianShop.vue b/pkg_product/views/famousQianxianShop.vue
index 5f0691f..b488cde 100644
--- a/pkg_product/views/famousQianxianShop.vue
+++ b/pkg_product/views/famousQianxianShop.vue
@@ -33,6 +33,7 @@
             object-fit="contain"
             play-btn-position="center"
             class="video"
+            id="coverVideo"
           />
         </view>
       </view>
@@ -171,12 +172,24 @@
                   </view>
                   <view class="info-item-body">
                     <img-box
+                      v-if="item.type === 1"
                       :imgList="item.images"
                       :num="item.images.length"
                       :img-radius="10"
                       style="width: 100%;"
                       @click="infoItemViewClick(item)"
                     />
+                    <video
+                      v-else
+                      @play="infoItemViewClick(item, index)"
+                      play-btn-position="center" 
+                      :show-fullscreen-btn="false" 
+                      class="video-item v12-mt-0" 
+                      :src="item.video" 
+                      objectFit
+                      controls 
+                      :id="'video-item' + index"
+                      :poster="item.video + '?vframe/jpg/offset/1'"></video>
                   </view>
                   <view class="info-item-bottom">
                     <view class="time">
@@ -704,6 +717,7 @@ export default {
       // 产品
       leftList: [],
       rightList: [],
+      videoPlayers:[]
     }
   },
   // 必须在页面加 onPageScroll(e){} ，才能滑动显示背景
@@ -1050,7 +1064,27 @@ export default {
     infoClick(info) {
       // this.$yrouter.push('/pagesInn/inn/innInfoDetail?id=' + info.id)
     },
-    infoItemViewClick(item) {
+    infoItemViewClick(item, index) {
+      if(item.type === 2) {
+        const coverCtx = uni.createVideoContext('coverVideo', this)
+        coverCtx.pause()
+        const playerId = 'video-item' + index
+        if(this.videoPlayers.includes(playerId)) {
+          this.videoPlayers.forEach(player => {
+            if(player === playerId) return
+            const playerCtx = uni.createVideoContext(player, this)
+            playerCtx.pause()
+          })
+        } {
+          this.videoPlayers.push(playerId)
+          this.videoPlayers.forEach(player => {
+            if(player === playerId) return
+            const playerCtx = uni.createVideoContext(player, this)
+            playerCtx.pause()
+          })
+        }
+        this.$emit('video')
+      }
       uni.$u.debounce(() => {
         postCountyFamousNewsView({ countyFamousNewsId: item.id }).finally(() => {
           this.infoArray.map(info => {
@@ -1156,6 +1190,11 @@ export default {
 <style scoped lang="less">
 
 @import "@/assets/css/store.less";
+.video-item {
+  width: 100%;
+  height: 400rpx;
+  border-radius: 10rpx;
+}
 .focus-img {
   position: relative;
   .img {

From ffa827c1372e9084771a851fc4112d8edd0855bb Mon Sep 17 00:00:00 2001
From: modendeveloper <modendeveloper@163.com>
Date: Thu, 19 Dec 2024 00:25:54 +0800
Subject: [PATCH 23/54] =?UTF-8?q?Fix=EF=BC=9A2858=20=E3=80=90=E5=AF=BB?=
 =?UTF-8?q?=E8=B6=A3=E5=91=B3=E3=80=91=E5=8F=A4=E9=95=87=E5=86=85=E5=AE=B9?=
 =?UTF-8?q?=E6=8C=89=E5=9F=8E=E5=B8=82=E5=88=92=E5=88=86=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/cloud/haveFun.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pages/cloud/haveFun.vue b/pages/cloud/haveFun.vue
index ca2466e..4996971 100644
--- a/pages/cloud/haveFun.vue
+++ b/pages/cloud/haveFun.vue
@@ -98,6 +98,10 @@
           <view class="icon-box"><u-icon name="arrow-rightward" color="#fff" size="8"></u-icon></view>
         </view>
       </view>
+      <view class="v4-nodata" v-if="townList.length === 0">
+          <image src="@/static/images/img_nodata.png" mode="scaleToFill"/>
+          <view class="text">暂无数据</view>
+        </view>
     </view>
     <view class="body" v-else>
       <view class="v12-justify-between v12-align-center">
@@ -278,7 +282,7 @@ export default {
     fetchList(random = 0, randomSeed) {
       if(this.typeIndex === -1) {
         const params = {
-          cityName: this.name,
+          cityName: this.cityName,
           page: 1,
           limit: 999
         }

From 020bdadcaef85ccd3f0b14d8fdf7111ba57c07a7 Mon Sep 17 00:00:00 2001
From: modendeveloper <modendeveloper@163.com>
Date: Thu, 19 Dec 2024 00:26:18 +0800
Subject: [PATCH 24/54] =?UTF-8?q?Fix=EF=BC=9A2876=20=E3=80=90=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=90=8E=E5=8F=B0=E3=80=91=E5=9C=B0=E6=A0=87=E5=A5=BD?=
 =?UTF-8?q?=E7=89=A9=E8=B5=84=E8=AE=AF=E5=A2=9E=E5=8A=A0=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E8=A7=86=E9=A2=91=E5=8A=9F=E8=83=BD=EF=BC=8C=E5=89=8D=E7=AB=AF?=
 =?UTF-8?q?=E5=9C=B0=E6=A0=87=E5=A5=BD=E7=89=A9=E8=B5=84=E8=AE=AF=E4=B9=9F?=
 =?UTF-8?q?=E9=9C=80=E8=A6=81=E8=B0=83=E6=95=B4=E4=B8=BA=E5=8F=AF=E4=BB=A5?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E8=A7=86=E9=A2=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/home/components/information.vue | 40 ++++++++++++++++++++++++++-
 pages/town/components/information.vue |  2 +-
 2 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/pages/home/components/information.vue b/pages/home/components/information.vue
index c047ce4..0579b5d 100644
--- a/pages/home/components/information.vue
+++ b/pages/home/components/information.vue
@@ -20,13 +20,25 @@
             </view>
           </view>
           <view class="info-item-body">
+            <video 
+              v-if="item.type === 2"
+              @play="infoItemViewClick(item, index)"
+              play-btn-position="center" 
+              :show-fullscreen-btn="false" 
+              class="video-item v12-mt-0" 
+              :src="item.video" 
+              controls 
+              :id="'video-item' + index"
+              :poster="item.video + '?vframe/jpg/offset/1'"></video>
             <img-box
+              v-else
               :imgList="item.images"
               :num="item.images.length"
               :img-radius="10"
               style="width: 100%"
               @click="infoItemViewClick(item)"
             />
+           
           </view>
           <view class="info-item-bottom">
             <view class="time">
@@ -101,7 +113,8 @@ export default {
   data() {
     return {
       webUrl: this.$VUE_APP_RESOURCES_URL,
-      infoArray: []
+      infoArray: [],
+      videoPlayers:[]
     }
   },
   watch: {
@@ -138,6 +151,26 @@ export default {
       })
     },
     infoItemViewClick(item) {
+      if(item.type === 2) {
+        // const coverCtx = uni.createVideoContext('coverVideo', this)
+        // coverCtx.pause()
+        const playerId = 'video-item' + index
+        if(this.videoPlayers.includes(playerId)) {
+          this.videoPlayers.forEach(player => {
+            if(player === playerId) return
+            const playerCtx = uni.createVideoContext(player, this)
+            playerCtx.pause()
+          })
+        } {
+          this.videoPlayers.push(playerId)
+          this.videoPlayers.forEach(player => {
+            if(player === playerId) return
+            const playerCtx = uni.createVideoContext(player, this)
+            playerCtx.pause()
+          })
+        }
+        this.$emit('video')
+      }
       uni.$u.debounce(() => {
         hadView({ landmarkNewsId: item.id }).finally(() => {
           this.infoArray.map(info => {
@@ -152,6 +185,11 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+.video-item {
+  width: 100%;
+  height: 400rpx;
+  border-radius: 10rpx;
+}
 .info-wrapper{
   padding: 20px 10px;
 }
diff --git a/pages/town/components/information.vue b/pages/town/components/information.vue
index 7999222..409ca6f 100644
--- a/pages/town/components/information.vue
+++ b/pages/town/components/information.vue
@@ -34,7 +34,7 @@
               @play="infoItemViewClick(item, index)"
               play-btn-position="center" 
               :show-fullscreen-btn="false" 
-              class="kd-cover v12-mt-0" 
+              class="video-item v12-mt-0" 
               :src="item.images[0]" 
               controls 
               :id="'video-item' + index"

From 104d0ef4e19448c26090c671fbacd14455e6ddc2 Mon Sep 17 00:00:00 2001
From: modendeveloper <modendeveloper@163.com>
Date: Thu, 19 Dec 2024 00:32:33 +0800
Subject: [PATCH 25/54] =?UTF-8?q?Fix=EF=BC=9A2864=20=E3=80=90=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=90=8E=E5=8F=B0=E3=80=91=E5=8F=A4=E9=95=87=E7=AD=89?=
 =?UTF-8?q?=E7=BA=A7=E8=AE=BE=E7=BD=AE=EF=BC=8C=E5=90=8E=E5=8F=B0=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA=E7=BA=AF=E6=96=87=E6=9C=AC=E8=BE=93=E5=85=A5=EF=BC=8C?=
 =?UTF-8?q?=E5=89=8D=E7=AB=AF=E6=A0=87=E8=AF=86=E6=A0=B9=E6=8D=AE=E6=96=87?=
 =?UTF-8?q?=E6=9C=AC=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/town/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pages/town/index.vue b/pages/town/index.vue
index 22931b8..2a5aa1a 100644
--- a/pages/town/index.vue
+++ b/pages/town/index.vue
@@ -18,8 +18,8 @@
     <view class="top-intro">
       <view class="intro-title v12-pa-3">
         <text class="v12-font-bold v12-font-40">{{ townInfo.name }}</text>
-        <text class="aaaa" v-if="townInfo.isFourA === 1">
-          4A
+        <text class="aaaa" v-if="townInfo.qualityRating">
+          {{ townInfo.qualityRating }}
         </text>
       </view>
       <view class="shareBtn" @click="shareImg"><u-icon name="share-square" color="#C52733"></u-icon>分享给好友</view>

From 0b4cb9696ebbfe4ba0745ee2ddb7d90ee57ea45e Mon Sep 17 00:00:00 2001
From: modendeveloper <modendeveloper@163.com>
Date: Thu, 19 Dec 2024 23:00:37 +0800
Subject: [PATCH 26/54] =?UTF-8?q?Fix=EF=BC=9A2863=20=E3=80=90=E5=AF=BB?=
 =?UTF-8?q?=E8=B6=A3=E5=91=B3=E3=80=91=E9=85=8D=E7=BD=AE=E6=B4=BB=E5=8A=A8?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=B6=E9=97=B4=E6=8F=92=E4=BB=B6=EF=BC=8C?=
 =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E6=97=B6=E9=97=B4=E6=94=B9=E4=B8=BA=E7=BA=AF?=
 =?UTF-8?q?=E6=96=87=E6=9C=AC=E8=BE=93=E5=85=A5=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/cloud/haveFun.vue               | 2 +-
 pages/town/components/information.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pages/cloud/haveFun.vue b/pages/cloud/haveFun.vue
index 4996971..2a90f43 100644
--- a/pages/cloud/haveFun.vue
+++ b/pages/cloud/haveFun.vue
@@ -282,7 +282,7 @@ export default {
     fetchList(random = 0, randomSeed) {
       if(this.typeIndex === -1) {
         const params = {
-          cityName: this.cityName,
+          cityName: this.name,
           page: 1,
           limit: 999
         }
diff --git a/pages/town/components/information.vue b/pages/town/components/information.vue
index 409ca6f..0a8ac02 100644
--- a/pages/town/components/information.vue
+++ b/pages/town/components/information.vue
@@ -18,7 +18,7 @@
             <view class="intro">
               {{ item.intro }}
             </view>
-            <view class="intro v12-dark-text">活动时间: {{ item.startTime }} - {{ item.endTime }}</view>
+            <view class="intro v12-dark-text">活动时间: {{ item.activityTime }}</view>
           </view>
           <view class="info-item-body" v-if="item.contentType === 1">
             <img-box

From 555d2babdea3b3b4c5e4bef808a6aa2fe5cf813d Mon Sep 17 00:00:00 2001
From: modendeveloper <modendeveloper@163.com>
Date: Thu, 19 Dec 2024 23:03:20 +0800
Subject: [PATCH 27/54] =?UTF-8?q?Fix=EF=BC=9A2905=20=E3=80=90=E9=9D=9E?=
 =?UTF-8?q?=E9=81=97=E6=96=87=E5=8C=96=E3=80=91=E9=9D=9E=E9=81=97=E6=A0=87?=
 =?UTF-8?q?=E9=A2=98=E5=90=8D=E7=A7=B0=E7=9A=84=E6=96=87=E5=AD=97=E5=8C=BA?=
 =?UTF-8?q?=E5=9F=9F=E5=86=8D=E5=BB=B6=E9=95=BF=E4=B8=80=E7=82=B9=EF=BC=8C?=
 =?UTF-8?q?=E5=BB=B6=E9=95=BF=E8=87=B3=E7=BA=A2=E6=A1=86=E8=8C=83=E5=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/cloud/haveFun.vue                | 2 +-
 pkg_product/views/heritage/details.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pages/cloud/haveFun.vue b/pages/cloud/haveFun.vue
index 2a90f43..4996971 100644
--- a/pages/cloud/haveFun.vue
+++ b/pages/cloud/haveFun.vue
@@ -282,7 +282,7 @@ export default {
     fetchList(random = 0, randomSeed) {
       if(this.typeIndex === -1) {
         const params = {
-          cityName: this.name,
+          cityName: this.cityName,
           page: 1,
           limit: 999
         }
diff --git a/pkg_product/views/heritage/details.vue b/pkg_product/views/heritage/details.vue
index cc95ee0..984008a 100644
--- a/pkg_product/views/heritage/details.vue
+++ b/pkg_product/views/heritage/details.vue
@@ -154,7 +154,7 @@ export default {
   line-height: 70rpx;
 }
 .p-name{
-  max-width: 200rpx;
+  // max-width: 200rpx;
   text-align: center;
 }
 .card-footer{

From b133d0132ccb6cb49efc844d19a15b851d134423 Mon Sep 17 00:00:00 2001
From: modendeveloper <modendeveloper@163.com>
Date: Thu, 19 Dec 2024 23:41:46 +0800
Subject: [PATCH 28/54] =?UTF-8?q?Fix=EF=BC=9A2908=20=E3=80=90=E5=95=86?=
 =?UTF-8?q?=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E7=BB=93=E6=9E=9C--=E5=95=86=E5=93=81=E4=BB=B7=E6=A0=BC?=
 =?UTF-8?q?=E8=BF=87=E9=95=BF=E6=97=B6=E5=95=86=E5=93=81=E5=8E=9F=E4=BB=B7?=
 =?UTF-8?q?=E8=B6=85=E5=87=BA=E5=95=86=E5=93=81=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/shop/GoodsList/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/shop/GoodsList/index.vue b/pages/shop/GoodsList/index.vue
index 711d728..aa25eb2 100644
--- a/pages/shop/GoodsList/index.vue
+++ b/pages/shop/GoodsList/index.vue
@@ -68,7 +68,7 @@
           <view class="text">
             <view class="name more-t">{{ item.storeName }}</view>
             <view class="vip acea-row row-between-wrapper">
-              <view class="flex ai-end">
+              <view class="ai-end" :class="{'flex': force2Decimal(item.price).length < 6}">
                 <view class="money">
                   ￥
                   <text class="num" v-if="item.vipPrice && item.vipPrice > 0">{{ force2Decimal(item.vipPrice) }}</text>

From 78c83ecaa311c8f1b1d772e36770a7b412072627 Mon Sep 17 00:00:00 2001
From: modendeveloper <modendeveloper@163.com>
Date: Thu, 19 Dec 2024 23:59:15 +0800
Subject: [PATCH 29/54] =?UTF-8?q?Fix=EF=BC=9A2903=20=E3=80=90=E5=95=86?=
 =?UTF-8?q?=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E5=86=9C=E6=B0=91?=
 =?UTF-8?q?=E5=BA=97=E9=93=BA=E3=80=81=E6=9D=91=E5=B1=8B=E7=A7=9F=E5=94=AE?=
 =?UTF-8?q?=EF=BC=8C=E5=AF=BB=E8=B6=A3=E5=91=B3=E5=BA=97=E9=93=BA=EF=BC=8C?=
 =?UTF-8?q?=E8=A7=86=E9=A2=91=E8=B5=84=E8=AE=AF=E6=92=AD=E6=94=BE=E4=B8=AD?=
 =?UTF-8?q?=E5=86=8D=E7=82=B9=E5=87=BB=E8=A7=86=E9=A2=91=E5=B0=81=E9=9D=A2?=
 =?UTF-8?q?=E6=92=AD=E6=94=BE=EF=BC=8C=E4=B8=A4=E8=80=85=E4=BC=9A=E5=87=BA?=
 =?UTF-8?q?=E7=8E=B0=E5=90=8C=E6=97=B6=E6=92=AD=E6=94=BE=E6=83=85=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/town/components/information.vue           | 6 ++++++
 pagesInn/inn/farmerStore.vue                    | 7 +++++++
 pagesInn/inn/innHome.vue                        | 7 +++++++
 pkg_product/views/famousQianxianShop.vue        | 7 +++++++
 pkg_product/views/famousQianxianVillageShop.vue | 7 +++++++
 5 files changed, 34 insertions(+)

diff --git a/pages/town/components/information.vue b/pages/town/components/information.vue
index 0a8ac02..5b6bc95 100644
--- a/pages/town/components/information.vue
+++ b/pages/town/components/information.vue
@@ -102,6 +102,12 @@ export default {
     }
   },
   methods: {
+    coverPlay(){
+      this.videoPlayers.forEach(player => {
+        const playerCtx = uni.createVideoContext(player, this)
+        playerCtx.pause()
+      })
+    },
     infoItemViewClick(item, index) {
       if(item.contentType === 2) {
         // const coverCtx = uni.createVideoContext('coverVideo', this)
diff --git a/pagesInn/inn/farmerStore.vue b/pagesInn/inn/farmerStore.vue
index b2366e1..c7457ff 100644
--- a/pagesInn/inn/farmerStore.vue
+++ b/pagesInn/inn/farmerStore.vue
@@ -34,6 +34,7 @@
             play-btn-position="center"
             id="coverVideo"
             class="video"
+            @play="coverPlay"
           />
         </view>
       </view>
@@ -443,6 +444,12 @@ export default {
         }
       })
     },
+    coverPlay(){
+      this.videoPlayers.forEach(player => {
+        const playerCtx = uni.createVideoContext(player, this)
+        playerCtx.pause()
+      })
+    },
     infoItemViewClick(item, index) {
       if(item.type === 2) {
         const coverCtx = uni.createVideoContext('coverVideo', this)
diff --git a/pagesInn/inn/innHome.vue b/pagesInn/inn/innHome.vue
index b6dace8..c2805f9 100644
--- a/pagesInn/inn/innHome.vue
+++ b/pagesInn/inn/innHome.vue
@@ -35,6 +35,7 @@
             object-fit="contain"
             play-btn-position="center"
             class="video"
+            @play="coverPlay"
           />
         </view>
       </view>
@@ -668,6 +669,12 @@ export default {
     infoClick: function (info) {
       // this.$yrouter.push('/pagesInn/inn/innInfoDetail?id=' + info.id)
     },
+    coverPlay(){
+      this.videoPlayers.forEach(player => {
+        const playerCtx = uni.createVideoContext(player, this)
+        playerCtx.pause()
+      })
+    },
     infoItemViewClick(item, index) {
       if(item.type === 'NT_VIDEO') {
         const coverCtx = uni.createVideoContext('coverVideo', this)
diff --git a/pkg_product/views/famousQianxianShop.vue b/pkg_product/views/famousQianxianShop.vue
index b488cde..0004bdf 100644
--- a/pkg_product/views/famousQianxianShop.vue
+++ b/pkg_product/views/famousQianxianShop.vue
@@ -34,6 +34,7 @@
             play-btn-position="center"
             class="video"
             id="coverVideo"
+            @play="coverPlay"
           />
         </view>
       </view>
@@ -1064,6 +1065,12 @@ export default {
     infoClick(info) {
       // this.$yrouter.push('/pagesInn/inn/innInfoDetail?id=' + info.id)
     },
+    coverPlay(){
+      this.videoPlayers.forEach(player => {
+        const playerCtx = uni.createVideoContext(player, this)
+        playerCtx.pause()
+      })
+    },
     infoItemViewClick(item, index) {
       if(item.type === 2) {
         const coverCtx = uni.createVideoContext('coverVideo', this)
diff --git a/pkg_product/views/famousQianxianVillageShop.vue b/pkg_product/views/famousQianxianVillageShop.vue
index 56a11ad..eb6043d 100644
--- a/pkg_product/views/famousQianxianVillageShop.vue
+++ b/pkg_product/views/famousQianxianVillageShop.vue
@@ -34,6 +34,7 @@
             play-btn-position="center"
             class="video"
             id="coverVideo"
+            @play="coverPlay"
           />
         </view>
       </view>
@@ -256,6 +257,12 @@ export default {
     this.getInfoReq()
   },
   methods: {
+    coverPlay(){
+      this.videoPlayers.forEach(player => {
+        const playerCtx = uni.createVideoContext(player, this)
+        playerCtx.pause()
+      })
+    },
     handleVideo(item, index) {
       if(item.type === 2) {
         const coverCtx = uni.createVideoContext('coverVideo', this)

From 81c82aca5021cd9326be1d8a2cec882626bae895 Mon Sep 17 00:00:00 2001
From: linxi <linxi.jiang@jeeyor.com>
Date: Mon, 23 Dec 2024 09:18:14 +0800
Subject: [PATCH 30/54] =?UTF-8?q?Fix=EF=BC=9A2901=20=E3=80=90=E5=95=86?=
 =?UTF-8?q?=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E2=80=9C=E8=AF=B7?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=BA=97=E9=93=BA=E8=A7=86=E9=A2=91=E6=96=B9?=
 =?UTF-8?q?=E9=9D=A2=E2=80=9D=E6=94=B9=E4=B8=BA=E2=80=9C=E8=AF=B7=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=E5=BA=97=E9=93=BA=E8=A7=86=E9=A2=91=E5=B0=81=E9=9D=A2?=
 =?UTF-8?q?=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg_join/views/shop.vue     | 2 +-
 pkg_join/views/supplier.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg_join/views/shop.vue b/pkg_join/views/shop.vue
index d5525e2..83b7973 100644
--- a/pkg_join/views/shop.vue
+++ b/pkg_join/views/shop.vue
@@ -447,7 +447,7 @@ export default {
         'coverVideo': {
           type: 'string',
           required: true,
-          message: '请上传店铺视频方面',
+          message: '请上传店铺视频封面',
           trigger: ['blur', 'change']
         },
         'logo': {
diff --git a/pkg_join/views/supplier.vue b/pkg_join/views/supplier.vue
index 278da64..eee1e60 100644
--- a/pkg_join/views/supplier.vue
+++ b/pkg_join/views/supplier.vue
@@ -625,7 +625,7 @@ export default {
         'coverVideo': {
           type: 'string',
           required: true,
-          message: '请上传店铺视频方面',
+          message: '请上传店铺视频封面',
           trigger: ['blur', 'change']
         },
         'logo': {

From 2b12a0370323aacefd65c7f5e7dfe57e11dd51b6 Mon Sep 17 00:00:00 2001
From: linxi <linxi.jiang@jeeyor.com>
Date: Mon, 23 Dec 2024 09:20:26 +0800
Subject: [PATCH 31/54] =?UTF-8?q?Fix=EF=BC=9A2898=20=E3=80=90=E5=95=86?=
 =?UTF-8?q?=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?1-3=E6=AC=A1=E2=80=9C=E6=8D=A2=E4=B8=80=E6=8D=A2=E2=80=9D?=
 =?UTF-8?q?=E5=90=8E=E7=BB=A7=E7=BB=AD=E7=82=B9=E5=87=BB=E6=97=A0=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/cloud/haveFun.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/cloud/haveFun.vue b/pages/cloud/haveFun.vue
index 4996971..0296a2f 100644
--- a/pages/cloud/haveFun.vue
+++ b/pages/cloud/haveFun.vue
@@ -296,7 +296,7 @@ export default {
         type: this.typeList[this.typeIndex].id,
         cityName: this.cityName,
         random: random,
-        randomSeed: randomSeed
+        randomSeed: this.page > 1 ? randomSeed : null
       }
       const name = this.name.trim()
       if (name.length > 0) {

From a9b63ca251915c827c5b4ddddcebe19ac913a072 Mon Sep 17 00:00:00 2001
From: linxi <linxi.jiang@jeeyor.com>
Date: Tue, 24 Dec 2024 10:18:56 +0800
Subject: [PATCH 32/54] =?UTF-8?q?Fix=EF=BC=9A2922=20=E3=80=90=E5=9C=B0?=
 =?UTF-8?q?=E6=A0=87=E5=A5=BD=E7=89=A9=E3=80=91=E5=A4=9A=E4=B8=AA=E8=A7=86?=
 =?UTF-8?q?=E9=A2=91=E8=B5=84=E8=AE=AF=E6=94=B9=E4=B8=BA=E4=B8=8D=E8=83=BD?=
 =?UTF-8?q?=E5=90=8C=E6=97=B6=E6=92=AD=E6=94=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/home/components/information.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/home/components/information.vue b/pages/home/components/information.vue
index 0579b5d..00d28e2 100644
--- a/pages/home/components/information.vue
+++ b/pages/home/components/information.vue
@@ -150,7 +150,7 @@ export default {
         }
       })
     },
-    infoItemViewClick(item) {
+    infoItemViewClick(item, index) {
       if(item.type === 2) {
         // const coverCtx = uni.createVideoContext('coverVideo', this)
         // coverCtx.pause()

From 420a14f6d997e5f91e58f25c313b8cb2ca54a69c Mon Sep 17 00:00:00 2001
From: linxi <linxi.jiang@jeeyor.com>
Date: Tue, 24 Dec 2024 10:26:16 +0800
Subject: [PATCH 33/54] =?UTF-8?q?Fix=EF=BC=9A2826=20=E3=80=90=E5=95=86?=
 =?UTF-8?q?=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E5=86=9C=E6=B0=91?=
 =?UTF-8?q?=E5=BA=97=E9=93=BA=E6=97=A0=E6=B3=95=E5=8F=96=E6=B6=88=E6=94=B6?=
 =?UTF-8?q?=E8=97=8F=EF=BC=8C=E6=94=B6=E8=97=8F=E6=97=B6=E7=82=B9=E5=8F=96?=
 =?UTF-8?q?=E6=B6=88=E5=9B=BE=E6=A0=87=E6=9C=AA=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/farmer.js                |  3 +++
 pagesInn/inn/farmerStore.vue | 11 ++++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/api/farmer.js b/api/farmer.js
index 324d8c5..34316e7 100644
--- a/api/farmer.js
+++ b/api/farmer.js
@@ -21,4 +21,7 @@ export function setFarmerShopCollection(data) {
   return request.post("/collection/farmerShop/add", data)
 }
 
+export function removeFarmerShopCollection(data) {
+  return request.post("/collection/farmerShop/remove", data)
+}
 
diff --git a/pagesInn/inn/farmerStore.vue b/pagesInn/inn/farmerStore.vue
index c7457ff..9884f6f 100644
--- a/pagesInn/inn/farmerStore.vue
+++ b/pagesInn/inn/farmerStore.vue
@@ -81,14 +81,14 @@
                   :src="webUrl + '/icon/icon-star-on.png'"
                   mode="scaleToFill"
                   class="icon"
-                  @click="doneFavorite"
+                  @click="doneFavorite(store.hasFavorite)"
                 />
                 <image
                   v-else
                   :src="webUrl + '/icon/icon-star-off.png'"
                   mode="scaleToFill"
                   class="icon"
-                  @click="doneFavorite"
+                  @click="doneFavorite(store.hasFavorite)"
                 />
                 <text>{{ store.favoriteCount  }}</text>
               </view>
@@ -340,7 +340,7 @@
 </template>
 
 <script>
-import { getFarmerShop, setFarmerShopZan, getFarmerShopNews, setFarmerShopCollection } from '@/api/farmer'
+import { getFarmerShop, setFarmerShopZan, getFarmerShopNews, removeFarmerShopCollection, setFarmerShopCollection } from '@/api/farmer'
 import { postCountyFamousNewsZan, postCountyFamousNewsView } from '@/api/qianxian'
 import imgBox from '@/components/imageTypeSet/imagebox.vue'
 export default {
@@ -514,11 +514,12 @@ export default {
         }
       })
     },
-    doneFavorite() {
+    doneFavorite(has) {
+      const api = !has ? setFarmerShopCollection : removeFarmerShopCollection
       const params = {
         farmerShopId: this.id
       }
-      setFarmerShopCollection(params).then(res => {
+      api(params).then(res => {
         this.getFarmerData()
       })
     },

From 34ff7c403a41fee6415c9faa156367356af048ff Mon Sep 17 00:00:00 2001
From: linxi <linxi.jiang@jeeyor.com>
Date: Tue, 24 Dec 2024 10:50:10 +0800
Subject: [PATCH 34/54] =?UTF-8?q?Fix=EF=BC=9A2909=20=E3=80=90=E5=95=86?=
 =?UTF-8?q?=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E4=BB=B7=E6=A0=BC=E8=BF=87=E9=95=BF=E6=97=B6=EF=BC=8C=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E8=B6=B3=E8=BF=B9=E5=86=85=E5=95=86=E5=93=81=E4=BB=B7?=
 =?UTF-8?q?=E6=A0=BC=E4=BF=A1=E6=81=AF=E6=98=BE=E7=A4=BA=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/user/History/index.vue | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pages/user/History/index.vue b/pages/user/History/index.vue
index 82f2f6e..ba30e72 100644
--- a/pages/user/History/index.vue
+++ b/pages/user/History/index.vue
@@ -43,9 +43,9 @@
                   <view class="v12-primary-text v12-primary-border v12-radius-6 v12-font-18 v12-px-1">{{ historyItem.couponName }}</view>
                 </view>
                 <view class="v12-justify-between v12-mt-2 price">
-                  <view class="v12-font-bold v12-primary-text v12-align-center">
+                  <view class="v12-font-bold v12-primary-text" :class="{'v12-align-center': (historyItem.price).toString().length < 5 && (historyItem.otPrice).toString().length < 5 }">
                     <text class="v12-font-16">￥</text>
-                    <text class="v12-font-24">{{ historyItem.price }}</text>
+                    <text class="v12-font-24 v12-mr-1">{{ historyItem.price }}</text>
                     <view class="ot-price v12-font-weight-400">
                       <text class="v12-font-22">￥</text>
                       <text class="v12-font-22">{{ historyItem.otPrice }}</text>
@@ -254,8 +254,9 @@ export default {
     padding: 12rpx 12rpx 20rpx 12rpx;
     .price {
       line-height: 34rpx;
+      align-items: flex-end;
       .ot-price {
-        margin: 0 0 0 10rpx;
+        // margin: 0 0 0 10rpx;
         color: #CBCBCB;
         position: relative;
       }

From 37117598ea034fc3cc3b4dca222a4192842eabc3 Mon Sep 17 00:00:00 2001
From: linxi <linxi.jiang@jeeyor.com>
Date: Tue, 24 Dec 2024 11:10:48 +0800
Subject: [PATCH 35/54] =?UTF-8?q?Fix=EF=BC=9A2874=20=E3=80=90=E5=95=86?=
 =?UTF-8?q?=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E5=86=9C=E6=B0=91?=
 =?UTF-8?q?=E5=BA=97=E9=93=BA=E6=A0=87=E8=AF=86=EF=BC=8C=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?=E4=B8=8B=E5=9B=BE=E6=89=80=E7=A4=BA=E7=9A=84=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg_product/views/famousQianxianShop.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkg_product/views/famousQianxianShop.vue b/pkg_product/views/famousQianxianShop.vue
index 0004bdf..7717d12 100644
--- a/pkg_product/views/famousQianxianShop.vue
+++ b/pkg_product/views/famousQianxianShop.vue
@@ -579,7 +579,7 @@
                     <image :src="item.cover" v-if="item.coverType === 1" class="img" mode="heightFix|widthFix"></image>
                     <video :src="item.cover" v-else :show-center-play-btn="false" :show-fullscreen-btn="false" :show-play-btn="false" class="img"  :poster="item.cover + '?vframe/jpg/offset/1'"></video>
                     <image
-                      :src="webUrl + '/orderIcon/farmer.png'"
+                      :src="webUrl + '/orderIcon/nm.png'"
                       class="mark-img"
                     />
                   </view>
@@ -1218,8 +1218,8 @@ export default {
     right: 0;
     z-index: 3;
     display: block;
-    width: 125rpx;
-    height: 83rpx;
+    width: 100%;
+    height: 100%;
     border-radius: 0 25rpx 0 0;
   }
 }

From 69d866e6cebcc99f95f98dc7ddf3feec23f4b38c Mon Sep 17 00:00:00 2001
From: linxi <linxi.jiang@jeeyor.com>
Date: Tue, 24 Dec 2024 11:34:27 +0800
Subject: [PATCH 36/54] =?UTF-8?q?Fix=EF=BC=9A2873=20=E3=80=90=E5=95=86?=
 =?UTF-8?q?=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E5=8E=BF=E5=9F=8E?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=EF=BC=8C=E6=94=B9=E4=B8=BA=E4=B8=80?=
 =?UTF-8?q?=E4=B8=AA=E5=95=86=E5=93=81=EF=BC=8C=E4=B8=80=E4=B8=AA=E5=BA=97?=
 =?UTF-8?q?=E9=93=BA=EF=BC=8C=E9=94=99=E5=BC=80=E6=8E=92=E5=88=97=EF=BC=8C?=
 =?UTF-8?q?=E6=AF=8F=E8=A1=8C=E5=9B=BA=E5=AE=9A=E4=B8=80=E4=B8=AA=E5=95=86?=
 =?UTF-8?q?=E5=93=81=EF=BC=8C=E4=B8=80=E4=B8=AA=E5=BA=97=E9=93=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg_product/views/famousQianxianShop.vue | 32 ++++++++++++++----------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/pkg_product/views/famousQianxianShop.vue b/pkg_product/views/famousQianxianShop.vue
index 7717d12..a643f4a 100644
--- a/pkg_product/views/famousQianxianShop.vue
+++ b/pkg_product/views/famousQianxianShop.vue
@@ -817,22 +817,28 @@ export default {
         if (success) {
           const products = data.products || []
           const farmerShops = data.farmerShops || []
-          this.leftList = this.sortProductsAndStores(products, farmerShops)
-          console.log(this.leftList);
-          // products.map((item, index) => {
-          //   item.isOldBrand = 0
-          //   item.isLandmarkGoods = 0
-          //   if (index % 2 === 0) {
-          //     this.leftList.push(item)
-          //   }
-          //   if (index % 2 === 1) {
-          //     item.isFarmer = 1
-          //     this.rightList.push(item)
-          //   }
-          // })
+          this.leftList = this.newSort(products, farmerShops)
         }
       })
     },
+    newSort(a, b) {
+      const minLen = Math.min(a.length, b.length)
+      const megerMap = []
+      for (let i = 0; i < minLen; i ++) {
+        if(i % 2 === 0) {
+          megerMap.push(a[i], b[i])
+        } else {
+          megerMap.push(b[i], a[i])
+        }
+      }
+      if(a.length > minLen) {
+        megerMap.push(...a.slice(minLen))
+      }
+      if(b.length > minLen) {
+        megerMap.push(...b.slice(minLen))
+      }
+      return megerMap
+    },
     shuffleArray(array) {
       for (let i = array.length - 1; i > 0; i--) {
           let j = Math.floor(Math.random() * (i + 1));

From 7f459e2b99376041794eecdbba88dcb51ba8cf78 Mon Sep 17 00:00:00 2001
From: modendeveloper <modendeveloper@163.com>
Date: Tue, 24 Dec 2024 22:27:29 +0800
Subject: [PATCH 37/54] =?UTF-8?q?Fix=EF=BC=9A2948=20=E3=80=90=E5=95=86?=
 =?UTF-8?q?=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E6=8E=A8=E8=8D=90?=
 =?UTF-8?q?=E5=BA=97=E9=93=BA-=E9=A1=B5=E9=9D=A2=E4=B8=8B=E6=BB=91?=
 =?UTF-8?q?=E5=88=B7=E6=96=B0=E5=BA=97=E9=93=BA=E6=95=B0=E6=8D=AE=E5=90=8E?=
 =?UTF-8?q?=EF=BC=8C=E7=82=B9=E5=87=BB=E2=80=9C=E6=8D=A2=E4=B8=80=E6=8D=A2?=
 =?UTF-8?q?=E2=80=9D=EF=BC=8C=E5=BA=97=E9=93=BA=E6=95=B0=E6=8D=AE=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E4=B8=8D=E5=85=A8=E4=B8=94=E5=86=8D=E6=AC=A1=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E2=80=9C=E6=8D=A2=E4=B8=80=E6=8D=A2=E2=80=9D=E6=97=A0?=
 =?UTF-8?q?=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/cloud/haveFun.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pages/cloud/haveFun.vue b/pages/cloud/haveFun.vue
index 0296a2f..7113b02 100644
--- a/pages/cloud/haveFun.vue
+++ b/pages/cloud/haveFun.vue
@@ -231,6 +231,7 @@ export default {
   methods: {
     handleRefresh() {
       uni.showLoading()
+      this.page = 1
       this.fetchList(1, this.randomSeed)
     },
     toTown(town) {

From 3639c2d04f45fd77a9ec125bb194a13611c86e14 Mon Sep 17 00:00:00 2001
From: modendeveloper <modendeveloper@163.com>
Date: Tue, 24 Dec 2024 22:27:49 +0800
Subject: [PATCH 38/54] =?UTF-8?q?Fix=EF=BC=9A2951=20=E3=80=90=E5=95=86?=
 =?UTF-8?q?=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E4=B9=8B=E5=89=8D?=
 =?UTF-8?q?=E5=AF=BB=E8=B6=A3=E5=91=B3=E5=9F=8E=E5=B8=82=E6=97=A0=E5=BA=97?=
 =?UTF-8?q?=E9=93=BA=E6=97=B6=EF=BC=8C=E6=97=A0=E6=B3=95=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E8=BF=9B=E5=85=A5=E8=AF=A6=E6=83=85=E9=A1=B5=EF=BC=8C=E7=8E=B0?=
 =?UTF-8?q?=E5=9C=A8=E8=A7=A3=E9=99=A4=E8=BF=99=E4=B8=AA=E9=99=90=E5=88=B6?=
 =?UTF-8?q?=EF=BC=8C=E6=97=A0=E5=BA=97=E9=93=BA=E4=B9=9F=E5=8F=AF=E4=BB=A5?=
 =?UTF-8?q?=E7=82=B9=E8=BF=9B=E5=8E=BB=EF=BC=8C=E4=B8=8D=E7=84=B6=E7=9C=8B?=
 =?UTF-8?q?=E4=B8=8D=E4=BA=86=E5=8F=A4=E9=95=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/chose-city/chose-city.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/chose-city/chose-city.vue b/pages/chose-city/chose-city.vue
index 122b383..669a92e 100644
--- a/pages/chose-city/chose-city.vue
+++ b/pages/chose-city/chose-city.vue
@@ -310,7 +310,7 @@ export default {
     },
     select(item) {
       if (this.type === 0 && item.hasData === 0) return
-      if ((this.type === 1 || this.type === 2) && item.hasShop === 0) return
+      // if ((this.type === 1 || this.type === 2) && item.hasShop === 0) return
       uni.setStorageSync("cityName", item.cityName)
 
       switch (this.type) {

From 5994f5dba4646ccd3ed70913c15be5070e9d5c43 Mon Sep 17 00:00:00 2001
From: modendeveloper <modendeveloper@163.com>
Date: Tue, 24 Dec 2024 22:46:17 +0800
Subject: [PATCH 39/54] =?UTF-8?q?Fix=EF=BC=9A2947=20=E3=80=90=E5=95=86?=
 =?UTF-8?q?=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E6=B4=BB=E5=8A=A8?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9=E4=B8=BA=E8=A7=86=E9=A2=91=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=A7=86=E9=A2=91=E6=A1=86=EF=BC=8C=E5=8F=82?=
 =?UTF-8?q?=E8=80=83=E5=BA=97=E9=93=BA=E8=A7=86=E9=A2=91=E8=B5=84=E8=AE=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/town/components/information.vue | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pages/town/components/information.vue b/pages/town/components/information.vue
index 5b6bc95..81b16bf 100644
--- a/pages/town/components/information.vue
+++ b/pages/town/components/information.vue
@@ -143,6 +143,11 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+.video-item {
+  width: 100%;
+  height: 400rpx;
+  border-radius: 10rpx;
+}
 .info-wrapper{
   padding: 20px 10px;
 }

From 7672f8a309dc8fd73c1b3fbe5f8940610372f592 Mon Sep 17 00:00:00 2001
From: modendeveloper <modendeveloper@163.com>
Date: Tue, 24 Dec 2024 22:54:04 +0800
Subject: [PATCH 40/54] =?UTF-8?q?Fix=EF=BC=9A2946=20=E3=80=90=E5=95=86?=
 =?UTF-8?q?=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E5=8F=A4=E9=95=87?=
 =?UTF-8?q?=E4=B8=BB=E5=9B=BE=E8=A7=86=E9=A2=91=E5=A2=9E=E5=8A=A0=E6=92=AD?=
 =?UTF-8?q?=E6=94=BE/=E6=9A=82=E5=81=9C=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/town/index.vue | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pages/town/index.vue b/pages/town/index.vue
index 2a5aa1a..34f75af 100644
--- a/pages/town/index.vue
+++ b/pages/town/index.vue
@@ -9,10 +9,8 @@
         class="img" 
         :src="townInfo.cover"  
         autoplay
-        :play-btn-position="center" 
+        play-btn-position="center" 
         :show-fullscreen-btn="false"
-        :show-play-btn="false"
-        :show-center-play-btn="flase"
         > </video>
     </view>
     <view class="top-intro">

From 403e8d1e3fa6e6d98cf4272bd6e798e497f2a7f0 Mon Sep 17 00:00:00 2001
From: modendeveloper <modendeveloper@163.com>
Date: Tue, 24 Dec 2024 22:56:47 +0800
Subject: [PATCH 41/54] =?UTF-8?q?Fix=EF=BC=9A2943=20=E3=80=90=E5=95=86?=
 =?UTF-8?q?=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?-=E5=BA=97=E9=93=BA=E5=88=97=E8=A1=A8=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=B0=81=E9=9D=A2=E8=A7=86=E9=A2=91=E6=97=A0=E9=9C=80=E6=92=AD?=
 =?UTF-8?q?=E6=94=BE=EF=BC=8C=E6=98=BE=E7=A4=BA=E5=B0=81=E9=9D=A2=E5=8D=B3?=
 =?UTF-8?q?=E5=8F=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/town/components/projects.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pages/town/components/projects.vue b/pages/town/components/projects.vue
index 31bfb25..b8b4637 100644
--- a/pages/town/components/projects.vue
+++ b/pages/town/components/projects.vue
@@ -44,8 +44,9 @@
                 :show-fullscreen-btn="false" 
                 class="town-cover" 
                 :src="item.cover" 
+                :show-play-btn="false"
+                :show-center-play-btn="false"
                 controls 
-                autoplay 
                 :poster="item.cover + '?vframe/jpg/offset/1'"></video>
             <view class="name-box">
               <image

From c7fc52d5c3ec15231f1a57815a54f9a5dd6751ea Mon Sep 17 00:00:00 2001
From: modendeveloper <modendeveloper@163.com>
Date: Tue, 24 Dec 2024 23:07:00 +0800
Subject: [PATCH 42/54] =?UTF-8?q?Fix=EF=BC=9A2949=20=E3=80=90=E5=95=86?=
 =?UTF-8?q?=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E4=BC=98=E6=83=A0?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E4=B8=AD=E6=97=A0=E6=9B=B4=E5=A4=9A=E5=8F=AF?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8=E5=88=B8=E6=97=B6=E5=A2=9E=E5=8A=A0=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E2=80=9C=E6=9A=82=E6=97=A0=E6=9B=B4=E5=A4=9A=E5=8F=AF?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8=E5=88=B8=EF=BC=8C=E5=BF=AB=E5=8E=BB=E6=8A=BD?=
 =?UTF-8?q?=E5=A5=96=E5=90=A7~=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/CouponsPopup.vue | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/components/CouponsPopup.vue b/components/CouponsPopup.vue
index 2c7adf5..be18a8a 100644
--- a/components/CouponsPopup.vue
+++ b/components/CouponsPopup.vue
@@ -75,6 +75,9 @@
             @change="selectCoupon"
             v-if="index !== maxIndex"
           />
+          <view v-if="list.length === 1" class="no-quan v12-font-28 v12-dark1-text text-center">
+            暂无更多可使用优惠券，快去抽奖去吧~
+          </view>
         </view>
         <view
           v-if="list.length === 0"
@@ -193,6 +196,9 @@ export default {
 </script>
 
 <style scoped lang="less">
+.text-center{
+  text-align: center;
+}
 .popup-coupons {
   background: #F0F0F0;
   .popup-box {

From 3c897506d26344c88c61574435b0ec684f3ef539 Mon Sep 17 00:00:00 2001
From: modendeveloper <modendeveloper@163.com>
Date: Tue, 24 Dec 2024 23:35:18 +0800
Subject: [PATCH 43/54] =?UTF-8?q?Fix=EF=BC=9A2950=20=E3=80=90=E5=95=86?=
 =?UTF-8?q?=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E9=9D=9E=E9=81=97?=
 =?UTF-8?q?=E6=96=87=E5=8C=96=E5=BA=97=E9=93=BA=E5=B0=81=E9=9D=A2=E4=B8=BA?=
 =?UTF-8?q?=E8=A7=86=E9=A2=91=E6=97=B6=E6=98=BE=E7=A4=BA=E7=A9=BA=E7=99=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg_product/views/heritage/details.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkg_product/views/heritage/details.vue b/pkg_product/views/heritage/details.vue
index 984008a..f4f0c7a 100644
--- a/pkg_product/views/heritage/details.vue
+++ b/pkg_product/views/heritage/details.vue
@@ -47,7 +47,8 @@
         <!--  -->
         <view class="card-item v12-white v12-radius-20 column-flex" v-for="(item, index) in details.pageB.hotels" :key="index" @click="toStore(item)">
           <view>
-            <image class="card-item-img" :src="item.cover" mode="aspectFit|aspectFill|widthFix" lazy-load="false"></image>
+            <image v-if="item.coverType === 1" class="card-item-img" :src="item.cover" mode="aspectFit|aspectFill|widthFix" lazy-load="false"></image>
+            <video v-if="item.coverType === 2"  class="card-item-img" :show-center-play-btn="false" :show-fullscreen-btn="false" :show-play-btn="false" :src="item.cover" :poster="item.cover + '?vframe/jpg/offset/1'"></video>
             <view class="more-t v12-font-28 v12-font-bold v12-px-2">
               {{ item.content || '' }}
             </view>

From 8b93ab3c186c98d554e34c5f7bdb19a94caebb0b Mon Sep 17 00:00:00 2001
From: modendeveloper <modendeveloper@163.com>
Date: Thu, 26 Dec 2024 19:46:36 +0800
Subject: [PATCH 44/54] =?UTF-8?q?Fix=EF=BC=9A2963=20=E3=80=90=E5=95=86?=
 =?UTF-8?q?=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E5=9F=8E=E5=B8=82?=
 =?UTF-8?q?=E5=88=87=E6=8D=A2=E6=8F=90=E7=A4=BA--=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=E6=A1=86=E6=95=88=E6=9E=9C=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/cloud/haveFun.vue | 44 +++++++++++++++++++++++++++++++++++++++--
 1 file changed, 42 insertions(+), 2 deletions(-)

diff --git a/pages/cloud/haveFun.vue b/pages/cloud/haveFun.vue
index 7113b02..cbc88e3 100644
--- a/pages/cloud/haveFun.vue
+++ b/pages/cloud/haveFun.vue
@@ -8,6 +8,7 @@
             <image :src="webUrl+'/orderIcon/map.png'" mode="scaleToFill"></image>
           </view>
         </view>
+        
         <view class="search-box v12-primary-border flex jc-between ai-center">
           <input
             v-model="name"
@@ -26,6 +27,19 @@
           </view>
         </view>
       </view>
+      <view class="v12-pa-2" style="position: relative">
+        <view class="v12-radius-20 v12-px-2 v12-py-1 tip-wrap v12-align-center v12-justify-between">
+          <view class="v12-align-center">
+            <image
+              class="map-icon"
+              mode="scaleToFill"
+              :src="webUrl + '/orderIcon/map_white.png'"
+            ></image>
+            <text style="width: 85%" class="v12-font-24 v12-white-text">定位显示你在  {{ cityName }}  点击可切换其他城市</text>
+          </view>
+          <view  @click="goCity('cloud')" class="qh-btn v12-white v12-radius-10 v12-font-24 v12-font-bold v12-dark-text v12-px-2">点击切换</view>
+        </view>
+      </view>
       <view>
         
         <scroll-view class="type-box flex" scroll-x enable-flex>
@@ -341,6 +355,32 @@ export default {
 }
 </script>
 <style scoped lang="less">
+.map-icon{
+  width: 30rpx;
+  height: 30rpx;
+  margin-right: 5rpx;
+}
+.qh-btn{
+  padding-top: 4rpx;
+  padding-bottom: 4rpx;
+  // border: thin dashed #999;
+  white-space: nowrap;
+}
+.tip-wrap{
+  background: #AAAEB3;
+  position: relative;
+  align-items: self-start !important;
+  &::before{
+    position: absolute;
+    content: '';
+    border-left: 15rpx solid transparent;
+    border-right: 15rpx solid transparent;
+    border-top: 20rpx solid transparent;
+    border-bottom: 20rpx solid #AAAEB3;
+    top: -30rpx;
+    left: 10%;
+  }
+}
 .icon-box{
   border: 1rpx solid #fff;
   border-radius: 100%;
@@ -450,7 +490,7 @@ export default {
       height: 200rpx;
       box-sizing: border-box;
       white-space: nowrap;
-      padding: 20rpx 20rpx 0 20rpx;
+      padding: 0rpx 20rpx 0 20rpx;
 
       .item {
         width: 154rpx;
@@ -482,7 +522,7 @@ export default {
   }
 
   .body {
-    padding: 20rpx 20rpx;
+    padding: 0 20rpx 20rpx;
     background: #f5f5f5;
   }
 

From 0ceb016e208f04980efb679d0dffc2a0f37282e3 Mon Sep 17 00:00:00 2001
From: modendeveloper <modendeveloper@163.com>
Date: Thu, 26 Dec 2024 19:56:19 +0800
Subject: [PATCH 45/54] =?UTF-8?q?Fix=EF=BC=9A2966=20=E3=80=90=E5=95=86?=
 =?UTF-8?q?=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E7=89=B9=E8=89=B2?=
 =?UTF-8?q?=E7=A4=BC=E5=93=81=E4=B8=BB=E9=A1=B5=E4=B8=AD=E7=9A=84=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E8=AE=BE=E7=BD=AE=E4=BD=8E=E4=BA=8E3=E4=B8=AA?=
 =?UTF-8?q?=EF=BC=8C=E5=95=86=E5=93=81=E5=90=8D=E7=A7=B0=E8=BF=87=E9=95=BF?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=95=86=E5=93=81=E5=90=8D=E7=A7=B0=E4=B8=8D?=
 =?UTF-8?q?=E4=BC=9A=E5=AF=B9=E5=BA=94=E5=9B=BE=E7=89=87=E5=AE=BD=E5=BA=A6?=
 =?UTF-8?q?=E6=8D=A2=E8=A1=8C=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/cloud/haveFun.vue        | 2 +-
 pkg_product/views/giftList.vue | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/pages/cloud/haveFun.vue b/pages/cloud/haveFun.vue
index cbc88e3..bb49999 100644
--- a/pages/cloud/haveFun.vue
+++ b/pages/cloud/haveFun.vue
@@ -35,7 +35,7 @@
               mode="scaleToFill"
               :src="webUrl + '/orderIcon/map_white.png'"
             ></image>
-            <text style="width: 85%" class="v12-font-24 v12-white-text">定位显示你在  {{ cityName }}  点击可切换其他城市</text>
+            <text style="width: 95%" class="v12-font-24 v12-white-text">定位显示你在  {{ cityName }}  点击可切换其他城市</text>
           </view>
           <view  @click="goCity('cloud')" class="qh-btn v12-white v12-radius-10 v12-font-24 v12-font-bold v12-dark-text v12-px-2">点击切换</view>
         </view>
diff --git a/pkg_product/views/giftList.vue b/pkg_product/views/giftList.vue
index 42d1175..798db4f 100644
--- a/pkg_product/views/giftList.vue
+++ b/pkg_product/views/giftList.vue
@@ -257,6 +257,7 @@ export default {
         text-align: center;
         font-size: 12px;
         color: #fff;
+        width: 180rpx;
         .good-img {
           width: 90px;
           height: 90px;

From 8aa2454a1ae4775dc08be24608025c9323089ded Mon Sep 17 00:00:00 2001
From: modendeveloper <modendeveloper@163.com>
Date: Thu, 26 Dec 2024 23:30:30 +0800
Subject: [PATCH 46/54] =?UTF-8?q?Task=EF=BC=9A=E6=9D=91=E5=B1=8B=E5=A4=9A?=
 =?UTF-8?q?=E5=8A=A0=E4=B8=80=E7=BA=A7=E5=88=86=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/qianxian.js                          |  4 ++
 pkg_product/views/famousQianxianShop.vue | 61 +++++++++++++++++++++++-
 2 files changed, 63 insertions(+), 2 deletions(-)

diff --git a/api/qianxian.js b/api/qianxian.js
index 8dab74b..499c22d 100644
--- a/api/qianxian.js
+++ b/api/qianxian.js
@@ -99,3 +99,7 @@ export function getCountyFamousVillageNews(param) {
 export function getShareImg(id) {
     return request.get('/countyFamous/poster/' + id, {login: true})
 }
+
+export function getSaleList(params) {
+    return request.get('/countyFamous/village/category', params, {login: true})
+}
diff --git a/pkg_product/views/famousQianxianShop.vue b/pkg_product/views/famousQianxianShop.vue
index a643f4a..5c5d5f3 100644
--- a/pkg_product/views/famousQianxianShop.vue
+++ b/pkg_product/views/famousQianxianShop.vue
@@ -316,6 +316,7 @@
           <goo-skeleton v-else />
         </view>
         <!-- 产业 -->
+
         <view
           v-if="activeIndex === 0"
           class="industry-section"
@@ -470,6 +471,11 @@
                   </view>
                 </view>
                 <view class="village-wrap">
+                  <view class="v12-pa-2 sale-wrap">
+                    <view :class="{'saleActive' : saleActived === sale.id}" v-for="(sale, i) in saleList" :key="i" @click="handleSale(sale)">
+                      {{ sale.name }}
+                    </view>
+                  </view>
                   <view v-if="villageList.length > 0" class="village-list">
                     <view
                       v-for="(village, villageIndex) in villageList"
@@ -644,7 +650,8 @@ import {
   getCountyFamousInvestmentFile,
   getCountyFamousVillage,
   getCountyFamousCityDetail,
-  getShareImg
+  getShareImg,
+  getSaleList
 } from '@/api/qianxian'
 import {formatDateTime} from '@/utils'
 import {getUrlParam} from '@/utils/common.js'
@@ -661,11 +668,13 @@ export default {
   mixins: [pageListenMixins],
   data() {
     return {
+      saleActived: null,
       webUrl: this.$VUE_APP_RESOURCES_URL,
       isLoad: false,
       activeIndex: 0,
       loading: false,
       scrollData: {},
+      saleList: [],
       inn: {
         cityName: '',
         pics: [],
@@ -744,8 +753,36 @@ export default {
     this.getGuideReq()
     // this.initPoster()
     this.getListReq()
+    this.getsaleList()
   },
   methods: {
+    handleSale(e) {
+      if(this.saleActived === e.id) {
+        this.saleActived = null
+      } else {
+         this.saleActived = e.id
+      }
+      
+      getCountyFamousVillage({
+        countyFamousDataId: this.id,
+        categoryId: this.saleActived,
+        page: 1,
+        limit: 9999
+      }).then(res => {
+        const { success, data } = res
+        if (success) {
+          this.villageList = data.records || []
+        }
+      })
+    },
+    getsaleList() {
+      const params = {
+        countyFamousDataId: this.id
+      }
+      getSaleList(params).then(res => {
+        this.saleList = res.data || []
+      })
+    },
     goStore(item) {
       if (item.farmerShopId === 0) {
         uni.showToast({
@@ -770,7 +807,7 @@ export default {
         }
       })
     },
-    getListReq() {
+    getListReq(id) {
       // getPoster(this.id).then(({data}) => this.posterUrl = data)
       getCountyFamousIndustry({
         countyFamousDataId: this.id,
@@ -804,6 +841,7 @@ export default {
       })
       getCountyFamousVillage({
         countyFamousDataId: this.id,
+        categoryId: id,
         page: 1,
         limit: 9999
       }).then(res => {
@@ -1203,6 +1241,25 @@ export default {
 <style scoped lang="less">
 
 @import "@/assets/css/store.less";
+.saleActive{
+  background: #C52733 !important;
+  color: #fff !important;
+}
+.sale-wrap{
+  display: flex;
+  align-items: center;
+  flex-wrap: wrap;
+  justify-content: flex-start;
+  view {
+    background: #f5f5f5;
+    border-radius: 6rpx;
+    padding: 4rpx 16rpx;
+    margin-right: 10rpx;
+    margin-bottom: 10rpx;
+    font-size: 24rpx;
+    white-space: nowrap;
+  }
+}
 .video-item {
   width: 100%;
   height: 400rpx;

From 4a449485f7b70ac96a8c382419b870d861cda661 Mon Sep 17 00:00:00 2001
From: lifizer <913626195@qq.com>
Date: Fri, 27 Dec 2024 11:43:10 +0800
Subject: [PATCH 47/54] =?UTF-8?q?Fix(=E5=85=A8=E5=9B=BD=E7=89=B9=E4=BA=A7/?=
 =?UTF-8?q?=E5=9F=8E=E5=B8=82=E9=80=89=E6=8B=A9):[#2972]=E5=85=A8=E5=9B=BD?=
 =?UTF-8?q?=E7=89=B9=E4=BA=A7=E7=9A=84=E7=89=B9=E5=88=AB=E6=8E=A8=E8=8D=90?=
 =?UTF-8?q?=E5=A4=84=E5=BA=97=E9=93=BA=E8=A7=86=E9=A2=91=E5=B0=81=E9=9D=A2?=
 =?UTF-8?q?=E5=9B=BE=E6=9C=AA=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/chose-city/chose-city.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pages/chose-city/chose-city.vue b/pages/chose-city/chose-city.vue
index 669a92e..6a6738a 100644
--- a/pages/chose-city/chose-city.vue
+++ b/pages/chose-city/chose-city.vue
@@ -90,7 +90,11 @@
                   class="item flex-0 flex flex-col jc-between ai-center"
                   @click="goToStore(item.hotelId || '')"
                 >
-                  <image class="cover" :src="item.hotelImage" mode="scaleToFill" />
+                  <image
+                    :src="item.hotelImage + (item.hotelImage.indexOf('.mp4') > -1 ? '?vframe/jpg/offset/1' : '')"
+                    class="cover"
+                    mode="scaleToFill"
+                  />
                   <image class="logo" :src="item.hotelLogo" mode="scaleToFill" />
                   <view style="width: 100%;box-sizing: border-box;padding:0 8rpx">
                     <view class="name tc one-t">{{ item.hotelName }}</view>

From 20a46f10dc168a05ce0bd0e672d1978edf24bdf3 Mon Sep 17 00:00:00 2001
From: lifizer <913626195@qq.com>
Date: Fri, 27 Dec 2024 11:55:13 +0800
Subject: [PATCH 48/54] =?UTF-8?q?Fix(=E5=AF=BB=E8=B6=A3=E5=91=B3):[#2970]?=
 =?UTF-8?q?=E5=9B=BE=E6=A0=87=E6=9B=BF=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/cloud/haveFun.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/cloud/haveFun.vue b/pages/cloud/haveFun.vue
index bb49999..a4f3647 100644
--- a/pages/cloud/haveFun.vue
+++ b/pages/cloud/haveFun.vue
@@ -5,7 +5,7 @@
         <view class="flex jc-end">
           <view class="city-box" @click="goCity('cloud')">
             <text style="white-space:nowrap; width: 90rpx" class="v12-primary-text one-t">{{ cityName }}</text>
-            <image :src="webUrl+'/orderIcon/map.png'" mode="scaleToFill"></image>
+            <image :src="webUrl+'/icon/fun-city-change.png'" mode="scaleToFill"></image>
           </view>
         </view>
         

From 851bcb16d784edee60472f9704aba22b626e4eab Mon Sep 17 00:00:00 2001
From: lifizer <913626195@qq.com>
Date: Fri, 27 Dec 2024 11:55:45 +0800
Subject: [PATCH 49/54] =?UTF-8?q?Fix(=E8=AE=A2=E5=8D=95/=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?):[#2965]=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85=E9=A1=B5=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E5=A4=8D=E5=88=B6=E5=BF=AB=E9=80=92=E5=8D=95=E5=8F=B7?=
 =?UTF-8?q?=EF=BC=8C=E7=B2=98=E8=B4=B4=E4=BB=A5=E5=90=8E=E4=BC=9A=E5=8F=98?=
 =?UTF-8?q?=E6=88=90=E8=AE=A2=E5=8D=95=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/OrderDetails/index.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pages/order/OrderDetails/index.vue b/pages/order/OrderDetails/index.vue
index 9731395..462c6f8 100644
--- a/pages/order/OrderDetails/index.vue
+++ b/pages/order/OrderDetails/index.vue
@@ -30,14 +30,14 @@
     </view>
 
     <!-- <view class="reject-reason" v-if="orderInfo._status._type==-3 && orderInfo.refundRejectReason">驳回原因：{{ orderInfo.refundRejectReason }}</view> -->
-    <view @click="goLogistics(orderInfo)" class="v12-radius-20 v12-white v12-pa-3 v12-mt-4" v-if="orderInfo._status._type == 3 || (orderInfo._status._type == 2 && orderInfo.isTickets!==1)">
-      <view >
+    <view class="v12-radius-20 v12-white v12-pa-3 v12-mt-4" v-if="orderInfo._status._type == 3 || (orderInfo._status._type == 2 && orderInfo.isTickets!==1)">
+      <view>
         <text class="v12-secondary-dark-text v12-font-28">{{ orderInfo.deliveryName }}：{{ orderInfo.deliveryId }}</text>
-        <text class="v12-font-22 v12-px-2 v12-py-1 v12-ml-1 v12-primary-text v12-primary-border v12-radius-40" @click="copyClipboard(orderInfo.orderId)">
+        <text class="v12-font-22 v12-px-2 v12-py-1 v12-ml-1 v12-primary-text v12-primary-border v12-radius-40" @click="copyClipboard(orderInfo.deliveryId)">
           复制
         </text>
       </view>
-      <view class="v12-mt-2 v12-justify-between">
+      <view class="v12-mt-2 v12-justify-between" @click="goLogistics(orderInfo)">
         <view class="v12-align-center">
           <view class="v12-align-center v12-mr-2">
             <image class="logo" :src="webUrl+'/orderIcon/car.png'" mode="" style="margin-right:0; width: 32rpx; height:32rpx"/>

From febca80a9b6ae05483d7852b3e665ea5e1b25f11 Mon Sep 17 00:00:00 2001
From: lifizer <913626195@qq.com>
Date: Fri, 27 Dec 2024 11:56:34 +0800
Subject: [PATCH 50/54] =?UTF-8?q?Fix(=E5=AF=BB=E8=B6=A3=E5=91=B3):[#2971]?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=A0=87=E9=A2=98=E6=9B=BF=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pages.json b/pages.json
index 6530222..94ee8fd 100644
--- a/pages.json
+++ b/pages.json
@@ -103,7 +103,7 @@
     {
       "path": "pages/cloud/haveFun",
       "style": {
-        "navigationBarTitleText": "探索生活好去处"
+        "navigationBarTitleText": "趣游生活"
       }
     },
     {
@@ -111,7 +111,7 @@
       "style": {
         "navigationBarTextStyle": "white",
         "navigationStyle": "custom",
-        "navigationBarTitleText": "探索生活好去处"
+        "navigationBarTitleText": "趣游生活"
       }
     },
     {

From 71aa5e5a3ca8be4d0156dba9ddc6ec074d16ed9d Mon Sep 17 00:00:00 2001
From: linxi <linxi.jiang@jeeyor.com>
Date: Fri, 27 Dec 2024 16:54:54 +0800
Subject: [PATCH 51/54] =?UTF-8?q?Fix=EF=BC=9A2975=20=E3=80=90=E5=95=86?=
 =?UTF-8?q?=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E4=BA=A7=E4=B8=9A?=
 =?UTF-8?q?--=E7=A7=9F=E5=94=AE=E8=B5=84=E8=AE=AF=E4=B8=8B=E4=B8=89?=
 =?UTF-8?q?=E7=BA=A7=E5=88=86=E7=B1=BB=E6=A0=87=E7=AD=BE=E9=9C=80=E8=A6=81?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=94=BE=E5=A4=A7=EF=BC=8C=E5=8F=82=E8=80=83?=
 =?UTF-8?q?=E6=95=88=E6=9E=9C=E5=9B=BE=EF=BC=8C=E6=8A=8A=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E9=AB=98=E5=BA=A6=E5=86=8D=E5=8A=A0=E4=B8=80=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg_product/views/famousQianxianShop.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg_product/views/famousQianxianShop.vue b/pkg_product/views/famousQianxianShop.vue
index 5c5d5f3..94d5c48 100644
--- a/pkg_product/views/famousQianxianShop.vue
+++ b/pkg_product/views/famousQianxianShop.vue
@@ -1253,7 +1253,7 @@ export default {
   view {
     background: #f5f5f5;
     border-radius: 6rpx;
-    padding: 4rpx 16rpx;
+    padding: 6rpx 16rpx;
     margin-right: 10rpx;
     margin-bottom: 10rpx;
     font-size: 24rpx;
@@ -1842,7 +1842,7 @@ export default {
       }
       .village-wrap {
         height: 980rpx;
-        padding: 16rpx 0 0 0;
+        // padding: 16rpx 0 0 0;
         overflow-y: auto;
       }
       .village-list {

From cc2664f116110e2b948e7b08ada5ed5615f707d8 Mon Sep 17 00:00:00 2001
From: linxi <linxi.jiang@jeeyor.com>
Date: Fri, 27 Dec 2024 17:06:24 +0800
Subject: [PATCH 52/54] =?UTF-8?q?Fix=EF=BC=9A2959=20=E3=80=90=E5=95=86?=
 =?UTF-8?q?=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E5=85=88=E6=92=AD?=
 =?UTF-8?q?=E6=94=BE=E5=8F=A4=E9=95=87=E6=B4=BB=E5=8A=A8=E7=89=88=E5=9D=97?=
 =?UTF-8?q?=E8=A7=86=E9=A2=91=EF=BC=8C=E5=86=8D=E6=92=AD=E6=94=BE=E4=B8=BB?=
 =?UTF-8?q?=E5=9B=BE=E8=A7=86=E9=A2=91=EF=BC=8C=E6=B4=BB=E5=8A=A8=E7=89=88?=
 =?UTF-8?q?=E5=9D=97=E8=A7=86=E9=A2=91=E4=B8=8D=E4=BC=9A=E6=9A=82=E5=81=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/town/components/information.vue | 6 ++++++
 pages/town/index.vue                  | 6 +++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/pages/town/components/information.vue b/pages/town/components/information.vue
index 81b16bf..392db92 100644
--- a/pages/town/components/information.vue
+++ b/pages/town/components/information.vue
@@ -108,6 +108,12 @@ export default {
         playerCtx.pause()
       })
     },
+    handlePlayer() {
+      this.videoPlayers.forEach(player => {
+        const playerCtx = uni.createVideoContext(player, this)
+        playerCtx.pause()
+      })
+    },
     infoItemViewClick(item, index) {
       if(item.contentType === 2) {
         // const coverCtx = uni.createVideoContext('coverVideo', this)
diff --git a/pages/town/index.vue b/pages/town/index.vue
index 34f75af..76d8e9d 100644
--- a/pages/town/index.vue
+++ b/pages/town/index.vue
@@ -11,6 +11,7 @@
         autoplay
         play-btn-position="center" 
         :show-fullscreen-btn="false"
+        @play="handlePlay"
         > </video>
     </view>
     <view class="top-intro">
@@ -39,7 +40,7 @@
           <culture :list="townInfo.cultureInfo.cultureImages"></culture>
         </view>
         <view v-if="actived === 3">
-          <information :infoArray="activeties" @video="handleVideo"></information>
+          <information ref="information" :infoArray="activeties" @video="handleVideo"></information>
         </view>
         <view v-if="actived === 4">
           <service :info="{...townInfo.serviceInfo, name:  townInfo.name}"></service>
@@ -114,6 +115,9 @@ export default {
     this.getActive()
   },
   methods: {
+    handlePlay() {
+      this.$refs.information.handlePlayer()
+    },
     handleVideo() {
       const videoCtx = uni.createVideoContext('videoCover', this)
       videoCtx.pause()

From cd4bef91c2797f80480dd52e54d98032b31d42d5 Mon Sep 17 00:00:00 2001
From: linxi <linxi.jiang@jeeyor.com>
Date: Fri, 27 Dec 2024 17:24:16 +0800
Subject: [PATCH 53/54] =?UTF-8?q?Fix=EF=BC=9A2958=20=E3=80=90=E5=95=86?=
 =?UTF-8?q?=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E2=80=9C=E6=8D=A2=E4=B8=80=E6=8D=A2=E2=80=9D=EF=BC=8C=E6=B5=8F?=
 =?UTF-8?q?=E8=A7=88=E5=BA=97=E9=93=BA=E5=88=97=E8=A1=A8=E5=87=BA=E7=8E=B0?=
 =?UTF-8?q?=E9=87=8D=E5=A4=8D=E5=BA=97=E9=93=BA=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/cloud/haveFun.vue | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pages/cloud/haveFun.vue b/pages/cloud/haveFun.vue
index a4f3647..c7f24d7 100644
--- a/pages/cloud/haveFun.vue
+++ b/pages/cloud/haveFun.vue
@@ -208,7 +208,8 @@ export default {
     // 后端接口结构需要调整下，需要补充总页数，前端可判断当前页数大于等于总页数则不发送网络请求
     if(this.isNext) {
       this.page++
-		  this.fetchList()
+      const random = this.randomSeed ? 1 : 0
+		  this.fetchList(random, this.randomSeed)
     }
 	},
   onLoad() {
@@ -246,6 +247,7 @@ export default {
     handleRefresh() {
       uni.showLoading()
       this.page = 1
+      this.hotelList = []
       this.fetchList(1, this.randomSeed)
     },
     toTown(town) {
@@ -283,7 +285,7 @@ export default {
       
       if (this.typeIndex === index) return
       this.typeIndex = index
-      
+      this.randomSeed = null
       this.currType = index === -1 ? {} : this.typeList[index]
       this.name = ''
       this.search()
@@ -322,7 +324,6 @@ export default {
         if (success) {
           if(random === 1) {
             this.randomSeed = msg
-            this.hotelList = []
           }
           for (let i = 0; i < data.length; i++) {
             const cover = data[i].cover

From 0bb76095fb995fec57dc0ac3cf45c2205f5990a8 Mon Sep 17 00:00:00 2001
From: linxi <linxi.jiang@jeeyor.com>
Date: Fri, 27 Dec 2024 18:05:06 +0800
Subject: [PATCH 54/54] =?UTF-8?q?Fix=EF=BC=9A2975=20=E3=80=90=E5=95=86?=
 =?UTF-8?q?=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E4=BA=A7=E4=B8=9A?=
 =?UTF-8?q?--=E7=A7=9F=E5=94=AE=E8=B5=84=E8=AE=AF=E4=B8=8B=E4=B8=89?=
 =?UTF-8?q?=E7=BA=A7=E5=88=86=E7=B1=BB=E6=A0=87=E7=AD=BE=E9=9C=80=E8=A6=81?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=94=BE=E5=A4=A7=EF=BC=8C=E5=8F=82=E8=80=83?=
 =?UTF-8?q?=E6=95=88=E6=9E=9C=E5=9B=BE=EF=BC=8C=E6=8A=8A=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E9=AB=98=E5=BA=A6=E5=86=8D=E5=8A=A0=E4=B8=80=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg_product/views/famousQianxianShop.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkg_product/views/famousQianxianShop.vue b/pkg_product/views/famousQianxianShop.vue
index 94d5c48..2ab3b21 100644
--- a/pkg_product/views/famousQianxianShop.vue
+++ b/pkg_product/views/famousQianxianShop.vue
@@ -1256,7 +1256,8 @@ export default {
     padding: 6rpx 16rpx;
     margin-right: 10rpx;
     margin-bottom: 10rpx;
-    font-size: 24rpx;
+    font-size: 26rpx;
+    font-weight: bold;
     white-space: nowrap;
   }
 }