diff --git a/assets/css/base.less b/assets/css/base.less
index 78111a7..d917846 100644
--- a/assets/css/base.less
+++ b/assets/css/base.less
@@ -290,4 +290,9 @@ checkbox .wx-checkbox-input.wx-checkbox-input-checked {
 
 .ai-center {
   align-items: center;
+}
+.ql-editor.ql-blank::before {
+  font-style: normal;
+  font-size: 28rpx;
+  color: #C2C5CC;
 }
\ No newline at end of file
diff --git a/assets/css/style.less b/assets/css/style.less
index 79d1604..c093901 100644
--- a/assets/css/style.less
+++ b/assets/css/style.less
@@ -2463,6 +2463,7 @@ page {
 }
 
 .user .wrapper .myOrder .orderState .item .pictrue {
+  position: relative;
   width: 52rpx;
   height: 52rpx;
   margin: 0 auto 0.18*100rpx auto;
diff --git a/config/index.js b/config/index.js
index d928392..6084326 100644
--- a/config/index.js
+++ b/config/index.js
@@ -1,11 +1,3 @@
-// export const VUE_APP_API_URL = "https://shop.xdd618.com/api";
-// export const VUE_APP_API_URL = "https://www.xdd618.com/api";
-
-// export const SERVICE_API_URL = "https://service-test.xdd618.com/api";
-// export const SERVICE_API_URL = "https://service.xdd618.com/api";
-
-// export const SOCKET_URL = "wss://service-test.xdd618.com/ws";
-// export const SOCKET_URL = "wss://service.xdd618.com/ws";
 const NODE_ENV = process.env.VUE_APP_ENV || 'development'
 let BASE_URL = ''
 let SERVICE_URL = ''
@@ -16,7 +8,7 @@ if (NODE_ENV === 'development' || NODE_ENV === 'test') {
 	SERVICE_WS_URL = 'wss://service-test.xdd618.com/ws'
 }
 if (NODE_ENV === 'prod') {
-	BASE_URL = 'https://www.xdd618.com/api'
+	BASE_URL = 'https://wxapp.xdd618.com/api'
 	SERVICE_URL = 'https://service.xdd618.com/api'
 	SERVICE_WS_URL = 'wss://service.xdd618.com/ws'
 }
@@ -26,7 +18,7 @@ export const SERVICE_API_URL = SERVICE_URL
 export const SOCKET_URL = SERVICE_WS_URL
 
 
-export const VUE_APP_RESOURCES_URL = "https://www.xdd618.com/api/file/pic";
+export const VUE_APP_RESOURCES_URL = "https://wxapp.xdd618.com/api/file/pic"
 export const STATIC_RESOURCE_URL = "https://resource.xdd618.com/image"
 
 export const WX_LIVE_APPID = "wx2b03c6e691cd7370";
diff --git a/pages.json b/pages.json
index 1b1d2c9..c62bafb 100644
--- a/pages.json
+++ b/pages.json
@@ -856,14 +856,6 @@
             "navigationBarTitleText": "文玩"
           }
         },
-        {
-          "path": "views/store",
-          "style": {
-            "navigationBarTitleText": "文玩店铺详情",
-            "navigationStyle": "custom",
-            "navigationBarTextStyle": "white"
-          }
-        },
         {
           "path": "views/storeList",
           "style": {
@@ -883,7 +875,7 @@
   },
   "globalStyle": {
     "navigationBarTextStyle": "black",
-    "navigationBarTitleText": "uni-app",
+    "navigationBarTitleText": "地标文化特产",
     "navigationBarBackgroundColor": "#F8F8F8",
     "backgroundColor": "#F8F8F8"
   },
diff --git a/pages/chose-city/chose-city.vue b/pages/chose-city/chose-city.vue
index 3e292bd..5a01372 100644
--- a/pages/chose-city/chose-city.vue
+++ b/pages/chose-city/chose-city.vue
@@ -126,13 +126,13 @@
 </template>
 
 <script>
-import MescrollMixins from "@/mixins/mescroll-mixins.js";
-import {fetchCity} from "@/api/wenwan";
-import MescrollBody from "@/components/mescroll-uni/mescroll-body.vue";
-import {getCurAddress, getLocation} from "@/utils/common.js";
+import MescrollMixins from '@/mixins/mescroll-mixins.js'
+import {fetchCity} from '@/api/wenwan'
+import MescrollBody from '@/components/mescroll-uni/mescroll-body.vue'
+import {getCurAddress, getLocation} from '@/utils/common.js'
 
 export default {
-  name: "choseCity",
+  name: 'ChoseCity',
   components: {
     MescrollBody
   },
@@ -143,8 +143,7 @@ export default {
         // 此时mescroll会携带page的参数:
         //   let pageNum = mescroll.num; // 页码, 默认从1开始
         //   let pageSize = mescroll.size; // 页长, 默认每页10条
-
-        mescroll.endSuccess(10);
+        mescroll.endSuccess(10)
       }
     })
   ],
@@ -162,23 +161,23 @@ export default {
         auto: true
       },
       listGroup: [],
-      provinceName: "",
+      provinceName: '',
       listCity: [],
       navActive: 0,
-      keyword: "",
+      keyword: '',
       type: null,
-      location: "",
+      location: '',
       banner: {},
       recommendInfo: null // 推荐信息
-    };
+    }
   },
   onLoad(options) {
-    this.type = Number(options.type);
-    this.location = options.city;
+    this.type = Number(options.type)
+    this.location = options.city
     if (this.location === undefined) {
-      this.getMapData();
+      this.getMapData()
     }
-    this.init();
+    this.init()
   },
   methods: {
     reload() {
@@ -218,23 +217,23 @@ export default {
       })
     },
     async getMapData() {
-      const map = await getLocation();
+      const map = await getLocation()
       if (map) {
-        const {latitude, longitude} = map[1];
-        const address = await getCurAddress(latitude, longitude);
-        this.location = address[1].data.result.ad_info.city;
+        const {latitude, longitude} = map[1]
+        const address = await getCurAddress(latitude, longitude)
+        this.location = address[1].data.result.ad_info.city
       }
     },
     init() {
       fetchCity(this.type).then(res => {
         if (res.success) {
-          this.listGroup = res.data.group;
+          this.listGroup = res.data.group
           if (this.listGroup.length > 0) {
-            this.listCity = this.listGroup[0].city;
-            this.provinceName = this.listGroup[0].label;
+            this.listCity = this.listGroup[0].city
+            this.provinceName = this.listGroup[0].label
             this.recommendInfo = this.listGroup[0].recommendInfo
             this.banner = {
-            ...this.listGroup[0],
+              ...this.listGroup[0],
               icon: this.listGroup[0].icon,
               url: this.listGroup[0].uniappUrl
             }
@@ -243,18 +242,18 @@ export default {
       })
     },
     asideTap(index) {
-      this.navActive = index;
-      this.listCity = this.listGroup[index].city;
-      this.provinceName = this.listGroup[index].label;
+      this.navActive = index
+      this.listCity = this.listGroup[index].city
+      this.provinceName = this.listGroup[index].label
       this.recommendInfo = this.listGroup[index].recommendInfo
       this.banner = {
         ...this.listGroup[index],
         icon: this.listGroup[index].icon,
         url: this.listGroup[index].uniappUrl
       }
-      //触发加载请求
-      this.mescroll.scrollTo(0, 0);
-      this.mescroll && this.mescroll.resetUpScroll(false);
+      // 触发加载请求
+      this.mescroll.scrollTo(0, 0)
+      this.mescroll && this.mescroll.resetUpScroll(false)
     },
     emptyClick: function () {
       //触发加载请求
@@ -262,9 +261,9 @@ export default {
     },
     search() {
       this.listGroup.findIndex((group, index) => {
-        let result;
+        let result
         group.city.forEach(item => {
-          result = item.cityName.indexOf(this.keyword, 0);
+          result = item.cityName.indexOf(this.keyword, 0)
           if (result !== -1) {
             this.asideTap(index);
             return null;
@@ -276,8 +275,8 @@ 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 === 0 && item.hasData === 0) return
+      if ((this.type === 1 || this.type === 2) && item.hasShop === 0) return
       uni.setStorageSync("cityName", item.cityName)
 
       switch (this.type) {
@@ -285,20 +284,20 @@ export default {
           uni.navigateTo({
             url: `/pkg_product/views/nativeList?cityId=${item.cityId}`
           })
-          break;
+          break
         case 1:
           uni.navigateTo({
             url: `/wenwan/views/storeList?cityId=${item.cityId}`
           })
-          break;
+          break
         case 6:
           uni.navigateTo({
             url: `/pkg_product/views/scenicSpot?cityId=${item.cityId}`
           })
-          break;
+          break
         default:
           uni.navigateBack()
-          break;
+          break
       }
     },
     goToStore(id) {
@@ -306,7 +305,7 @@ export default {
         return
       }
       uni.navigateTo({
-        url: "/pagesInn/inn/innHome?id=" + id
+        url: '/pagesInn/inn/innHome?id=' + id
       })
     },
     goToGoods(productId) {
diff --git a/pages/cloud/components/HotelItem.vue b/pages/cloud/components/HotelItem.vue
new file mode 100644
index 0000000..f63f17b
--- /dev/null
+++ b/pages/cloud/components/HotelItem.vue
@@ -0,0 +1,110 @@
+<template>
+  <view class="cover-box-wrap">
+    <view class="cover-box">
+      <image
+        :src="item.cover"
+        class="cover"
+        mode="scaleToFill"
+      />
+      <view class="my-mask">
+        <image
+          class="icon"
+          :src="webUrl + '/20220510142728577618.png'"
+          mode="scaleToFill"
+        />
+        <text>{{ item.cityName }}</text>
+      </view>
+    </view>
+    <view class="more-t">{{ item.content }}</view>
+    <view class="flex ai-center bottom">
+      <image
+        v-if="item.logo"
+        :src="item.logo"
+        class="logo"
+        mode="scaleToFill"
+      ></image>
+      <image
+        v-else
+        :src="webUrl + '/20230609145651814148.png'"
+        class="logo"
+      />
+      <text class="one-t">{{ item.name }}</text>
+    </view>
+  </view>
+</template>
+<script>
+export default {
+  name: 'FunHotelItem',
+  props: {
+    item: {
+      type: Object,
+      default: () => {
+        return {}
+      }
+    }
+  },
+  data() {
+    return {
+      webUrl: this.$VUE_APP_RESOURCES_URL
+    }
+  }
+}
+</script>
+<style scoped lang="less">
+.cover-box-wrap {
+  margin: 20rpx 0 0 0;
+  .cover-box {
+    position: relative;
+    width: 328rpx;
+    height: auto;
+    border-radius: 14rpx;
+    overflow: hidden;
+  }
+  .cover {
+    width: 328rpx;
+    height: 328rpx;
+    vertical-align: middle;
+  }
+  .icon {
+    width: 26rpx;
+    height: 26rpx;
+    margin-top: -6rpx;
+    margin-right: 6rpx;
+    vertical-align: middle;
+  }
+  .logo {
+    width: 36rpx;
+    height: 36rpx;
+    vertical-align: middle;
+    margin: 0 8rpx;
+    border-radius: 50%;
+  }
+  .item {
+    width: 328rpx;
+    box-sizing: border-box;
+  }
+  .my-mask {
+    position: absolute;
+    bottom: 0;
+    left: 0;
+    width: 100%;
+    height: 60rpx;
+    line-height: 60rpx;
+    box-sizing: border-box;
+    padding: 0 24rpx;
+    background: linear-gradient(rgba(51, 51, 51, 0), rgba(0, 0, 0, 1));
+    color: #fff;
+    font-size: 24rpx;
+  }
+  .more-t {
+    margin: 10rpx;
+  }
+  .one-t {
+    color: #666;
+    font-size: 24rpx;
+  }
+  .bottom {
+    margin: 0 0 20rpx 0;
+  }
+}
+</style>
diff --git a/pages/cloud/haveFun.vue b/pages/cloud/haveFun.vue
index 359503d..cc86761 100644
--- a/pages/cloud/haveFun.vue
+++ b/pages/cloud/haveFun.vue
@@ -1,117 +1,36 @@
-<script>
-import {getHotelList, getHotelTypeList} from "@/api/inn.js";
-import {getCurAddress, getLocation} from "@/utils/common";
-
-export default {
-  data() {
-    return {
-      webUrl: this.$VUE_APP_RESOURCES_URL,
-      name: "",
-      page: 1,
-      typeList: [],
-      typeIndex: 0,
-      cityName: "",
-      hotelList: [],
-    }
-  },
-  onLoad() {
-    this.getMapData();
-    getHotelTypeList().then(({data}) => {
-      this.typeList = data;
-    });
-  },
-  onShow() {
-    let memCityName = uni.getStorageSync("cityName")
-
-    if (memCityName.length) {
-      this.cityName = memCityName;
-      uni.removeStorageSync("cityName")
-      this.search();
-    }
-  },
-  onReachBottom() {
-    if (!this.cityName) {
-      return
-    }
-    this.page++;
-    this.fetchList();
-  },
-  methods: {
-    goCity() {
-      uni.navigateTo({
-        url: `/pages/chose-city/chose-city?type=2&city=${this.cityName}`
-      })
-    },
-
-    goInnDetail(item) {
-      uni.navigateTo({
-        url: `/pagesInn/inn/innHome?id=${item.id}`
-      })
-    },
-
-    async getMapData() {
-      const map = await getLocation();
-      if (map.length > 1) {
-        const {latitude, longitude} = map[1];
-        const address = await getCurAddress(latitude, longitude);
-        this.cityName = address[1].data.result.ad_info.city;
-        this.search();
-      }
-    },
-
-    tapType(index) {
-      if (this.typeIndex === index) return;
-      this.typeIndex = index;
-      this.search();
-    },
-    search() {
-      this.page = 1;
-      this.hotelList = [];
-      this.fetchList();
-    },
-    fetchList() {
-      let param = {
-        page: this.page,
-        type: this.typeList[this.typeIndex].id,
-        cityName: this.cityName
-      };
-      let name = this.name.trim();
-      if (name.length > 0) param.name = name;
-      getHotelList(param).then(res => {
-        if (res.status === 200) {
-          for (let i = 0; i < res.data.length; i++) {
-            res.data[i].hide = true;
-            this.hotelList.push(res.data[i])
-          }
-        }
-      })
-    }
-  }
-}
-</script>
-
 <template>
   <view class="have-fun">
-<!--    <u-navbar title="寻趣味" height="90rpx">-->
-<!--      <view slot="left">&nbsp;</view>-->
-<!--    </u-navbar>-->
     <view class="top-box">
       <view class="search-box flex jc-between ai-center">
-        <input type="text" v-model="name" placeholder="搜索店铺" placeholder-style="color:#949494"
-               @confirm="search">
-        <image class="icon" :src="webUrl+'/20220903142935869059.png'" mode="scaleToFill"
-               @click="search"/>
+        <input
+          v-model="name"
+          type="text"
+          placeholder="搜索店铺"
+          placeholder-style="color:#949494"
+          @confirm="search"
+        >
+        <image
+          class="icon"
+          :src="webUrl+'/20220903142935869059.png'"
+          mode="scaleToFill"
+          @click="search"
+        />
       </view>
-
       <scroll-view class="type-box flex" scroll-x enable-flex>
-        <view class="item flex-0 flex flex-col jc-center ai-center" :class="{'active':typeIndex===index}"
-              v-for="(item,index) in typeList" :key="index" @click="tapType(index)">
+        <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>
-
     <view class="body">
       <view class="flex jc-end">
         <view class="city-box" @click="goCity('cloud')">
@@ -119,41 +38,150 @@ export default {
           <text>{{ cityName }}</text>
         </view>
       </view>
-
-      <view class="list" v-if="hotelList.length">
-        <custom-waterfalls-flow :value="hotelList" imageKey="cover">
-          <view
-            v-for="(item,index) in hotelList"
-            :key="index"
-            class="item"
-            @click="goInnDetail(item)"
-          >
-            <view class="cover-box">
-              <image class="cover" :src="item.cover" mode="scaleToFill"></image>
-              <view class="my-mask">
-                <image class="icon" :src="webUrl+'/20220510142728577618.png'"
-                       mode="scaleToFill"></image>
-                <text>{{ item.cityName }}</text>
+      <view v-if="isLoad">
+        <view v-if="hotelList.length > 0">
+          <view class="list-wrapper">
+            <view class="list">
+              <view
+                v-for="(item, index) in hotelEvenList"
+                :key="index"
+                class="item"
+                @click="goInnDetail(item)"
+              >
+                <fun-hotel-item :item="item" />
               </view>
             </view>
-            <view class="more-t">{{ item.content }}</view>
-            <view class="flex ai-center" style="margin-bottom: 18rpx;">
-              <image class="logo" :src="item.logo" mode="scaleToFill" v-if="item.logo"></image>
-              <image class="logo" :src="webUrl+'/20230609145651814148.png'" v-else/>
-              <text class="one-t">{{ item.name }}</text>
+            <view class="list">
+              <view
+                v-for="(item, index) in hotelOddList"
+                :key="index"
+                class="item"
+                @click="goInnDetail(item)"
+              >
+                <fun-hotel-item :item="item" />
+              </view>
             </view>
           </view>
-        </custom-waterfalls-flow>
-      </view>
-
-      <view class="v4-nodata" v-else>
-        <image src="@/static/images/img_nodata.png" mode="scaleToFill"/>
-        <view class="text">暂无数据</view>
+        </view>
+        <view class="v4-nodata" v-else>
+          <image src="@/static/images/img_nodata.png" mode="scaleToFill"/>
+          <view class="text">暂无数据</view>
+        </view>
       </view>
+      <goo-skeleton v-else />
     </view>
   </view>
 </template>
-
+<script>
+import { getHotelList, getHotelTypeList } from "@/api/inn.js"
+import { getCurAddress, getLocation } from "@/utils/common"
+import GooSkeleton from '@/components/GooSkeleton/index.vue'
+import FunHotelItem from './components/HotelItem'
+export default {
+  components: {
+    GooSkeleton,
+    FunHotelItem
+  },
+  data() {
+    return {
+      webUrl: this.$VUE_APP_RESOURCES_URL,
+      name: '',
+      page: 1,
+      typeList: [],
+      typeIndex: 0,
+      cityName: '',
+      hotelList: [],
+      isLoad: false
+    }
+  },
+  computed: {
+    hotelOddList() {
+      const arr = this.hotelList.filter(function(item, index) { return index % 2 === 1 })
+      return arr
+    },
+    hotelEvenList() {
+      const arr = this.hotelList.filter(function(item, index) { return index % 2 === 0 })
+      return arr
+    }
+  },
+  onLoad() {
+    this.getMapData()
+    getHotelTypeList().then(({data}) => {
+      this.typeList = data;
+    })
+  },
+  onShow() {
+    const memCityName = uni.getStorageSync('cityName')
+    if (memCityName.length) {
+      this.cityName = memCityName
+      uni.removeStorageSync('cityName')
+      this.search()
+    }
+  },
+  methods: {
+    goCity() {
+      uni.navigateTo({
+        url: `/pages/chose-city/chose-city?type=2&city=${this.cityName}`
+      })
+    },
+    goInnDetail(item) {
+      uni.navigateTo({
+        url: `/pagesInn/inn/innHome?id=${item.id}`
+      })
+    },
+    async getMapData() {
+      const map = await getLocation()
+      if (map.length > 1) {
+        const {latitude, longitude} = map[1]
+        const address = await getCurAddress(latitude, longitude)
+        this.cityName = address[1].data.result.ad_info.city
+        this.search()
+      }
+    },
+    tapType(index) {
+      if (this.typeIndex === index) return
+      this.typeIndex = index
+      this.search()
+    },
+    search() {
+      this.isLoad = false
+      this.page = 1
+      this.hotelList = []
+      this.fetchList()
+    },
+    fetchList() {
+      const param = {
+        page: this.page,
+        type: this.typeList[this.typeIndex].id,
+        cityName: this.cityName
+      }
+      const name = this.name.trim()
+      if (name.length > 0) {
+        param.name = name
+      }
+      getHotelList(param).then(res => {
+        const { success, data } = res
+        if (success) {
+          for (let i = 0; i < data.length; i++) {
+            const cover = data[i].cover
+            data[i].hide = true
+            // 视频封面取第一帧图片
+            if (data[i].coverType === 2) {
+              data[i].videoCover = cover
+              data[i].cover = (cover + '?vframe/jpg/offset/1')
+            } else {
+              data[i].videoCover = ''
+            }
+            this.hotelList.push(data[i])
+          }
+        }
+      }).finally(() => {
+        this.isLoad = true
+      })
+    }
+  }
+}
+</script>
 <style scoped lang="less">
 .have-fun {
   //padding-top: 120rpx;
@@ -240,70 +268,16 @@ export default {
     }
   }
 
-  .list {
-    margin-top: 20rpx;
-
-    .cover {
+  .list-wrapper {
+    display: flex;
+    justify-content: space-between;
+    .list {
       width: 328rpx;
-      height: 328rpx;
-      vertical-align: middle;
-    }
-
-    .icon {
-      width: 26rpx;
-      height: 26rpx;
-      margin-top: -6rpx;
-      margin-right: 6rpx;
-      vertical-align: middle;
-    }
-
-    .logo {
-      width: 36rpx;
-      height: 36rpx;
-      vertical-align: middle;
-      margin: 0 8rpx;
-      border-radius: 50%;
-    }
-
-    .item {
-      width: 328rpx;
-      box-sizing: border-box;
-    }
-
-    .cover-box {
-      position: relative;
-      width: 328rpx;
-      height: auto;
-      border-radius: 14rpx;
-      overflow: hidden;
-
-      .my-mask {
-        position: absolute;
-        bottom: 0;
-        left: 0;
+      .item {
         width: 100%;
-        height: 60rpx;
-        line-height: 60rpx;
         box-sizing: border-box;
-        padding: 0 24rpx;
-        background: linear-gradient(rgba(51, 51, 51, 0), rgba(0, 0, 0, 1));
-        color: #fff;
-        font-size: 24rpx;
       }
     }
-
-    .more-t {
-      margin: 10rpx;
-    }
-
-    .one-t {
-      color: #666;
-      font-size: 24rpx;
-    }
-  }
-
-  /deep/ .waterfalls-flow-column .column-value {
-    background-color: rgba(0, 0, 0, 0) !important;
   }
 }
 </style>
diff --git a/pages/home/index.vue b/pages/home/index.vue
index 405b075..69e42e6 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -211,7 +211,9 @@
         <view class="msg_title">
           {{ unReadMessageInfo.noticeTitle }}
         </view>
-        <view class="msg_content" v-html="unReadMessageInfo.noticeContent"></view>
+        <view class="msg_content">
+          <rich-text :nodes="unReadMessageInfo.noticeContent" />
+        </view>
         <view class="msg_line"></view>
         <view class="msg_btn" @click="msgConfirm">我知道了</view>
       </view>
diff --git a/pages/shop/GoodSearch/index.vue b/pages/shop/GoodSearch/index.vue
index 9c09b0c..70af129 100644
--- a/pages/shop/GoodSearch/index.vue
+++ b/pages/shop/GoodSearch/index.vue
@@ -2,36 +2,41 @@
   <view class="good-search">
     <view class="header">
       <view class="search-box flex jc-between ai-center">
-        <input v-model="search" type="text" placeholder="搜索商品" placeholder-style="color:#999"/>
+        <input
+          v-model.trim="search"
+          type="text"
+          placeholder="搜索商品"
+          placeholder-style="color:#999"
+        />
         <view class="btn flex-0 flex jc-center ai-center" @click="submit">
           <text class="iconfont icon-sousuo2"></text>
           <text>搜索</text>
         </view>
       </view>
     </view>
-
-    <view class="page-content" v-if="historyKey.length">
+    <view v-if="historyKey.length" class="page-content">
       <view class="title">历史搜索</view>
       <view class="list acea-row limit-box">
         <view
-            class="item"
-            v-for="item of historyKey"
-            :key="item.id"
-            @click="toSearch(item.word)"
-        >{{ item.word }}
+          v-for="item of historyKey"
+          :key="item.id"
+          class="item"
+          @click="toSearch(item.word)"
+        >
+          {{ item.word }}
         </view>
       </view>
     </view>
-
     <view class="page-content" v-if="keywords.length">
       <view class="title">热门搜索</view>
       <view class="list acea-row">
         <view
-            class="item"
-            v-for="keywordsKey of keywords"
-            :key="keywordsKey"
-            @click="toSearch(keywordsKey)"
-        >{{ keywordsKey }}
+          v-for="keywordsKey of keywords"
+          :key="keywordsKey"
+          class="item"
+          @click="toSearch(keywordsKey)"
+        >
+          {{ keywordsKey }}
         </view>
       </view>
     </view>
@@ -40,19 +45,18 @@
 </template>
 
 <script>
-import {getSearchKeyword} from "@/api/store";
-import {trim} from "@/utils";
-
+import {getSearchKeyword} from '@/api/store'
+import {trim} from '@/utils'
 export default {
-  name: "GoodSearch",
+  name: 'GoodSearch',
   props: {},
   data: function () {
     return {
       webUrl: this.$VUE_APP_RESOURCES_URL,
       keywords: [],
-      search: "",
+      search: '',
       historyKey: []
-    };
+    }
   },
   mounted: function () {
     this.getData();
@@ -62,29 +66,32 @@ export default {
   },
   methods: {
     submit() {
-      const search = trim(this.search) || "";
-      if (!search) return;
-
-      this.historyKey.unshift({id: this.$global.generateMixed(10), word: search});
-      this.setHistory();
-      this.search = "";
-
-      this.toSearch(search);
+      const search = trim(this.search) || ''
+      if (!search) return
+      this.setHistory(search)
+      this.search = ''
+      this.toSearch(search)
     },
     toSearch(s) {
-      this.$yrouter.push({path: "/pages/shop/GoodsList/index", query: {s}});
+      this.setHistory(s)
+      this.$yrouter.push({path: '/pages/shop/GoodsList/index', query: {s}})
     },
     getData() {
       getSearchKeyword().then(res => {
-        this.keywords = res.data;
-      });
+        this.keywords = res.data
+      })
     },
     getHistory() {
-      let temp = JSON.parse(uni.getStorageSync("historyKey")) || [];
-      this.historyKey = temp.slice(0, 30);
+      let temp = JSON.parse(uni.getStorageSync('historyKey') || '[]')
+      this.historyKey = temp.slice(0, 30)
     },
-    setHistory() {
-      uni.setStorageSync("historyKey", JSON.stringify(this.historyKey));
+    setHistory(word) {
+      const index = this.historyKey.findIndex(item => item.word === word)
+      if (index > -1) {
+        return
+      }
+      this.historyKey.unshift({id: this.$global.generateMixed(10), word })
+      uni.setStorageSync('historyKey', JSON.stringify(this.historyKey))
     }
   }
 };
diff --git a/pages/shop/GoodsCon/index.vue b/pages/shop/GoodsCon/index.vue
index ea02c39..4656fe4 100644
--- a/pages/shop/GoodsCon/index.vue
+++ b/pages/shop/GoodsCon/index.vue
@@ -210,9 +210,15 @@
         <view class="service-section goods-section" v-if="storeInfo && storeInfo.isTickets!=1">
           <view class="cell flex jc-between ai-center" @click="changeCoupons()" v-if="couponList['usable'].length>0">
             <view>
-              <text class="coupon-label tc" v-for="(item,index) in couponList.usable" :key="index" v-if="index<2">
-                {{ item.couponTitle }}
-              </text>
+              <template v-for="(item, index) in couponList.usable">
+                <text
+                  v-if="index < 2"
+                  :key="index"
+                  class="coupon-label tc"
+                >
+                  {{ item.couponTitle }}
+                </text>
+              </template>
             </view>
             <view class="value">优惠详情
               <uni-icons type="right" size="13" color="#707070"></uni-icons>
@@ -403,7 +409,9 @@
 
         <!-- 购买须知开始 -->
         <view class="acea-row row-column bg-white" style="padding: 20rpx;border-width: 2px;border-color: #939390;">
-          <view class="conter" v-html="buyNotice"></view>
+          <view class="conter">
+            <rich-text :nodes="buyNotice" />
+          </view>
         </view>
         <!-- 购买须知结束 -->
 
@@ -939,9 +947,8 @@ export default {
     },
     // 2022/9/28 add
     goStore() {
-      let path = this.isWenwan === 0 ? "/pagesInn/inn/innHome" : "/wenwan/views/store";
       this.$yrouter.push({
-        path,
+        path: "/pagesInn/inn/innHome",
         query: {
           id: this.systemStore.id
         }
diff --git a/pages/shop/GoodsCon/index_bak20240206.vue b/pages/shop/GoodsCon/index_bak20240206.vue
deleted file mode 100644
index 2840d86..0000000
--- a/pages/shop/GoodsCon/index_bak20240206.vue
+++ /dev/null
@@ -1,1894 +0,0 @@
-<template>
-  <view :class="productConClass">
-    <hx-navbar :back="true" :fixed="true" color="#fff" :statusBar="true" transparent="hidden" barPlaceholder="hidden">
-    </hx-navbar>
-    <view v-if="storeInfo.id">
-      <!-- 原模块 -->
-      <product-con-swiper :img-urls="storeInfo.sliderImageArr"
-                          v-if="source!='pre' && source!='day'"></product-con-swiper>
-      <!-- v4 预售轮播图 -->
-      <product-con-swiper :img-urls="preInfo.sliderImageArr" v-if="source==='pre'"></product-con-swiper>
-      <!-- v4 每日特价轮播图 -->
-      <product-con-swiper :img-urls="dayInfo.sliderImageArr" v-if="source==='day'"></product-con-swiper>
-
-      <view class="wrapper">
-        <!-- 原模块 -->
-        <view class="change-section bg-white" v-if="source==='' || source==='famous' ">
-          <view class="introduce bold">{{ storeInfo.storeName }}</view>
-          <rich-text class="subInfo" :nodes="storeInfo.storeInfo" v-if="storeInfo.storeInfo"/>
-          <view class="share acea-row row-between row-middle" style="flex-wrap: nowrap;">
-            <view class="money font-color-lightred acea-row ai-end">
-              <text class="num">￥{{ attr.productSelect.price }}</text>
-              <text style="color: #999999;font-size: 24rpx;">￥</text>
-              <text style="color: #999999;font-size: 24rpx;text-decoration: line-through;">
-                {{ attr.productSelect.otPrice }}
-              </text>
-              <!--              <block v-if="Object.values(productValue).length>1">-->
-              <!--                <text class="num">￥{{ priceRangeStr(productValue) }}</text>-->
-              <!--                <text style="color: #999999;font-size: 24rpx;">￥</text>-->
-              <!--                <text-->
-              <!--                    style="color: #999999;font-size: 24rpx;text-decoration: line-through;">-->
-              <!--                  {{ minMaxOtPrice(productValue).min }}-->
-              <!--                </text>-->
-              <!--                <text style="color: #999999;font-size: 24rpx;">-</text>-->
-              <!--                <text style="color: #999999;font-size: 24rpx;">￥</text>-->
-              <!--                <text-->
-              <!--                    style="color: #999999;font-size: 24rpx;text-decoration: line-through;">-->
-              <!--                  {{ minMaxOtPrice(productValue).max }}-->
-              <!--                </text>-->
-              <!--              </block>-->
-              <!--              <block v-else>-->
-              <!--                <text class="num"-->
-              <!--                      v-if="storeInfo.vipPrice && storeInfo.vipPrice > 0">￥{{ force2Decimal(storeInfo.vipPrice) }}-->
-              <!--                </text>-->
-              <!--                <text v-else class="num">￥{{ force2Decimal(storeInfo.price) }}</text>-->
-              <!--                <text style="text-decoration: line-through;color: #999999;font-size: 24rpx;"-->
-              <!--                      v-if="storeInfo.otPrice && storeInfo.otPrice>0">￥{{ force2Decimal(storeInfo.otPrice) }}-->
-              <!--                </text>-->
-              <!--              </block>-->
-              <text v-if="storeInfo.vipPrice && storeInfo.vipPrice > 0" class="vip-price-tag">已享受会员价格</text>
-            </view>
-            <view style="flex-shrink:0;" class="acea-row row-middle" @click="listenerActionSheet">
-              <image :src="webUrl+'/20210806121714655368.png'" mode="" style="width: 36rpx;height: 36rpx;"></image>
-            </view>
-          </view>
-          <!-- 文玩 -->
-          <!--          <view class="wenwan-info flex jc-between ai-center" v-if="isWenwan===1">-->
-          <!--            <text>产地:{{ storeInfo.origin }}</text>-->
-          <!--            <text>单位:{{ storeInfo.unitName }}</text>-->
-          <!--            <text>规格:{{ storeInfo.storeInfo }}</text>-->
-          <!--          </view>-->
-        </view>
-
-        <!-- v4 特产 -->
-        <view class="spe-section change-section bg-white" v-if="source==='spe'">
-          <view class="spe-line-1 flex ai-center">
-            <img class="icon-spe" :src="webUrl+'/20220514112935428191.png'" mode="scaleToFill">
-            <view class="one-t">{{ storeInfo.storeName }}</view>
-          </view>
-
-          <view class="spe-line-2 flex jc-between ai-center">
-            <view class="flex ai-center">
-              <view class="money font-color-lightred acea-row row-bottom">
-                <text class="num bold">￥{{ attr.productSelect.price }}</text>
-                <text style="color: #999999;font-size: 24rpx;">￥</text>
-                <text style="color: #999999;font-size: 24rpx;text-decoration: line-through;">
-                  {{ attr.productSelect.otPrice }}
-                </text>
-              </view>
-              <!--              <block v-if="Object.values(productValue).length>1">-->
-              <!--                <view class="money font-color-lightred acea-row row-middle">-->
-              <!--                  <text class="num">￥{{ priceRangeStr(productValue) }}</text>-->
-              <!--                  <text style="color: #999999;font-size: 24rpx;">￥</text>-->
-              <!--                  <text-->
-              <!--                      style="color: #999999;font-size: 24rpx;text-decoration: line-through;">-->
-              <!--                    {{ minMaxOtPrice(productValue).min }}-->
-              <!--                  </text>-->
-              <!--                  <text style="color: #999999;font-size: 24rpx;">-</text>-->
-              <!--                  <text style="color: #999999;font-size: 24rpx;">￥</text>-->
-              <!--                  <text-->
-              <!--                      style="color: #999999;font-size: 24rpx;text-decoration: line-through;">-->
-              <!--                    {{ minMaxOtPrice(productValue).max }}-->
-              <!--                  </text>-->
-              <!--                </view>-->
-              <!--              </block>-->
-              <!--              <block v-else>-->
-              <!--                <text class="price"-->
-              <!--                      v-if="storeInfo.vipPrice && storeInfo.vipPrice > 0">￥{{ force2Decimal(storeInfo.vipPrice) }}-->
-              <!--                </text>-->
-              <!--                <text v-else class="price">￥{{ force2Decimal(storeInfo.price) }}</text>-->
-              <!--                <text style="text-decoration: line-through;color: #A5A5A5;font-size: 22rpx;"-->
-              <!--                      v-if="storeInfo.otPrice && storeInfo.otPrice>0">￥{{ force2Decimal(storeInfo.otPrice) }}-->
-              <!--                </text>-->
-              <!--              </block>-->
-              <text v-if="storeInfo.origin" class="vip-price-tag">{{ storeInfo.origin }}</text>
-            </view>
-
-            <view style="flex-shrink:0;" class="acea-row row-middle" @click="listenerActionSheet">
-              <image :src="webUrl+'/20210806121714655368.png'" mode="" style="width: 36rpx;height: 36rpx;"></image>
-            </view>
-          </view>
-        </view>
-
-        <!-- v4 预售抬头 -->
-        <view class="pre-section change-section bg-white" v-if="source==='pre'">
-
-          <view class="pre-line-1 flex">
-            <view class="surplus flex">
-              <view class="red-grid tc">还剩</view>
-              <view class="white-grid flex">
-                <text style="color:#ED0F0F">{{ preInfo.surplus }}</text>
-                天
-              </view>
-            </view>
-            <view class="one-t">{{ preInfo.title }}</view>
-          </view>
-
-          <view class="pre-line-2 flex jc-between ai-center">
-            <view class="flex ai-center">
-              <image class="label-vip" :src="webUrl+'/20221118104357701129.png'" mode="scaleToFill"
-                     v-if="storeInfo.vipPrice && storeInfo.vipPrice > 0"></image>
-              <text class="price">￥{{ force2Decimal(preInfo.price) }}</text>
-              <view class="date-box">
-                <text class="post-grid" v-if="preInfo.postTime">{{ preInfo.postTime.substring(0, 10) }}发货</text>
-                <text class="stop-grid" v-if="preInfo.stopTime">{{ preInfo.stopTime.substring(0, 10) }}结束</text>
-              </view>
-            </view>
-            <view style="flex-shrink:0;" class="acea-row row-middle" @click="listenerActionSheet">
-              <image :src="webUrl+'/20210806121714655368.png'" mode="" style="width: 36rpx;height: 36rpx;"></image>
-            </view>
-          </view>
-
-        </view>
-
-        <!-- v4 秒杀抬头 -->
-        <view class="kill-section change-section bg-white" v-if="source==='kill'">
-
-          <view class="kill-line-1 more-t">{{ killInfo.storeInfo.title }}</view>
-
-          <view class="kill-line-2 flex jc-between ai-center">
-            <view class="flex ai-center">
-              <text class="price">￥{{ force2Decimal(killInfo.storeInfo.price) }}</text>
-              <text style="text-decoration: line-through;color: #A5A5A5;font-size: 22rpx;margin-left:12rpx"
-                    v-if="killInfo.storeInfo.otPrice && killInfo.storeInfo.otPrice>0">
-                ￥{{ force2Decimal(killInfo.storeInfo.otPrice) }}
-              </text>
-
-              <view class="count-box flex ai-center">
-                <text class="gray">倒计时:</text>
-                <count-down :isDay="true" :isSecond="false" dayText="天" hourText="时" minuteText="分"
-                            :datatime="killInfo.stop"></count-down>
-              </view>
-            </view>
-            <view style="flex-shrink:0;" class="acea-row row-middle" @click="listenerActionSheet">
-              <image :src="webUrl+'/20210806121714655368.png'" mode="" style="width: 36rpx;height: 36rpx;"></image>
-            </view>
-          </view>
-
-        </view>
-
-        <!-- v4 每日特价抬头 -->
-        <view class="day-section change-section bg-white" v-if="source==='day'">
-          <view class="day-line-1 flex ai-center">
-            <img class="icon-day" :src="webUrl+'/20220514103348573632.png'" mode="scaleToFill">
-            <view class="one-t">{{ dayInfo.title }}</view>
-          </view>
-          <view class="day-line-2 flex jc-between ai-center">
-            <view class="flex ai-center">
-              <text class="price">￥{{ force2Decimal(dayInfo.price) }}</text>
-              <text style="text-decoration: line-through;color: #A5A5A5;font-size: 22rpx;"
-                    v-if="dayInfo.productPrice && dayInfo.productPrice>0">￥{{ force2Decimal(dayInfo.productPrice) }}
-              </text>
-              <!-- 原价 -->
-              <view class="count-box flex ai-center">
-                <text class="gray">倒计时:</text>
-                <count-down :isDay="true" :isSecond="false" dayText="天" hourText="时" minuteText="分"
-                            :datatime="dayInfo.stop"></count-down>
-              </view>
-            </view>
-            <view style="flex-shrink:0;" class="acea-row row-middle" @click="listenerActionSheet">
-              <image :src="webUrl+'/20210806121714655368.png'" mode="" style="width: 36rpx;height: 36rpx;"></image>
-            </view>
-          </view>
-
-          <view style="border-bottom: 1px solid #F0F0F0;height: 1px;margin: 10rpx 32rpx;"></view>
-
-          <view class="label acea-row row-middle row-around" style="color: #666666;flex-wrap: nowrap;">
-            <text>库存:{{ dayInfo.stock }}{{ dayInfo.unitName }}</text>
-            <text v-if="tempName">{{ tempName }}</text>
-            <text>销量:{{ dayInfo.sales }}{{ dayInfo.unitName }}</text>
-          </view>
-        </view>
-
-        <!-- v9 优惠券开始 -->
-        <u-popup :show="show" :round="10" mode="bottom" closeOnClickOverlay @close="changeCoupons()">
-          <CouponsPopup :two-list="couponList" @close="changeCoupons"/>
-        </u-popup>
-        <!-- v9 优惠券结束 -->
-
-        <!-- v6服务项目开始 -->
-        <view class="service-section goods-section" v-if="storeInfo && storeInfo.isTickets!=1">
-          <view class="cell flex jc-between ai-center" @click="changeCoupons()" v-if="couponList['usable'].length>0">
-            <view>
-              <text class="coupon-label tc" v-for="(item,index) in couponList.usable" :key="index" v-if="index<2">
-                {{ item.couponTitle }}
-              </text>
-            </view>
-            <view class="value">优惠详情
-              <uni-icons type="right" size="13" color="#707070"></uni-icons>
-            </view>
-          </view>
-
-          <view class="cell flex jc-between ai-center" @click="selecAttrTap">
-            <view class="flex ai-center">
-              <view class="after-title">规格</view>
-              <view class="title bold">{{ attrValue }}</view>
-            </view>
-            <view class="value">库存：{{ storeInfo.stock }}
-              <uni-icons type="right" size="13" color="#707070"></uni-icons>
-            </view>
-          </view>
-
-          <view class="cell flex jc-between ai-center">
-            <view class="flex">
-              <view class="after-title">送至</view>
-              <view class="title bold" v-if="postAddress">{{ postAddress }}
-                <view class="sub-title flex ai-end">
-                  <image class="icon-time" :src="webUrl+'/20230106150523489905.png'" mode="scaleToFill"/>
-                  <view class="text">
-                    {{ storeInfo.isFastPost == 1 ? "预计48小时内发货" : "预计发货时间：" + storeInfo.postTime }}
-                  </view>
-                </view>
-              </view>
-              <view class="title bold" @click="getAddress" v-else>无法获取定位信息，点击重新授权定位</view>
-            </view>
-          </view>
-
-          <view class="cell flex jc-between ai-center">
-            <view class="flex ai-center">
-              <view class="after-title">快递</view>
-              <view class="title bold">{{ storeInfo.postage === 0 ? "免运费" : `￥${storeInfo.postage}` }}</view>
-            </view>
-            <view class="value red">销量：{{ storeInfo.sales }}</view>
-          </view>
-
-          <view class="cell flex jc-between ai-center" v-if="storeInfo.guarantee">
-            <view class="flex ai-center">
-              <view class="after-title flex-0">保障</view>
-              <view class="title bold">{{ storeInfo.guarantee }}</view>
-            </view>
-          </view>
-        </view>
-        <!-- v6服务项目结束 -->
-
-        <!-- 门店信息开始 -->
-        <!--        <view class="shop-info" v-if="systemStore">-->
-        <!--          <view class="title flex jc-between ai-center">-->
-        <!--            <view class="flex ai-center">-->
-        <!--              <image class="icon-shop" :src="webUrl+'/20210806122617026592.png'"/>-->
-        <!--              <text class="tip">门店信息</text>-->
-        <!--            </view>-->
-        <!--            <text class="font-color-lightred" @click="goStore">进入店铺</text>-->
-        <!--          </view>-->
-
-        <!--          <view class="flex" @click="showChang(systemStore)">-->
-        <!--            <image class="cover flex-0" :src="systemStore.image"/>-->
-        <!--            <view class="flex flex-col jc-between" style="width: 100%;">-->
-        <!--              <view class="flex jc-between ai-center">-->
-        <!--                <text class="name">{{ systemStore.name }}</text>-->
-        <!--                <text class="distance" v-if="systemStore.distance != null">距离{{ systemStore.distance }}千米</text>-->
-        <!--              </view>-->
-        <!--              <view class="flex jc-between ai-center">-->
-        <!--                <view class="address one-t">{{ systemStore.address }}</view>-->
-        <!--                <image class="icon-pos flex-0" :src="webUrl+'/20220903142929759087.png'"/>-->
-        <!--              </view>-->
-        <!--            </view>-->
-        <!--          </view>-->
-        <!--        </view>-->
-
-        <view class="store-section goods-section" v-if="systemStore">
-          <view class="flex jc-between ai-center">
-            <view class="title bold flex ai-center">
-              <image class="logo" :src="systemStore.image" mode="scaleToFill"/>
-              {{ systemStore.name }}
-            </view>
-            <view class="value flex ai-center" style="color:#DA0000" @click="goStore">进店逛逛
-              <uni-icons type="right" size="12" color="#DA0000"></uni-icons>
-            </view>
-          </view>
-
-          <view class="product-list flex" v-if="merBestProducts.length>0">
-            <view class="item flex flex-col jc-between" v-for="(item,index) in merBestProducts" :key="index"
-                  @click="goodsDetail(item)">
-              <view>
-                <view class="cover-box">
-                  <image class="tag" :src="webUrl+'/20230224104110531590.png'" mode="scaleToFill" v-if="index===0"/>
-                  <image class="tag" :src="webUrl+'/20230224104120134853.png'" mode="scaleToFill" v-if="index===1"/>
-                  <image class="tag" :src="webUrl+'/20230224104130457881.png'" mode="scaleToFill" v-if="index===2"/>
-                  <image class="cover" :src="item.image" mode="scaleToFill"/>
-                </view>
-                <view class="more-t bold">{{ item.storeName }}</view>
-              </view>
-              <view class="price bold">￥{{ item.price }}</view>
-            </view>
-          </view>
-        </view>
-        <!-- 门店信息结束 -->
-
-        <!-- v6产品参数开始 -->
-        <view class="param-section goods-section"
-              v-if="Object.entries(storeInfo.exPropertiesData).length>0 && storeInfo.isTickets!==1">
-          <view class="bold">产品参数</view>
-          <view class="table">
-            <view class="row flex ai-center" v-for="(item,index) in storeInfo.exPropertiesData.slice(0,exSliceEnd)"
-                  :key="index">
-              <view class="title tc">{{ item.key }}</view>
-              <view class="value tc bold">{{ item.value }}</view>
-            </view>
-            <view class="row value tc" style="color:#666" @click="changeExEnd"
-                  v-if="storeInfo.exPropertiesData.length>3">
-              <uni-icons :type="exSliceEnd===3?'bottom':'top'" size="13" color="#707070"></uni-icons>
-              点击{{ exSliceEnd === 3 ? '展开查看' : '折叠' }}更多参数
-            </view>
-          </view>
-        </view>
-        <!-- v6产品参数结束 -->
-
-        <!-- 用户评价开始 -->
-        <view class="userEvaluation" v-if="replyCount">
-          <view class="title acea-row row-between-wrapper">
-            <view>用户评价({{ replyCount }})</view>
-            <text @click="goEvaluateList(id)" class="praise">
-              <text class="font-color-red">{{ replyChance }}%</text>
-              好评率
-              <text class="iconfont icon-jiantou"></text>
-            </text>
-          </view>
-          <user-evaluation :reply="reply"></user-evaluation>
-        </view>
-        <!-- 用户评价结束 -->
-
-        <!-- 商品信息开始 -->
-        <!-- <view class="product-info acea-row row-column" style="flex-wrap: nowrap;">
-		  <view class="product-info-item acea-row row-between" style="border-bottom: none;">
-			  <view class="product-item-title" style="font-size: 32rpx;color: #080F1A;font-weight: bold;">商品信息</view>
-			  <view class="product-item-value" @click="toggleProductInfo">
-				  <uni-icons :type="isProductInfoExpand?'arrowdown':'arrowup'"></uni-icons>
-			  </view>
-		  </view>
-
-		  <block v-if="isProductInfoExpand">
-			  <view class="product-info-item acea-row row-between">
-			  			  <view class="product-item-title">销量</view>
-			  			  <view class="product-item-value">{{storeInfo.sales}}{{storeInfo.unitName||''}}</view>
-			  </view>
-			  <view class="product-info-item acea-row row-between">
-			  			  <view class="product-item-title">库存</view>
-			  			  <view class="product-item-value">{{storeInfo.stock||0}}{{storeInfo.unitName||''}}</view>
-			  </view>
-
-			  <view v-if="systemStore" class="product-info-item acea-row row-between">
-			  			  <view class="product-item-title">店铺</view>
-			  			  <view class="product-item-value acea-row row-middle" style="flex-wrap: nowrap;">
-						  <image :src="systemStore.image" mode="" style="width: 40rpx;height: 40rpx;border-radius: 50%;flex-shrink: 0;"></image>
-						  {{systemStore.name||''}}
-						  </view>
-			  </view>
-			  <view v-if="systemStore" class="product-info-item acea-row row-between">
-			  			  <view class="product-item-title">地址</view>
-			  			  <view class="product-item-value">{{systemStore.address||''}}</view>
-			  </view>
-			  <view class="product-info-item acea-row row-between">
-			  			  <view class="product-item-title">距离</view>
-			  			  <view class="product-item-value">{{systemStore.distance}}km</view>
-			  </view>
-		  </block>
-	  </view> -->
-        <!-- 商品信息结束 -->
-
-        <!-- 商品详情开始 -->
-        <view class="product-intro" style="margin-top: 24rpx">
-          <!-- 原模块 -->
-          <!--          <view class="conter" v-html="storeInfo.description" ></view>-->
-          <rich-text :nodes="storeInfo.description" v-if="source!='pre' && source!='day'"/>
-          <!-- v4 预售详情 -->
-          <rich-text :nodes="preInfo.description" v-if="source==='pre'"/>
-          <!-- v4 每日特价详情 -->
-          <rich-text :nodes="dayInfo.description" v-if="source==='day'"/>
-        </view>
-        <!-- 商品详情结束 -->
-
-        <!-- 购买须知开始 -->
-        <view class="acea-row row-column bg-white" style="padding: 20rpx;border-width: 2px;border-color: #939390;">
-          <view class="conter" v-html="buyNotice"></view>
-        </view>
-        <!-- 购买须知结束 -->
-
-        <!-- 占位 -->
-        <view style="height:100rpx;"></view>
-        <view class="footer acea-row row-between-wrapper">
-
-          <view style="position: relative;" class="item">
-            <view class="iconfont icon-kefu"></view>
-            <view style="text-align: center;">
-              客服
-            </view>
-            <button class="cus-btn" @click="goRoom"></button>
-          </view>
-
-          <view @click="goShoppingCart()" v-if="animated" class="item animated bounceIn">
-            <view class="iconfont icon-gouwuche1">
-              <text class="num bg-color-lightred" v-if="CartCount > 0">{{ CartCount }}</text>
-            </view>
-            <text style="text-align: center;">购物车</text>
-          </view>
-          <view @click="goShoppingCart()" class="item animated" v-if="!animated">
-            <view class="iconfont icon-gouwuche1">
-              <text class="num bg-color-lightred" v-if="CartCount > 0">{{ CartCount }}</text>
-            </view>
-            <text style="text-align: center;">购物车</text>
-          </view>
-
-          <view style="position: relative;" class="item" @click="toHome">
-
-            <view class="iconfont icon-shouye-xianxing"></view>
-            <view style="text-align: center;">首页</view>
-
-          </view>
-
-
-          <view class="bnt acea-row row-middle row-right"
-                style="background: transparent !important;border-radius: 0 !important;">
-            <view class="btn-car" :class="{'btn-car-disabled':isOpen === true && attr.productSelect.stock === 0}"
-                  @click="joinCart">加入购物车
-            </view>
-            <view class="btn-buy" :class="{'btn-buy-disabled':isOpen === true && attr.productSelect.stock === 0}"
-                  @click="tapBuy">立即购买
-            </view>
-          </view>
-        </view>
-        <!--        <CouponPop v-on:changeFun="changeFun" :coupon="coupon"></CouponPop>-->
-        <ProductWindow v-on:changeFun="changeFun" :attr="attr" :cartNum="cart_num"/>
-        <StorePoster v-on:setPosterImageStatus="setPosterImageStatus" :posterImageStatus="posterImageStatus"
-                     :posterData="posterData" :goodId="id"></StorePoster>
-        <ShareInfo v-on:setShareInfoStatus="setShareInfoStatus" :shareInfoStatus="shareInfoStatus"></ShareInfo>
-        <view class="generate-posters acea-row row-middle on" v-if="posters">
-          <view class="item" @click="setPosterImageStatus">
-            <view class="iconfont icon-haibao"></view>
-            <view>生成海报</view>
-          </view>
-        </view>
-        <view class="generate-posters acea-row row-middle" v-if="!posters">
-          <view class="item" @click="setPosterImageStatus">
-            <view class="iconfont icon-haibao"></view>
-            <view>生成海报</view>
-          </view>
-        </view>
-        <view class="mask" @touchmove.prevent @click="listenerActionClose" v-show="posters"></view>
-        <view class="posterCanvasWarp">
-          <canvas class="posterCanvas" canvas-id="myCanvas"></canvas>
-        </view>
-      </view>
-    </view>
-  </view>
-</template>
-
-<script>
-import ProductConSwiper from "@/components/ProductConSwiper";
-import UserEvaluation from "@/components/UserEvaluation";
-import ProductWindow from "@/components/ProductWindow";
-import StorePoster from "@/components/StorePoster";
-import ShareInfo from "@/components/ShareInfo";
-import CountDown from "@/components/CountDown";
-import {getCartCount, getProductCode, getProductDetail, postCartAdd} from "@/api/store";
-import {userBindParent} from "@/api/user";
-import {handleQrCode, isWeixin} from "@/utils";
-import {getHomeData} from "@/api/public";
-import {getDailyGoods, getPreSale, getYxStoreSeckill} from "@/api/goods";
-import {mapGetters} from "vuex";
-import {diffDay, formatDateTime} from "@/utils/index";
-import {getCurAddress, getLocation, getUrlParam} from "@/utils/common.js";
-import cookie from "@/utils/store/cookie";
-import {famousGoodsShareImage, secKillGoodsShareImage} from "@/api/share";
-import CouponsPopup from "@/components/CouponsPopup.vue"
-import { formatContent } from '@/utils/util.js'
-
-export default {
-  name: "GoodsCon",
-  components: {
-    CountDown,
-    ProductConSwiper,
-    UserEvaluation,
-    ProductWindow,
-    StorePoster,
-    ShareInfo,
-    CouponsPopup
-  },
-  data: function () {
-    return {
-      isProductInfoExpand: true, //商品信息是否展开
-      shareInfoStatus: false,
-      weixinStatus: false,
-      mapShow: false,
-      mapKey: "",
-      posterData: {
-        image: "",
-        title: "",
-        price: "",
-        code: ""
-      },
-      posterImageStatus: false,
-      animated: false,
-      coupon: {
-        coupon: false,
-        list: []
-      },
-      attr: {
-        cartAttr: false,
-        productAttr: [],
-        productSelect: {}
-      },
-      isOpen: false, //是否打开属性组件
-      productValue: {},
-      id: null,
-      partnerId: null,
-      activityId: 0, // v4 add
-      source: "", // v4 add
-      preInfo: {},
-      killInfo: {},
-      dayInfo: {},
-      storeInfo: {},
-      couponList: {},
-      attrTxt: "请选择",
-      attrValue: "",
-      cart_num: 1, //购买数量
-      replyCount: "",
-      replyChance: "",
-      reply: [],
-      priceName: 0,
-      CartCount: 0,
-      posters: false,
-      banner: [{}, {}],
-      swiperRecommend: {
-        pagination: {
-          el: ".swiper-pagination",
-          clickable: true
-        },
-        autoplay: false,
-        loop: false,
-        speed: 1000,
-        observer: true,
-        observeParents: true
-      },
-      goodList: [],
-      systemStore: {},
-      qqmapsdk: null,
-      productConClass: "product-con",
-      tempName: "",
-      merBestProducts: [],
-      buyNotice: null,
-      isWenwan: 0,
-      postAddress: null,
-      exSliceEnd: 3,
-      webUrl: this.$VUE_APP_RESOURCES_URL,
-      // v9-2
-      show: false,
-    };
-  },
-  computed: mapGetters(["isLogin", "location", "userInfo"]),
-  onShareAppMessage() {
-    return new Promise(async (resolve, reject) => {
-      let result;
-      let params = `?id=${this.id}&partnerId=${this.userInfo.uid}`;
-      if (this.source === 'famous') {
-        result = await famousGoodsShareImage(this.id);
-      }
-      if (this.source === 'kill') {
-        result = await secKillGoodsShareImage(this.activityId);
-        params += `&activityId=${this.activityId}`
-      }
-
-      if (result?.status === 200) {
-        resolve({
-          title: this.storeInfo.storeName,
-          path: '/pages/shop/GoodsCon/index' + params,
-          imageUrl: result.data
-        })
-      } else {
-        resolve({
-          title: this.storeInfo.storeName,
-          path: '/pages/shop/GoodsCon/index' + params,
-          imageUrl: this.storeInfo.image
-        })
-      }
-    })
-  },
-  onLoad: function (options) {
-    // test data
-    console.log("getLaunchOptionsSync", uni.getLaunchOptionsSync());
-    console.log("getEnterOptionsSync", uni.getEnterOptionsSync());
-    uni.removeStorageSync('couponId')
-
-    let url = handleQrCode();
-    if (url && url.productId) {
-      this.id = url.productId;
-    } else if (options.id) {
-      this.id = options.id || null;
-      this.partnerId = options.partnerId || null;
-      this.activityId = this._route.query.activityId;
-      this.source = this._route.query.from || "";
-    } else {
-      let obj = uni.getEnterOptionsSync();
-      if (options.scene != null || obj.query.scene != null) {
-        let query = options ? decodeURIComponent(options.scene) : decodeURIComponent(obj.query.scene);
-        this.id = getUrlParam(query, "id") || null;
-        this.partnerId = getUrlParam(query, "partnerId") || null;
-      }
-    }
-    if (this.partnerId) cookie.set("spread", this.partnerId);
-
-    //已登录状态的扫码进入绑定一下上级
-    if (url != null && url.spread != null) {
-      let urlSpread = parseInt(url.spread);
-      if (!Number.isNaN(urlSpread)) {
-        //绑定上级
-        userBindParent({
-          spread: urlSpread
-        }).catch(err => {
-
-        }).finally(() => {
-
-        })
-      }
-    }
-
-    setTimeout(() => {
-      this.productCon();
-      this.fetchCompanyDatea();
-
-      switch (this.source) {
-        case "pre":
-          this.getPreInfo();
-          break;
-        case "kill":
-          this.getKillInfo();
-          break;
-        case "day":
-          this.getDayInfo();
-          break;
-      }
-    }, 500)
-  },
-  onShow() {
-    this.getMapData()
-  },
-  watch: {
-    posterImageStatus(status) {
-      if (status) {
-        this.productConClass = "noscroll product-con";
-      } else {
-        this.productConClass = "product-con";
-      }
-    }
-  },
-  methods: {
-    goRoom() {
-      uni.navigateTo({
-        url: `/pkg_common/views/room?id=${this.storeInfo.merId}&name=${this.storeInfo.merName}`
-      })
-    },
-    goodsDetail: function (item) {
-      this.$yrouter.push({
-        path: '/pages/shop/GoodsCon/index',
-        query: {
-          id: item.id
-        }
-      })
-    },
-    async getMapData() {
-      let location = uni.getStorageSync("location");
-
-      if (location.length === 0) {
-        const map = await getLocation();
-        if (map.length > 1) {
-          const {latitude, longitude} = map[1];
-          let address = await getCurAddress(latitude, longitude);
-          address = address[1].data.result.ad_info;
-          location = address.province + address.city + address.district;
-        }
-      }
-
-      this.postAddress = location;
-    },
-    // 获取当前位置经纬度
-    handleLoacation(toast) {
-      let that = this;
-      uni.getLocation({
-        type: 'gcj02',
-        success: async (res) => {
-          // 获取到经纬度后根据实际业务做处理，下面业务逻辑仅供参考
-
-          const map = await getLocation();
-          if (map.length > 1) {
-            const {latitude, longitude} = map[1];
-            let address = await getCurAddress(latitude, longitude);
-            address = address[1].data.result.ad_info;
-            that.postAddress = address.province + address.city + address.district;
-          }
-        },
-        fail: err => {
-          // 判断是否获取到了定位
-          // this.isLocation = false
-
-          // 根据不同需求做了两种类型提示，需要根据实际业务修改
-          if (toast) {
-            // this.$u.toast是用的框架里封装的弹出消息
-            this.$u.toast('您已拒绝授权，相关功能会无法使用！')
-            return
-          }
-          //用户已授权，但是获取地理位置失败，提示用户去系统设置中打开定位
-          uni.showModal({
-            title: '提示',
-            content: '请在系统设置中打开定位服务，重新进入小程序！'
-          })
-        }
-      })
-    },
-    // 定位获取位置信息授权逻辑
-    getAddress() {
-      //wx.getSetting是获取用户授权的信息的，除了应用在位置信息授权还能应用在用户信息授权等等
-      uni.getSetting({
-        success: res => {
-          // true说明已经授权，如果还拿不到定位信息，说明用户的手机没开启定位功能
-          if (res.authSetting['scope.userLocation'] === true) {
-            // console.log('已经授权，非第一次')
-            //授权后默认加载，直接获取定位
-            this.handleLoacation(false)
-          }
-          // scope.userLocation === undefined代表用户未授权且第一次登陆
-          else if (res.authSetting['scope.userLocation'] === undefined) {
-            // 如果用户是第一次登陆且未授权的情况，会直接弹窗请求授权
-            // 使用 getlocation 获取用户 经纬度位置
-            // console.log('第一次登陆且未授权')
-            this.handleLoacation(true)
-          }
-          // 小程序检测到用户不是第一次进入该页面,且未授权
-          else if (res.authSetting['scope.userLocation'] !== undefined && res.authSetting['scope.userLocation'] !== true) {
-            // console.log('不是第一次进入该页面,且未授权')
-            uni.showModal({
-              title: '是否授权当前位置',
-              content: '需要获取您的地理位置，请确认授权，否则无法相关功能！',
-              success: res => {
-                //如果点击取消则显示授权失败
-                if (res.cancel) {
-                  this.$u.toast('您已拒绝授权!')
-                }
-                //如果点击确定会打开授权页请求二次授权
-                else if (res.confirm) {
-                  uni.openSetting({
-                    success: dataAu => {
-                      if (dataAu.authSetting['scope.userLocation'] === true) {
-                        this.$u.toast('授权成功!')
-                        //再次授权，调用getLocationt的API
-                        this.handleLoacation(false)
-                      } else {
-                        // this.isLocation = false
-                        this.$u.toast('授权失败!')
-                      }
-                    }
-                  })
-                }
-              }
-            })
-          }
-        },
-        fail: err => {
-          // this.isLocation = false
-          uni.showModal({
-            title: '提示',
-            content: '未知错误，请重新打开小程序！'
-          })
-        }
-      })
-    },
-    changeExEnd() {
-      if (this.exSliceEnd === 3) {
-        this.exSliceEnd = this.storeInfo.exPropertiesData.length;
-      } else {
-        this.exSliceEnd = 3;
-      }
-    },
-    // v4 预售
-    getPreInfo() {
-      getPreSale(this.activityId).then(({
-                                          data
-                                        }) => {
-        var now = new Date().getTime();
-        var nowStr = formatDateTime(now, 'yyyy-MM-dd');
-        data.surplus = diffDay(nowStr, data.stopTime.substring(0, 10))
-        this.preInfo = data;
-        this.handleAttr(data);
-      }).catch(err => console.warn("err=", err))
-    },
-    // v4 秒杀
-    getKillInfo() {
-      getYxStoreSeckill(this.activityId).then(({
-                                                 data
-                                               }) => {
-        let stopTime = data.storeInfo.stopTime;
-        let stopDate = new Date(stopTime.replace(/-/g, "/"));
-        data.stop = Math.floor(stopDate.getTime() / 1000);
-        this.killInfo = data
-        this.handleAttr(data);
-      }).catch(err => console.warn("err=", err))
-    },
-    // v4 每日特价
-    getDayInfo() {
-      getDailyGoods(this.activityId).then(({
-                                             data
-                                           }) => {
-        let stopTime = data.stopTime;
-        let stopDate = new Date(stopTime.replace(/-/g, "/"));
-        data.stop = Math.floor(stopDate.getTime() / 1000);
-        this.dayInfo = data
-        this.handleAttr(data);
-      }).catch(err => console.warn("err=", err))
-    },
-    // 关联商品规格
-    handleAttr(data) {
-      this.$set(this.attr, "productAttr", data.productAttr);
-      this.$set(this, "productValue", data.productValue);
-      this.DefaultSelect();
-    },
-
-    priceRangeStr: function (prices) {
-      var ret = '';
-      var maxPrice = 0;
-      var minPrice = Object.values(prices)[0].price;
-
-      Object.values(prices).forEach((item) => {
-        minPrice = Math.min(minPrice, item.price);
-        maxPrice = Math.max(maxPrice, item.price);
-      })
-      if (maxPrice >= 0 && minPrice >= 0) {
-        if (maxPrice > minPrice) {
-          ret = minPrice + '-' + maxPrice;
-        } else if (maxPrice == minPrice) {
-          ret = minPrice;
-        }
-      }
-      return ret;
-    },
-    minMaxOtPrice: function (prices) {
-      var maxPrice = Object.values(prices)[0].otPrice;
-      var minPrice = Object.values(prices)[0].otPrice;
-      Object.values(prices).forEach((item) => {
-        minPrice = Math.min(minPrice, item.otPrice);
-        maxPrice = Math.max(maxPrice, item.otPrice);
-      })
-      return {
-        min: minPrice,
-        max: maxPrice
-      }
-    },
-    fetchCompanyDatea: function () {
-      var that = this;
-      getHomeData().then(res => {
-        that.buyNotice = res.data.buyNotice.replace(
-            /\<img/gi,
-            '<img style="max-width:100%;height:auto;"'
-        );
-      });
-    },
-    force2Decimal(v) {
-      return this.$force2Decimal(v);
-    },
-    toggleProductInfo() {
-      this.isProductInfoExpand = !this.isProductInfoExpand;
-    },
-    toHome() {
-      this.$yrouter.switchTab("/pages/home/index");
-    },
-    goShoppingCart() {
-      this.$yrouter.switchTab("/pages/cart");
-    },
-    goCustomerList() {
-      this.$yrouter.push({
-        path: "/pages/user/CustomerList/index"
-      });
-    },
-    goStoreList() {
-      this.$yrouter.push({
-        path: "/pages/shop/StoreList/index"
-      });
-    },
-    goEvaluateList(id) {
-      this.$yrouter.push({
-        path: "/pages/shop/EvaluateList/index",
-        query: {
-          id
-        }
-      });
-    },
-    // 2022/9/28 add
-    goStore() {
-      let path = this.isWenwan === 0 ? "/pagesInn/inn/innHome" : "/wenwan/views/store";
-      this.$yrouter.push({
-        path,
-        query: {
-          id: this.systemStore.id
-        }
-      });
-    },
-    showChang: function (data) {
-      this.$yrouter.push({
-        path: "/pages/map/index",
-        query: data
-      });
-    },
-    setShareInfoStatus: function () {
-      this.shareInfoStatus = !this.shareInfoStatus;
-      this.posters = false;
-    },
-    shareCode: function () {
-      var that = this;
-      getProductCode(that.id).then(res => {
-        that.posterData.code = res.data.code;
-        that.listenerActionSheet();
-      });
-    },
-    setPosterImageStatus: function () {
-      this.posterImageStatus = !this.posterImageStatus;
-      this.posters = false;
-    },
-    //产品详情接口；
-    productCon: function () {
-      let that = this;
-      let from = this.location;
-      if (this.$deviceType == "app") {
-        from.from = "app";
-      }
-      if (that.source === 'kill') {
-        from.seckillId = that.activityId
-      }
-
-      uni.showLoading({
-        title: "加载中",
-        mask: true
-      });
-      getProductDetail(that.id, from)
-          .then(res => {
-            // 会造成两个style属性，并且生效的是后一个
-            // res.data.storeInfo.description = res.data.storeInfo.description.replace(
-            //     /\<img/gi,
-            //     '<img style="display:block;max-width:100%;height:auto;"'
-            // );
-            if (res.data.storeInfo.description) {
-              console.log(res.data.storeInfo.description)
-              res.data.storeInfo.description = formatContent(res.data.storeInfo.description)
-            }
-            that.$set(that, "storeInfo", res.data.storeInfo);
-            that.isWenwan = res.data.isWenwan;
-
-            // 给 attr 赋值，将请求回来的规格赋值给 attr
-            if (this.source === "" || this.source === 'famous') {
-              that.$set(that.attr, "productAttr", res.data.productAttr);
-              that.$set(that, "productValue", res.data.productValue);
-            }
-            that.attr.defaultSku = res.data.defaultSku
-            that.attr.defaultSkuIndex = res.data.defaultSkuIndex
-
-            res.data.couponList['unusable']?.map(item => item.status = 2)
-            that.$set(that, 'couponList', res.data.couponList)
-            that.$set(that, "replyCount", res.data.replyCount);
-            that.$set(that, "replyChance", res.data.replyChance);
-            that.reply = res.data.reply ? [res.data.reply] : [];
-            that.$set(that, "reply", that.reply);
-            that.$set(that, "priceName", res.data.priceName);
-            that.$set(that, "tempName", res.data.tempName);
-            that.$set(that, "merBestProducts", res.data.merBestProducts);
-            that.posterData.image = that.storeInfo.image;
-            if (that.storeInfo.storeName.length > 30) {
-              that.posterData.title =
-                  that.storeInfo.storeName.substring(0, 30) + "...";
-            } else {
-              that.posterData.title = that.storeInfo.storeName;
-            }
-            that.posterData.price = that.storeInfo.price;
-            that.posterData.code = that.storeInfo.codeBase;
-            that.systemStore = res.data.systemStore;
-            let good_list = res.data.goodList || [];
-            let goodArray = [];
-            let count = Math.ceil(good_list.length / 6);
-            for (let i = 0; i < count; i++) {
-              var list = good_list.slice(i * 6, 6);
-              if (list.length)
-                goodArray.push({
-                  list: list
-                });
-            }
-            that.mapKay = res.data.mapKay;
-            that.$set(that, "goodList", goodArray);
-            that.DefaultSelect();
-            that.getCartCount();
-
-            //动态配置share
-            that.$set(that, "share", {
-              title: that.storeInfo.storeName,
-              path: '/pages/shop/GoodsCon/index?id=' + that.id,
-              imageUrl: that.storeInfo.image,
-              desc: '',
-              content: ''
-            });
-
-          })
-          .catch(err => {
-            uni.showToast({
-              title: err.msg || err.response.data.msg || err.response.data.message,
-              icon: "none",
-              duration: 2000
-            });
-          })
-          .finally(() => {
-            uni.hideLoading();
-          });
-    },
-    //默认选中属性；
-    DefaultSelect: function () {
-      let productAttr = this.attr.productAttr;
-      let value = [];
-      for (let i = 0; i < productAttr.length; i++) {
-        this.$set(productAttr[i], "index", this.attr.defaultSkuIndex[i]);
-        value.push(productAttr[i].attrValueArr[1]);
-      }
-      //sort();排序函数:数字-英文-汉字；
-      // let productSelect = this.productValue[value.sort().join(",")];
-
-      const skuKey = this.attr.defaultSku?.join(',')
-      let productSelect = this.productValue[skuKey]
-      if (productSelect && productAttr.length) {
-        this.$set(
-            this.attr.productSelect,
-            "store_name",
-            this.storeInfo.storeName
-        );
-        this.$set(this.attr.productSelect, "image", productSelect.image);
-        this.$set(this.attr.productSelect, "price", productSelect.price);
-        this.$set(this.attr.productSelect, "otPrice", productSelect.otPrice);
-        this.$set(this.attr.productSelect, "stock", productSelect.stock);
-        this.$set(this.attr.productSelect, "unique", productSelect.unique);
-        this.$set(this.attr.productSelect, "cart_num", 1);
-        // this.$set(this, "attrValue", value.sort().join(","));
-        this.$set(this, "attrValue", skuKey);
-        this.$set(this, "attrTxt", "已选择");
-      } else if (!productSelect && productAttr.length) {
-        this.$set(
-            this.attr.productSelect,
-            "store_name",
-            this.storeInfo.storeName
-        );
-        this.$set(this.attr.productSelect, "image", this.storeInfo.image);
-        this.$set(this.attr.productSelect, "price", this.storeInfo.price);
-        this.$set(this.attr.productSelect, "otPrice", this.storeInfo.otPrice);
-        this.$set(this.attr.productSelect, "stock", 0);
-        this.$set(this.attr.productSelect, "unique", "");
-        this.$set(this.attr.productSelect, "cart_num", 0);
-        this.$set(this, "attrValue", "");
-        this.$set(this, "attrTxt", "请选择");
-      } else if (!productSelect && !productAttr.length) {
-        this.$set(
-            this.attr.productSelect,
-            "store_name",
-            this.storeInfo.storeName
-        );
-        this.$set(this.attr.productSelect, "image", this.storeInfo.image);
-        this.$set(this.attr.productSelect, "price", this.storeInfo.price);
-        this.$set(this.attr.productSelect, "otPrice", this.storeInfo.otPrice);
-        this.$set(this.attr.productSelect, "stock", this.storeInfo.stock);
-        this.$set(
-            this.attr.productSelect,
-            "unique",
-            this.storeInfo.unique || ""
-        );
-        this.$set(this.attr.productSelect, "cart_num", 1);
-        this.$set(this, "attrValue", "");
-        this.$set(this, "attrTxt", "请选择");
-      }
-    },
-    //购物车；
-    ChangeCartNum: function (changeValue) {
-      //changeValue:是否 加|减
-      //获取当前变动属性
-      let productSelect = this.productValue[this.attrValue];
-      //如果没有属性,赋值给商品默认库存
-      if (productSelect === undefined && !this.attr.productAttr.length) {
-        productSelect = this.attr.productSelect;
-      }
-      //无属性值即库存为0；不存在加减；
-      if (productSelect === undefined) return;
-      let stock = productSelect.stock || 0;
-      let num = this.attr.productSelect;
-      if (changeValue) {
-        num.cart_num++;
-        if (num.cart_num > stock) {
-          this.$set(this.attr.productSelect, "cart_num", stock);
-          this.$set(this, "cart_num", stock);
-        } else {
-          this.$set(this.attr.productSelect, "cart_num", num.cart_num);
-          this.$set(this, "cart_num", num.cart_num);
-        }
-      } else {
-        num.cart_num--;
-        if (num.cart_num < 1) {
-          this.$set(this.attr.productSelect, "cart_num", 1);
-          this.$set(this, "cart_num", 1);
-        } else {
-          this.$set(this.attr.productSelect, "cart_num", num.cart_num);
-          this.$set(this, "cart_num", num.cart_num);
-        }
-      }
-    },
-    //将父级向子集多次传送的函数合二为一；
-    changeFun: function (opt) {
-      if (typeof opt !== "object") opt = {};
-      let action = opt.action || "";
-      let value = opt.value === undefined ? "" : opt.value;
-      this[action] && this[action](value);
-    },
-
-    //打开属性插件；
-    selecAttrTap: function () {
-      this.attr.cartAttr = true;
-      this.isOpen = true;
-    },
-    changeattr: function (msg) {
-
-      // 修改了规格
-      this.attr.cartAttr = msg;
-      this.isOpen = false;
-    },
-    //选择属性；
-    ChangeAttr: function (res) {
-      // 修改了规格
-      let productSelect = this.productValue[res.value];
-      if (productSelect) {
-        this.attr.productAttr[res.indexw].index = res.indexn;
-        this.$set(this.attr.productSelect, "image", productSelect.image);
-        this.$set(this.attr.productSelect, "price", productSelect.price);
-        this.$set(this.attr.productSelect, "otPrice", productSelect.otPrice);
-        this.$set(this.attr.productSelect, "stock", productSelect.stock);
-        this.$set(this.attr.productSelect, "unique", productSelect.unique);
-        this.$set(this.attr.productSelect, "cart_num", 1);
-        this.$set(this, "attrValue", res.value);
-        this.$set(this, "attrTxt", "已选择");
-      } else {
-        this.$set(this.attr.productSelect, "image", this.storeInfo.image);
-        this.$set(this.attr.productSelect, "price", this.storeInfo.price);
-        this.$set(this.attr.productSelect, "otPrice", this.storeInfo.otPrice);
-        this.$set(this.attr.productSelect, "stock", 0);
-        this.$set(this.attr.productSelect, "unique", "");
-        this.$set(this.attr.productSelect, "cart_num", 0);
-        this.$set(this, "attrValue", "");
-        this.$set(this, "attrTxt", "请选择");
-      }
-    },
-    //  点击加入购物车按钮
-    joinCart: function () {
-      if (this.isOpen === true && this.attr.productSelect.stock === 0) return;
-      //0=加入购物车
-      this.goCat(0);
-    },
-    //立即购买；
-    tapBuy: function () {
-      if (this.isOpen === true && this.attr.productSelect.stock === 0) return;
-      //  1=直接购买
-      this.goCat(1);
-    },
-    // 加入购物车；
-    goCat: function (news) {
-      let that = this,
-          productSelect = that.productValue[this.attrValue];
-      //打开属性
-      if (that.attrValue) {
-        //默认选中了属性，但是没有打开过属性弹窗还是自动打开让用户查看默认选中的属性
-        that.attr.cartAttr = !that.isOpen ? true : false;
-      } else {
-        if (that.isOpen) that.attr.cartAttr = true;
-        else that.attr.cartAttr = !that.attr.cartAttr;
-      }
-
-      //只有关闭属性弹窗时进行加入购物车
-      if (that.attr.cartAttr === true && that.isOpen === false) {
-        return (that.isOpen = true);
-      }
-
-      //如果有属性,没有选择,提示用户选择
-      if (
-          (that.attr.productAttr.length &&
-              productSelect === undefined &&
-              that.isOpen === true) || productSelect.stock === 0
-      ) {
-        uni.showToast({
-          title: "产品库存不足，请选择其他商品",
-          icon: "none",
-          duration: 5000
-        });
-        return;
-      }
-
-      let q = {
-        productId: that.id,
-        cartNum: that.attr.productSelect.cart_num,
-        new: news,
-        uniqueId: that.attr.productSelect !== undefined ?
-            that.attr.productSelect.unique : ""
-      };
-
-      // v4 新增活动ID
-      switch (this.source) {
-        case "pre":
-          q.preSaleId = Number(this.activityId)
-          break;
-        case "kill":
-          q.secKillId = Number(this.activityId)
-          break;
-        case "day":
-          q.dailyGoodsId = Number(this.activityId)
-          break;
-      }
-
-      postCartAdd(q)
-          .then(function (res) {
-            that.isOpen = false;
-            that.attr.cartAttr = false;
-            if (news) {
-              that.$yrouter.push({
-                path: "/pages/order/OrderSubmission/index",
-                query: {
-                  id: res.data.cartId
-                }
-              });
-            } else {
-              uni.showToast({
-                title: "添加购物车成功",
-                icon: "success",
-                duration: 2000,
-                complete: () => {
-                  that.getCartCount(true);
-                }
-              });
-            }
-          })
-          .catch(error => {
-            that.isOpen = false;
-            uni.showToast({
-              title: error.msg,
-              icon: "none",
-              duration: 5000
-            });
-          });
-    },
-    //获取购物车数量
-    getCartCount: function (isAnima) {
-      let that = this;
-      const isLogin = that.isLogin;
-      if (isLogin) {
-        getCartCount({
-          numType: 0
-        }).then(res => {
-          that.CartCount = res.data.count;
-          //加入购物车后重置属性
-          if (isAnima) {
-            that.animated = true;
-            setTimeout(function () {
-              that.animated = false;
-            }, 500);
-          }
-        });
-      }
-    },
-    listenerActionSheet: function () {
-      if (isWeixin() === true) {
-        this.weixinStatus = true;
-      }
-      this.posters = true;
-    },
-    listenerActionClose: function () {
-      this.posters = false;
-    },
-    // v9-2
-    changeCoupons() {
-      this.show = !this.show
-    },
-  }
-};
-</script>
-
-<style scoped lang="less">
-@import "@/assets/css/goods.less";
-// wenwan add
-.bg-white {
-  background-color: white;
-}
-
-.wenwan-info {
-  margin: 0 32rpx;
-  padding: 16rpx 0 24rpx;
-  border-top: 1rpx solid #F0F0F0;
-  color: #666666;
-  font-size: 24rpx;
-  line-height: 36rpx;
-}
-
-.shop-info {
-  margin-top: 24rpx;
-  padding: 26rpx 32rpx 32rpx;
-  background-color: #fff;
-  font-size: 24rpx;
-  line-height: 34rpx;
-
-  .title {
-    margin-bottom: 20rpx;
-    padding-bottom: 16rpx;
-    border-bottom: 1rpx solid #F0F0F0;
-  }
-
-  .icon-shop {
-    width: 32rpx;
-    height: 32rpx;
-    margin-right: 10rpx;
-  }
-
-  .tip {
-    color: #666666;
-  }
-
-  .cover {
-    width: 80rpx;
-    height: 80rpx;
-    border-radius: 8rpx;
-    margin-right: 16rpx;
-  }
-
-  .name {
-    color: #333333;
-    font-weight: bold;
-  }
-
-  .distance {
-    color: #0DC5C5;
-    font-size: 20rpx;
-    line-height: 30rpx;
-  }
-
-  .address {
-    width: 520rpx;
-    color: #999999;
-    font-size: 20rpx;
-    line-height: 30rpx;
-  }
-
-  .icon-pos {
-    width: 24rpx;
-    height: 24rpx;
-  }
-}
-
-// v4 add
-.spe-section {
-  .spe-line-1 {
-    padding: 20rpx 0;
-    font-size: 32rpx;
-    line-height: 48rpx;
-    color: #333333;
-
-    .icon-spe {
-      width: 66rpx;
-      height: 38rpx;
-      margin-right: 10rpx;
-    }
-  }
-
-  .spe-line-2 {
-    .price {
-      font-size: 32rpx;
-      line-height: 48rpx;
-      color: #FF564A;
-    }
-
-    .vip-price-tag {
-      margin-left: 30rpx;
-    }
-  }
-}
-
-.pre-section {
-  .pre-line-1 {
-    padding: 20rpx 0;
-
-    .surplus {
-      height: 40rpx;
-      line-height: 40rpx;
-      margin-right: 10rpx;
-      box-sizing: border-box;
-      border: 1rpx solid #FD685D;
-      font-size: 24rpx;
-
-      .red-grid {
-        width: 58rpx;
-        background: #FD685D;
-        color: #fff;
-        font-size: 22rpx;
-      }
-
-      .white-grid {
-        padding: 0 10rpx;
-        color: #333;
-      }
-    }
-  }
-
-  .pre-line-2 {
-    .label-vip {
-      width: 40rpx;
-      height: 24rpx;
-      margin-right: 6rpx;
-    }
-
-    .price {
-      font-size: 32rpx;
-      line-height: 48rpx;
-      color: #FF564A;
-    }
-
-    .date-box {
-      box-sizing: border-box;
-      margin-left: 20rpx;
-      padding-left: 14rpx;
-      border-left: 2rpx solid #DBDBDB;
-      font-size: 24rpx;
-      line-height: 1;
-
-      .post-grid {
-        color: #ED0F0F;
-      }
-
-      .stop-grid {
-        margin-left: 10rpx;
-        color: #999;
-      }
-    }
-  }
-}
-
-.kill-section {
-  .kill-line-1 {
-    padding: 20rpx 0;
-    font-size: 32rpx;
-    line-height: 48rpx;
-    color: #333333;
-  }
-
-  .kill-line-2 {
-    .label-vip {
-      width: 40rpx;
-      height: 24rpx;
-      margin-right: 6rpx;
-    }
-
-    .price {
-      font-size: 32rpx;
-      line-height: 48rpx;
-      color: #FF564A;
-    }
-
-    .count-box {
-      margin-left: 70rpx;
-      line-height: 38rpx;
-      color: #ED0F0F;
-      font-size: 26rpx;
-
-      .gray {
-        color: #333;
-        font-size: 22rpx;
-      }
-    }
-  }
-}
-
-.day-section {
-  .day-line-1 {
-    padding: 20rpx 0;
-    font-size: 32rpx;
-    line-height: 48rpx;
-    color: #333333;
-
-    .icon-day {
-      width: 96rpx;
-      height: 38rpx;
-      margin-right: 10rpx;
-    }
-  }
-
-  .day-line-2 {
-    .label-vip {
-      width: 40rpx;
-      height: 24rpx;
-      margin-right: 6rpx;
-    }
-
-    .price {
-      font-size: 32rpx;
-      line-height: 48rpx;
-      color: #FF564A;
-    }
-
-    .count-box {
-      margin-left: 70rpx;
-      line-height: 49rpx;
-      color: #FD685D;
-      font-size: 28rpx;
-    }
-  }
-}
-
-.geoPage {
-  position: fixed;
-  width: 100%;
-  height: 100%;
-  top: 0;
-  z-index: 10000;
-}
-
-.vline {
-  width: 0px !important;
-  height: 36rpx;
-  position: absolute;
-  border-left: 1px solid rgba(255, 255, 255, 0.6);
-  top: 20rpx;
-  left: 50%;
-}
-
-.product-con .footer .bnt {
-  position: relative;
-  background: linear-gradient(139deg, rgba(255, 149, 141, 1) 0%, rgba(255, 92, 138, 1) 100%);
-  border-radius: 50rpx;
-
-  .btn-car {
-    width: 200rpx;
-    height: 60rpx;
-    line-height: 60rpx;
-    box-sizing: border-box;
-    margin-right: 20rpx;
-    border: 2rpx solid #FF564A;
-    border-radius: 30rpx;
-    color: #FF564A;
-  }
-
-  .btn-car-disabled {
-    border: 2rpx solid #D0D0D0;
-    color: #D0D0D0;
-  }
-
-  .btn-buy {
-    width: 200rpx;
-    height: 60rpx;
-    line-height: 60rpx;
-    border-radius: 30rpx;
-    background: #FF564A;
-    color: #FFFFFF;
-  }
-
-  .btn-buy-disabled {
-    background: #D0D0D0;
-  }
-}
-
-.cus-btn {
-  width: 100%;
-  height: 100%;
-  position: absolute;
-  top: 0;
-  right: 0;
-  background-color: transparent !important;
-}
-
-.cus-btn:hover {
-  color: transparent !important;
-  background-color: transparent !important;
-}
-
-.cus-btn::after {
-  border: none !important;
-  background-color: transparent !important;
-}
-
-.pink-dot {
-  width: 24rpx;
-  height: 24rpx;
-  background: rgba(255, 86, 74, 0.4);
-  border-radius: 50%;
-  position: absolute;
-  z-index: 0;
-  bottom: 24rpx;
-  right: -12rpx;
-}
-
-.vip-price-tag {
-
-  font-size: 12*2rpx;
-  color: #0DC5C5;
-  border: 1px solid #0DC5C5;
-  border-radius: 2*2rpx;
-  padding: 0.02rem 0.08rem 0.02rem 0.08rem;
-  margin-left: 0.24rem;
-
-}
-
-.product-con .product-intro .conter {
-  background-color: #fff;
-  width: auto;
-}
-
-.product-con .wrapper {
-  position: relative;
-  background-color: #F6F6F6;
-  z-index: 1;
-  border-radius: 12rpx;
-}
-
-.product-con .store-info {
-  margin-top: 0.2 * 100rpx;
-  background-color: #fff;
-}
-
-.product-con .store-info .title {
-  padding: 0 0.3 * 100rpx;
-  font-size: 0.28 * 100rpx;
-  color: #282828;
-  height: 0.8 * 100rpx;
-  line-height: 0.8 * 100rpx;
-  border-bottom: 0.01 * 100rpx solid #f5f5f5;
-}
-
-.product-con .store-info .info {
-  padding: 0 0.3 * 100rpx;
-  height: 1.26 * 100rpx;
-}
-
-.product-con .store-info .info .picTxt {
-  width: 100%;
-  display: flex;
-  align-items: center;
-}
-
-.product-con .store-info .info .picTxt .pictrue {
-  width: 0.76 * 100rpx;
-  height: 0.76 * 100rpx;
-  margin-right: 0.2 * 100rpx;
-}
-
-.product-con .store-info .info .picTxt .pictrue image {
-  width: 100%;
-  height: 100%;
-  border-radius: 0.06 * 100rpx;
-}
-
-.product-con .store-info .info .picTxt .text {
-  flex: 1;
-}
-
-.product-con .store-info .info .picTxt .text .name {
-  font-size: 0.3 * 100rpx;
-  color: #282828;
-}
-
-.product-con .store-info .info .picTxt .text .address {
-  font-size: 0.24 * 100rpx;
-  color: #666;
-  margin-top: 0.03 * 100rpx;
-}
-
-.product-con .store-info .info .picTxt .text .address .iconfont {
-  color: #707070;
-  font-size: 0.18 * 100rpx;
-  margin-left: 0.1 * 100rpx;
-}
-
-.product-con .store-info .info .picTxt .addressBox {
-  display: flex;
-  flex-direction: column;
-  align-items: flex-end;
-}
-
-.product-con .store-info .info .picTxt .addressBox .iconfont {
-  font-size: 0.4 * 100rpx;
-}
-
-.product-con .store-info .info .picTxt .addressBox .addressTxt {
-  font-size: 0.24 * 100rpx;
-  color: #eb3729;
-}
-
-.product-con .store-info .praise {
-  font-size: 0.28 * 100rpx;
-  color: #808080;
-}
-
-.product-con .store-info .praise .iconfont {
-  font-size: 0.28 * 100rpx;
-}
-
-.product-con .superior {
-  background-color: #fff;
-  margin-top: 0.2 * 100rpx;
-}
-
-.product-con .superior .title {
-  height: 0.98 * 100rpx;
-}
-
-.product-con .superior .title image {
-  width: 0.3 * 100rpx;
-  height: 0.3 * 100rpx;
-}
-
-.product-con .superior .title .titleTxt {
-  margin: 0 0.2 * 100rpx;
-  font-size: 0.3 * 100rpx;
-  background-image: linear-gradient(to right, #f57a37 0%, #f21b07 100%);
-  background-image: -webkit-linear-gradient(to right, #f57a37 0%, #f21b07 100%);
-  background-image: -moz-linear-gradient(to right, #f57a37 0%, #f21b07 100%);
-  -webkit-background-clip: text;
-  -webkit-text-fill-color: transparent;
-}
-
-.product-con .superior .slider-banner {
-  width: 6.9 * 100rpx;
-  margin: 0 auto;
-  padding-bottom: 0.2 * 100rpx;
-}
-
-.product-con .superior .slider-banner .list {
-  width: 100%;
-  padding-bottom: 0.2 * 100rpx;
-}
-
-.product-con .superior .slider-banner .list .item {
-  width: 2.15 * 100rpx;
-  margin: 0 0.22 * 100rpx 0.3 * 100rpx 0;
-  font-size: 0.26 * 100rpx;
-}
-
-.product-con .superior .slider-banner .list .item:nth-of-type(3n) {
-  margin-right: 0;
-}
-
-.product-con .superior .slider-banner .list .item .pictrue {
-  width: 100%;
-  height: 2.15 * 100rpx;
-}
-
-.product-con .superior .slider-banner .list .item .pictrue image {
-  width: 100%;
-  height: 100%;
-  border-radius: 0.06 * 100rpx;
-}
-
-.product-con .superior .slider-banner .list .item .name {
-  color: #282828;
-  margin-top: 0.12 * 100rpx;
-}
-
-.product-con .superior .slider-banner .swiper-pagination-bullet {
-  background-color: #999;
-}
-
-.product-con .superior .slider-banner .swiper-pagination-bullet-active {
-  background-color: #e93323;
-}
-
-.mask {
-  -webkit-filter: blur(2px);
-  -moz-filter: blur(2px);
-  -ms-filter: blur(2px);
-  filter: blur(2px);
-}
-
-.footer .icon-shoucang1 {
-  color: #eb3729;
-}
-
-.product-con .product-intro .conter view {
-  width: 100% !important;
-}
-
-.product-con .footer .item .iconfont.icon-gouwuche1 .num {
-  right: -15rpx !important;
-}
-
-.generate-posters {
-  width: 100%;
-  height: 1.7 * 100rpx;
-  background-color: #fff;
-  position: fixed;
-  left: 0;
-  bottom: 0;
-  z-index: 99;
-  transform: translate3d(0, 100%, 0);
-  -webkit-transform: translate3d(0, 100%, 0);
-  -ms-transform: translate3d(0, 100%, 0);
-  -moz-transform: translate3d(0, 100%, 0);
-  -o-transform: translate3d(0, 100%, 0);
-  transition: all 0.3s cubic-bezier(0.25, 0.5, 0.5, 0.9);
-  -webkit-transition: all 0.3s cubic-bezier(0.25, 0.5, 0.5, 0.9);
-  -moz-transition: all 0.3s cubic-bezier(0.25, 0.5, 0.5, 0.9);
-  -o-transition: all 0.3s cubic-bezier(0.25, 0.5, 0.5, 0.9);
-}
-
-.generate-posters.on {
-  transform: translate3d(0, 0, 0);
-  -webkit-transform: translate3d(0, 0, 0);
-  -ms-transform: translate3d(0, 0, 0);
-  -moz-transform: translate3d(0, 0, 0);
-  -o-transform: translate3d(0, 0, 0);
-}
-
-.generate-posters .item {
-  flex: 50%;
-  -webkit-flex: 50%;
-  -ms-flex: 50%;
-  text-align: center;
-}
-
-.generate-posters .item .iconfont {
-  font-size: 0.8 * 100rpx;
-  color: #5eae72;
-}
-
-.generate-posters .item .iconfont.icon-haibao {
-  color: #5391f1;
-}
-
-.noscroll {
-  height: 100%;
-  overflow: hidden;
-}
-
-.goods-detail-title {
-  margin-left: 32rpx;
-  font-size: 32rpx;
-  color: #080F1A;
-  font-weight: bold;
-}
-
-.product-info {
-  margin: 32rpx;
-  padding-top: 40rpx;
-  padding-bottom: 40rpx;
-  background-color: #fff;
-  border-radius: 12rpx;
-
-}
-
-.product-info-item {
-  padding-top: 20rpx;
-  padding-bottom: 20rpx;
-  border-bottom: 1px solid #EBECF0;
-  flex-wrap: nowrap;
-}
-
-.product-item-title {
-  color: #8B8F99;
-  font-size: 28rpx;
-  margin-left: 40rpx;
-  flex-shrink: 0;
-  margin-right: 40rpx;
-}
-
-.product-item-value {
-  color: #080F1A;
-  font-size: 28rpx;
-  margin-right: 40rpx;
-}
-</style>
diff --git a/pages/user/User/index.vue b/pages/user/User/index.vue
index f9e4966..faaed09 100644
--- a/pages/user/User/index.vue
+++ b/pages/user/User/index.vue
@@ -84,12 +84,12 @@
       </view>
       <view class="my-wrapper wrapper">
         <view class="myOrder">
-          <view class="title acea-row row-between-wrapper">
+          <view class="title acea-row row-between-wrapper" @click="goMyOrder(0)">
             <view class="acea-row row-middle">
               <text class="line"></text>
               <text>我的订单</text>
             </view>
-            <text @click="goMyOrder(0)" class="allOrder">
+            <text class="allOrder">
               <text class="iconfont icon-jiantou"></text>
             </text>
           </view>
@@ -206,6 +206,7 @@
             :src="bannerBgUrl"
             mode="widthFix"
             class="bg"
+            @click="bannerClickHandle"
           />
         </view>
       </view>
@@ -316,9 +317,10 @@ export default {
         },
         {
           text: '帮助中心',
-          url: '/pages/user/Message/Message',
+          url: '',
           icon: '/icon/icon-help.png',
-          allowEnter: true
+          allowEnter: true,
+          showTip: true
         },
         {
           text: '设置中心',
@@ -327,7 +329,8 @@ export default {
           allowEnter: true
         }
       ],
-      bannerBgUrl: ''
+      bannerBgUrl: '',
+      userCenterBannerUrl: ''
     }
   },
   computed: mapGetters(['userInfo']),
@@ -435,6 +438,7 @@ export default {
         if (success) {
           if (data.userCenterBanner) {
             this.bannerBgUrl = data.userCenterBanner
+            this.userCenterBannerUrl = data.userCenterBannerUrl || ''
           }
         }
       })
@@ -468,6 +472,12 @@ export default {
     },
     toolItemClickHandle(item) {
       const url = item.url
+      if (item.showTip) {
+        this.$dialog.toast({
+          mes: '暂未开放'
+        })
+        return
+      }
       if (!url || !item.allowEnter) {
         return
       }
@@ -478,6 +488,12 @@ export default {
         return
       }
       uni.navigateTo({ url })
+    },
+    bannerClickHandle() {
+      if (!this.userCenterBannerUrl) {
+        return
+      }
+      this.linkTo(this.userCenterBannerUrl)
     }
   }
 }
@@ -627,6 +643,7 @@ export default {
         .qrcode {
           display: flex;
           align-items: center;
+          width: 160rpx;
           padding: 10rpx 16rpx;
           border: 1rpx solid #FFFBD3;
           border-radius: 8rpx;
diff --git a/pagesInn/components/jin-edit/jin-edit.vue b/pagesInn/components/jin-edit/jin-edit.vue
index c435769..a3bcc47 100644
--- a/pagesInn/components/jin-edit/jin-edit.vue
+++ b/pagesInn/components/jin-edit/jin-edit.vue
@@ -1,17 +1,19 @@
 <template>
 	<view class="container" :style="{height: height}"> 
 		<editor
+			ref="editot"
+			id="editor"
 			class="ql-container"
 			:placeholder="placeholder"
 			:show-img-size="true"
 			:show-img-toolbar="true"
 			:show-img-resize="true"
+			:read-only="readOnly"
+          	placeholder-style="font-size:24rpx;color:#C2C5CC;"
 			@ready="onEditorReady"
-			id="editor"
 			@statuschange="statuschange"
 			@focus="editFocus" 
 			@blur="editBlur"
-			ref="editot"
 		></editor>   
 		<!-- 操作工具 -->
 		<view class="tool-view" > 
@@ -36,7 +38,7 @@
 				</view>
 			</view>
 			<view class="tool">
-				<!-- <jinIcon class="single" type="&#xe6f3;" title="图片" @click="insertImage"></jinIcon> -->
+				<jinIcon class="single" type="&#xe6f3;" title="图片" @click="insertImage"></jinIcon>
 				<jinIcon class="single" type="&#xe6f9;" title="格式" @click="showMore" :color="showMoreTool ? activeColor : '#666666'"></jinIcon>
 				<jinIcon class="single" type="&#xe6eb;" title="分割线" @click="insertDivider"></jinIcon>
 				<jinIcon class="single" type="&#xe6e8;" title="撤回" @click="undo"></jinIcon>
@@ -49,8 +51,15 @@
 
 <script>
 import jinIcon from './jin-icons.vue';
+import {
+  chooseImage
+} from '@/utils'
 export default {
 	props: {
+		readOnly: {
+			type: Boolean,
+			default: false
+		},
 		// 点击图片时显示图片大小控件
 		showImgSize: {
 			type: Boolean,
@@ -127,14 +136,32 @@ export default {
 				},res => {
 					this.editorCtx = res.context;
 					this.editorCtx.setContents({
-						html: this.html
+						html: this.html,
+						success: () => {
+							this.editorCtx.blur()
+						}
 					})
+					setTimeout(() => {
+						uni.pageScrollTo({
+							scrollTop: 0,
+							duration: 0
+						})
+					}, 500)
 				})
 				.exec();
 		},
 		undo() {
 			this.editorCtx.undo();
 		},
+		insertImage() {
+			const _this = this
+			chooseImage((path) => {
+				_this.editorCtx.insertImage({
+					src: path,
+					alt: '图片'
+				})
+			})
+		},
 		/// 插入分割线
 		insertDivider() {
 			this.editorCtx.insertDivider();
@@ -238,7 +265,7 @@ export default {
 
 .ql-container {
 	line-height: 150%;
-	font-size: 22rpx;
+	font-size: 28rpx;
 	width: 100%;
 	height: 240px;
 	background: #fff;
diff --git a/pagesInn/components/jin-edit/jin-icons.vue b/pagesInn/components/jin-edit/jin-icons.vue
index 223ff10..0d35516 100644
--- a/pagesInn/components/jin-edit/jin-icons.vue
+++ b/pagesInn/components/jin-edit/jin-icons.vue
@@ -23,7 +23,7 @@
 			},
 			fontSize: {
 				type: String,
-				default: '32rpx'
+				default: '36rpx'
 			},
 			title: {
 				type: String,
@@ -53,7 +53,7 @@
 		bottom: 0;
 		width: 100%;
 		text-align: center;
-		font-size: 8px;
+		font-size: 12px;
 		color: #666;
 		line-height: 8px;
 		transform: translateY(-8px);
diff --git a/pagesInn/inn/innHome.vue b/pagesInn/inn/innHome.vue
index 6878809..64e9480 100644
--- a/pagesInn/inn/innHome.vue
+++ b/pagesInn/inn/innHome.vue
@@ -29,8 +29,8 @@
           <video
             :src="inn.cover"
             :autoplay="true"
-            :controls="false"
-            :loop="true"
+            :controls="true"
+            :loop="false"
             object-fit="contain"
             play-btn-position="center"
             class="video"
@@ -149,147 +149,169 @@
       <view :class="isMyInn ? 'my-inn-page' : ''">
         <!-- v4 商品列表 -->
         <view v-if="activeIndex === 0" class="goods-section">
-          <view class="flex flex-wrap">
-            <view
-              v-for="(item,index) in goodsList"
-              :key="index"
-              class="item"
-              @click="goGoodsConByID(item)"
-            >
-              <image
-                :src="item.image"
-                class="cover"
-              />
-              <view class="">
-                <view class="name more-t">{{ item.storeName }}</view>
-                <view class="price-line flex ai-center">
+          <view v-if="isLoadGoodListoSuccess">
+            <view v-if="goodsList.length > 0">
+              <view class="flex flex-wrap">
+                <view
+                  v-for="(item,index) in goodsList"
+                  :key="index"
+                  class="item"
+                  @click="goGoodsConByID(item)"
+                >
                   <image
-                    :src="webUrl + '/20221118104357701129.png'"
-                    class="label"
-                    mode="scaleToFill"
+                    :src="item.image"
+                    class="cover"
                   />
-                  <text>￥{{ item.price }}</text>
+                  <view class="">
+                    <view class="name more-t">{{ item.storeName }}</view>
+                    <view class="price-line flex ai-center">
+                      <image
+                        :src="webUrl + '/20221118104357701129.png'"
+                        class="label"
+                        mode="scaleToFill"
+                      />
+                      <text>￥{{ item.price }}</text>
+                    </view>
+                  </view>
+                  <view class="sales-line flex ai-center">
+                    <image
+                      :src="webUrl + '/20221118092713277343.png'"
+                      class="icon"
+                      mode="scaleToFill"
+                    />
+                    <text>{{ item.sales }}人已购买</text>
+                  </view>
                 </view>
               </view>
-              <view class="sales-line flex ai-center">
-                <image
-                  :src="webUrl + '/20221118092713277343.png'"
-                  class="icon"
-                  mode="scaleToFill"
-                />
-                <text>{{ item.sales }}人已购买</text>
+              <view class="btn">
+                <view class="btn-cont" @click="viewAllGoodHandle">
+                  查看所有商品
+                  <text class="iconfont icon-jiantou"></text>
+                </view>
               </view>
             </view>
-          </view>
-          <view v-show="goodsList.length > 0" class="btn">
-            <view class="btn-cont" @click="viewAllGoodHandle">
-              查看所有商品
-              <text class="iconfont icon-jiantou"></text>
+            <view v-else class="tab-no-data">
+              店主还没有上传内容哦~
             </view>
           </view>
+          <goo-skeleton v-else />
         </view>
         <!-- 最新资讯 -->
         <view
           v-if="activeIndex === 1"
           class="info-section"
         >
-          <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 v-if="isLoadInfoListSuccess">
+            <view v-if="infoArray.length > 0" class="info-wrapper">
+              <view class="info-list">
                 <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"
-                  @click="infoClick(item)"
+                  v-for="(item, index) in infoArray"
+                  :key="index"
+                  class="info-item"
                 >
-                  <view class="name one-t">
-                    {{ item.name }}
-                  </view>
-                  <view class="intro more-t">
-                    {{ item.intro }}
-                  </view>
-                </view>
-                <view class="info-item-body">
-                  <view v-if="item.type === 'NT_VIDEO'" class="video">
-                    <video
-                      :src="item.video"
-                      :poster="item.video + '?vframe/jpg/offset/1'"
-                      controls
-                      play-btn-position="center"
-                      class="video-item"
-                    />
-                  </view>
-                  <view v-else>
-                    <img-box
-                      :imgList="item.resources"
-                      :num="item.resources.length"
-                      :img-radius="10"
-                      style="width: 100%;"
-                    />
-                  </view>
-                </view>
-                <view class="info-item-bottom">
-                  <view class="time">
-                    {{ item.createdTime ? item.createdTime.replace(/-/g, '.').substr(0, 10) : '' }}
-                  </view>
-                  <view class="btns">
-                    <view class="flex">
-                      <image
-                        :src="webUrl + '/20230803152147141807.png'"
-                        class="icon"
-                      />
-                      <text class="seeNum-txt">{{ item.pv }}</text>
+                  <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"
+                    @click="infoClick(item)"
+                  >
+                    <view class="name one-t">
+                      {{ item.name }}
                     </view>
-                    <view class="flex">
-                      <image
-                        :src="webUrl + '/20230803151302213857.png'"
-                        class="icon"
-                      />
-                      <text class="seeNum-txt">{{ item.zan }}</text>
+                    <view class="intro more-t">
+                      {{ item.intro }}
                     </view>
-                    <view v-if="isMyInn" class="flex more-btn" @click="toggleMoreHandle(index)">
-                      <image
-                        :src="webUrl + '/page/hotel/more.png'"
-                        class="icon"
+                  </view>
+                  <view class="info-item-body">
+                    <view v-if="item.type === 'NT_VIDEO'" class="video">
+                      <video
+                        :src="item.video"
+                        :poster="item.video + '?vframe/jpg/offset/1'"
+                        controls
+                        play-btn-position="center"
+                        class="video-item"
                       />
-                      <view
-                        v-if="item.showMore"
-                        class="more-wrapper"
-                      >
-                        <view
-                          v-if="item.isTop === 0"
-                          class="more-item"
-                          @click="setTopInfoHandle(item, 1)"
-                        >
-                          <image
-                            :src="webUrl + '/page/hotel/settop.png'"
-                            class="more-icon"
-                          />
-                          置顶动态
-                        </view>
-                        <view
+                    </view>
+                    <view v-else>
+                      <img-box
+                        :imgList="item.resources"
+                        :num="item.resources.length"
+                        :img-radius="10"
+                        style="width: 100%;"
+                      />
+                    </view>
+                  </view>
+                  <view class="info-item-bottom">
+                    <view class="time">
+                      {{ item.createdTime ? item.createdTime.replace(/-/g, '.').substr(0, 10) : '' }}
+                    </view>
+                    <view class="btns">
+                      <view class="flex">
+                        <image
+                          :src="webUrl + '/20230803152147141807.png'"
+                          class="icon"
+                        />
+                        <text class="seeNum-txt">{{ item.pv }}</text>
+                      </view>
+                      <view class="flex">
+                        <image
+                          v-if="!item.zanVo"
+                          :src="webUrl + '/page/hotel/zan-off.png'"
+                          class="zan-off-icon"
+                          @click="likeInfoItemHandle(item, index, 1)"
+                        />
+                        <image
                           v-else
-                          class="more-item"
-                          @click="setTopInfoHandle(item, 0)"
+                          :src="webUrl + '/page/hotel/zan-on.png'"
+                          class="zan-on-icon"
+                          @click="likeInfoItemHandle(item, index, 0)"
+                        />
+                        <!-- <image
+                          :src="webUrl + '/20230803151302213857.png'"
+                          class="icon"
+                        />
+                        <text class="seeNum-txt">{{ item.zan }}</text> -->
+                      </view>
+                      <view v-if="isMyInn" class="flex more-btn" @click="toggleMoreHandle(index)">
+                        <image
+                          :src="webUrl + '/page/hotel/more.png'"
+                          class="icon"
+                        />
+                        <view
+                          v-if="item.showMore"
+                          class="more-wrapper"
                         >
-                          <image
-                            :src="webUrl + '/page/hotel/delete.png'"
-                            class="more-icon"
-                          />
-                          取消置顶
-                        </view>
-                        <view class="more-item" @click="deleteInnInfo(item, index)">
-                          <image
-                            :src="webUrl + '/page/hotel/delete.png'"
-                            class="more-icon"
-                          />
-                          删除动态
+                          <view
+                            v-if="item.isTop === 0"
+                            class="more-item"
+                            @click="setTopInfoHandle(item, 1)"
+                          >
+                            <image
+                              :src="webUrl + '/page/hotel/settop.png'"
+                              class="more-icon"
+                            />
+                            置顶动态
+                          </view>
+                          <view
+                            v-else
+                            class="more-item"
+                            @click="setTopInfoHandle(item, 0)"
+                          >
+                            <image
+                              :src="webUrl + '/page/hotel/down.png'"
+                              class="more-icon"
+                            />
+                            取消置顶
+                          </view>
+                          <view class="more-item" @click="deleteInnInfo(item, index)">
+                            <image
+                              :src="webUrl + '/page/hotel/delete.png'"
+                              class="more-icon"
+                            />
+                            删除动态
+                          </view>
                         </view>
                       </view>
                     </view>
@@ -297,7 +319,11 @@
                 </view>
               </view>
             </view>
+            <view v-else class="tab-no-data">
+              店主还没有上传内容哦~
+            </view>
           </view>
+          <goo-skeleton v-else />
         </view>
         <!-- 企业文化 -->
         <view
@@ -325,19 +351,27 @@
               />
             </view>
           </view>
+          <view v-else class="tab-no-data">
+            店主还没有上传内容哦~
+          </view>
         </view>
         <!-- 商家资质 -->
         <view
           v-if="activeIndex === 3"
           class="qualifications-section"
         >
-          <image
-            v-for="(item, index) in inn.qualifications"
-            :key="index"
-            :src="item.image"
-            class="store-img"
-            mode="widthFix"
-          />
+          <view v-if="inn.qualifications.length > 0">
+            <image
+              v-for="(item, index) in inn.qualifications"
+              :key="index"
+              :src="item.image"
+              class="store-img"
+              mode="widthFix"
+            />
+          </view>
+          <view v-else class="tab-no-data">
+            店主还没有上传内容哦~
+          </view>
         </view>
       </view>
       <view v-if="isMyInn" class="bottom-view acea-row">
@@ -386,7 +420,8 @@ import {
   getPoster,
   getHotelGoodList,
   postHotelNewsDel,
-  setTopHotelNew
+  setTopHotelNew,
+  getHotelNewsZan
 } from "@/api/inn.js"
 import {formatDateTime} from "@/utils"
 import {getUrlParam} from "@/utils/common.js"
@@ -434,14 +469,16 @@ export default {
         { text: '最新资讯', value: 1, isShow: true },
         { text: '企业文化', value: 2, isShow: true },
         { text: '商家资质', value: 3, isShow: true }
-      ]
+      ],
+      isLoadGoodListoSuccess: false,
+      isLoadInfoListSuccess: false
     }
   },
   // 必须在页面加 onPageScroll(e){} ，才能滑动显示背景
   onPageScroll(e) {
     this.scrollData = e
   },
-  onLoad: function (options) {
+  onLoad(options) {
     if (options.id) {
       this.id = options.id || null
       this.partnerId = options.partnerId || null
@@ -469,7 +506,7 @@ export default {
     if (!this.isLoad) {
       return
     }
-    if (this.inn.hasProduct <= 0) {
+    if (this.inn.hasProduct > 0) {
       this.fetchGoods()
     }
     this.fetchInnInfoList()
@@ -568,7 +605,7 @@ export default {
       })
     },
     infoClick: function (info) {
-      this.$yrouter.push('/pagesInn/inn/innInfoDetail?id=' + info.id)
+      // this.$yrouter.push('/pagesInn/inn/innInfoDetail?id=' + info.id)
     },
     publishBtnClick: function () {
       this.$yrouter.push('/pagesInn/inn/innInfoPublish?hotelId=' + this.inn.id)
@@ -617,6 +654,7 @@ export default {
       if (_this.loading) {
         return
       }
+      _this.isLoadInfoListSuccess = false
       _this.loading = true
       _this.infoArray = []
       getHotelNewsList({
@@ -635,6 +673,7 @@ export default {
         }))
       }).finally(() => {
         _this.loading = false
+        _this.isLoadInfoListSuccess = true
         uni.stopPullDownRefresh()
       })
     },
@@ -733,7 +772,6 @@ export default {
           this.fetchInnInfoList()
           break
         case 0:
-          this.goodsList = []
           this.fetchGoods()
           break
         default:
@@ -741,6 +779,8 @@ export default {
       }
     },
     fetchGoods() {
+      this.isLoadGoodListoSuccess = false
+      this.goodsList = []
       getHotelGoodList({
         id: this.inn.id,
         page: 1,
@@ -755,6 +795,8 @@ export default {
             }
           }
         }
+      }).finally(() => {
+        this.isLoadGoodListoSuccess = true
       })
     },
     call: function () {
@@ -809,10 +851,27 @@ export default {
           this.$dialog.toast({
             mes: '操作成功!'
           })
+          setTimeout(() => {
+            uni.hideLoading()
+          }, 3000)
           this.fetchInnInfoList()
         }
-      }).finally(() => {
-        uni.hideLoading()
+      }).catch(() => {
+        setTimeout(() => {
+          uni.hideLoading()
+        }, 3000)
+      })
+    },
+    likeInfoItemHandle(item, index, value) {
+      getHotelNewsZan(item.id).then(res => {
+        const { success } = res
+        if (success) {
+          this.$dialog.toast({
+            mes: '操作成功!'
+          })
+          this.$set(this.infoArray[index], 'zanVo', value)
+          // this.fetchInnInfoList()
+        }
       })
     }
   }
@@ -823,6 +882,7 @@ export default {
 @import "@/assets/css/store.less";
 .my-inn-page {
   padding: 0 0 100rpx 0;
+  background-color: #f6f6f6;
 }
 .cover-box {
   position: relative;
@@ -1145,7 +1205,7 @@ export default {
     z-index: 5;
     display: flex;
     align-items: center;
-    padding: 40rpx 32rpx;
+    padding: 40rpx 10rpx 40rpx 32rpx;
     color: #333;
     font-size: 14px;
     .map-info-hd {
@@ -1162,16 +1222,16 @@ export default {
     }
     .map-info-ft {
       .item + .item {
-        margin: 0 0 0 36rpx;
+        margin: 0 0 0 6rpx;
       }
       .item {
         text-align: center;
-        font-weight: bold;
+        font-weight: 500;
         .img {
           display: block;
-          width: 72rpx;
-          height: 72rpx;
-          margin: 0 0 20rpx 0;
+          width: 96rpx;
+          height: 96rpx;
+          margin: 0 0 -16rpx 0;
         }
       }
     }
@@ -1259,6 +1319,14 @@ export default {
           height: 32rpx;
           margin: 0 8rpx 0 0;
         }
+        .zan-off-icon {
+          width: 138rpx;
+          height: 40rpx;
+        }
+        .zan-on-icon {
+          width: 80rpx;
+          height: 40rpx;
+        }
         .more-btn {
           position: relative;
           .more-wrapper {
@@ -1292,4 +1360,10 @@ export default {
     }
   }
 }
+.tab-no-data {
+  text-align: center;
+  font-size: 32rpx;
+  color: #999;
+  line-height: 200rpx;
+}
 </style>
diff --git a/pagesInn/inn/innInfoPublish.vue b/pagesInn/inn/innInfoPublish.vue
index 07ecdc2..ab68f46 100644
--- a/pagesInn/inn/innInfoPublish.vue
+++ b/pagesInn/inn/innInfoPublish.vue
@@ -8,7 +8,7 @@
           'active': tabIndex === index
         }"
         @click="changeTab(index)"
-      >{{item.label}}</text>
+      >{{ item.label }}</text>
     </view>
     <form @submit="formSubmit">
       <view class="form-item">
@@ -37,23 +37,26 @@
           :dataList="picsArray"
           :upload_img_wh="uploadImgWH"
           :upload_max="uploadMax"
+          :upload_count="uploadCount"
           :url="uploadUrl"
           :type='uploadType'
           :header="uploadHeader"
           @change="uploadedImgChange"
         />
       </view>
+      <!--
       <view class="form-item">
         <view class="title">资讯详情:</view>
         <view class="inp">
           <jin-edit
             :html="form.content"
-            placeholder="请输入内容"
+            placeholder="请输入内容..."
             height="320px"
             @editOk="editOk"
           />
         </view>
       </view>
+      -->
       <view class="form-btn">
         <button form-type="submit">发布</button>
       </view>
@@ -62,22 +65,19 @@
 </template>
 
 <script>
-  import tmUpload from '@/pagesInn/components/tm-upload/tm-upload.vue';
-  import jinEdit from '@/pagesInn/components/jin-edit/jin-edit.vue';
+  import tmUpload from '@/pagesInn/components/tm-upload/tm-upload.vue'
   import {
     VUE_APP_API_URL
-  } from "@/config";
+  } from '@/config'
   import {
     postHotelNewsAdd
-  } from "@/api/inn.js";
+  } from '@/api/inn.js'
   export default {
     components: {
-      tmUpload,
-      jinEdit
+      tmUpload
     },
     data() {
       return {
-        webUrl: this.$VUE_APP_RESOURCES_URL,
         uploadUrl: VUE_APP_API_URL + '/api/upload',
         uploadType: 'image',
         uploadCount: 9,
@@ -88,19 +88,18 @@
         uploadedFilesArray: [],
         uploadMax:10,
         picsArray: [],
-        showUpload:true,
-
+        showUpload: true,
         hotelId: 0,
         tabData: [{
-            label: "图文动态",
-            type: "NT_TEXT",
-            uploadType: "image",
+            label: '图文动态',
+            type: 'NT_TEXT',
+            uploadType: 'image',
             uploadCount: 9
           },
           {
-            label: "视频动态",
-            type: "NT_VIDEO",
-            uploadType: "video",
+            label: '视频动态',
+            type: 'NT_VIDEO',
+            uploadType: 'video',
             uploadCount: 1
           }
         ],
@@ -113,17 +112,16 @@
       }
     },
     onLoad(option) {
-      this.hotelId = option.hotelId;
+      this.hotelId = option.hotelId
     },
     methods: {
       changeTab(index) {
-        this.tabIndex = index;
-        this.showUpload = false;
-        this.uploadType = this.tabData[index].uploadType;
-        this.uploadCount = this.tabData[index].uploadCount;
-        
+        this.tabIndex = index
+        this.showUpload = false
+        this.uploadType = this.tabData[index].uploadType
+        this.uploadCount = this.tabData[index].uploadCount
         setTimeout(()=>{
-          this.showUpload = true;
+          this.showUpload = true
         },100)
       },
       editOk(res) {
@@ -131,45 +129,45 @@
       },
       //文件上传结果
       uploadedImgChange: function(uploadedFilesList) {
-        this.uploadedFilesArray = uploadedFilesList;
+        this.uploadedFilesArray = uploadedFilesList
       },
       formSubmit(e) {
         if (!this.form.title) {
-          this.$dialog.error("请输入动态标题");
-          return;
+          this.$dialog.error('请输入动态标题')
+          return
         }
         if (!this.form.intro) {
-          this.$dialog.error("请输入简介");
-          return;
-        }
-        if (!this.form.content) {
-          this.$dialog.error("请输入资讯详情");
-          return;
+          this.$dialog.error('请输入简介')
+          return
         }
+        // if (!this.form.content) {
+        //   this.$dialog.error('请输入资讯详情')
+        //   return
+        // }
         if (this.uploadedFilesArray.length == 0) {
-          this.$dialog.error("请上传动态图片或视频");
-          return;
+          this.$dialog.error('请上传动态图片或视频')
+          return
         }
         uni.showLoading();
         postHotelNewsAdd({
           hotelId: this.hotelId,
           name: this.form.title,
           intro: this.form.intro,
-          content: this.form.content,
+          content: this.form.content.replace(/\<img src/g, '<img style="display: block;max-width: 100%;" src'),
           type: this.uploadType === 'image' ? 'NT_TEXT' : 'NT_VIDEO',
           resources: this.uploadType === 'image' ? this.uploadedFilesArray : [],
           video: this.uploadType === 'image' ? '' : this.uploadedFilesArray[0]
         }).then(res => {
           uni.hideLoading();
           this.$dialog.toast({
-            mes: "发布成功!"
-          });
+            mes: '发布成功!'
+          })
           setTimeout(() => {
-            this.$yrouter.back();
-          }, 1000);
+            this.$yrouter.back()
+          }, 3000)
         }).catch((err) => {
           uni.hideLoading();
-          this.$dialog.error(err.msg);
+          this.$dialog.error(err.msg)
         })
       }
     }
@@ -221,6 +219,7 @@
         padding: 10rpx 16rpx;
         border: 1px solid #eee;
         border-radius: 6rpx;
+        font-size: 28rpx;
       }
       .inp-input {
         padding: 0 16rpx;
diff --git a/pagesInn/inn/innProfileEdit.vue b/pagesInn/inn/innProfileEdit.vue
index 5a986f6..4364c17 100644
--- a/pagesInn/inn/innProfileEdit.vue
+++ b/pagesInn/inn/innProfileEdit.vue
@@ -99,7 +99,7 @@
           </view>
         </view>
       </view>
-      <view class="item is_required">
+      <!-- <view class="item is_required">
         <view class="cell acea-row row-column">
           <view class="cell-title">店铺简介</view>
           <view>
@@ -111,7 +111,7 @@
             />
           </view>
         </view>
-      </view>
+      </view> -->
       <view class="item">
         <view class="img-upload">
           <tm-upload
diff --git a/components/gbro-marquee/marquee.vue b/pkg-video/components/gbro-marquee/marquee.vue
similarity index 100%
rename from components/gbro-marquee/marquee.vue
rename to pkg-video/components/gbro-marquee/marquee.vue
diff --git a/pkg-video/views/lottery.vue b/pkg-video/views/lottery.vue
index 20a104c..8f31e1d 100644
--- a/pkg-video/views/lottery.vue
+++ b/pkg-video/views/lottery.vue
@@ -80,11 +80,11 @@
 </template>
 
 <script>
-import {getDetail, getPrize, takePrize} from "@/api/lottery";
-import gbroMarquee from "@/components/gbro-marquee/marquee.vue";
+import { getDetail, getPrize, takePrize } from '@/api/lottery'
+import gbroMarquee from '../components/gbro-marquee/marquee.vue'
 
 export default {
-  components: {gbroMarquee},
+  components: { gbroMarquee },
   data() {
     return {
       ready: false,
diff --git a/pkg_product/views/festival.vue b/pkg_product/views/festival.vue
index 08502f5..b1878ac 100644
--- a/pkg_product/views/festival.vue
+++ b/pkg_product/views/festival.vue
@@ -1,39 +1,74 @@
+<template>
+  <view class="pkg-product-festival">
+    <hx-navbar
+      :fixed="true"
+      :background-color="[[13,197,197],[13,197,197]]"
+      statusBarFontColor="#ffffff"
+      barPlaceholder="hidden"
+      transparent="auto"
+      color='#ffffff'
+    />
+    <view v-if="isLoad">
+      <image
+        v-if="topImage"
+        :src="topImage"
+        class="top-img"
+        mode="widthFix"
+      />
+      <view
+        v-for="(content,cIndex) in contents"
+        :key="cIndex"
+        class="section"
+      >
+        <image
+          :src="content.backgroundImage"
+          class="section-bg"
+          mode="widthFix"
+        />
+        <view
+          :class="cIndex === 0 ? 'section12' : 'section8'"
+          class="list flex flex-wrap"
+        >
+          <image
+            v-for="(item,index) in content.products"
+            :key="index"
+            :class="cIndex === 0 ? 'span12' : 'span8'"
+            :src="item.image"
+            mode="scaleToFill"
+            @click="$global.navToGoods(item.id)"
+          />
+        </view>
+      </view>
+    </view>
+    <goo-skeleton v-else />
+  </view>
+</template>
 <script>
-import {getFestival} from "@/api/product";
-
+// 节日专题
+import { getFestival } from '@/api/product'
+import GooSkeleton from '@/components/GooSkeleton/index.vue'
 export default {
-  name: "festival", // 节日专题
+  name: 'Festival',
+  components: {
+    GooSkeleton
+  },
   data() {
     return {
-      webUrl: this.$VUE_APP_RESOURCES_URL,
+      isLoad: false,
       topImage: '',
       contents: []
     }
   },
   onLoad() {
     getFestival().then(({data}) => {
-      this.topImage = data.topImage;
-      this.contents = data.contents;
+      this.isLoad = true
+      this.topImage = data.topImage
+      this.contents = data.contents
     })
   }
 }
 </script>
 
-<template>
-  <view class="pkg-product-festival">
-    <image class="top-img" mode="widthFix" :src="topImage" v-if="topImage"/>
-
-    <view class="section" v-for="(content,cIndex) in contents" :key="cIndex">
-      <image class="section-bg" :src="content.backgroundImage" mode="widthFix"/>
-
-      <view class="list flex flex-wrap" :class="cIndex===0?'section12':'section8'">
-        <image :class="cIndex===0?'span12':'span8'" mode="scaleToFill" :src="item.image"
-               v-for="(item,index) in content.products" :key="index" @click="$global.navToGoods(item.id)"/>
-      </view>
-    </view>
-  </view>
-</template>
-
 <style scoped lang="less">
 .pkg-product-festival {
   image {
@@ -70,12 +105,14 @@ export default {
       top: 350rpx;
       left: 0;
       width: 100vw;
+      justify-content: space-between;
+      box-sizing: border-box;
     }
 
     .span12 {
       width: 332rpx;
       height: 520rpx;
-      margin: 0 22rpx 24rpx 0;
+      margin: 0 0 24rpx 0;
     }
 
     .span12:nth-child(2n) {
@@ -85,7 +122,7 @@ export default {
     .span8 {
       width: 234rpx;
       height: 384rpx;
-      margin: 0 8rpx 24rpx 0;
+      margin: 0 0 24rpx 0;
     }
 
     .span8:nth-child(3n) {
diff --git a/pkg_user/components/Coupons.vue b/pkg_user/components/Coupons.vue
new file mode 100644
index 0000000..bd82d9e
--- /dev/null
+++ b/pkg_user/components/Coupons.vue
@@ -0,0 +1,142 @@
+<template>
+  <view class="components-coupons">
+    <image class="coupons__cover" :src="data.image" mode="widthFix"/>
+
+    <view class="coupons__section flex jc-between ai-center">
+      <view>有效期至：
+        <text>{{ data.endTime }}</text>
+      </view>
+      <view class="coupons__tag coupons__tag-expire" v-if="data.status===2">已到期</view>
+      <view class="coupons__tag" @click="goGoods()" v-if="data.status===0 && !radioModel">去使用</view>
+      <view @click="selectCoupon">
+        <radio :value="data.id" :checked="data.checked" color="#FF564A" v-if="radioModel && data.status===0"/>
+      </view>
+    </view>
+
+    <view class="coupons__rules">
+      <view class="coupons__rules-title" @click="changeRules()">使用规则
+        <image :class="{'open':isOpen}" :src="webUrl+'/20231125220409665027.png'" mode="scaleToFill"/>
+      </view>
+      <view
+        :class="isOpen ? 'auto-height' : ''"
+        class="coupon-html"
+      >
+        <rich-text :nodes="data.description" />
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+export default {
+  name: "Coupons",
+  props: {
+    data: Object,
+    radioModel: {
+      type: Boolean,
+      default: false
+    },
+    checked: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+      webUrl: this.$VUE_APP_RESOURCES_URL,
+      isOpen: false
+    }
+  },
+  methods: {
+    changeRules() {
+      this.isOpen = !this.isOpen
+    },
+    goGoods() {
+      uni.switchTab({url: '/pages/home/landMark'})
+      // this.$global.navToGoods(this.data.productId)
+    },
+    selectCoupon() {
+      if (!this.radioModel) return
+      this.$emit('change', this.data.id)
+    }
+  }
+}
+</script>
+
+<style scoped lang="less">
+.components-coupons {
+  width: 686rpx;
+  box-sizing: border-box;
+  border: 2rpx solid #FF564A;
+  border-radius: 16rpx;
+  overflow: hidden;
+
+  image {
+    vertical-align: middle;
+  }
+
+  .coupons__cover {
+    width: 100%;
+    height: auto;
+  }
+
+  .coupons__section {
+    width: 100%;
+    box-sizing: border-box;
+    padding: 18rpx 20rpx 16rpx 16rpx;
+    font-size: 32rpx;
+    line-height: 1;
+
+    text {
+      color: #EA1C1C;
+      font-weight: bold;
+    }
+
+    .coupons__tag {
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      width: 120rpx;
+      height: 52rpx;
+      box-sizing: border-box;
+      border-radius: 8rpx;
+      border: 2px solid #0DC5C5;
+      color: #0DC5C5;
+      font-size: 32rpx;
+      line-height: 1;
+    }
+
+    .coupons__tag-expire {
+      border: 2rpx solid #BFBFBF;
+      color: #999999;
+    }
+  }
+
+  .coupons__rules {
+    padding: 0 20rpx 20rpx 16rpx;
+
+    .coupons__rules-title {
+      color: #999999;
+      font-size: 28rpx;
+
+      image {
+        width: 26rpx;
+        height: 26rpx;
+        margin-left: 6rpx;
+      }
+
+      .open {
+        transform: rotate(180deg);
+      }
+    }
+    .coupon-html {
+      height: 80rpx;
+      overflow: hidden;
+      transition: all .3s;
+      &.auto-height {
+        height: auto;
+      }
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/pkg_user/views/myCoupons.vue b/pkg_user/views/myCoupons.vue
index 6413c58..b871308 100644
--- a/pkg_user/views/myCoupons.vue
+++ b/pkg_user/views/myCoupons.vue
@@ -5,23 +5,13 @@
     <Coupons class="coupons" :data="item" v-for="(item,index) in list" :key="index"/>
 
     <image class="zero-coupons" :src="webUrl+'/20231201201733142658.png'" mode="scaleToFill" v-if="list.length===0"/>
-    <!--    <view>-->
-    <!--      <button @tap="startRecord">开始录音</button>-->
-    <!--      <button @tap="endRecord">停止录音</button>-->
-    <!--      <button @tap="playVoice">播放录音</button>-->
-    <!--    </view>-->
   </view>
 </template>
 
 <script>
-import SubSection from "@/components/SubSection.vue";
-import Coupons from "@/components/Coupons.vue";
-import {getCouponsUser} from "@/api/user";
-
-const recorderManager = uni.getRecorderManager();
-const innerAudioContext = uni.createInnerAudioContext();
-
-innerAudioContext.autoplay = true;
+import SubSection from '@/components/SubSection.vue'
+import Coupons from '../components/Coupons.vue'
+import {getCouponsUser} from '@/api/user'
 
 export default {
   name: "myCoupons",
@@ -29,7 +19,6 @@ export default {
   data() {
     return {
       webUrl: this.$VUE_APP_RESOURCES_URL,
-      voicePath: '',
       current: 0,
       canUse: 0,
       notUse: 0,
@@ -37,34 +26,10 @@ export default {
     }
   },
   onLoad() {
-    // let self = this;
-    // recorderManager.onStop(function (res) {
-    //   console.log('recorder stop' + JSON.stringify(res));
-    //   self.voicePath = res.tempFilePath;
-    // });
-
     this.fetchList(1)
     this.fetchList(2)
   },
   methods: {
-    startRecord() {
-      console.log('开始录音');
-
-      recorderManager.start();
-    },
-    endRecord() {
-      console.log('录音结束');
-      recorderManager.stop();
-    },
-    playVoice() {
-      console.log('播放录音');
-
-      if (this.voicePath) {
-        innerAudioContext.src = this.voicePath;
-        innerAudioContext.play();
-      }
-    },
-
     changeNav(index) {
       this.current = index
       this.fetchList(index + 1)
@@ -79,7 +44,7 @@ export default {
         if (type === 1) this.canUse = data.length
         if (type === 2) this.notUse = data.length
       })
-    },
+    }
   }
 }
 </script>
diff --git a/uni_modules/custom-waterfalls-flow/components/custom-waterfalls-flow/custom-waterfalls-flow.vue b/uni_modules/custom-waterfalls-flow/components/custom-waterfalls-flow/custom-waterfalls-flow.vue
index 0f019e9..7b634d7 100644
--- a/uni_modules/custom-waterfalls-flow/components/custom-waterfalls-flow/custom-waterfalls-flow.vue
+++ b/uni_modules/custom-waterfalls-flow/components/custom-waterfalls-flow/custom-waterfalls-flow.vue
@@ -1,8 +1,29 @@
 <template>
 	<view class="waterfalls-flow">
-		<view v-for="(item,index) in data.column" :key="index" class="waterfalls-flow-column" :id="`waterfalls_flow_column_${index+1}`" :msg="msg" :style="{'width':w,'margin-left':index==0?0:m}">
-			<view :class="['column-value',{'column-value-show':item2.o}]" v-for="(item2,index2) in columnValue(index)" :key="index2" :style="[s1]" @click.stop="wapperClick(item2)">
-				<view class="inner" v-if="data.seat==1">
+		<view
+			v-for="(item, index) in data.column"
+			:key="index" class="waterfalls-flow-column"
+			:id="`waterfalls_flow_column_${index+1}`"
+			:msg="msg"
+			:style="{
+				'width': w,
+				'margin-left': index == 0 ? 0 : m
+			}"
+		>
+			<view
+				v-for="(item2, index2) in columnValue(index)"
+				:key="index2"
+				:class="[
+					'column-value',
+					{ 'column-value-show': item2.o }
+				]"
+				:style="[s1]"
+				@click.stop="wapperClick(item2)"
+			>
+				<view
+					v-if="data.seat == 1"
+					class="inner"
+				>
 					<!-- #ifdef MP-WEIXIN -->
 					<!-- #ifdef VUE2 -->
 					<slot name="slot{{item2.index}}"></slot>
@@ -15,8 +36,22 @@
 					<slot v-bind="item2"></slot>
 					<!-- #endif -->
 				</view>
-				<image :class="['img',{'img-hide':item2[hideImageKey]==true||item2[hideImageKey]==1},{'img-error':!item2[data.imageKey]}]" :src="item2[data.imageKey]" mode="widthFix" @load="imgLoad(item2,index+1)" @error="imgError(item2,index+1)" @click.stop="imageClick(item2)"></image>
-				<view class="inner" v-if="data.seat==2">
+				<image
+					:class="[
+						'img',
+						{ 'img-hide': item2[hideImageKey] == true || item2[hideImageKey] == 1 },
+						{ 'img-error': !item2[data.imageKey] }
+					]"
+					:src="item2[data.imageKey]"
+					mode="widthFix"
+					@load="imgLoad(item2, index+1)"
+					@error="imgError(item2, index+1)"
+					@click.stop="imageClick(item2)"
+				/>
+				<view
+					v-if="data.seat==2"
+					class="inner"
+				>
 					<!-- #ifdef MP-WEIXIN -->
 					<!-- #ifdef VUE2 -->
 					<slot name="slot{{item2.index}}"></slot>
@@ -156,6 +191,7 @@
 						this.msg++;
 					}
 					this.$nextTick(() => {
+						console.log(this.data.list)
 						this.initValue(this.curIndex, 'refresh==>');
 					})
 				}, 1)
diff --git a/utils/dialog.js b/utils/dialog.js
index 732c0bc..0906f31 100644
--- a/utils/dialog.js
+++ b/utils/dialog.js
@@ -49,7 +49,7 @@ dialog.message = (mes = "操作失败", obj = {}) => {
 		uni.showToast({
 			title: mes,
 			icon: "none",
-			duration: 2000,
+			duration: 3000,
 			complete: () => {
 				resolve();
 			}
@@ -61,7 +61,7 @@ dialog.toast = (options) => {
 	uni.showToast({
 		title: options.mes,
 		icon: "none",
-		duration: 2000,
+		duration: 3000,
 		complete: () => {
 			options.callback ? options.callback() : null
 		}
@@ -72,7 +72,7 @@ dialog.error = (mes) => {
 	uni.showToast({
 		title: mes,
 		icon: "none",
-		duration: 2000
+		duration: 3000
 	});
 };
 
@@ -84,7 +84,7 @@ export function validatorDefaultCatch(err, type = "message") {
 	uni.showToast({
 		title: err.errors[0].message,
 		icon: 'none',
-		duration: 2000
+		duration: 3000
 	})
 	return false
 }
diff --git a/utils/request.js b/utils/request.js
index b46aeb5..2428f46 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -64,6 +64,7 @@ function baseRequest(options) {
             uni.showToast({
                 title: res.data.msg,
                 icon: 'none',
+                duration: 3000,
                 success() {
                 }
             })
diff --git a/wenwan/views/store.vue b/wenwan/views/store.vue
deleted file mode 100644
index f17e651..0000000
--- a/wenwan/views/store.vue
+++ /dev/null
@@ -1,1048 +0,0 @@
-<template>
-  <view class="container">
-    <!-- title="店铺主页" -->
-    <hx-navbar :fixed="true" statusBarFontColor="#ffffff" barPlaceholder="hidden" transparent="auto" color='#ffffff'
-               :background-color="[[13,197,197],[13,197,197]]" :pageScroll.sync="scrollData"/>
-
-    <!--    7-3-->
-    <image class="fixed-share" :src="webUrl+'/20230619110913307276.png'" @click="changeShare"
-           v-if="posterUrl.length>0"/>
-    <u-popup :show="showShare" mode="center" bgColor="transparent">
-      <view class="box-share">
-        <view class="box-img">
-          <image class="icon" :src="webUrl+'/20230608112219219303.png'" @click="changeShare"/>
-          <image class="main-img" :src="posterUrl"/>
-        </view>
-        <image class="btn" :src="webUrl+'/20230608112210135038.png'" @click="saveImg"/>
-      </view>
-    </u-popup>
-
-    <view class="" style="position: relative;">
-      <image style="width: 750rpx" :src="inn.cover" mode="widthFix"></image>
-      <image style="width: 750rpx;position: absolute;left: 0;bottom: 0;" :src="webUrl+'/20210227115029488890.png'"
-             mode="widthFix"></image>
-    </view>
-
-    <view class="innInfoWrap">
-      <view class="acea-row">
-        <view class="inn-logo" style="flex-shrink: 0;margin-right: 10rpx;">
-          <image :src="inn.logo" v-if="inn.logo"></image>
-          <image :src="webUrl+'/20230609145651814148.png'" v-else/>
-        </view>
-        <view class="acea-row row-column" style="flex-grow: 1;">
-          <view class="acea-row row-between row-middle" style="flex-wrap: nowrap;">
-            <view class="inn-name" style="margin-right: 20rpx;flex-grow: 1;">{{ inn.name }}</view>
-            <view class="acea-row row-center row-middle" style="flex-shrink: 0;">
-              <view class="acea-row row-middle" v-if="inn.cityName != undefined && inn.cityName.length>0">
-                <image style="width: 22rpx;height: 22rpx;margin-right: 8rpx;" :src="webUrl+'/20210807215539157727.png'"
-                       mode=""></image>
-                <text style="font-size: 24rpx;color: #fff;">{{ inn.cityName }}</text>
-              </view>
-            </view>
-          </view>
-          <view class="acea-row row-between" style="margin-top: 22rpx;">
-            <view class="acea-row row-middle" style="flex-grow: 1;">
-              <view class="acea-row row-middle">
-                <view class="inn-owner" style="flex-grow: 1;">{{ inn.ownerName }}/店主</view>
-
-                <!-- <view class="inn-tag-wrap acea-row row-left row-middle">
-									<view class="zanmost-tag" v-if="inn.zanMostTag>0">点赞最多</view>
-									<view class="latest-tag" v-if="inn.newTag>0">最新发布</view>
-									<view class="location-tag" v-if="inn.cityName != undefined && inn.cityName.length>0">{{inn.cityName}}</view>
-								</view> -->
-              </view>
-              <!-- <view v-if="inn.qrcode.length>0" class="" @click="showQrcode" style="margin-left: 10rpx;width: 76rpx;height: 76rpx;">
-								<image style="width: 100%;height: 100%;" mode="scaleToFill"  :src="inn.qrcode"></image>
-							</view> -->
-            </view>
-
-            <view class="guarantee" v-if="inn.guaranteeValue">保证金：{{ inn.guaranteeValue }}元</view>
-            <view class="acea-row row-center row-middle" style="flex-shrink: 0;" @click="zanInn">
-              <block v-if="isLike">
-                <image style="width: 48rpx;height: 48rpx;margin-right: 10rpx;" :src="webUrl+'/20230828095210280991.png'"
-                       mode=""></image>
-                <text style="font-size: 28rpx;color: #FF564A;">{{ inn.zan }}</text>
-              </block>
-              <block v-else>
-                <image style="width: 48rpx;height: 48rpx;margin-right: 10rpx;" :src="webUrl+'/20230828095217616640.png'"
-                       mode=""></image>
-                <text style="font-size: 28rpx;color: #333333;">{{ inn.zan }}</text>
-
-              </block>
-            </view>
-
-          </view>
-
-        </view>
-      </view>
-    </view>
-
-
-    <view class="" style="padding: 0 32rpx;margin-top: 10rpx;">
-      <view class="inn-signature">
-        <text style="font-size: 24rpx;color: #080F1A;">{{ inn.content }}</text>
-      </view>
-    </view>
-
-    <view v-if="inn.desc != null && inn.desc.length>0" class="" style="padding: 0 32rpx;margin-top: 30rpx;">
-      <view class="desc-box">
-        <!-- <text class="fixed">简介：</text> -->
-        <view v-html="handleRichText(inn.desc)"></view>
-      </view>
-
-      <!-- 	<view class="inn-intro">
-				<text class="inn-intro-bold">简介:</text>
-				<view class='conter' :class="isExpand ? 'show' : 'hide'" v-html="handleRichText(inn.desc)"></view>
-				<view class="acea-row row-right row-middle" @click="doExpandDesc" style="margin-top: 10rpx;">
-					<view class="">{{isExpand?"收起":"展开"}}</view>
-					<image style="width: 40rpx;height: 40rpx;" v-if="isExpand" :src="webUrl+'/20210315103122759604.png'" mode=""></image>
-					<image style="width: 40rpx;height: 40rpx;" v-if="!isExpand" :src="webUrl+'/20210315103104298188.png'" mode=""></image>
-				</view>
-			</view> -->
-    </view>
-
-    <view class="map-wrap acea-row row-center">
-      <image style="height: 160rpx;width: 100%;" :src="webUrl+'/20210225151241154614.png'"></image>
-      <view class="address-block acea-row row-middle">
-        <image style="width: 32rpx;height: 32rpx;margin-right: 10rpx;" :src="webUrl+'/20220901223747933873.png'"
-               mode=""></image>
-        <text class="address-text">{{ inn.address }}</text>
-      </view>
-      <view class="buttons-block acea-row row-middle">
-        <view class="phone-block acea-row row-middle" @click="call">
-          <image style="width: 32rpx;height: 32rpx;margin-right: 10rpx;" :src="webUrl+'/20220901223901017309.png'"
-                 mode=""></image>
-          <text style="font-size: 24rpx;color: #41454d;">联系客服</text>
-        </view>
-        <view class="vline"></view>
-        <view class="map-block acea-row row-middle" @click="showLocation">
-          <image style="width: 32rpx;height: 32rpx;margin-right: 10rpx;" :src="webUrl+'/20220901223401590275.png'"
-                 mode=""></image>
-          <text style="font-size: 24rpx;color: #41454d;">进入地图</text>
-        </view>
-      </view>
-    </view>
-
-    <view class="top-tab acea-row row-middle row-center" style="margin-top: 60rpx;border-bottom: 1px solid #f5f5f5;">
-      <view class="tab" @click="changeTab(0)">
-        <text class=""
-              :style="activeIndex==0?'color:#080F1A;font-size:32rpx;':'color:#A6AAB3;font-size:28rpx;'">企业文化
-        </text>
-        <view v-show="activeIndex==0" class="btLine"></view>
-      </view>
-      <view class="tab" style="margin-left: 70rpx;" @click="changeTab(1)">
-        <text class=""
-              :style="activeIndex==1?'color:#080F1A;font-size:32rpx;':'color:#A6AAB3;font-size:28rpx;'">最新资讯
-        </text>
-        <view v-show="activeIndex==1" class="btLine"></view>
-      </view>
-      <view class="tab" style="margin-left: 70rpx;" @click="changeTab(2)">
-        <text class=""
-              :style="activeIndex==2?'color:#080F1A;font-size:32rpx;':'color:#A6AAB3;font-size:28rpx;'">商家资质
-        </text>
-        <view v-show="activeIndex==2" class="btLine"></view>
-      </view>
-      <view class="tab" style="margin-left: 70rpx;" @click="changeTab(3)" v-show="inn.hasProduct>0">
-        <text class=""
-              :style="activeIndex==3?'color:#080F1A;font-size:32rpx;':'color:#A6AAB3;font-size:28rpx;'">商品
-        </text>
-        <view v-show="activeIndex==3" class="btLine"></view>
-      </view>
-    </view>
-    <view v-if="activeIndex==0" class="pics-section" style="position: relative;">
-      <view class="pics-list acea-row" v-if="inn.pics.length>0">
-        <view :style="{width:picColumnWidth}" @click="showPic(index)" class="pics-item" v-for="(url, index) in inn.pics"
-              :key="index">
-          <image :style="{width:picColumnWidth,height:picColumnWidth,borderRadius:'8rpx'}" :src="url" mode=""></image>
-        </view>
-      </view>
-    </view>
-
-    <view v-if="activeIndex==1" class="info-section" style="position: relative;">
-      <view class="info-list acea-row row-column" v-if="infoArray.length>0">
-        <view class="pics-item acea-row" style="flex-wrap: nowrap;" v-for="(info, index) in infoArray" :key="index">
-          <view class="date-block" style="flex-shrink: 0;">
-            <view class="month-day" :style="index==0?'color:#0DC5C5;':''">{{ info.monthDay }}</view>
-            <view class="year">{{ info.year }}</view>
-            <view v-if="isMyInn" class="" style="margin-top: 10rpx;" @click="deleteInnInfo(info)">
-              <image style="width:36rpx;height: 36rpx;" :src="webUrl+'/20210302150736618877.png'" mode=""></image>
-            </view>
-          </view>
-          <view class="separator-block acea-row row-column row-middle" style="flex-shrink: 0;">
-            <view :class="['dot',index==0?'first-cell':'']" style="flex-shrink: 0;"></view>
-            <view v-if="(index+1)!=infoArray.length" class="dash-line" style="flex-grow: 1;"></view>
-          </view>
-          <view class="info-card" style="flex-grow: 1;">
-            <view class="info-title line1" @click="infoClick(info)">{{ info.name }}</view>
-            <block v-if="info.type=='NT_TEXT'">
-              <img-box style="width: 100%;" :imgList='info.resources' :num='info.resources.length'></img-box>
-            </block>
-
-            <view v-else class="video-wrap" style="margin-top: 10rpx;">
-              <video style="width: 100%;height: 264rpx;" :src="info.resources[0]" controls play-btn-position="center"/>
-            </view>
-
-            <view class="info-media-wrap acea-row row-middle row-between" style="margin-top: 10rpx;" @click="infoClick(info)">
-              <view class="acea-row row-middle">
-                <view class="acea-row row-middle">
-                  <image style="width: 28rpx;height: 28rpx;margin-right: 4rpx;"
-                         :src="webUrl+'/20230803152147141807.png'"
-                         mode=""></image>
-                  <text class="seeNum-txt">{{ info.pv }}</text>
-                </view>
-                <view class="acea-row row-middle" style="margin-left: 20rpx;">
-                  <image style="width: 28rpx;height: 28rpx;margin-right: 4rpx;"
-                         :src="webUrl+'/20230803151302213857.png'" mode=""></image>
-                  <text class="likeNum-txt">{{ info.zan }}</text>
-                </view>
-              </view>
-              <view class="time">{{ info.time }}</view>
-            </view>
-          </view>
-        </view>
-      </view>
-    </view>
-    <!-- 商家资质 -->
-    <view style="padding: 32rpx" v-if="activeIndex==2">
-      <image class="store-img" :src="item.image" mode="widthFix" v-for="item in inn.qualifications"/>
-    </view>
-
-    <!-- v4 商品列表 -->
-    <view v-if="activeIndex==3" class="goods-section flex flex-wrap">
-      <view class="item" v-for="(item,index) in goodsList" :key="index" @click="goGoodsConByID(item)">
-        <img class="cover" :src="item.image" alt="">
-        <view class="">
-          <view class="name more-t">{{ item.storeName }}</view>
-          <view class="info-line flex jc-between ai-center">
-            <text>产地:{{ item.origin }}</text>
-            <text>单位:{{ item.unitName }}</text>
-          </view>
-          <view class="info-line" style="margin-top: 4rpx">规格:{{ item.storeInfo }}</view>
-          <view class="price-line">￥{{ item.price }}</view>
-        </view>
-      </view>
-    </view>
-    <view class="btn-all flex jc-center ai-center" @click="goClass" v-if="activeIndex==3">全部商品列表</view>
-
-    <view v-if="isMyInn" class="bottom-view acea-row">
-      <view class="bottom-btn" style="margin-right: 1px; flex: 1;" @click="publishBtnClick">发布动态</view>
-      <view class="bottom-btn" style="flex: 1;" @click="modifyBtnClick">修改资料</view>
-    </view>
-    <view v-if="isMyInn" class="bottom-placeholder"></view>
-
-  </view>
-</template>
-
-<script>
-import {
-  getHomeHotelDetail,
-  getHotelDetail,
-  getHotelNewsList,
-  getHotelZan,
-  getPoster,
-  goodsList,
-  postHotelNewsDel
-} from "@/api/inn.js";
-import {formatDateTime} from "@/utils";
-import {getUrlParam} from "@/utils/common.js";
-import imgBox from '@/components/imageTypeSet/imagebox.vue'
-import cookie from "@/utils/store/cookie";
-
-var that;
-export default {
-  components: {
-    imgBox
-  },
-  data() {
-    return {
-      webUrl: this.$VUE_APP_RESOURCES_URL,
-      isExpand: false,
-      activeIndex: 0,
-      page: 1,
-      limit: 20,
-      loading: false,
-      loadend: false,
-      picColumnWidth: '325rpx',
-      scrollData: {},
-      infoArray: [],
-      inn: {},
-      isMyInn: false, //是否是自己的客栈
-      goodsList: [],
-      goodsPage: 1,
-      showShare: false,
-      posterUrl: "", // 分享海报
-      id: null,
-      partnerId: null,
-      isLike:false //点赞
-    }
-  },
-  //必须在页面加 onPageScroll(e){} ，才能滑动显示背景
-  onPageScroll(e) {
-    this.scrollData = e;
-  },
-  onShow: function () {
-    // this.goodsPage = 1;
-    // this.goodsList = [];
-    // this.fetchGoods();
-
-    this.page = 1;
-    this.loading = false;
-    this.loadend = false;
-
-  },
-  onLoad: function (options) {
-    // test data
-    console.log("getLaunchOptionsSync", uni.getLaunchOptionsSync());
-    console.log("getEnterOptionsSync", uni.getEnterOptionsSync());
-
-    if (options.id) {
-      this.id = options.id || null;
-      this.partnerId = options.partnerId || null;
-    } else {
-      let obj = uni.getEnterOptionsSync();
-      if (options.scene || obj.query.scene) {
-        let query = options ? decodeURIComponent(options.scene) : decodeURIComponent(obj.query.scene);
-        this.id = getUrlParam(query, "id") || null;
-        this.partnerId = getUrlParam(query, "partnerId") || null;
-      }
-    }
-    if (this.partnerId) cookie.set("spread", this.partnerId);
-
-    this.fetchInnDetail();
-    this.changeTab(this.activeIndex);
-    this.initPoster();
-
-    that = this;
-    this.isMyInn = (this.$yroute.query.isMyInn != null ? true : false);
-    uni.getSystemInfo({
-      success: (e) => {
-        //两列商品宽度
-        that.picColumnWidth = (e.screenWidth - uni.upx2px(92)) / 2 + 'px';
-        console.log('picColumnWidth:' + that.picColumnWidth);
-      }
-    });
-  },
-  // 下拉刷新
-  onPullDownRefresh() {
-    if (this.activeIndex == 0) {
-      this.page = 1;
-      this.loading = false;
-      this.loadend = false;
-      this.fetchInnInfoList();
-    } else {
-      this.fetchInnDetail();
-    }
-  },
-  // 上拉触底
-  onReachBottom() {
-    if (this.activeIndex === 3) {
-      this.goodsPage++;
-      this.fetchGoods();
-    } else {
-      !this.loading && this.fetchInnInfoList();
-    }
-  },
-  methods: {
-    changeShare() {
-      this.showShare = !this.showShare;
-    },
-    goClass() {
-      uni.navigateTo({
-        url: "/wenwan/views/goodsClass"
-      })
-    },
-
-    goGoodsConByID(item) {
-      this.$yrouter.push({
-        path: '/pages/shop/GoodsCon/index',
-        query: {
-          id: item.id
-        }
-      });
-    },
-
-    saveImg() {
-      let that = this;
-
-      uni.getSetting({
-        success: getRes => {
-          if (getRes.authSetting["scope.writePhotosAlbum"]) {
-            that.downloadImage();
-          } else {
-            uni.authorize({
-              scope: "scope.writePhotosAlbum",
-              success: () => {
-                that.downloadImage();
-              },
-              fail: () => {
-                console.log("authorize fail")
-                uni.openSetting({
-                  success: openRes => {
-                    console.log(typeof openRes, openRes)
-                  },
-                  fail: () => {
-                    uni.showToast({
-                      title: "请在设置中打开对应权限",
-                      icon: "none"
-                    })
-                  }
-                })
-              }
-            })
-          }
-        },
-        fail: (err) => {
-          console.log(err, 2)
-        }
-      })
-    },
-
-    downloadImage() {
-      let that = 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 => {
-          console.log(typeof downRes, downRes, "down")
-
-          uni.saveImageToPhotosAlbum({
-            filePath: downRes.filePath, //临时文件地址
-            success: function () {
-              uni.showToast({
-                title: "保存成功",
-                icon: "success",
-                success() {
-                  that.showShare = false;
-                }
-              })
-            },
-            fail: function (err) {
-              uni.showToast({
-                title: err,
-                icon: "none"
-              })
-            }
-          })
-        },
-        fail: function (err) {
-          uni.showToast({
-            title: err.errMsg,
-            icon: "error"
-          })
-        }
-      })
-    },
-
-    doExpandDesc: function () {
-      this.isExpand = !this.isExpand;
-    }
-    ,
-    showQrcode: function () {
-      uni.previewImage({
-        current: 0,
-        urls: [this.inn.qrcode]
-      });
-    }
-    ,
-    zanInn: function () {
-      getHotelZan(this.inn.id).then(() => {
-        this.isLike = !this.isLike;
-        this.fetchInnDetail();
-      }).catch((err) => {
-        uni.showToast({
-          title: err.msg + '',
-          icon: 'none',
-          mask: false,
-          duration: 1500
-        });
-      })
-    },
-    infoClick: function (info) {
-      this.$yrouter.push('/pagesInn/inn/innInfoDetail?id=' + info.id);
-    }
-    ,
-    publishBtnClick: function () {
-      this.$yrouter.push('/pagesInn/inn/innInfoPublish?hotelId=' + this.inn.id);
-    }
-    ,
-
-    modifyBtnClick: function () {
-      this.$yrouter.push("/pagesInn/inn/innProfileEdit?hotel=" + encodeURIComponent(JSON.stringify(this.inn)));
-      // this.$yrouter.push('/pagesInn/inn/innProfileEdit');
-    }
-    ,
-    //删除客栈动态
-    deleteInnInfo: function (info) {
-
-      uni.showModal({
-        title: '确认删除此动态?',
-        content: '',
-        showCancel: true,
-        cancelText: '取消',
-        confirmText: '确认',
-        success: res => {
-
-          if (res.confirm) {
-            uni.showLoading();
-            var param = {
-              id: info.id,
-              hotelId: that.inn.id
-            }
-            postHotelNewsDel(param).then((res1) => {
-              uni.hideLoading();
-
-
-              that.$dialog.toast({
-                mes: '删除成功!'
-              });
-              //删除成功刷新动态列表
-              that.page = 1;
-              that.loading = false;
-              that.loadend = false;
-              that.fetchInnInfoList();
-
-              // setTimeout(function() {
-
-
-              // }, 1000);
-
-
-            }).catch((err) => {
-              uni.hideLoading();
-
-              uni.showToast({
-                title: err.msg,
-                icon: "none",
-                duration: 1500
-              });
-
-            }).finally(() => {
-
-            });
-          }
-
-        },
-        fail: () => {
-        },
-        complete: () => {
-        }
-      });
-    }
-    ,
-    fetchInnInfoList: function () {
-      if (that.loading) return; //阻止下次请求（false可以进行请求）；
-      if (that.loadend) return; //阻止结束当前请求（false可以进行请求）；
-      that.loading = true;
-      let q = {
-        page: that.page,
-        limit: that.limit,
-        hotelId: that.id
-      };
-      getHotelNewsList(q).then(res => {
-        that.loading = false;
-        //apply();js将一个数组插入另一个数组;
-        if (that.page == 1) {
-          that.infoArray = [];
-        }
-        that.infoArray.push.apply(that.infoArray, res.data.map((info) => {
-          var pt = info.createdTime.replace(/-/g, "/");
-          info.year = formatDateTime(pt, 'yyyy');
-          info.monthDay = formatDateTime(pt, 'MM/dd');
-          info.time = formatDateTime(pt, 'HH:mm:ss');
-          return info;
-        }));
-        that.loadend = res.data.length < that.limit; //判断所有数据是否加载完成；
-        that.page = that.page + 1;
-      }).catch((err) => {
-
-      }).finally(() => {
-        uni.stopPullDownRefresh();
-      });
-    }
-    ,
-    handleRichText: function (str) {
-      if (str != null) {
-
-        return `<span class="fixed">简介：</span>` + str.replace(/<\/?[^>]*>/g, '');
-      } else {
-        return '';
-      }
-    }
-    ,
-    fetchInnDetail: function () {
-      if (this.isMyInn) {
-        getHotelDetail(this.id).then((res) => {
-          that.inn = res.data;
-          that.isLike = res.data.zanVo !== null;
-          this.fetchInnInfoList();
-        }).catch((err) => {
-
-        }).finally(() => {
-          uni.stopPullDownRefresh();
-        });
-      } else {
-        getHomeHotelDetail(this.id).then((res) => {
-          that.inn = res.data;
-          that.isLike = res.data.zanVo !== null;
-          this.fetchInnInfoList();
-        }).catch((err) => {
-
-        }).finally(() => {
-          uni.stopPullDownRefresh();
-        });
-      }
-    },
-    initPoster() {
-      getPoster(this.id).then(({data}) => this.posterUrl = data);
-    },
-    showLocation: function () {
-      if (!this.inn.latitude || !this.inn.longitude) {
-        this.$dialog.error('暂无位置信息');
-      } else {
-        uni.openLocation({
-          latitude: this.inn.latitude,
-          longitude: this.inn.longitude
-        });
-      }
-    }
-    ,
-    showPic: function (index) {
-      uni.previewImage({
-        current: index,
-        urls: this.inn.pics
-      })
-    }
-    ,
-    changeTab: function (index) {
-      this.activeIndex = index;
-      this.page = 1;
-      this.loading = false;
-      this.loadend = false;
-
-      //刷新数据
-      switch (this.activeIndex) {
-        case 0:
-          break;
-        case 1:
-          this.fetchInnInfoList();
-          break;
-        case 3:
-          this.goodsPage = 1;
-          this.goodsList = [];
-          this.fetchGoods();
-          break;
-      }
-    }
-    ,
-    fetchGoods() {
-      goodsList({
-        id: this.inn.id,
-        page: this.goodsPage
-      }).then(({
-                 data
-               }) => {
-        let len = data.records.length;
-        if (len > 0) {
-          for (let i = 0; i < len; i++) {
-            this.goodsList.push(data.records[i]);
-          }
-        }
-      }).catch(() => {
-      })
-    }
-    ,
-    call: function () {
-
-      if (this.inn.tel != undefined && this.inn.tel.length > 0) {
-        uni.makePhoneCall({
-
-          // 手机号
-          phoneNumber: this.inn.tel,
-
-          // 成功回调
-          success: (res) => {
-            console.log('调用成功!')
-          },
-
-          // 失败回调
-          fail: (res) => {
-            console.log('调用失败!')
-          }
-
-        });
-      } else {
-        this.$dialog.error('电话为空');
-      }
-    }
-  }
-}
-</script>
-
-<style>
-.conter {
-  /* width:600upx; */
-  height: auto;
-  min-height: 100rpx;
-  display: -webkit-box;
-  word-break: break-all;
-  -webkit-box-orient: vertical;
-  /* 要显示多少行就改变line-clamp的数据,此处折叠起来显示一行*/
-  -webkit-line-clamp: 5;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  background-color: #F5F5F5;
-  padding: 10rpx;
-}
-
-.hide {
-  display: -webkit-box;
-}
-
-.show {
-  display: block;
-}
-
-
-.conter >>> img {
-  display: block;
-  max-width: 100% !important;
-}
-</style>
-
-<style scoped lang="less">
-@import "@/assets/css/store.less";
-
-.guarantee {
-  margin-right: 16rpx;
-  padding: 7rpx 16rpx;
-  border-radius: 8rpx;
-  background: #0DC5C5;
-  color: #fff;
-  font-size: 22rpx;
-}
-
-.store-img {
-  width: 686rpx;
-  margin-bottom: 20rpx;
-  vertical-align: middle;
-}
-
-.goods-section {
-  padding: 40rpx 32rpx 0;
-  background: #fff;
-
-  .item {
-    position: relative;
-    width: 328rpx;
-    box-sizing: border-box;
-    margin-right: 30rpx;
-    margin-bottom: 24rpx;
-    border-radius: 8rpx;
-    background: #fff;
-
-    .name {
-      margin: 8rpx 0 10rpx;
-      font-size: 28rpx;
-      line-height: 36rpx;
-      color: #333333;
-    }
-
-    .info-line {
-      font-size: 22rpx;
-      line-height: 36rpx;
-      color: #707070;
-    }
-
-    .price-line {
-      margin-top: 10rpx;
-      font-size: 28rpx;
-      line-height: 36rpx;
-      color: #DA0000;
-    }
-  }
-
-  .item:nth-child(2n) {
-    margin-right: 0;
-  }
-
-  .cover {
-    width: 328rpx;
-    height: 328rpx;
-    background: rgba(255, 255, 255, 0.39);
-    border-radius: 8rpx;
-    vertical-align: middle;
-  }
-}
-
-.container {
-  position: relative;
-  background: #FFFFFF;
-}
-
-.innInfoWrap {
-  padding: 0 18*2rpx;
-  margin-top: -66rpx;
-  position: relative;
-  z-index: 1;
-}
-
-.inn-logo {
-  width: 56*2rpx;
-  height: 56*2rpx;
-}
-
-.inn-logo image {
-  width: 100%;
-  height: 100%;
-  border-radius: 50%;
-}
-
-.inn-name {
-  font-size: 32rpx;
-  color: #FFFFFF;
-  line-height: 56rpx;
-}
-
-.inn-owner {
-  font-size: 24rpx;
-  color: #8B8F99;
-  // margin-top: 22rpx;
-}
-
-
-.inn-tag-wrap {
-  margin-top: 10rpx;
-  // margin-bottom: 10rpx;
-}
-
-.zanmost-tag {
-  padding: 2rpx 8rpx 2rpx 8rpx;
-  background: #FF2D69;
-  font-size: 10*2rpx;
-  color: #FFFFFF;
-  margin-right: 8rpx;
-}
-
-.latest-tag {
-  padding: 2rpx 8rpx 2rpx 8rpx;
-  background: #0DC5C5;
-  font-size: 10*2rpx;
-  color: #FFFFFF;
-  margin-right: 8rpx;
-}
-
-.location-tag {
-  padding: 2rpx 8rpx 2rpx 8rpx;
-  background: #FD685D;
-  font-size: 10*2rpx;
-  color: #FFFFFF;
-}
-
-.inn-signature {
-  background-image: url('http://admin-api.xdd618.com/file/pic/20210225101530789767.png');
-  background-repeat: no-repeat;
-  background-size: 100% 100%;
-  padding: 20rpx;
-}
-
-.inn-intro-bold {
-  font-size: 28rpx;
-  color: #0DC5C5;
-}
-
-.inn-intro {
-  font-size: 22rpx;
-  color: #A6AAB3;
-}
-
-
-.map-wrap {
-  padding: 0 32rpx;
-  position: relative;
-  margin-top: 40rpx;
-}
-
-.address-block {
-  position: absolute;
-  top: 20rpx;
-  left: 56rpx;
-}
-
-.address-text {
-  font-size: 24rpx;
-  color: #41454D;
-}
-
-.phone-block {
-  padding-left: 40rpx;
-  padding-right: 40rpx;
-}
-
-.map-block {
-  padding-left: 40rpx;
-  padding-right: 40rpx;
-}
-
-.vline {
-  width: 0px;
-  margin-left: 20rpx;
-  margin-right: 20rpx;
-  height: 32rpx;
-  border: 1px solid #DADCE0;
-}
-
-.buttons-block {
-
-  background: #FFFFFF;
-  height: 80rpx;
-  box-shadow: 0px 6rpx 16rpx rgba(205, 214, 214, 0.6);
-  border-radius: 12rpx;
-  // width: 263*2rpx;
-  padding: 0 20rpx;
-  position: absolute;
-  margin: 0 auto;
-  bottom: -40rpx;
-
-}
-
-.btLine {
-  width: 100%;
-  height: 6rpx;
-  margin-top: 18rpx;
-  background: #0DC5C5;
-}
-
-.pics-list {
-  position: relative;
-  margin: 36rpx 0;
-  background-color: #fff;
-  flex-wrap: wrap;
-}
-
-.pics-list .pics-item {
-  margin-left: 36rpx;
-  margin-top: 20rpx;
-}
-
-.info-section {
-  padding: 36rpx;
-}
-
-.info-list {
-  width: 100%;
-}
-
-.separator-block {
-  padding: 10rpx;
-  margin: 0 20rpx;
-}
-
-.info-card {
-  width: 500rpx;
-  box-sizing: border-box;
-  margin-bottom: 40rpx;
-  padding: 24rpx;
-  border-radius: 8rpx;
-  background: #EBECF0;
-  overflow-x: hidden;
-}
-
-
-.info-title {
-  font-size: 24rpx;
-  color: #080F1A;
-}
-
-.time {
-  font-size: 22rpx;
-  color: #A6AAB3;
-}
-
-.month-day {
-  font-size: 28rpx;
-  color: #41454D;
-}
-
-.year {
-  font-size: 20rpx;
-  color: #DADCE0;
-  margin-top: 10rpx;
-}
-
-.dot {
-  width: 12rpx;
-  height: 12rpx;
-  background: #080F1A;
-  border-radius: 50%;
-  opacity: 1;
-
-}
-
-.first-cell {
-  background: #0DC5C5;
-}
-
-.dash-line {
-  width: 0px;
-  border: 1px dashed #DADCE0;
-  opacity: 1;
-  margin-top: 10rpx;
-  margin-bottom: 0rpx;
-}
-
-.seeNum-txt {
-  font-size: 22rpx;
-  color: #080F1A;
-}
-
-.likeNum-txt {
-  font-size: 22rpx;
-  color: #080F1A;
-}
-
-.bottom-view {
-  height: 86rpx;
-  line-height: 86rpx;
-  position: fixed;
-  left: 0;
-  right: 0;
-  z-index: 2;
-  background: #FFFFFF;
-  bottom: 0;
-}
-
-.bottom-btn {
-  text-align: center;
-  font-size: 32rpx;
-  color: #fff;
-  background: #0DC5C5;
-}
-
-.bottom-placeholder {
-  height: 86rpx;
-  width: 100%;
-}
-
-.desc-box {
-  /deep/ .fixed {
-    font-size: 28rpx;
-    font-weight: bold;
-    line-height: 44rpx;
-    color: #0DC5C5;
-  }
-
-  font-size: 22rpx;
-  line-height: 40rpx;
-  color: #A6AAB3;
-}
-
-.btn-all {
-  width: 750rpx;
-  height: 80rpx;
-  background: #0DC5C5;
-  color: #fff;
-  font-size: 28rpx;
-}
-</style>
diff --git a/wenwan/views/storeList.vue b/wenwan/views/storeList.vue
index ba1d85d..62cd5da 100644
--- a/wenwan/views/storeList.vue
+++ b/wenwan/views/storeList.vue
@@ -82,9 +82,9 @@ export default {
       })
     },
     goStore: function (item) {
-      //跳转到客栈详情
+      // 跳转到客栈详情
       uni.navigateTo({
-        url: `/wenwan/views/store?id=${item.id}`,
+        url: `/pagesInn/inn/innHome?id=${item.id}`,
       })
     },
     search() {