From f9b8ca6bf2ac16a5f4ed3cbae4120c4f938833b8 Mon Sep 17 00:00:00 2001
From: lifizer <913626195@qq.com>
Date: Wed, 26 Jun 2024 14:40:45 +0800
Subject: [PATCH] =?UTF-8?q?Feat(=E9=A1=B5=E9=9D=A2):=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=9F=8B=E7=82=B9=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/shop/GoodsCon/index.vue     |   1 +
 pagesInn/inn/innHome.vue          |   1 +
 pkg_product/views/famousHot.vue   |   8 +-
 pkg_product/views/famousStory.vue |  13 +-
 pkg_product/views/healthList.vue  | 234 ++++++++++++++++++++----------
 pkg_product/views/nativeList.vue  |  10 +-
 6 files changed, 184 insertions(+), 83 deletions(-)

diff --git a/pages/shop/GoodsCon/index.vue b/pages/shop/GoodsCon/index.vue
index 90f6e16..74cf7c1 100644
--- a/pages/shop/GoodsCon/index.vue
+++ b/pages/shop/GoodsCon/index.vue
@@ -584,6 +584,7 @@ export default {
         this.pageKeyId = `product_from_countyFamous_productId_${id}`
         break
       default:
+        this.pageKeyId = `product_from_common_productId_${id}`
         break
     }
 
diff --git a/pagesInn/inn/innHome.vue b/pagesInn/inn/innHome.vue
index d1e4b7f..fd2cdb3 100644
--- a/pagesInn/inn/innHome.vue
+++ b/pagesInn/inn/innHome.vue
@@ -512,6 +512,7 @@ export default {
         this.pageKeyId = `product_from_countyFamous_productId_${id}`
         break
       default:
+        this.pageKeyId = `hotel_from_common_hotelId_${id}`
         break
     }
     if (id) {
diff --git a/pkg_product/views/famousHot.vue b/pkg_product/views/famousHot.vue
index 0e4a87c..0155832 100644
--- a/pkg_product/views/famousHot.vue
+++ b/pkg_product/views/famousHot.vue
@@ -7,7 +7,7 @@
       <view class="story-box flex flex-col ai-center">
         <image class="story-title" :src="webUrl+'/20230313105024432472.png'" mode="scaleToFill"/>
         <view class="story-content">
-          <view v-html="story.content"></view>
+          <view v-html="story.content" />
         </view>
       </view>
     </view>
@@ -25,7 +25,11 @@
             <view class="name more-t">{{ item.storeName }}</view>
             <!--            <view class="unit">100g/盒</view>-->
             <view class="flex ai-center" style="margin-top: 12rpx" v-if="item.tags.length">
-              <view class="label flex jc-center ai-center" v-for="tag in item.tags">{{ tag }}</view>
+              <view
+                v-for="(tag, tagIndex) in item.tags"
+                :key="tagIndex"
+                class="label flex jc-center ai-center"
+              >{{ tag }}</view>
             </view>
           </view>
           <view class="flex jc-between ai-center">
diff --git a/pkg_product/views/famousStory.vue b/pkg_product/views/famousStory.vue
index 4594aa6..661c69e 100644
--- a/pkg_product/views/famousStory.vue
+++ b/pkg_product/views/famousStory.vue
@@ -1,15 +1,22 @@
 <template>
   <view class="famous-story">
-    <image class="img" :src="item.image" mode="scaleToFill" v-for="item in list" @click="goHot(item)"/>
+    <image
+      v-for="(item, index) in list"
+      :key="index"
+      :src="item.image"
+      class="img"
+      mode="scaleToFill"
+      @click="goHot(item)"
+    />
   </view>
 </template>
 
 <script>
-import {getStoryList} from "@/api/product";
+import {getStoryList} from '@/api/product'
 import { pageListenMixins } from '@/mixins/pageListenMixins'
 
 export default {
-  name: "famousStory",
+  name: 'FamousStory',
   mixins: [pageListenMixins],
   data() {
     return {
diff --git a/pkg_product/views/healthList.vue b/pkg_product/views/healthList.vue
index d3c687d..1c72a82 100644
--- a/pkg_product/views/healthList.vue
+++ b/pkg_product/views/healthList.vue
@@ -2,63 +2,143 @@
   <view class="pkg-product-list">
     <view class="first-half">
       <view class="search-box flex jc-between ai-center">
-        <input type="text" v-model="keyword" placeholder="搜索内容" placeholder-style="color:#949494" @confirm="search">
-        <image class="icon" :src="webUrl+'/20220903142935869059.png'" mode="scaleToFill" @click="search"></image>
+        <input
+          v-model="keyword"
+          type="text"
+          placeholder="搜索内容"
+          placeholder-style="color:#949494"
+          @confirm="search"
+        >
+        <image
+          :src="webUrl+'/20220903142935869059.png'"
+          class="icon"
+          mode="scaleToFill"
+          @click="search"
+        />
       </view>
-
-      <swiper class="swiper-box" indicator-dots indicator-color="rgba(255,255,255,.3)" indicator-active-color="#fff"
-              autoplay circular v-if="bannerList.length>0">
-        <swiper-item v-for="(item,index) in bannerList" :key="index">
-          <image :src="item.pic" mode="scaleToFill" @click="$global.commonJump(item.uniappUrl)"/>
+      <swiper
+        v-if="bannerList.length > 0"
+        indicator-dots
+        indicator-color="rgba(255,255,255,.3)"
+        indicator-active-color="#fff"
+        autoplay
+        circular
+        class="swiper-box"
+      >
+        <swiper-item
+          v-for="(item, index) in bannerList"
+          :key="index"
+        >
+          <image
+            :src="item.pic"
+            mode="scaleToFill"
+            @click="$global.commonJump(item.uniappUrl)"
+          />
         </swiper-item>
       </swiper>
-
-      <view class="tab-box flex jc-center ai-center" v-show="tabIndex===0">
-        <image class="active" src="/static/images/v6/btn_active_left.png" @click="changeTab(0)"/>
-        <image class="inactive" src="/static/images/v6/btn_right.png" @click="changeTab(1)"/>
+      <view
+        v-show="tabIndex === 0"
+        class="tab-box flex jc-center ai-center"
+      >
+        <image
+          src="/static/images/v6/btn_active_left.png"
+          class="active"
+          @click="changeTab(0)"
+        />
+        <image
+          src="/static/images/v6/btn_right.png"
+          class="inactive"
+          @click="changeTab(1)"
+        />
       </view>
-      <view class="tab-box flex jc-center ai-center" v-show="tabIndex===1">
-        <image class="inactive" src="/static/images/v6/btn_left.png" @click="changeTab(0)"/>
-        <image class="active" src="/static/images/v6/btn_active_right.png" @click="changeTab(1)"/>
+      <view
+        v-show="tabIndex === 1"
+        class="tab-box flex jc-center ai-center"
+      >
+        <image
+          src="/static/images/v6/btn_left.png"
+          class="inactive"
+          @click="changeTab(0)"
+        />
+        <image
+          src="/static/images/v6/btn_active_right.png"
+          class="active"
+          @click="changeTab(1)"
+        />
       </view>
     </view>
-
     <view class="body-box">
       <view class="aside-box flex-0">
-        <view class="item flex jc-center ai-center" :class="index === asideIndex ? 'active' : ''"
-              v-for="(item, index) in asideList" :key="index" @click="asideTap(index)">
+        <view
+          v-for="(item, index) in asideList"
+          :key="index"
+          :class="index === asideIndex ? 'active' : ''"
+          class="item flex jc-center ai-center"
+          @click="asideTap(index)"
+        >
           <text class="one-t">{{ item.label }}</text>
         </view>
       </view>
-
       <view class="article-box">
-        <scroll-view class="list flex flex-wrap" :style="{'height':listHeight}" :enable-flex="true"
-                     :scroll-anchoring="true"
-                     :scroll-y="true"
-                     :scroll-with-animation="true" :enable-back-to-top="true" @scrolltolower="onLower"
-                     v-if="dataList.length>0">
-          <view v-for="(item, index) in dataList" :key="index">
-            <view class="item item-store" @click="goStore(item.id)" v-if="tabIndex===0">
-              <image class="cover" :src="item.cover" mode="scaleToFill"/>
+        <scroll-view
+          v-if="dataList.length > 0"
+          :style="{'height':listHeight}"
+          :enable-flex="true"
+          :scroll-anchoring="true"
+          :scroll-y="true"
+          :scroll-with-animation="true"
+          :enable-back-to-top="true"
+          class="list flex flex-wrap"
+          @scrolltolower="onLower"
+        >
+          <view
+            v-for="(item, index) in dataList"
+            :key="index"
+          >
+            <view
+              v-if="tabIndex === 0"
+              class="item item-store"
+              @click="goStore(item.id)"
+            >
+              <image
+                :src="item.cover"
+                class="cover"
+                mode="scaleToFill"
+              />
               <view class="name one-t">{{ item.content }}</view>
               <view class="price store flex ai-center" style="width: 100%;">
-                <image class="flex-0" :src="item.logo" mode="scaleToFill"/>
+                <image
+                  :src="item.logo"
+                  class="flex-0"
+                  mode="scaleToFill"
+                />
                 <view class="one-t">{{ item.name }}</view>
               </view>
             </view>
-
             <view class="item" @click="goGoods(item.id)" v-else>
-              <image class="cover" :src="item.image" mode="scaleToFill"/>
+              <image
+                :src="item.image"
+                class="cover"
+                mode="scaleToFill"
+              />
               <view class="name more-t">{{ item.storeName }}</view>
               <view class="price">￥{{ item.price }}</view>
             </view>
           </view>
         </scroll-view>
-
         <view class="tc" v-else>
-          <image class="img-nodata" :src="webUrl+'/20240106205121705480.png'" mode="scaleToFill"
-                 v-if="tabIndex===0"/>
-          <image class="img-nodata" :src="webUrl+'/20240219170514226953.png'" mode="scaleToFill" v-else/>
+          <image
+            v-if="tabIndex === 0"
+            :src="webUrl+'/20240106205121705480.png'"
+            class="img-nodata"
+            mode="scaleToFill"
+          />
+          <image
+          v-else
+          :src="webUrl+'/20240219170514226953.png'"
+          class="img-nodata"
+          mode="scaleToFill"
+        />
         </view>
       </view>
     </view>
@@ -66,103 +146,105 @@
 </template>
 
 <script>
-import {fetchCity} from "@/api/wenwan";
-import {wellnessFood, wellnessPlaceList} from "@/api/product";
-import {getProducts} from "@/api/store";
-
+// 康养食材
+import { fetchCity } from '@/api/wenwan'
+import { wellnessFood, wellnessPlaceList } from '@/api/product'
+import { getProducts } from '@/api/store'
+import { pageListenMixins } from '@/mixins/pageListenMixins'
 export default {
-  name: "healthList",
+  name: 'HealthList',
+  mixins: [pageListenMixins],
   data() {
     return {
       webUrl: this.$VUE_APP_RESOURCES_URL,
       tabIndex: 0,
-      keyword: "",
+      keyword: '',
       page: 1,
-      listHeight: "auto",
-
+      listHeight: 'auto',
       bannerList: [],
       asideList: [],
       asideIndex: 0,
-      dataList: [], // 列表数据
+      dataList: [],
+      pageKeyId: Object.freeze('wellnessFoodIndex')
     }
   },
   onLoad() {
-    this.init();
+    this.init()
   },
   methods: {
     init() {
       wellnessFood().then(({data}) => {
         this.bannerList = data.banner
-      });
+      })
       fetchCity(4).then(({data}) => {
-        this.asideList = data.group;
-        this.search();
-      });
+        this.asideList = data.group
+        this.search()
+      })
     },
     changeTab(index) {
-      if (this.asideList.length === 0) return;
-      if (index === this.tabIndex) return;
-      this.page = 1;
-      this.dataList = [];
-      this.tabIndex = index;
-      this.search();
+      if (this.asideList.length === 0) return
+      if (index === this.tabIndex) return
+      this.page = 1
+      this.dataList = []
+      this.tabIndex = index
+      this.search()
     },
     onLower() {
-      this.page++;
-      this.search();
+      this.page++
+      this.search()
     },
     search() {
       let param = {
         page: this.page,
         limit: 10,
         keyword: this.keyword,
-        provinceId: this.asideList.length > 0 ? this.asideList[this.asideIndex].provinceId : ""
+        provinceId: this.asideList.length > 0 ? this.asideList[this.asideIndex].provinceId : ''
       }
       if (this.tabIndex === 0) {
         wellnessPlaceList(param).then(({data}) => {
-          this.handleData(data);
-        });
+          this.handleData(data)
+        })
       } else {
-        param.isWellnessFood = 1;
+        param.isWellnessFood = 1
         getProducts(param).then(({data}) => {
-          this.handleData(data);
-        });
+          this.handleData(data)
+        })
       }
     },
     handleData(data) {
-      let that = this;
+      const that = this
       if (this.page === 1) {
-        this.dataList = [];
+        this.dataList = []
       }
-      this.dataList = this.dataList.concat(data);
+      this.dataList = this.dataList.concat(data)
       uni.getSystemInfo({
         success: function (res) {
-          let len = that.dataList.length;
-          let {windowHeight} = res;
-          that.listHeight = "auto";
+          const len = that.dataList.length
+          const {windowHeight} = res
+          that.listHeight = 'auto'
           if (windowHeight > 600 && len > 4) {
-            that.listHeight = "100%";
+            that.listHeight = '100%'
           }
           if (windowHeight <= 600 && len > 2) {
-            that.listHeight = "100%";
+            that.listHeight = '100%'
           }
         }
-      });
+      })
     },
     asideTap(index) {
-      this.asideIndex = index;
-      this.page = 1;
-      this.dataList = [];
-      this.search();
+      this.asideIndex = index
+      this.page = 1
+      this.dataList = []
+      this.search()
     },
     goStore(id) {
       uni.navigateTo({
-        url: "/pagesInn/inn/innHome?id=" + id
+        url: '/pagesInn/inn/innHome?id=' + id + '&from=wellness'
       })
     },
     goGoods(id) {
       uni.navigateTo({
-        url: "/pages/shop/GoodsCon/index?id=" + id
+        url: '/pages/shop/GoodsCon/index?id=' + id + '&from=wellness'
       })
     }
   }
diff --git a/pkg_product/views/nativeList.vue b/pkg_product/views/nativeList.vue
index 76011ad..eed2b71 100644
--- a/pkg_product/views/nativeList.vue
+++ b/pkg_product/views/nativeList.vue
@@ -59,9 +59,12 @@
 </template>
 
 <script>
+// 特产-城市商品列表
 import { fetchNormal, getCategory } from "@/api/store"
+import { pageListenMixins } from '@/mixins/pageListenMixins'
 export default {
   name: 'NativeListPage',
+  mixins: [pageListenMixins],
   data() {
     return {
       webUrl: this.$VUE_APP_RESOURCES_URL,
@@ -71,11 +74,14 @@ export default {
       cityName: '',
       page: 1,
       listHeight: 'auto',
-      loading: false
+      loading: false,
+      pageKeyId: ''
     }
   },
   onLoad(option) {
-    this.cityId = option.cityId
+    const cityId = option.cityId
+    this.cityId = cityId
+    this.pageKeyId = `goodsProductList_cityId_${cityId}`
     this.init()
   },
   methods: {