From 017bb4a66a94fd756a75649568a8f8937de84522 Mon Sep 17 00:00:00 2001
From: lifizer <913626195@qq.com>
Date: Thu, 29 Feb 2024 10:46:13 +0800
Subject: [PATCH] =?UTF-8?q?Refactor(ALL):Vue3=E5=90=8C=E6=AD=A5=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E4=B8=BAVue2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/CheckboxIcon.vue         |    8 +-
 components/gbro-marquee/marquee.vue |  492 +++++++++
 main.js                             |    2 -
 pages/cart.vue                      |  203 ++--
 pages/home/index.vue                | 1542 +++++++--------------------
 pkg-video/views/city.vue            |  156 +--
 pkg-video/views/lottery-log.vue     |  112 +-
 pkg-video/views/lottery.vue         |  258 +++--
 pkg-video/views/watch.vue           |  415 +++----
 pkg_product/views/healthList.vue    |    2 +-
 pkg_user/views/myCoupons.vue        |    2 +-
 pkg_user/views/myFavorite.vue       |  491 +++++----
 pkg_user/views/withdrawalLog.vue    |   52 +-
 13 files changed, 1805 insertions(+), 1930 deletions(-)
 create mode 100644 components/gbro-marquee/marquee.vue

diff --git a/components/CheckboxIcon.vue b/components/CheckboxIcon.vue
index 29228c1..fc19d24 100644
--- a/components/CheckboxIcon.vue
+++ b/components/CheckboxIcon.vue
@@ -13,6 +13,12 @@ export default {
     defaultState: {
       type: Boolean,
       default: false
+    },
+    mark: {
+      type: Array,
+      default: () => {
+        return []
+      }
     }
   },
   data() {
@@ -27,7 +33,7 @@ export default {
   },
   methods: {
     change() {
-      this.$emit('change', !this.isSelected)
+      this.$emit('change', !this.isSelected, this.mark)
     }
   }
 }
diff --git a/components/gbro-marquee/marquee.vue b/components/gbro-marquee/marquee.vue
new file mode 100644
index 0000000..40fbfb7
--- /dev/null
+++ b/components/gbro-marquee/marquee.vue
@@ -0,0 +1,492 @@
+<template>
+	<view class="marquee_box" @touchstart='touchstartFn' @touchend='touchendFn'>
+		<block v-show="isShow">
+			<view class="" v-if="direction=='right'||direction=='left'">
+				<view v-if="broadcastType=='text'" class="marquee_container" :style="'background:'+broadcastStylees.back_color+';'">
+					<view v-if="broadcastIconIsDisplay" class="broadIcon" :style="'background:'+broadcastStylees.back_color+';font-size:28rpx;'">
+						<text class="iconfont icon-guangbozheng-"></text>
+						<text style="margin-left:12rpx;">{{broadcast_tit}}:</text>
+					</view>
+					<view class="boradcast_text_left_rig" :class='[direction=="left"?"marquee_text_left":direction=="right"?"marquee_text_right":"",animation_paused?"animation_pausedcss":""]'
+					 :style="'--marqueeWidth--:'+(-broadcastStylees.width_mal)+'px;--speed--:'+broadcastStylees.time+'s;width:'+broadcastStylees.width_mal+'px;'">
+						<view v-for="(item,index) in broadcastDataes" @click.stop="click_event(index)" :key="index" :style="'color:'+broadcastStylees.text_color+';margin-left:'+(index!=0?item.starspos:0)+'px;font-size:'+broadcastStylees.font_size+'rpx;'">
+							{{item.text}}
+						</view>
+					</view>
+				</view>
+				
+				<view v-if="broadcastType=='mould'" class="mould">
+					<view class="" style="width: 100%;position: relative;overflow: hidden;" :style="'height:'+viewHeight+'rpx;'">
+						<view class="broadcastTopBtm dsf" :class="[direction=='left'?'broadcastDataTopBtmDatacss_let':direction=='right'?'broadcastDataTopBtmDatacss_rig':'',animation_paused?'animation_pausedcss':'']"
+						 :style="'--scrollWidth--:'+(-(scrlloWidth/2))+'px;--scrollSpeed2--:'+(scrlloWidth/broadcastStyle.speed)+'s;width:'+(scrlloWidth*2)+'px;'">
+							<view ref="mouldRef" class="bml01" style="display: flex;justify-content: space-between;">
+								<slot />
+								<!-- <slot /> -->
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+			
+			<view v-if="direction=='top'||direction=='bottom'" class="broadcastTopBtm" :style="'font-size:'+broadcastStyle.font_size+'rpx;color:'+broadcastStyle.text_color+';background:'+broadcastStyle.back_color+';height:'+viewHeight+'rpx;--scrollHeight--:'+(-broadcastTopBtmHeight/2)+'px;--scrollSpeed--:'+((broadcastTopBtmHeight/2)/broadcastStyle.speed)+'s;'">
+				<view v-if="broadcastType=='text'" :class="[direction=='top'?'broadcastDataTopBtmDatacss_top':direction=='bottom'?'broadcastDataTopBtmDatacss_bottom':'',animation_paused?'animation_pausedcss':'']">
+					<view v-for="(item,index) in broadcastDataTopBtmDataes" :key="index" @click.stop="click_event()" class="bdbd_item">
+						{{item}}
+					</view>
+				</view>
+				<view v-if="broadcastType=='mould'" :class="[direction=='top'?'broadcastDataTopBtmDatacss_top':direction=='bottom'?'broadcastDataTopBtmDatacss_bottom':'',animation_paused?'animation_pausedcss':'']">
+					<slot />
+					<!-- <slot /> -->
+				</view>
+			</view>
+
+		</block>
+
+
+	</view>
+</template>
+
+<script>
+	/**
+	 * author:G.bro
+	 * date:20200513
+	 * * **/
+	export default {
+		data() {
+			return {
+				broadcastDataes: [],
+				broadcastDataTopBtmDataes: [],
+				broadcastStylees: {},
+				broadcastTopBtmHeight: 0,
+				scrlloWidth: 0,
+				animation_paused: false,
+				qualifications: true,
+				isShow: false
+			}
+		},
+		props: {
+			broadcastType: {
+				type: String,
+				default: 'text' //mould
+			},
+			imgdata: {
+				type: Array
+			},
+			broadcastData: {
+				type: Array
+			},
+			broadcastStyle: {
+				type: Object,
+				default () {
+					return {
+						speed: 90, //滚动速度，每秒3个字
+						font_size: "28", //字体大小(rpx)
+						text_color: "#fff", //字体颜色
+						back_color: "#815CD4", //背景色
+
+					}
+				}
+			},
+			broadcastIconIsDisplay: { //图标是否显示
+				type: Boolean,
+				default: false
+			},
+			// broadcast_icon: {
+			// 	type: String,
+			// 	default: ''
+			// },
+			broadcast_tit: {
+				type: String,
+				default: '今日热点'
+			},
+			direction: {
+				type: String,
+				default: 'left'
+			},
+			viewHeight: {
+				type: Number,
+				default: 200
+			},
+			touchEvent: {
+				type: true,
+				default: false
+			}
+
+		},
+		watch: {
+			broadcastData(v) {
+				console.log(v, '---')
+
+				if (v.length) {
+					this.isShow = true;
+					this.initialization();
+				}
+
+
+
+			},
+			imgdata(v) {
+				console.log(v, '---')
+				this.isShow = true;
+				this.initialization();
+
+
+			}
+		},
+		created() {
+
+
+		},
+		mounted() {
+
+			// if(this.broadcastType=='text'){有偏差
+			// 	let assist = { ...this.broadcastStyle};
+			// 	const querys = uni.createSelectorQuery().in(this)
+			// 	querys.select('.boradcast_text_left_rig').boundingClientRect(rect => {
+			// 		assist.width_mal = rect.width;
+			// 			assist.time = rect.width/assist.speed;
+			// 			that.broadcastStylees=assist;
+			// 	}).exec()
+			// }
+		},
+		methods: {
+			initialization() {
+				let that = this;
+
+				if (that.broadcastType == "text") {
+					if (that.direction == "right" || that.direction == "left") {
+						that.initial_let_rig();
+					} else {
+						let arr = [...that.broadcastData];
+						arr = arr.concat(arr);
+						that.broadcastDataTopBtmDataes = arr;
+					}
+				}
+
+				if (that.direction == "top" || that.direction == "bottom") {
+					that.$nextTick(() => {
+						let dir = `.broadcastDataTopBtmDatacss_${that.direction}`
+						const query2 = uni.createSelectorQuery().in(that);
+						query2.select(dir).boundingClientRect(rect => {
+							that.broadcastTopBtmHeight = rect.height;
+							console.log(rect, '==rect.height')
+
+							if (that.viewHeight - rect.height > 10) {
+								that.qualifications = false;
+								that.animation_paused = true;
+								that.broadcastDataTopBtmDataes.splice(that.broadcastDataTopBtmDataes.length / 2, that.broadcastDataTopBtmDataes
+									.length - 1);
+							}
+
+						}).exec();
+					})
+					
+				}
+				if (that.direction == "left" || that.direction == "right") {
+					this.$nextTick(() => {
+						try {
+							if (that.broadcastType == 'mould') {
+								const query = uni.createSelectorQuery().in(that)
+								query.select('.bml01').boundingClientRect(rect => {
+									that.scrlloWidth = rect.width;
+									console.log(rect, '===================rect.width')
+								}).exec()
+							}
+						} catch (e) {
+							that.scrlloWidth = that.$refs.mouldRef.$el.clientWidth * 2
+						}
+					})
+				}
+
+
+
+			},
+			touchendFn(e) {
+				if (this.touchEvent && this.qualifications) {
+					this.animation_paused = false;
+				}
+			},
+			touchstartFn(e) {
+				if (this.touchEvent && this.qualifications) {
+					this.animation_paused = true;
+				}
+			},
+			initial_let_rig() {
+				let broadcastData = [...this.broadcastData];
+				console.log(this.direction, 'this.direction')
+				if (this.direction == "right") {
+					broadcastData.reverse();
+				}
+
+				let ititdata = broadcastData.map((item) => {
+						return {
+							"text": item,
+							"starspos": uni.getSystemInfoSync().windowWidth - 103
+						}
+					}),
+					assist = { ...this.broadcastStyle
+					},
+					this_width = 0,
+					spacing = 0,
+					speed = (assist.speed * assist.font_size); //m每秒行走的距离
+
+				for (let i in ititdata) {
+					this_width += ititdata[i].text.length * assist.font_size;
+					if (i != ititdata.length - 1) {
+						spacing += ititdata[i].starspos
+					}
+				}
+				let total_length = (this_width / 2) + spacing; //总长
+				assist.time = total_length / speed; /**滚动时间*/
+				assist.width_mal = total_length;
+				this.broadcastDataes = ititdata;
+				this.broadcastStylees = assist;
+			},
+			click_event(index) {
+				let i;
+				if (index > ((broadcastDataTopBtmDataes.length / 2) - 1)) {
+					i = index - (broadcastDataTopBtmDataes.length / 2);
+				} else {
+					i = index
+				}
+				this.$emit("changeEvent", {
+					i,
+					msg: `你点击了${i+1}条`
+				});
+			}
+
+		}
+	}
+</script>
+
+<style>
+	/* app端有可能要加上 */
+	/* page {
+		overflow: hidden;
+		width: 100%;
+	} */
+
+	.marquee_box {
+		width: 100%;
+		overflow: hidden;
+		position: inherit;
+		height: auto;
+	}
+
+	.mould {
+		width: 750rpx;
+		overflow: hidden;
+		position: inherit;
+	}
+
+	.dsf {
+		display: flex;
+		justify-content: space-between;
+	}
+
+	.broadIcon {
+		/* width: 60rpx; */
+		padding: 0 22rpx;
+		height: 60rpx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		position: absolute;
+		left: 0;
+		top: 0;
+		color: #fff;
+		z-index: 999;
+		line-height: 60rpx;
+
+	}
+
+
+
+
+
+	.marquee_container {
+		position: relative;
+		width: 100%;
+		height: 60rpx;
+
+	}
+
+	.marquee_text_left {
+		display: flex;
+		white-space: nowrap;
+		animation-name: around_left;
+		animation-duration: var(--speed--);
+		animation-iteration-count: infinite;
+		animation-timing-function: linear;
+		line-height: 60rpx;
+		position: absolute;
+
+	}
+
+	@keyframes around_left {
+		from {
+			left: 100%;
+		}
+
+		to {
+			left: var(--marqueeWidth--);
+		}
+	}
+
+	.marquee_text_right {
+		display: flex;
+		white-space: nowrap;
+		animation-name: around_right;
+		animation-duration: var(--speed--);
+		animation-iteration-count: infinite;
+		animation-timing-function: linear;
+		line-height: 60rpx;
+		position: absolute;
+
+	}
+
+	@keyframes around_right {
+		from {
+			right: 100%;
+		}
+
+		to {
+			right: var(--marqueeWidth--);
+		}
+	}
+
+	.marquee_tit {
+		height: 60rpx;
+		line-height: 60rpx;
+
+	}
+
+	.broadcastTopBtm {
+		padding: 12rx;
+		overflow: hidden;
+		position: relative;
+	}
+
+	.broadcastDataTopBtmDatacss_top {
+		width: 100%;
+		animation-name: around_top;
+		animation-duration: var(--scrollSpeed--);
+		animation-iteration-count: infinite;
+		animation-timing-function: linear;
+		position: absolute;
+		left: 0;
+	}
+
+	@keyframes around_top {
+		from {
+			top: 0%;
+		}
+
+		to {
+			top: var(--scrollHeight--);
+		}
+	}
+
+	.broadcastDataTopBtmDatacss_bottom {
+		width: 100%;
+		animation-name: around_Bottom;
+		animation-duration: var(--scrollSpeed--);
+		animation-iteration-count: infinite;
+		animation-timing-function: linear;
+		position: absolute;
+		left: 0;
+	}
+
+	@keyframes around_Bottom {
+		from {
+			bottom: 0%;
+		}
+
+		to {
+			bottom: var(--scrollHeight--);
+		}
+	}
+
+	.broadcastDataTopBtmDatacss_let {
+		width: 100%;
+		animation-name: around_let;
+		animation-duration: var(--scrollSpeed2--);
+		animation-iteration-count: infinite;
+		animation-timing-function: linear;
+		position: absolute;
+		left: 0;
+		top: 0;
+	}
+
+	.broadcastDataTopBtmDatacss_rig {
+
+		width: 100%;
+		animation-name: around_rig;
+		animation-duration: var(--scrollSpeed2--);
+		animation-iteration-count: infinite;
+		animation-timing-function: linear;
+		position: absolute;
+		right: 0%;
+		top: 0;
+		display: flex;
+		justify-content: flex-end;
+	}
+
+	.animation_pausedcss {
+		animation-play-state: paused;
+	}
+
+	@keyframes around_let {
+		from {
+			left: 0%;
+		}
+
+		to {
+			left: var(--scrollWidth--);
+		}
+	}
+
+	@keyframes around_rig {
+		from {
+			right: 0%;
+		}
+
+		to {
+			right: var(--scrollWidth--);
+		}
+	}
+
+	.bdbd_item {
+		padding: 0 12rpx;
+		line-height: 60rpx;
+		overflow: hidden;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+	}
+
+	@font-face {
+		font-family: "iconfont";
+		src: url('//at.alicdn.com/t/font_1686137_9el2ov99ag.eot?t=1589197045289');
+		/* IE9 */
+		src: url('//at.alicdn.com/t/font_1686137_9el2ov99ag.eot?t=1589197045289#iefix') format('embedded-opentype'),
+			/* IE6-IE8 */
+			url('data:application/x-font-woff2;charset=utf-8;base64,d09GMgABAAAAAANIAAsAAAAAByAAAAL7AAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHEIGVgCCcAqCJIIbATYCJAMICwYABCAFhG0HNxtIBhHVmxnIfiTYMS7bb8koPCedCeJJj2/e7iZfYqkjkZzk9lw0oCspm5uha1SEYUrOg//lO9IN4UL4FQBGHE6b4vPv8pzmojHnedQFGG8NaG9cCySQAgnMG8ZuIniA2yGAP8kUIg0ateiALwbQTwAZMXRwX3wLLgzGifoi2A1TDbIKC1+1WF0CVvLvy0fKxRcUlgYkthnUcAB13sA47XgOPSgBwXIGwJkFGigEDEiHRlMrtAwVovGPQoZ0OFa2wJs6nkf5h/3jgYDYgMxAABJ1/jMJsPBRMxUARq/vB7iTzgYmPjQ5vv+S6E4b/P2XXBBxLwYELI3pvDFm/XqMs27QknXgrK82yepoddiXOXTJhi3NTe/e7XznTqcNG7ZujLoN2Drexulwy99hXacl0UZCzNW77p1WfV52MOpyx+O3nVuFt1qs+xziN+DL8Q0BU2N17J84FTs1YMOXE/2dXf8DTwV62/5bne0/dmdranzv25uGonfvtepore/p0pXugqw9N2SpuKsuTSuYO7vtjzV1oka1azMqsm50/SYtYxvHNug6blqbRuGpQccDpjYpGzCwauyCmnETJpadjJjwO6teaETz1uHNQjPqfmhPHQC8q/q2Lvj3vyF17cvZvUOqvvkGGAAePO36jTu8q4ZhFvC9Q7PAnxYMzDOxCKjUI/MNs6JfzoECneta8QC2cJ5MVUe9VkzwJerlLD4kZdD4kkk01EJYBFAJG19q4U8BjWcHEME4NGL8gHzmaxBCOQlFMBehCeUy0VAfwyKaz7AJFQ1/OknEkgFki5dUfUYt6MD8IFnaPdKKEtk3DFfVnBdx2gv5TF4Yu6EcXXFHXmLE+Q6TiAfPtMGi7Ya1EhxMGa10UeSY+943XamztDWK+oxa0IH5QbK0e1pcVOXzNwxX1dyRM+J8IZ+pcRi7YQBxle+Dch5ln/MdJhEPnmmDRTNghSGCo7lTRitdnBA45t4o5IfKu+2V298tAfwBGiWwuSZo8KX3YOgfkRnbpgEA') format('woff2'),
+			url('//at.alicdn.com/t/font_1686137_9el2ov99ag.woff?t=1589197045289') format('woff'),
+			url('//at.alicdn.com/t/font_1686137_9el2ov99ag.ttf?t=1589197045289') format('truetype'),
+			/* chrome, firefox, opera, Safari, Android, iOS 4.2+ */
+			url('//at.alicdn.com/t/font_1686137_9el2ov99ag.svg?t=1589197045289#iconfont') format('svg');
+		/* iOS 4.1- */
+	}
+
+	.iconfont {
+		font-family: "iconfont" !important;
+		font-size: 16px;
+		font-style: normal;
+		-webkit-font-smoothing: antialiased;
+		-moz-osx-font-smoothing: grayscale;
+	}
+
+	.icon-guangbozheng-:before {
+		content: "\e640";
+	}
+</style>
diff --git a/main.js b/main.js
index cb37717..3805ca1 100644
--- a/main.js
+++ b/main.js
@@ -15,9 +15,7 @@ import {
     WX_LIVE_APPID
 } from "@/config";
 import uView from "uview-ui";
-import VueCompositionApi from '@vue/composition-api'
 
-Vue.use(VueCompositionApi)
 Vue.use(uView);
 Vue.mixin(mixin)
 
diff --git a/pages/cart.vue b/pages/cart.vue
index 2d2733a..091bcdd 100644
--- a/pages/cart.vue
+++ b/pages/cart.vue
@@ -10,12 +10,12 @@
 
       <view class="flex jc-between">
         <view class="flex ai-center">
-          <CheckboxIcon style="margin-right: 24rpx;" :default-state="item['state']" @change="value => onChange(value, index, '')"/>
+          <CheckboxIcon style="margin-right: 24rpx;" :default-state="item['state']" :mark="[index]" @change="onChange"/>
           <image class="store-cover" :src="item['merAvatar']"
                  mode="scaleToFill"/>
           <view style="color:#333333;font-size: 30rpx">{{ item['merName'] }}</view>
         </view>
-        <view class="flex ai-center" style="color:#E92727;font-size: 24rpx" @click="navToStore(item['merId'])">
+        <view class="flex ai-center" style="color:#E92727;font-size: 24rpx" @click="navToStore(item['hotelId'])">
           进店逛逛
           <image style="width: 24rpx;height: 24rpx" :src="webUrl+'/20240109234706982937.png'" mode="scaleToFill"/>
         </view>
@@ -24,16 +24,20 @@
       <view class="goods-box">
         <view class="goods flex ai-center" v-for="(goods,gIndex) in item['carts']" :key="gIndex">
           <CheckboxIcon style="margin-right: 24rpx;" :default-state="goods['state']" :mark="[index,gIndex]"
-                        @change="value => onChange(value, index, gIndex)"/>
+                        @change="onChange"/>
           <image class="goods-cover flex-0" :src="goods['productInfo']['attrInfo']['image']" mode="scaleToFill"
+                 @click="navToGoods(goods['productId'])"
                  v-if="goods['productInfo']['attrInfo']['image']"/>
-          <image class="goods-cover flex-0" :src="goods['productInfo']['image']" mode="scaleToFill" v-else/>
+          <image class="goods-cover flex-0" :src="goods['productInfo']['image']" mode="scaleToFill"
+                 @click="navToGoods(goods['productId'])" v-else/>
 
           <view style="width: 100%">
-            <view class="one-t">{{ goods['productInfo']['storeName'] }}</view>
-            <view class="sku ai-center">规格：{{ goods['productInfo']['attrInfo']['sku'] }}</view>
+            <view class="one-t" @click="navToGoods(goods['productId'])">{{ goods['productInfo']['storeName'] }}</view>
+            <view class="sku ai-center" @click="navToGoods(goods['productId'])">
+              规格：{{ goods['productInfo']['attrInfo']['sku'] }}
+            </view>
             <view class="flex jc-between ai-center" style="width: 100%;margin-top: 26rpx;">
-              <view style="color:#E92727;font-size: 32rpx;">
+              <view style="color:#E92727;font-size: 32rpx;" @click="navToGoods(goods['productId'])">
                 <text class="bold" style="font-size: 24rpx">￥</text>
                 {{ goods['truePrice'] }}
               </view>
@@ -63,8 +67,8 @@
 
     <view class="footer-fixed flex jc-between ai-center">
       <view style="margin-left: 32rpx;">
-        <CheckboxIcon style="margin-right: 24rpx;" :default-state="isAll" @change="value => onAllChange(value)"/>
-        <text style="color:#666666;font-size: 32rpx">已选({{ selectCount }})</text>
+        <CheckboxIcon style="margin-right: 24rpx;" :default-state="isAll" :mark="[-1]" @change="onChange"/>
+        <text style="color:#666666;font-size: 32rpx">全选({{ selectCount }})</text>
       </view>
       <view class="flex ai-center">
         <view style="margin-right: 20rpx;color:#666666;font-size: 32rpx">合计:
@@ -76,120 +80,133 @@
   </view>
 </template>
 
-<script setup>
+<script>
 import {changeCartNum, getCartGroup, postCartDel} from "@/api/store";
-import {VUE_APP_RESOURCES_URL} from '../config/index'
 import CheckboxIcon from "@/components/CheckboxIcon.vue";
+import {VUE_APP_RESOURCES_URL} from '../config/index'
 
 const webUrl = VUE_APP_RESOURCES_URL
 
 export default {
-  name: 'CartIndex',
-  components: {
-    CheckboxIcon
-  },
+  components: {CheckboxIcon},
   data() {
     return {
-      webUrl,
       ready: false,
-      isAll: false,
-      selectCount: 0,
-      total: 0,
-      list: []
+      list: [],
+      isAll: false
+    }
+  },
+  computed: {
+    total() {
+      let price = 0
+      this.list.forEach(item => {
+        item['carts'].forEach(goods => {
+          if (goods.state) price += Math.round(goods['cartNum'] * goods['truePrice'] * 100) / 100
+        })
+      })
+      return Math.round(price * 100) / 100
+    },
+    selectCount() {
+      let count = 0
+      this.list.forEach(item => {
+        item['carts'].forEach(goods => {
+          if (goods.state) count++
+        })
+      })
+      return count
     }
   },
   onShow() {
-    this.ready = true
     this.getCart()
+    this.ready = true
   },
   methods: {
     async getCart() {
       const res = await getCartGroup()
       if (res.success) {
         this.list = res.data['valid']
-        this.list.map(item => {
-          item.state = false
-          if (item.carts) {
-            item.carts.map(child => {
-              child.state = false
-            })
-          }
-        })
-        this.handleAll(true)
+        this.handleAll(false)
       }
     },
-    onChange(state, index, childIndex) {
-      if (childIndex === '') {
-        this.list[index].state = state
-        this.list[index].carts.map(good => {
-          good.state = state
-        })
-      } else {
-        this.list[index].carts[childIndex].state = state
-        let count = 0
-        this.list[index].carts.map(good => {
-          if (good.state) {
-            count++
-          }
-        })
-        this.list[index].state = count === this.list[index].carts.length
-      }
-      this.$forceUpdate()
-      this.calcAll()
-    },
-    onAllChange() {
-      this.handleAll(!this.isAll)
-    },
+
     handleAll(state) {
-      this.list.map(item => {
-        item.state = state
-        if (item.carts) {
-          item.carts.map(good => {
-            good.state = state
-          })
-        }
-      })
       this.isAll = state
-      this.calcAll()
-    },
-    calcAll() {
-      let total = 0
-      let count = 0
-      let goodsAll = 0
-      this.list.map(item => {
-        if (item.carts) {
-          item.carts.map(good => {
-            goodsAll++
-            if (good.state) {
-              total += good.cartNum * good.truePrice
-              count++
-            }
-          })
-        }
+      this.list = this.list.map(item => {
+        item.state = state
+        item.carts = item.carts.map(goods => {
+          goods.state = state
+          return goods
+        })
+        return item
       })
-      this.total = total
-      this.selectCount = count
-      this.isAll = goodsAll === count
     },
+
     navToStore(id) {
+      if (id === 0) {
+        uni.showToast({
+          title: '店铺装修中~',
+          icon: 'none',
+          duration: 3000
+        })
+        return
+      }
+
       uni.navigateTo({
         url: '/pagesInn/inn/innHome?id=' + id
       })
     },
+
+    onChange(state, mark) {
+      if (mark.length === 1) {
+        if (mark[0] === -1) {
+          this.handleAll(state)
+        } else {
+          this.list[mark[0]]['state'] = state
+          this.list[mark[0]]['carts'] = this.list[mark[0]]['carts'].map(goods => {
+            goods.state = state
+            return goods
+          })
+        }
+      }
+
+      if (mark.length === 2) {
+        this.list[mark[0]]['carts'][mark[1]]['state'] = state
+        const length = this.list[mark[0]]['carts'].length
+        let count = 0
+        this.list[mark[0]]['carts'] = this.list[mark[0]]['carts'].map((goods, gIndex) => {
+          if (gIndex === mark[1]) goods['state'] = state
+          if (goods['state']) count++
+          return goods
+        })
+        this.list[mark[0]]['state'] = count === length
+      }
+    },
+
+    changeNum(event) {
+      changeCartNum(event.name, event.value)
+    },
+
     handleIds() {
-      const ids = []
-      this.list.map(item => {
-        item.carts.map(good => {
-          if (good.state) {
-            ids.push(good.id)
-          }
+      if (this.selectCount === 0) {
+        uni.showToast({
+          title: "请选择产品",
+          icon: "none",
+          duration: 2000
+        })
+        return []
+      }
+
+      let ids = []
+      this.list.forEach(item => {
+        item['carts'].forEach(goods => {
+          if (goods['state']) ids.push(goods['id'])
         })
       })
       return ids
     },
+
     remove() {
-      const _this = this
-      const ids = _this.handleIds()
+      const ids = this.handleIds()
       if (ids.length === 0) return
 
       uni.showModal({
@@ -198,12 +215,15 @@ export default {
         showCancel: true,
         cancelText: '取消',
         confirmText: '确认',
-        success: async () => {
-          const res = await postCartDel(ids)
-          if (res.success) await _this.getCart()
+        success: async (result) => {
+          if (result.confirm) {
+            const res = await postCartDel(ids)
+            if (res.success) await this.getCart()
+          }
         }
       })
     },
+
     submit() {
       const ids = this.handleIds()
       if (ids.length === 0) return
@@ -264,9 +284,8 @@ view {
 
     .sku {
       display: inline-flex;
-      height: 42rpx;
       margin-top: 12rpx;
-      padding: 0 20rpx;
+      padding: 10rpx 20rpx;
       border-radius: 22rpx;
       background: #FDF1F3;
       color: #999999;
diff --git a/pages/home/index.vue b/pages/home/index.vue
index 453ea80..405b075 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -1,5 +1,6 @@
 <template>
   <view class="index">
+
     <view class="header  acea-row row-column row-left" style="position: absolute;left: 0;right: 0;"
           :style="{top:statusBarHeight+'px'}">
 
@@ -56,20 +57,27 @@
         搜索商品
       </view>
     </view>
-
-    <!-- 快捷跳转块v4 -->
-    <view class="fast-nav x-start">
-      <view class="item y-f" v-for="(item,index) in menus" :key="index" @click="$global.commonJump(item.uniapp_url)">
-        <image :src="item.pic"
-               mode="scaleToFill"></image>
-        <view class="one-t">{{ item.name }}</view>
-      </view>
-    </view>
-    <!-- 快捷跳转块v4end -->
     <!-- 导航v9 -->
-<!--    <u-scroll-list style="background: pink">-->
-<!--      <view>aaa</view>-->
-<!--    </u-scroll-list>-->
+    <view style="padding:24rpx 30rpx;background-color: #FFFFFF">
+      <u-scroll-list indicatorActiveColor="#FF6666">
+        <view v-for="n in menuArr[0].length" :key="n">
+          <view class="flex flex-col ai-center" style="width: 138rpx;margin-bottom: 32rpx;"
+                @click="$global.commonJump(menuArr[0][n]['uniapp_url'])">
+            <image style="width: 86rpx;height: 86rpx" :src="menuArr[0][n]['pic']" mode="scaleToFill"/>
+            <view class="one-t tc" style="width: 100%;margin-top: 16rpx;color:#666666;font-size: 26rpx">
+              {{ menuArr[0][n]['name'] }}
+            </view>
+          </view>
+          <view class="flex flex-col ai-center" style="width: 138rpx" v-if="menuArr[1][n]"
+                @click="$global.commonJump(menuArr[1][n]['uniapp_url'])">
+            <image style="width: 86rpx;height: 86rpx" :src="menuArr[1][n]['pic']" mode="scaleToFill"/>
+            <view class="one-t tc" style="width: 100%;margin-top: 16rpx;color:#666666;font-size: 26rpx">
+              {{ menuArr[1][n]['name'] }}
+            </view>
+          </view>
+        </view>
+      </u-scroll-list>
+    </view>
     <!-- 导航v9end -->
 
     <!-- v4 预售专区开始 -->
@@ -85,48 +93,6 @@
     </view>
     <!-- v4 预售专区结束 -->
 
-    <!-- v4 限时秒杀开始 -->
-    <!--    <view class="seckill" v-if="seckillList.length">-->
-    <!--      <view class="header acea-row row-between">-->
-    <!--        <view class="acea-row">-->
-    <!--          <view>-->
-    <!--            <view class="title">限时秒杀</view>-->
-    <!--            <view class="sub-title">尖货限时抢</view>-->
-    <!--          </view>-->
-    <!--          <view class="count-box">-->
-    <!--            <count-down :isDay="false" isSecond :dayText="false" :hourText="':'" :minuteText="':'" :secondText="false"-->
-    <!--                        :datatime="seckillTime.stop"></count-down>-->
-    <!--          </view>-->
-    <!--        </view>-->
-
-    <!--        <view class="more" @click="goSeckill">查看更多-->
-    <!--          <uni-icons type="arrowright" color="#7C7C7C" size="14"/>-->
-    <!--        </view>-->
-    <!--      </view>-->
-
-    <!--      <view class="list">-->
-    <!--        <view class="item" v-for="(item,index) in seckillList" :key="index" @click="goGoodsConByProductID(item,'kill')">-->
-    <!--          <image class="left-img" :src="item.image" mode="scaleToFill"></image>-->
-    <!--          <view class="content">-->
-    <!--            <view class="title">{{ item.title }}</view>-->
-    <!--            <view class="item-bottom">-->
-    <!--              <view class="price-line acea-row row-between">-->
-    <!--                <text class="price">￥{{ item.price }}</text>-->
-    <!--                <image class="cart" :src="webUrl+'/20220521111716109789.png'" mode="scaleToFill"></image>-->
-    <!--              </view>-->
-    <!--              <view class="desc-line">-->
-    <!--                <image class="fire-gray" :src="webUrl+'/20220214125642215597.png'" mode="scaleToFill"></image>-->
-    <!--                <text class="sold">{{ item.sales }}人已购买</text>-->
-    <!--                &lt;!&ndash;   <view class="space"></view>-->
-    <!--                <text>{{item.merName}}</text> &ndash;&gt;-->
-    <!--              </view>-->
-    <!--            </view>-->
-    <!--          </view>-->
-    <!--        </view>-->
-    <!--      </view>-->
-    <!--    </view>-->
-    <!-- v4 限时秒杀结束 -->
-
     <!-- v4 每天特价开始 -->
     <view class="special-offer" v-if="dailyGoodsList.length">
       <view class="header flex">
@@ -190,7 +156,6 @@
             <image :src="stay.indexImage" mode="scaleToFill" @click="goHomeStay(stay)"/>
           </swiper-item>
         </swiper>
-        <!--        <image :src="contentHomestay.indexImage" mode="scaleToFill" @click="goHomeStay" v-if="contentHomestay.indexImage"/>-->
         <image :src="contentFestival.indexImage" mode="scaleToFill" @click="goFestival"
                v-if="contentFestival.indexImage"/>
       </view>
@@ -259,8 +224,7 @@
 </template>
 
 <script>
-import {mapActions, mapGetters} from 'vuex';
-import {formatDateTime} from "@/utils";
+import {mapGetters} from 'vuex';
 
 import PromotionGood from '@/components/PromotionGood';
 import CouponWindow from '@/components/CouponWindow';
@@ -270,7 +234,6 @@ import imgBox from '@/components/imageTypeSet/imagebox.vue'
 
 import {getCouponReceive, noticeDetail, noticeList} from "@/api/user";
 import {getHomeData, getShareImage} from '@/api/public';
-import {getHomeHotelList} from "@/api/inn.js";
 import {getProducts} from "@/api/store";
 import {sharpBannar} from "@/api/goods";
 import NP from "number-precision";
@@ -289,7 +252,6 @@ export default {
   props: {},
   data: function () {
     return {
-      userTotal: '', //总会员数
       currentIndex: 0,
       speed: 200,
       seriesWidth: 400,
@@ -308,6 +270,7 @@ export default {
       restaurantArray: [],
       banner: [],
       menus: [],
+      menuArr: [[], []],
       roll: [],
       cityName: "",
       activity: [],
@@ -394,8 +357,6 @@ export default {
       statusBarHeight: 64,
       dailyGoodsList: [], // 每日特价
       preSaleList: [], // 预售商品
-      seckillList: [], // 秒杀商品
-      seckillTime: {}, // 秒杀场次
       month: 0, // 每日特价:月
       date: 0, // 每日特价：日
       bannarList: [], // 尖货推荐横幅
@@ -414,46 +375,15 @@ export default {
     getShareImage().then(({data}) => this.shareAppImg = data);
     uni.getSystemInfo({
       success: (e) => {
-        // this.compareVersion(e.SDKVersion, '2.5.0')
         let statusBar = 0;
         let customBar = 0;
 
-        // #ifdef MP
-        statusBar = e.statusBarHeight
-        customBar = e.statusBarHeight + 45
-        if (e.platform === 'android') {
-          //this.$store.commit('SET_SYSTEM_IOSANDROID', false)
-          customBar = e.statusBarHeight + 50
-        }
-        // #endif
-
-
         // #ifdef MP-WEIXIN
         statusBar = e.statusBarHeight
-        // @ts-ignore
-        //uni.getMenuButtonBoundingClientRect();
         const custom = uni.getMenuButtonBoundingClientRect()
         customBar = custom.bottom + custom.top - e.statusBarHeight
         // #endif
 
-
-        // #ifdef MP-ALIPAY
-        statusBar = e.statusBarHeight
-        customBar = e.statusBarHeight + e.titleBarHeight
-        // #endif
-
-
-        // #ifdef APP-PLUS
-        statusBar = e.statusBarHeight
-        customBar = e.statusBarHeight + 45
-        // #endif
-
-
-        // #ifdef H5
-        statusBar = 0
-        customBar = e.statusBarHeight + 45
-        // #endif
-
         that.statusBarHeight = customBar;
         //两列商品宽度
         that.hotGoodsColumnWidth = (e.screenWidth - uni.upx2px(90)) / 2 + 'px';
@@ -462,6 +392,8 @@ export default {
 
       }
     });
+
+    this.testAni()
   },
   onShow: function () {
     const today = new Date();
@@ -486,11 +418,13 @@ export default {
       imageUrl: this.shareAppImg
     }
   },
+  onPullDownRefresh() {
+    uni.stopPullDownRefresh()
+    uni.navigateTo({
+      url: '/pkg-video/views/lottery'
+    })
+  },
   methods: {
-    ...mapActions(["setLocation"]),
-    innOpenDateString(str, format) {
-      return formatDateTime(str, format);
-    },
     init() {
       let that = this;
 
@@ -503,10 +437,18 @@ export default {
         getHomeData().then(res => {
           that.logoUrl = res.data.logoUrl;
           that.$set(that, 'banner', res.data.banner);
-          that.$set(that, 'menus', res.data.menus);
+
+          that.$set(that, 'menus', res.data.menus)
+          res.data.menus?.forEach((item, index) => {
+            if (index % 2 === 0) {
+              that.menuArr[0].push(item)
+            } else {
+              that.menuArr[1].push(item)
+            }
+          })
+
           that.$set(that, 'roll', res.data.roll);
           that.$set(that, 'userList', res.data.lotteryRecord); //滚动会员信息
-          that.$set(that, 'userTotal', res.data.userTotal); //会员总数信息
           that.$set(that, 'info', res.data.info);
           that.$set(that, 'firstList', res.data.firstList.map((item) => {
             item.price = that.$force2Decimal(item.price);
@@ -564,13 +506,6 @@ export default {
             that.duration = Math.floor(that.seriesWidth / that.speed * 1000);
           }, 1)
 
-          // 尖货推荐
-          // let temp = {
-          //   storeName: "swiper",
-          //   image: "https://fastly.jsdelivr.net/npm/@vant/assets/cat.jpeg",
-          //   bannarList: that.bannarList
-          // }
-          // res.data.bastList.unshift(temp);
           for (let i = 0; i < res.data.bastList.length; i++) {
             res.data.bastList[i].hide = true;
           }
@@ -586,8 +521,6 @@ export default {
 
           that.$set(that, 'dailyGoodsList', res.data.dailyGoodsList);
           that.$set(that, 'preSaleList', res.data.preSaleList);
-          that.$set(that, 'seckillList', res.data.seckillList);
-          that.$set(that, 'seckillTime', res.data.seckillTime);
 
           uni.hideLoading();
         });
@@ -615,79 +548,9 @@ export default {
     clickItem(data) {
       this.goGoodsCon(data);
     },
-    swiperChange(e) {
-      this.currentIndex = e.detail.current;
-    },
     msgConfirm: function () {
       that.$refs.popup.close();
     },
-
-    getHotelList: function () {
-      let that = this;
-
-      var q = {
-        page: 1,
-        limit: 6,
-        type: 1 //类型 1客栈 2购物店 3餐馆
-      };
-
-      //如果定位到了城市加入参数
-      if (this.cityName.length > 0) {
-        q.cityName = this.cityName;
-      }
-
-      getHomeHotelList(q).then(res => {
-        that.innArray = [];
-        that.innArray.push.apply(that.innArray, res.data);
-      })
-    },
-    getShopList: function () {
-      let that = this;
-
-      var q = {
-        page: 1,
-        limit: 4,
-        type: 2 //类型 1客栈 2购物店 3餐馆
-      };
-
-      //如果定位到了城市加入参数
-      if (this.cityName.length > 0) {
-        q.cityName = this.cityName;
-      }
-
-      getHomeHotelList(q).then(res => {
-        that.shopArray = [];
-        that.shopArray.push.apply(that.shopArray, res.data);
-      })
-    },
-    getRestaurantList: function () {
-      let that = this;
-
-      var q = {
-        page: 1,
-        limit: 4,
-        type: 3 //类型 1客栈 2购物店 3餐馆
-      };
-
-      //如果定位到了城市加入参数
-      if (this.cityName.length > 0) {
-        q.cityName = this.cityName;
-      }
-
-      getHomeHotelList(q).then(res => {
-        that.restaurantArray = [];
-        that.restaurantArray.push.apply(that.restaurantArray, res.data);
-      })
-    },
-    goMoreBoutiqueGift: function () {
-      //跳转伴手礼分类
-      this.$yrouter.reLaunch({
-        path: '/pages/shop/GoodsClass/index',
-        query: {
-          id: 18
-        }
-      });
-    },
     goPreSale: function () {
       this.$yrouter.push("/v4/views/preSale/preSale")
     },
@@ -768,13 +631,19 @@ export default {
     },
 
     goHomeStay(stay) {
+      if (stay.uniappUrl) {
+        this.$global.commonJump(stay.uniappUrl)
+        return
+      }
+
       if (stay.type === 2 && stay.isLinkToProduct) {
         this.$yrouter.push({
           path: '/pages/shop/GoodsCon/index',
           query: {
             id: stay.productId
           }
-        });
+        })
+        return
       }
       if (stay.type === 1) {
         uni.navigateTo({url: '/pkg_product/views/homestay?id=' + stay.id})
@@ -813,1014 +682,278 @@ export default {
       } else if (type === 2) {
         this.$global.levelJump(pageLevel, url, params)
       }
+    },
+
+    testAni() {
+      const query = uni.createSelectorQuery().in(this).select('.index')
+      query.fields({size: true, scrollOffset: true}, (data) => {
+        console.log(JSON.stringify(data))
+      }).exec()
     }
   }
 };
 </script>
 
-<style>
-@keyframes scroll-animation {
-  from {
-    transform: translateX(0);
-  }
-
-  to {
-    transform: translateX(-50%);
-  }
-}
-
-@-webkit-keyframes scroll-animation {
-  from {
-    transform: translateX(0);
-  }
-
-  to {
-    transform: translateX(-50%);
-  }
-}
-</style>
-
-<style lang="scss">
-/* #ifdef MP-WEIXIN */
-// wx-swiper .wx-swiper-dot {
-//   margin-bottom: 68rpx;
-// }
-/* #endif */
-</style>
-
 <style scoped lang="less">
 .index {
   background-color: #F5F5FA;
-}
 
-.index .header {
-  height: auto !important;
-  background-color: transparent !important;
-}
-
-.swiper-item {
-  height: 100%;
-}
-
-.fixed-header {
-  position: fixed;
-  z-index: 99;
-  top: 0;
-  left: 0;
-  right: 0;
-  background: #fff;
-  box-shadow: 0 0 20rpx -10rpx #aaa;
-
-  & + .fixed-header-box {
-    height: 98rpx
-  }
-}
-
-
-.member-box {
-  margin-bottom: 32rpx;
-}
-
-.title-text {
-  font-size: 32rpx;
-  font-weight: bold;
-  color: #fff;
-}
-
-.nickname-text {
-  font-size: 28rpx;
-  color: #fff;
-  margin-right: 16rpx;
-}
-
-.crown-img {
-  width: 40rpx;
-  height: 40rpx;
-  margin-right: 16rpx;
-}
-
-.avatar-img {
-  width: 68rpx;
-  height: 68rpx;
-  border-radius: 50%;
-  z-index: 1;
-}
-
-.live-broadcast-box {
-  width: 83*2rpx;
-  height: 32*2rpx;
-  box-sizing: border-box;
-  margin-right: 16rpx;
-  margin-left: -30rpx;
-  background: rgba(138, 143, 203, 1);
-  border-radius: 0px 16*2rpx 16*2rpx 0px;
-}
-
-.live-broadcast-box .video-icon {
-  width: 20*2rpx;
-  height: 20*2rpx;
-  margin-right: 5*2rpx;
-}
-
-.live-broadcast-box .living-box {
-  margin-right: 5*2rpx;
-  width: 20*2rpx;
-  height: 20*2rpx;
-  background: linear-gradient(137deg, rgba(252, 85, 179, 1) 0%, rgba(255, 45, 105, 1) 100%);
-  border-radius: 50%;
-}
-
-.live-broadcast-box .living-img {
-  width: 12*2rpx;
-  height: 12*2rpx;
-}
-
-.live-broadcast-box .living-status-text {
-  color: #fff;
-  font-size: 24rpx;
-}
-
-.slider-banner {
-  -webkit-transform: rotate(0);
-  width: auto !important;
-}
-
-
-.header {
-  background-repeat: no-repeat;
-  background-size: 100% 100%;
-}
-
-.header .paper-cuts-img {
-  position: absolute;
-  width: 159*2rpx;
-  height: 159*2rpx;
-  top: 0;
-  left: 0;
-  bottom: 0;
-  right: 0;
-  margin: auto;
-  z-index: 0;
-}
-
-.search {
-  -webkit-box-flex: 1;
-  -webkit-flex: 1;
-  flex: 1;
-  box-sizing: border-box;
-  height: 64rpx;
-  background-color: #F5F5F5;
-  padding: 0 28rpx;
-  font-size: 28rpx;
-  color: #acacac;
-  border-radius: 32rpx;
-  margin: 0 30rpx;
-}
-
-.notice {
-  margin-right: 24rpx;
-  color: #fff;
-  text-align: center;
-  font-size: 12*2rpx;
-  font-weight: bold;
-  flex-shrink: 0;
-}
-
-.close-btn {
-  width: 36rpx;
-  height: 36rpx;
-  flex-shrink: 0;
-}
-
-.company-title {
-  font-size: 18*2rpx;
-  color: #3868FD;
-  background: rgba(255, 255, 255, 1);
-  margin-left: 5*2rpx;
-  margin-right: 5*2rpx;
-}
-
-.company-hline {
-  width: 28*2rpx;
-  height: 0;
-  border: 1px solid rgba(56, 104, 253, 1);
-}
-
-.company-subtitle {
-  font-size: 14*2rpx;
-  color: rgba(121, 129, 253, 1);
-}
-
-.h-line {
-  width: 28*2rpx;
-  height: 0;
-  border: 1px solid rgba(255, 121, 0, 1);
-}
-
-.sub-title {
-  font-size: 14*2rpx;
-  margin-top: 10rpx;
-  color: rgba(252, 85, 179, 0.7);
-}
-
-.title .hot-title {
-  font-size: 18*2rpx;
-  color: #FF7900;
-  background: rgba(255, 255, 255, 1);
-  margin-left: 5*2rpx;
-  margin-right: 5*2rpx;
-}
-
-.hotGoodsList {
-  position: relative;
-  margin: 35rpx 0;
-  flex-wrap: wrap;
-}
-
-.hotGoodsList .newProductsItem {
-  margin-left: 35rpx;
-  margin-top: 20rpx;
-}
-
-.newProductsItem .market-price {
-  font-size: 12*2rpx;
-  color: #C2C5CC;
-  text-decoration: line-through;
-}
-
-.newProductsItem .money {
-  font-size: 16*2rpx;
-  color: #FF564A;
-  font-weight: bold;
-}
-
-.shoppingCart {
-  width: 28*2rpx;
-  height: 28*2rpx;
-  background: rgba(255, 45, 105, 1);
-  border-radius: 50%;
-}
-
-.cart-icon {
-  width: 18*2rpx;
-  height: 18*2rpx;
-}
-
-.img-box {
-  position: relative;
-}
-
-.price-tag {
-  position: absolute;
-  width: 39*2rpx;
-  height: 19*2rpx;
-  left: 0;
-  top: 0;
-}
-
-.like-btn {
-  position: absolute;
-  width: 24*2rpx;
-  height: 24*2rpx;
-  right: 0;
-  top: 0;
-}
-
-.pro-info {
-  font-size: 14*2rpx;
-}
-
-.company-logo-box {
-  flex-shrink: 0;
-}
-
-.company-info-box {
-  padding: 24rpx 24rpx 32rpx 24rpx;
-  background: rgba(255, 255, 255, 1);
-  box-shadow: 0 6rpx 12rpx rgba(0, 0, 0, 0.1);
-  border-radius: 0 12rpx 12rpx 12rpx;
-  flex-wrap: nowrap !important;
-}
-
-.company-info {
-  flex: 1;
-  margin-left: 16rpx;
-}
-
-.company-tel-box {
-  margin-top: 16rpx;
-}
-
-.company-logo {
-  width: 116*2rpx;
-  height: 100*2rpx;
-  background: rgba(139, 143, 153, 1);
-  border-radius: 4*2rpx;
-}
-
-.company-name {
-  font-size: 14*2rpx;
-  font-weight: bold;
-  color: rgba(8, 15, 26, 1);
-}
-
-.company-tel-title {
-  color: #C2C5CC;
-  font-size: 12*2rpx;
-}
-
-.company-tel {
-  font-size: 12*2rpx;
-  font-weight: bold;
-  color: rgba(65, 69, 77, 1);
-  margin-right: 16rpx;
-}
-
-.company-call-btn {
-  width: 40*2rpx;
-  height: 19*2rpx;
-  background: rgba(56, 104, 253, 1);
-  opacity: 1;
-  border-radius: 2*2rpx;
-  font-size: 12*2rpx;
-  color: rgba(255, 255, 255, 1);
-  text-align: center;
-}
-
-.line {
-  height: 0;
-  border: 1px solid rgba(235, 236, 240, 1);
-  margin-top: 10*2rpx;
-  margin-bottom: 10*2rpx;
-}
-
-.company-address {
-  font-size: 12*2rpx;
-  color: rgba(166, 170, 179, 1);
-}
-
-.new-tag {
-  padding: 1*2rpx 3*2rpx;
-  width: 29*2rpx;
-  height: 14*2rpx;
-  color: #fff;
-  font-size: 10*2rpx;
-  background: linear-gradient(142deg, rgba(255, 202, 30, 1) 0%, rgba(255, 170, 0, 1) 100%);
-  opacity: 1;
-  border-radius: 1*2rpx;
-  box-sizing: border-box;
-  position: absolute;
-  left: 10rpx;
-  top: 21.5rpx;
-
-}
-
-.newTag {
-  position: absolute;
-  z-index: 1;
-  left: -14rpx;
-  top: 40rpx;
-}
-
-.index .wrapper.hot .newProducts {
-  margin: 10rpx 0rpx 0rpx 0rpx;
-  box-shadow: none;
-  background: none;
-  padding: 0rpx 0rpx 0rpx 0rpx;
-}
-
-.index .news {
-  margin: 0rpx 30rpx !important;
-  border-radius: 8rpx !important;
-  background: #f7f7f7 !important;
-  border: none !important;
-  padding: 0 !important;
-}
-
-.index .news .new-banner .text .newsTitle {
-  color: #666666 !important;
-}
-
-.index .wrapper .title {
-  border: none;
-}
-
-.index .wrapper .title .text .name {
-  font-size: 18*2rpx !important;
-  color: #fff !important;
-  margin-right: 10rpx;
-}
-
-.newGoodsBox {
-  margin-left: 30rpx;
-  margin-right: 30rpx;
-}
-
-.cus-btn {
-  width: 100%;
-  height: 100%;
-  position: absolute;
-  top: 0;
-  right: 0;
-  background-color: transparent !important;
-}
-
-.cus-btn::after {
-  border: none !important;
-}
-
-.msg_title {
-  font-size: 0.36*100rpx;
-  font-weight: bold;
-  color: rgba(8, 15, 26, 1);
-  margin-top: 20rpx;
-}
-
-.msg_line {
-  background-color: #f3f3f3;
-  height: 1px;
-  width: 100%;
-  margin-top: 20rpx;
-}
-
-.msg_content {
-  padding: 0.1*100rpx;
-  color: #080F1A;
-  font-size: 0.32*100rpx;
-}
-
-.msg_btn {
-  padding: 10rpx;
-  font-size: 34rpx;
-  color: #38afef;
-  margin-top: 20rpx;
-  margin-bottom: 20rpx;
-}
-
-.inn-tag-wrap {
-  margin-top: 10rpx;
-  margin-bottom: 10rpx;
-}
-
-.zanmost-tag {
-  padding: 2rpx 8rpx 2rpx 8rpx;
-  background: #FF2D69;
-  font-size: 10*2rpx;
-  color: #FFFFFF;
-}
-
-.latest-tag {
-  padding: 2rpx 8rpx 2rpx 8rpx;
-  background: #0DC5C5;
-  font-size: 10*2rpx;
-  color: #FFFFFF;
-  margin-left: 8rpx;
-}
-
-.location-tag {
-  padding: 2rpx 8rpx 2rpx 8rpx;
-  background: #FD685D;
-  font-size: 10*2rpx;
-  color: #FFFFFF;
-  margin-left: 8rpx;
-}
-
-.inn-shop-icon {
-  border-radius: 50%;
-  width: 24*2rpx;
-  height: 24*2rpx;
-}
-
-.inn-shop-name {
-  font-size: 28rpx;
-  color: #080F1A;
-  font-weight: 500;
-}
-
-.inn-shop-date {
-  font-size: 18rpx;
-  color: #C2C5CC;
-}
-
-.slide-image {
-  position: absolute;
-  height: 200rpx;
-  width: 570rpx;
-  border-radius: 15rpx;
-  z-index: 5;
-  opacity: 0.7;
-  top: 18%;
-  margin: 0 20rpx;
-}
-
-.active {
-  opacity: 1;
-  z-index: 10;
-  height: 316rpx;
-  width: 572rpx;
-  top: 7%;
-  transition: all 0.2s ease-in 0s;
-}
-
-// v4
-.fast-nav {
-  flex-wrap: wrap;
-  padding: 40rpx 68rpx 0;
-  background: #fff;
-
-  .item {
-    width: 86rpx;
-    margin-right: 46rpx;
-    margin-bottom: 36rpx;
+  .header {
+    height: auto !important;
+    background-color: transparent !important;
   }
 
-  .item:nth-child(5n) {
-    margin-right: 0;
+  .header {
+    background-repeat: no-repeat;
+    background-size: 100% 100%;
   }
 
-  image {
-    width: 86rpx;
-    height: 86rpx;
-    margin-bottom: 10rpx;
+  .header .paper-cuts-img {
+    position: absolute;
+    width: 159*2rpx;
+    height: 159*2rpx;
+    top: 0;
+    left: 0;
+    bottom: 0;
+    right: 0;
+    margin: auto;
+    z-index: 0;
   }
 
-  .one-t {
-    width: 110rpx;
-    color: #666;
-    font-size: 26rpx;
-    line-height: 1;
-    text-align: center;
-  }
-}
-
-.home-luck {
-  width: 686rpx;
-  height: 272rpx;
-  margin: 20rpx 32rpx;
-}
-
-.my-swiper-item {
-  width: 420rpx;
-  box-sizing: border-box;
-  margin: 0 20rpx;
-  padding-bottom: 14rpx;
-  box-shadow: 0 6rpx 16rpx rgba(148, 148, 148, 0.16);
-}
-
-.money {
-  .btn-pay {
-    display: inline-block;
-    width: 120rpx;
-    height: 34rpx;
-    line-height: 34rpx;
-    border-radius: 18rpx;
-    background: #ED0F0F;
-    color: #fff;
-    font-size: 24rpx;
-    text-align: center;
-  }
-}
-
-.pre-sale {
-  position: relative;
-  width: 686rpx;
-  height: 440rpx;
-  margin: 0 auto;
-
-  .bg {
-    width: 100%;
+  .swiper-item {
     height: 100%;
   }
 
-  .list {
-    display: flex;
-    flex-wrap: nowrap;
-    position: absolute;
-    bottom: 36rpx;
-    width: 100%;
-    padding: 0 14rpx;
-    box-sizing: border-box;
-
-    .item {
-      display: flex;
-      flex-direction: column;
-      align-items: center;
-      margin: 0 10rpx;
-
-      image {
-        width: 200rpx;
-        height: 200rpx;
-        border-radius: 8rpx;
-      }
-
-      view {
-        width: 200rpx;
-        margin: 4rpx 0 12rpx;
-        color: #333;
-        font-size: 24rpx;
-        white-space: nowrap;
-        overflow: hidden;
-        text-overflow: ellipsis;
-      }
-
-      text {
-        display: inline-block;
-        padding: 2rpx 15rpx;
-        border-radius: 18rpx;
-        background: #ED0F0F;
-        color: #fff;
-        font-size: 24rpx;
-      }
-    }
+  .slider-banner {
+    -webkit-transform: rotate(0);
+    width: auto !important;
   }
-}
 
-// 限时秒杀
-.seckill {
-  margin-top: 40rpx;
+  .search {
+    -webkit-box-flex: 1;
+    -webkit-flex: 1;
+    flex: 1;
+    box-sizing: border-box;
+    height: 64rpx;
+    background-color: #F5F5F5;
+    padding: 0 28rpx;
+    font-size: 28rpx;
+    color: #acacac;
+    border-radius: 32rpx;
+    margin: 0 30rpx;
+  }
 
-  .header {
-    .title {
-      margin-right: 28rpx;
-      color: #333;
-      line-height: 48rpx;
-      font-size: 32rpx;
-      font-weight: bold;
+  .news {
+    margin: 0rpx 30rpx !important;
+    border-radius: 8rpx !important;
+    background: #f7f7f7 !important;
+    border: none !important;
+    padding: 0 !important;
+  }
+
+  .news .new-banner .text .newsTitle {
+    color: #666666 !important;
+  }
+
+  .cus-btn {
+    width: 100%;
+    height: 100%;
+    position: absolute;
+    top: 0;
+    right: 0;
+    background-color: transparent !important;
+  }
+
+  .cus-btn::after {
+    border: none !important;
+  }
+
+  .msg_title {
+    font-size: 0.36*100rpx;
+    font-weight: bold;
+    color: rgba(8, 15, 26, 1);
+    margin-top: 20rpx;
+  }
+
+  .msg_line {
+    background-color: #f3f3f3;
+    height: 1px;
+    width: 100%;
+    margin-top: 20rpx;
+  }
+
+  .msg_content {
+    padding: 0.1*100rpx;
+    color: #080F1A;
+    font-size: 0.32*100rpx;
+  }
+
+  .msg_btn {
+    padding: 10rpx;
+    font-size: 34rpx;
+    color: #38afef;
+    margin-top: 20rpx;
+    margin-bottom: 20rpx;
+  }
+
+
+  .pre-sale {
+    position: relative;
+    width: 686rpx;
+    height: 440rpx;
+    margin: 0 auto;
+
+    .bg {
+      width: 100%;
+      height: 100%;
     }
 
-    .sub-title {
-      line-height: 32rpx;
-      font-size: 22rpx;
-      color: #A1A1A1;
-    }
+    .list {
+      display: flex;
+      flex-wrap: nowrap;
+      position: absolute;
+      bottom: 36rpx;
+      width: 100%;
+      padding: 0 14rpx;
+      box-sizing: border-box;
 
-    .count-box {
-      margin-top: 6rpx;
-      font-size: 24rpx;
+      .item {
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        margin: 0 10rpx;
 
-      /deep/ .time {
-        .styleAll {
+        image {
+          width: 200rpx;
+          height: 200rpx;
+          border-radius: 8rpx;
+        }
+
+        view {
+          width: 200rpx;
+          margin: 4rpx 0 12rpx;
+          color: #333;
+          font-size: 24rpx;
+          white-space: nowrap;
+          overflow: hidden;
+          text-overflow: ellipsis;
+        }
+
+        text {
           display: inline-block;
-          height: 40rpx;
-          line-height: 40rpx;
-          padding: 0 4rpx;
+          padding: 2rpx 15rpx;
+          border-radius: 18rpx;
           background: #ED0F0F;
           color: #fff;
           font-size: 24rpx;
         }
-
-        .timeTxt {
-          margin: 0 4rpx;
-          color: #8D8D8D;
-        }
       }
     }
-
-    .more {
-      margin-top: 8rpx;
-      color: #7C7C7C;
-      font-size: 24rpx;
-    }
   }
 
-  .list {
-    padding: 20rpx 32rpx 0;
+  // 每天特价
+  .special-offer {
+    margin-top: 40rpx;
 
-    .item {
+    .flex {
       display: flex;
-      margin-bottom: 20rpx;
-      padding: 10rpx 16rpx 10rpx 12rpx;
-      background: #fff;
-      border-radius: 8px;
-
-      .content {
-        position: relative;
-        width: 100%;
-
-        .item-bottom {
-          position: absolute;
-          bottom: 0;
-          width: 100%;
-        }
-      }
-
-      .left-img {
-        flex-shrink: 0;
-        width: 200rpx;
-        height: 200rpx;
-        margin-right: 8rpx;
-        border-radius: 8rpx;
-      }
-
-      .cart {
-        width: 48rpx;
-        height: 48rpx;
-        margin-right: 8rpx;
-      }
-
-      .fire-gray {
-        width: 24rpx;
-        height: 24rpx;
-      }
-
-      .title {
-        font-size: 26rpx;
-        font-weight: bold;
-        line-height: 38rpx;
-        color: #333333;
-      }
-
-      .price-line {
-        align-items: flex-end;
-        margin-top: 20rpx;
-        margin-bottom: 8rpx;
-
-        .price {
-          color: #ED0F0F;
-          font-size: 26rpx;
-        }
-      }
-
-      .desc-line {
-        display: flex;
-        align-items: center;
-        font-size: 22rpx;
-        line-height: 32rpx;
-        color: #333333;
-
-        .sold {
-          padding-left: 8rpx;
-          color: #8D8D8D;
-        }
-
-        .space {
-          width: 16rpx;
-          height: 16rpx;
-          margin-right: 16rpx;
-          border-right: 1rpx solid #8D8D8D;
-        }
-      }
-    }
-  }
-}
-
-// 每天特价
-.special-offer {
-  margin-top: 40rpx;
-
-  .flex {
-    display: flex;
-  }
-
-  .header {
-    justify-content: space-between;
-    align-items: center;
-
-    .title {
-      margin-right: 8rpx;
-      color: #333;
-      line-height: 48rpx;
-      font-size: 32rpx;
-      font-weight: bold;
     }
 
-    .icon-date {
-      width: 40rpx;
-      height: 40rpx;
-    }
-
-    .date-box {
+    .header {
+      justify-content: space-between;
       align-items: center;
-      padding: 8rpx;
-      background: #fff;
-      border-radius: 8px;
 
-      .day {
-        color: #494949;
-        font-size: 40rpx;
+      .title {
+        margin-right: 8rpx;
+        color: #333;
+        line-height: 48rpx;
+        font-size: 32rpx;
         font-weight: bold;
+      }
 
-        text {
-          color: #FF1200;
+      .icon-date {
+        width: 40rpx;
+        height: 40rpx;
+      }
+
+      .date-box {
+        align-items: center;
+        padding: 8rpx;
+        background: #fff;
+        border-radius: 8px;
+
+        .day {
+          color: #494949;
+          font-size: 40rpx;
+          font-weight: bold;
+
+          text {
+            color: #FF1200;
+          }
+        }
+
+        .month {
+          height: 32rpx;
+          margin-left: 12rpx;
+          padding-left: 6rpx;
+          border-left: 2rpx solid #DDDDDD;
+          color: #999999;
+          font-size: 28rpx;
         }
       }
 
-      .month {
-        height: 32rpx;
-        margin-left: 12rpx;
-        padding-left: 6rpx;
-        border-left: 2rpx solid #DDDDDD;
-        color: #999999;
-        font-size: 28rpx;
+      .more {
+        margin-top: 8rpx;
+        color: #7C7C7C;
+        font-size: 24rpx;
       }
     }
 
-    .more {
-      margin-top: 8rpx;
-      color: #7C7C7C;
-      font-size: 24rpx;
-    }
-  }
+    .list {
+      flex-wrap: wrap;
+      justify-content: space-between;
+      padding: 0 32rpx 40rpx;
 
-  .list {
-    flex-wrap: wrap;
-    justify-content: space-between;
-    padding: 0 32rpx 40rpx;
-
-    .item {
-      position: relative;
-      flex-direction: column;
-      width: 328rpx;
-      margin-top: 20rpx;
-      background: #fff;
-
-      .top-img {
-        flex-shrink: 0;
+      .item {
+        position: relative;
+        flex-direction: column;
         width: 328rpx;
-        height: 328rpx;
-      }
+        margin-top: 20rpx;
+        background: #fff;
 
-      .icon-fire {
-        width: 24rpx;
-        height: 24rpx;
-      }
+        .top-img {
+          flex-shrink: 0;
+          width: 328rpx;
+          height: 328rpx;
+        }
 
-      .title {
-        display: -webkit-box;
-        -webkit-box-orient: vertical;
-        -webkit-line-clamp: 2;
-        overflow: hidden;
-        margin: 10rpx 12rpx 10rpx 10rpx;
-        font-size: 26rpx;
-        font-weight: bold;
-        line-height: 38rpx;
-        color: #333333;
-      }
+        .icon-fire {
+          width: 24rpx;
+          height: 24rpx;
+        }
 
-      .price {
-        align-items: center;
-        margin-left: 10rpx;
-        padding-bottom: 10rpx;
-
-        .red {
+        .title {
+          display: -webkit-box;
+          -webkit-box-orient: vertical;
+          -webkit-line-clamp: 2;
+          overflow: hidden;
+          margin: 10rpx 12rpx 10rpx 10rpx;
           font-size: 26rpx;
           font-weight: bold;
           line-height: 38rpx;
-          color: #ED0F0F;
-        }
-
-        .gray {
-          margin-left: 16rpx;
-          text-decoration: line-through;
-          font-size: 20rpx;
-          line-height: 30rpx;
-          color: #C2C5CC;
-        }
-      }
-
-      .shop {
-        position: absolute;
-        bottom: 0;
-        justify-content: space-between;
-        align-items: center;
-        width: 100%;
-        box-sizing: border-box;
-        padding: 6rpx 12rpx 18rpx 10rpx;
-        border: 1rpx solid #EFEFEF;
-        font-size: 22rpx;
-        line-height: 32rpx;
-        color: #333333;
-      }
-    }
-  }
-}
-
-.subject-box {
-  padding: 20rpx 32rpx 40rpx;
-  background: #FFFFFF;
-
-  image {
-    vertical-align: middle;
-  }
-
-  .section-half {
-    margin-bottom: 16rpx;
-
-    .bg-img {
-      width: 336rpx;
-      height: 180rpx;
-    }
-
-    .food-box {
-      position: relative;
-      width: 336rpx;
-      height: 180rpx;
-      overflow: hidden;
-
-      .swiper {
-        position: absolute;
-        left: 20rpx;
-        bottom: 20rpx;
-        width: 296rpx;
-        height: 72rpx;
-        overflow: hidden;
-        z-index: 10;
-
-        image {
-          width: 72rpx;
-          height: 72rpx;
-          margin-right: 4rpx;
-          border-radius: 4rpx;
-        }
-
-        image:last-child {
-          margin-right: 0;
-        }
-      }
-    }
-  }
-
-  .section-full {
-    image {
-      width: 336rpx;
-      height: 480rpx;
-    }
-
-    .swiper {
-      width: 336rpx;
-      height: 480rpx;
-    }
-  }
-}
-
-.popup-old-user {
-  image {
-    vertical-align: middle;
-  }
-
-  .main {
-    width: 560rpx;
-    height: 840rpx;
-    border-radius: 40rpx;
-  }
-
-  .icon-box {
-    width: 96rpx;
-    height: 96rpx;
-    margin-top: 40rpx;
-    background: rgba(51, 51, 51, .4);
-    border-radius: 50%;
-
-    image {
-      width: 40rpx;
-      height: 40rpx;
-    }
-  }
-}
-
-.bast-box {
-  .bast-title {
-    width: 312rpx;
-    height: 40rpx;
-    margin: 16rpx 0 16rpx;
-  }
-
-  .bannar-swiper {
-    height: 534rpx;
-
-    image {
-      width: 332rpx;
-      height: 534rpx;
-    }
-  }
-
-  .list {
-    padding: 32rpx;
-
-    .item {
-      position: relative;
-      flex-direction: column;
-      background: #fff;
-
-      .top-img {
-        width: 332rpx;
-        height: 332rpx;
-      }
-
-      .content {
-        box-sizing: border-box;
-        padding: 10rpx 10rpx 20rpx;
-
-        .title {
-          color: #333;
-          font-size: 28rpx;
+          color: #333333;
         }
 
         .price {
-          font-size: 32rpx;
+          align-items: center;
+          margin-left: 10rpx;
+          padding-bottom: 10rpx;
 
           .red {
-            color: #DA0000;
+            font-size: 26rpx;
+            font-weight: bold;
+            line-height: 38rpx;
+            color: #ED0F0F;
           }
 
           .gray {
@@ -1831,8 +964,163 @@ export default {
             color: #C2C5CC;
           }
         }
+
+        .shop {
+          position: absolute;
+          bottom: 0;
+          justify-content: space-between;
+          align-items: center;
+          width: 100%;
+          box-sizing: border-box;
+          padding: 6rpx 12rpx 18rpx 10rpx;
+          border: 1rpx solid #EFEFEF;
+          font-size: 22rpx;
+          line-height: 32rpx;
+          color: #333333;
+        }
+      }
+    }
+  }
+
+  .subject-box {
+    padding: 0 32rpx 40rpx;
+    background: #FFFFFF;
+
+    image {
+      vertical-align: middle;
+    }
+
+    .section-half {
+      margin-bottom: 16rpx;
+
+      .bg-img {
+        width: 336rpx;
+        height: 180rpx;
+      }
+
+      .food-box {
+        position: relative;
+        width: 336rpx;
+        height: 180rpx;
+        overflow: hidden;
+
+        .swiper {
+          position: absolute;
+          left: 20rpx;
+          bottom: 20rpx;
+          width: 296rpx;
+          height: 72rpx;
+          overflow: hidden;
+          z-index: 10;
+
+          image {
+            width: 72rpx;
+            height: 72rpx;
+            margin-right: 4rpx;
+            border-radius: 4rpx;
+          }
+
+          image:last-child {
+            margin-right: 0;
+          }
+        }
+      }
+    }
+
+    .section-full {
+      image {
+        width: 336rpx;
+        height: 480rpx;
+      }
+
+      .swiper {
+        width: 336rpx;
+        height: 480rpx;
+      }
+    }
+  }
+
+  .popup-old-user {
+    image {
+      vertical-align: middle;
+    }
+
+    .main {
+      width: 560rpx;
+      height: 840rpx;
+      border-radius: 40rpx;
+    }
+
+    .icon-box {
+      width: 96rpx;
+      height: 96rpx;
+      margin-top: 40rpx;
+      background: rgba(51, 51, 51, .4);
+      border-radius: 50%;
+
+      image {
+        width: 40rpx;
+        height: 40rpx;
+      }
+    }
+  }
+
+  .bast-box {
+    .bast-title {
+      width: 312rpx;
+      height: 40rpx;
+      margin: 16rpx 0 16rpx;
+    }
+
+    .bannar-swiper {
+      height: 534rpx;
+
+      image {
+        width: 332rpx;
+        height: 534rpx;
+      }
+    }
+
+    .list {
+      padding: 32rpx;
+
+      .item {
+        position: relative;
+        flex-direction: column;
+        background: #fff;
+
+        .top-img {
+          width: 332rpx;
+          height: 332rpx;
+        }
+
+        .content {
+          box-sizing: border-box;
+          padding: 10rpx 10rpx 20rpx;
+
+          .title {
+            color: #333;
+            font-size: 28rpx;
+          }
+
+          .price {
+            font-size: 32rpx;
+
+            .red {
+              color: #DA0000;
+            }
+
+            .gray {
+              margin-left: 16rpx;
+              text-decoration: line-through;
+              font-size: 20rpx;
+              line-height: 30rpx;
+              color: #C2C5CC;
+            }
+          }
+        }
       }
     }
   }
 }
-</style>
+</style>
\ No newline at end of file
diff --git a/pkg-video/views/city.vue b/pkg-video/views/city.vue
index eebc40a..3251ad6 100644
--- a/pkg-video/views/city.vue
+++ b/pkg-video/views/city.vue
@@ -49,88 +49,92 @@
   </view>
 </template>
 
-<script setup>
-import {onMounted, ref} from '@vue/composition-api'
+<script>
 import {getCurAddress, getLocation} from "@/utils/common";
 import {getVideoCity} from "@/api/video";
 
-const watchCity = ref(uni.getStorageSync('watchCity') || [])
-
-onMounted(() => {
-  getMapData()
-  fetchList()
-})
-
-const ready = ref(false)
-const cityName = ref('')
-const keyword = ref('')
-
-const onSearch = () => {
-  const name = keyword.value.trim()
-  if (name.length > 0) {
-    navToWatch(name)
-  }
-}
-
-const raw = ref()
-const searchList = ref([])
-const onChange = (value) => {
-  searchList.value = []
-  if (value.trim().length === 0) return
-  searchList.value = raw.value.filter(city => {
-    if (city['name'].indexOf(value) > -1) return city
-  })
-}
-
-const handleHistory = (name) => {
-  for (let i = 0; i < watchCity.value.length; i++) {
-    if (name === watchCity.value[i]) return
-  }
-  if (watchCity.value.length === 4) {
-    watchCity.value.pop()
-  }
-  watchCity.value.unshift(name)
-  uni.setStorageSync('watchCity', watchCity.value)
-}
-
-const getMapData = async () => {
-  const map = await getLocation();
-  if (map.length > 1) {
-    const {latitude, longitude} = map[1];
-    const address = await getCurAddress(latitude, longitude);
-    cityName.value = address[1].data.result['ad_info']['city']
-  }
-}
-
-const indexList = ref(["A", "B", "C"])
-const itemArr = ref([
-  ['列表A1', '列表A2', '列表A3'],
-  ['列表B1', '列表B2', '列表B3'],
-  ['列表C1', '列表C2', '列表C3']
-])
-
-const fetchList = async () => {
-  const res = await getVideoCity()
-  if (res.success) {
-    raw.value = res.data
-    const groupedByName = res.data.reduce((accumulator, current) => {
-      const groupKey = current['firstLetter'].toUpperCase()
-      if (!accumulator[groupKey]) {
-        accumulator[groupKey] = []
+export default {
+  data() {
+    return {
+      watchCity: [],
+      ready: false,
+      cityName: '',
+      keyword: '',
+      raw: null,
+      searchList: [],
+      indexList: ["A", "B", "C"],
+      itemArr: [
+        ['列表A1', '列表A2', '列表A3'],
+        ['列表B1', '列表B2', '列表B3'],
+        ['列表C1', '列表C2', '列表C3']
+      ]
+    }
+  },
+  mounted() {
+    this.watchCity = uni.getStorageSync('watchCity') || []
+    this.getMapData()
+    this.fetchList()
+  },
+  methods: {
+    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']
       }
-      accumulator[groupKey].push(current)
-      return accumulator
-    }, {})
+    },
 
-    indexList.value = Object.keys(groupedByName)
-    itemArr.value = Object.values(groupedByName)
+    async fetchList() {
+      const res = await getVideoCity()
+      if (res.success) {
+        this.raw = res.data
+        const groupedByName = res.data.reduce((accumulator, current) => {
+          const groupKey = current['firstLetter'].toUpperCase()
+          if (!accumulator[groupKey]) {
+            accumulator[groupKey] = []
+          }
+          accumulator[groupKey].push(current)
+          return accumulator
+        }, {})
+
+        this.indexList = Object.keys(groupedByName)
+        this.itemArr = Object.values(groupedByName)
+      }
+      this.ready = true
+    },
+
+    onSearch ()  {
+      const name = this.keyword.trim()
+      if (name.length > 0) {
+        this.navToWatch(name)
+      }
+    },
+
+    navToWatch (name)  {
+      this.handleHistory(name)
+      uni.redirectTo({url: '/pkg-video/views/watch?name=' + name})
+    },
+
+    handleHistory (name) {
+      for (let i = 0; i < this.watchCity.length; i++) {
+        if (name === this.watchCity[i]) return
+      }
+      if (this.watchCity.length === 4) {
+        watchCity.value.pop()
+      }
+      this.watchCity.unshift(name)
+      uni.setStorageSync('watchCity', this.watchCity)
+    },
+
+    onChange (value)  {
+      this.searchList = []
+      if (value.trim().length === 0) return
+      this.searchList = this.raw.filter(city => {
+        if (city['name'].indexOf(value) > -1) return city
+      })
+    }
   }
-  ready.value = true
-}
-
-const navToWatch = (name) => {
-  handleHistory(name)
-  uni.redirectTo({url: '/pkg-video/views/watch?name=' + name})
 }
 </script>
 
diff --git a/pkg-video/views/lottery-log.vue b/pkg-video/views/lottery-log.vue
index 8efa5db..0d1ea47 100644
--- a/pkg-video/views/lottery-log.vue
+++ b/pkg-video/views/lottery-log.vue
@@ -22,63 +22,71 @@
   </view>
 </template>
 
-<script setup>
-import {ref} from '@vue/composition-api'
-import {onShow} from '@dcloudio/uni-app'
-import {VUE_APP_RESOURCES_URL as webUrl} from '../../config/index'
+<script>
 import {getLogs, takePrize} from "@/api/lottery";
 
-const ready = ref(false)
-
-onShow(() => {
-  list.value = []
-  fetchList()
-})
-
-const page = ref(1)
-const list = ref([])
-const fetchList = async () => {
-  const res = await getLogs(page.value, 20)
-  if (res.success) {
-    res.data['records']?.forEach(item => list.value.push(item))
-    ready.value = true
-  }
-}
-
-const onBottom = () => {
-  page.value++
-  fetchList()
-}
-
-const takeItem = async (item) => {
-  if (item['prizeType'] === 1 && item['status'] === 1) {
-    uni.navigateTo({
-      url: '/pages/order/OrderSubmission/index?lotteryRecordId=' + item['id']
-    })
-    return
-  }
-
-  const res = await takePrize(item.id)
-  if (res.success) {
-    item['status'] = 2
-    uni.showModal({
-      title: '领取成功',
-      content: '您的奖品已经领取成功，请前往我的订单查看奖品发货信息',
-      cancelText: '下次再说',
-      confirmText: '查看订单',
-      success: function (res) {
-        if (res.confirm) {
-          console.log('用户点击确定');
-          uni.navigateTo({
-            url: '/pages/order/MyOrder/index'
-          })
-        } else if (res.cancel) {
-          console.log('用户点击取消');
-        }
+export default {
+  data() {
+    return {
+      webUrl: this.$VUE_APP_RESOURCES_URL,
+      ready: false,
+      page: 1,
+      list: []
+    }
+  },
+  onShow() {
+    this.page = 1
+    this.list = []
+    this.fetchList()
+  },
+  methods: {
+    async fetchList() {
+      const res = await getLogs(this.page, 20)
+      if (res.success) {
+        res.data['records']?.forEach(item => this.list.push(item))
+        this.ready = true
       }
-    });
+    },
+
+    onBottom() {
+      this.page++
+      this.fetchList()
+    },
+
+    async takeItem  (item)  {
+      if (item['prizeType'] === 1 && item['status'] === 1) {
+        uni.navigateTo({
+          url: '/pages/order/OrderSubmission/index?lotteryRecordId=' + item['id']
+        })
+        return
+      }
+
+      const res = await takePrize(item.id)
+      if (res.success) {
+        item['status'] = 2
+        uni.showModal({
+          title: '领取成功',
+          content: '您的奖品已经领取成功，请前往我的订单查看奖品发货信息',
+          cancelText: '下次再说',
+          confirmText: '查看订单',
+          success: function (res) {
+            if (res.confirm) {
+              console.log('用户点击确定');
+              uni.navigateTo({
+                url: '/pages/order/MyOrder/index'
+              })
+            } else if (res.cancel) {
+              console.log('用户点击取消');
+            }
+          }
+        });
+      }
+    }
   }
 }
+
+
+
 </script>
 
 <style scoped lang="less">
diff --git a/pkg-video/views/lottery.vue b/pkg-video/views/lottery.vue
index 481efaa..0fdb3ef 100644
--- a/pkg-video/views/lottery.vue
+++ b/pkg-video/views/lottery.vue
@@ -16,14 +16,17 @@
         <view class="btn-close" @click="onlyClose"/>
         <view class="img-box flex flex-col ai-center" v-if="diceResult['prizeImage']">
           <image style="width: 240rpx;height: 240rpx" :src="diceResult['prizeImage']" mode="scaleToFill"/>
-          <image style="width: 80rpx;height: 80rpx;margin-top: 40rpx;" :src="diceResult['diceImage']"
+          <image style="width: 80rpx;height: 80rpx;margin-top: 34rpx;" :src="diceResult['diceImage']"
                  mode="scaleToFill"/>
-          <view class="one-t bold" style="width:300rpx;margin-top: 40rpx;color:#F7E7B2">
+          <view class="one-t bold tc" style="width:300rpx;margin-top: 46rpx;color:#F7E7B2;font-size: 30rpx"
+                v-if="diceResult['isHit']===0">感谢您的参与
+          </view>
+          <view class="one-t bold tc" style="width:320rpx;margin-top: 46rpx;color:#F7E7B2;font-size: 30rpx" v-else>
             获得{{ diceResult['prizeName'] }}一份
           </view>
         </view>
         <image class="btn-result" style="width: 240rpx;height: 68rpx" :src="webUrl+'/20240125205521152611.png'"
-               mode="scaleToFill" @click="closeResultModel"/>
+               mode="scaleToFill" @click="closeResultModel" v-if="diceResult['isHit']!==0"/>
       </view>
 
       <view class="dialog-take flex jc-center" :style="{'backgroundImage':`url(${webUrl}/20240124210904824337.png)`}"
@@ -43,13 +46,19 @@
     <view class="btn-submit" @click="onSubmit"/>
     <view class="today-limit">{{ lotteryDetail.todayLimit }}</view>
 
-    <scroll-view class="prize-list flex" scroll-x="true" enable-flex="true">
-      <view class="item flex flex-0 jc-center ai-center"
-            :style="{'backgroundImage':`url(${webUrl}/20240122212856857899.png)`}"
-            v-for="(item,index) in lotteryDetail.prizeList" :key="index">
-        <image style="width: 120rpx;height: 120rpx" :src="item['prizeImage']" mode="scaleToFill"/>
-      </view>
-    </scroll-view>
+    <view class="prize-list">
+      <!-- mould 图文 模式 left -->
+      <gbro-marquee broadcastType='mould' @changeEvent='navToCoupons' direction="left" :viewHeight="300"
+                    :broadcastIconIsDisplay="!true" :touchEvent="true" :imgdata='imgData'
+                    :broadcastStyle='broadcastStyle2' style="width: 100%;margin-top: 20rpx;">
+        <block v-for="c in 2" :key="c">  <!--在小程序里遇到一个坑不能使用两个slot 所有统一复制一份做衔接 -->
+          <view class="flex flex-0 jc-center ai-center" style="width: 164rpx;height: 164rpx;background-size: 164rpx 164rpx;background-repeat: no-repeat;" :style="{'backgroundImage':`url(${webUrl}/20240122212856857899.png)`}" v-for="(item,index) in imgData" :key="index">
+            <image style="width: 120rpx;height: 120rpx" :src="item" mode="scaleToFill"></image>
+          </view>
+        </block>
+      </gbro-marquee>
+
+    </view>
 
     <view class="hit-box flex" @click="navToCoupons">
       <view class="img-first flex jc-center ai-center"
@@ -63,111 +72,136 @@
   </view>
 </template>
 
-<script setup>
-import {onMounted, ref} from '@vue/composition-api'
-import {VUE_APP_RESOURCES_URL as webUrl} from '../../config/index'
+<script>
 import {getDetail, getPrize, takePrize} from "@/api/lottery";
+import gbroMarquee from "@/components/gbro-marquee/marquee.vue";
 
-onMounted(() => {
-  init()
-})
+export default {
+  components: {gbroMarquee},
+  data() {
+    return {
+      ready: false,
+      webUrl: this.$VUE_APP_RESOURCES_URL,
+      lotteryDetail: {
+        diceConfig: {},
+        prizeList: [],
+        todayHitPrizeList: [],
+        todayLimit: 0
+      },
+      diceImg: '',
+      diceResult: {
+        prizeName: '',
+        prizeImage: '',
+        diceImage: '',
+        diceValue: 0
+      },
+      showDialog: false,
+      showRules: false,
+      showResult: false,
+      showTake: false,
+      broadcastStyle2: {
+        speed: 20,
+        font_size: "32", //字体大小(rpx)
+        text_color: "#333", //字体颜色
+        back_color: "red", //背景色
+      },
+      imgData: []
+    }
+  },
+  computed: {
+    moveDistance: function () {
+      const elWidth = this.lotteryDetail['prizeList'].length * 164
+      const diff = elWidth > 576 ? elWidth - 576 : 0
+      return uni.$u.getPx(diff + 'rpx')
+    }
+  },
+  onLoad() {
+    this.init()
+  },
+  methods: {
+    init() {
+      getDetail().then(res => {
+        if (res.success) {
+          this.lotteryDetail = res.data
+          this.diceImg = this.lotteryDetail.diceConfig['diceDefaultImage']
+          this.ready = true
+          setTimeout(()=>{
+            this.imgData = res.data['prizeList']?.map(item => item['prizeImage'])
+          },1000)
+        }
+      })
+    },
 
-const showDialog = ref(false)
-const showRules = ref(false)
-const showResult = ref(false)
-const showTake = ref(false)
+    onSubmit() {
+      getPrize().then(res => {
+        if (res.success) {
+          this.diceResult = res.data
+          const diceIndex = this.lotteryDetail.diceConfig['diceValues'].findIndex(item => item['diceValue'] === this.diceResult.diceValue)
+          this.diceImg = this.lotteryDetail.diceConfig['diceValues'][diceIndex]['diceValueGif']
+          setTimeout(() => {
+            this.showDialog = true
+            this.showResult = true
+            this.diceImg = this.lotteryDetail.diceConfig['diceValues'][diceIndex]['diceValueImage']
+            setTimeout(() => {
+              this.init()
+            }, 1000)
+          }, 2800)
+        }
+      })
+    },
 
-const ready = ref(false)
-const lotteryDetail = ref({
-  diceConfig: {},
-  prizeList: [],
-  todayHitPrizeList: [],
-  todayLimit: 0
-})
+    navToLog() {
+      uni.navigateTo({url: './lottery-log'})
+    },
 
-const navToLog = () => {
-  uni.navigateTo({url: './lottery-log'})
-}
+    navToCoupons() {
+      uni.navigateTo({url: '/pkg_user/views/myCoupons'})
+    },
 
+    openRulesModel() {
+      this.showDialog = true
+      this.showRules = true
+    },
 
-const openRulesModel = () => {
-  showDialog.value = true
-  showRules.value = true
-}
-const closeRulesModel = () => {
-  showDialog.value = false
-  showRules.value = false
-}
+    closeRulesModel() {
+      this.showDialog = false
+      this.showRules = false
+    },
 
-const init = async () => {
-  const res = await getDetail()
-  if (res.success) {
-    lotteryDetail.value = res.data
-    diceImg.value = lotteryDetail.value.diceConfig['diceDefaultImage']
-    ready.value = true
+    onlyClose() {
+      this.showResult = false
+      this.showDialog = false
+    },
+
+    closeResultModel() {
+      if (this.diceResult['prizeType'] === 4) {
+        this.showResult = false
+        this.showDialog = false
+        return
+      }
+      if (this.diceResult['prizeType'] === 1) {
+        this.showResult = false
+        this.showDialog = false
+        uni.navigateTo({
+          url: '/pages/order/OrderSubmission/index?lotteryRecordId=' + this.diceResult['id']
+        })
+        return
+      }
+
+      takePrize(this.diceResult.id).then(res => {
+        if (res.success) {
+          this.showResult = false
+          this.showTake = true
+        }
+      })
+    },
+
+    closeTakeModel() {
+      this.showTake = false
+      this.showDialog = false
+    }
   }
 }
-
-const diceIndex = ref(0)
-const diceImg = ref('')
-const onSubmit = async () => {
-  const res = await getPrize()
-  if (res.success) diceResult.value = res.data
-
-  diceIndex.value = lotteryDetail.value.diceConfig['diceValues'].findIndex(item => item['diceValue'] === diceResult.value.diceValue)
-  diceImg.value = lotteryDetail.value.diceConfig['diceValues'][diceIndex.value]['diceValueGif']
-  setTimeout(() => {
-    diceImg.value = lotteryDetail.value.diceConfig['diceValues'][diceIndex.value]['diceValueImage']
-    setTimeout(() => {
-      init()
-      showDialog.value = true
-      showResult.value = true
-    }, 1000)
-  }, 3000)
-}
-
-const diceResult = ref({
-  prizeName: '',
-  prizeImage: '',
-  diceImage: '',
-  diceValue: 0
-})
-
-const navToCoupons = () => {
-  uni.navigateTo({url: '/pkg_user/views/myCoupons'})
-}
-
-const onlyClose = () => {
-  showResult.value = false
-  showDialog.value = false
-}
-
-const closeResultModel = async () => {
-  if (diceResult.value['prizeType'] === 4) {
-    showResult.value = false
-    showDialog.value = false
-    return
-  }
-  if (diceResult.value['prizeType'] === 1) {
-    showResult.value = false
-    showDialog.value = false
-    uni.navigateTo({
-      url: '/pages/order/OrderSubmission/index?lotteryRecordId=' + diceResult.value['id']
-    })
-    return
-  }
-
-  const res = await takePrize(diceResult.value.id)
-  if (res.success) {
-    showResult.value = false
-    showTake.value = true
-  }
-}
-
-const closeTakeModel = () => {
-  showTake.value = false
-  showDialog.value = false
-}
 </script>
 
 <style scoped lang="less">
@@ -232,8 +266,8 @@ image {
 .dialog-result {
   position: fixed;
   left: 50%;
-  top: 50%;
-  transform: translate(-50%, -50%);
+  top: 200rpx;
+  transform: translate(-50%, 0);
   width: 476rpx;
   height: 856rpx;
   box-sizing: border-box;
@@ -252,7 +286,7 @@ image {
   .img-box {
     position: absolute;
     left: 50%;
-    top: 345rpx;
+    top: 344rpx;
     transform: translate(-50%, 0);
   }
 
@@ -314,13 +348,7 @@ image {
   top: 888rpx;
   width: 576rpx;
   height: 164rpx;
-
-  .item {
-    width: 164rpx;
-    height: 164rpx;
-    background-size: 164rpx 164rpx;
-    background-repeat: no-repeat;
-  }
+  overflow: hidden;
 }
 
 .hit-box {
diff --git a/pkg-video/views/watch.vue b/pkg-video/views/watch.vue
index 9fbc589..990408b 100644
--- a/pkg-video/views/watch.vue
+++ b/pkg-video/views/watch.vue
@@ -14,19 +14,18 @@
         <view class="item">
           <video :id="`video-${index}`" :src="item['video']" loop :controls="false" :show-center-play-btn="false"/>
 
-          <view class="btn-play flex jc-center ai-center" @click="controlVideo">
-            <image style="width:57rpx;height:65rpx" :src="webUrl+'/20240123093125710999.png'" mode="scaleToFill"
-                   v-if="showPlay"/>
-          </view>
+          <cover-view class="btn-play flex jc-center ai-center" @click="controlVideo">
+            <cover-image style="width:57rpx;height:65rpx" :src="webUrl+'/20240123093125710999.png'" v-if="showPlay"/>
+          </cover-view>
         </view>
 
-        <view class="fixed-footer flex jc-between ai-end"
-              :style="{'bottom':systemInfo['safeAreaInsets']['bottom']+'px'}" v-if="!showDialog">
-          <view class="flex ai-center">
+        <cover-view class="fixed-footer flex jc-between ai-end"
+                    :style="{'bottom':systemInfo['safeAreaInsets']['bottom']+'px'}" v-if="!showDialog">
+          <cover-view class="flex ai-center">
             <cover-image style="width: 80rpx;height: 80rpx;border-radius: 50%;z-index: 10" :src="item['hotelLogo']"
                          @click="navToStore(item['hotelId'])"/>
             <cover-view class="more-t">{{ item['hotelName'] }}</cover-view>
-          </view>
+          </cover-view>
 
           <cover-view class="flex ai-center">
             <cover-view class="flex flex-col ai-center" style="width:78rpx;margin-right: 16rpx;"
@@ -48,7 +47,7 @@
               <cover-view class="one-t tc">{{ item['replyCount'] }}</cover-view>
             </cover-view>
           </cover-view>
-        </view>
+        </cover-view>
       </swiper-item>
     </swiper>
 
@@ -81,210 +80,217 @@
   </view>
 </template>
 
-<script setup>
-import {ref} from '@vue/composition-api'
-import {onLoad, onShow} from '@dcloudio/uni-app'
-import {VUE_APP_RESOURCES_URL as webUrl} from '../../config/index'
+<script>
 import {getReplyList, likeVideo, randomList, removeFavoriteVideo, removeLikeVideo, submitReply} from "@/api/video";
 import {addVideo} from "@/api/favorite";
 import {getCurAddress, getLocation} from "@/utils/common";
 
-const systemInfo = ref()
-
-onLoad((options) => {
-  uni.getSystemInfo({
-    success(res) {
-      systemInfo.value = res
+export default {
+  data() {
+    return {
+      webUrl: this.$VUE_APP_RESOURCES_URL,
+      systemInfo: null,
+      ready: false,
+      cityName: '',
+      videoId: '',
+      list: [],
+      current: 0,
+      showPlay: false,
+      currentContext: null,
+      showDialog: false,
+      comment: '',
+      page: 1,
+      replyList: []
     }
-  })
-
-  videoId.value = options.videoId || ''
-  const name = options.name
-  if (name) {
-    cityName.value = name
-    fetchList()
-  } else {
-    getMapData()
-  }
-})
-
-onShow(() => {
-  ready.value = false
-  setTimeout(() => {
-    if (cityName.value) fetchList()
-  }, 1000)
-})
-
-const ready = ref(false)
-const cityName = ref('')
-const videoId = ref('')
-
-const navToCity = () => {
-  uni.redirectTo({url: '/pkg-video/views/city'})
-}
-
-const navToHome = () => {
-  uni.switchTab({url: '/pages/home/index'})
-}
-
-const navToStore = (id) => {
-  console.log(typeof id, id)
-  uni.navigateTo({url: '/pagesInn/inn/innHome?id=' + id})
-}
-
-const getMapData = async () => {
-  const map = await getLocation();
-  if (map.length > 1) {
-    const {latitude, longitude} = map[1];
-    const address = await getCurAddress(latitude, longitude);
-    cityName.value = address[1].data.result['ad_info']['city']
-  }
-
-  await fetchList()
-}
-
-const list = ref([])
-const fetchList = async () => {
-  let param
-  if (videoId.value) {
-    param = {
-      videoId: videoId.value,
-      limit: 2
-    }
-  } else {
-    param = {
-      cityName: cityName.value,
-      limit: 2
-    }
-  }
-  const res = await randomList(param)
-  if (res.success) {
-    res.data?.forEach(item => list.value.push(item))
-    if (!ready.value && list.value.length === 0) {
-      uni.showModal({
-        title: '',
-        content: '当前城市还没有视频，可以先看看其他城市的喔~',
-        cancelText: '返回',
-        cancelColor: '#3A87FC',
-        confirmText: '选择城市',
-        confirmColor: '#3A87FC',
-        success(res) {
-          if (res.confirm) {
-            navToCity()
-          } else if (res.cancel) {
-            navToHome()
-          }
-        }
-      })
-    }
-    ready.value = true
-    if (list.value.length > 0) handleVideoPlay()
-  }
-}
-
-const changeLike = async (item) => {
-  const videoId = item['id']
-  if (item['hasLike']) {
-    const res = await removeLikeVideo(videoId)
-    if (res.success) {
-      item['hasLike'] = false
-      item['likeCount'] = res.data['likeCount']
-    }
-  } else {
-    const res = await likeVideo(videoId)
-    if (res.success) {
-      item['hasLike'] = true
-      item['likeCount'] = res.data['likeCount']
-    }
-  }
-}
-
-const changeFav = async (item) => {
-  const videoId = item['id']
-  if (item['hasFavorite']) {
-    const res = await removeFavoriteVideo(videoId)
-    if (res.success) {
-      item['hasFavorite'] = false
-      item['favoriteCount'] = res.data['favoriteCount']
-    }
-  } else {
-    const res = await addVideo(videoId)
-    if (res.success) {
-      item['hasFavorite'] = true
-      item['favoriteCount'] = res.data['favoriteCount']
-    }
-  }
-}
-
-const current = ref(0)
-const onChange = (event) => {
-  current.value = event.detail.current
-  if (current.value + 2 >= list.value.length) fetchList()
-  handleVideoPlay()
-}
-
-const showPlay = ref(false)
-const currentContext = ref()
-const handleVideoPlay = () => {
-  for (let i = 0; i < list.value.length; i++) {
-    let id = `video-${i}`
-    let videoContext = uni.createVideoContext(id)
-    videoContext.pause()
-    if (current.value === i) videoContext.play()
-  }
-}
-const controlVideo = () => {
-  let id = `video-${current.value}`
-  currentContext.value = uni.createVideoContext(id)
-  if (showPlay.value) {
-    currentContext.value.play()
-  } else {
-    currentContext.value.pause()
-  }
-  showPlay.value = !showPlay.value
-}
-
-const showDialog = ref(false)
-const dialogClose = () => {
-  showDialog.value = false
-}
-const dialogOpen = () => {
-  comment.value = ''
-  page.value = 1
-  replyList.value = []
-  fetchReply()
-}
-const comment = ref('')
-const page = ref(1)
-
-const replyList = ref([])
-const fetchReply = async () => {
-  const id = list.value[current.value]['id']
-  const res = await getReplyList(id, page.value)
-  if (res.success && res.data['records']?.length > 0) {
-    res.data['records']?.forEach(item => {
-      item.time = uni.$u.timeFrom(Date.parse(item.createTime))
-      replyList.value.push(item)
-    })
-    page.value++
-  }
-}
-
-const onSubmit = async () => {
-  if (comment.value.trim().length === 0) return
-  const videoId = list.value[current.value]['id']
-  const res = await submitReply(videoId, comment.value)
-  if (res.success) {
-    uni.showToast({
-      title: '评论已发布',
-      icon: 'none',
-      success() {
-        list.value[current.value]['replyCount']++
-        showDialog.value = false
+  },
+  onLoad(options) {
+    let that = this
+    uni.getSystemInfo({
+      success(res) {
+        that.systemInfo = res
       }
     })
+
+    that.videoId = options.videoId || ''
+    const name = options.name
+    if (name) {
+      that.cityName = name
+      that.fetchList()
+    } else {
+      that.getMapData()
+    }
+  },
+  onShow() {
+    this.ready = false
+    setTimeout(() => {
+      if (this.cityName) this.fetchList()
+    }, 1000)
+  },
+  methods: {
+    navToCity() {
+      uni.redirectTo({url: '/pkg-video/views/city'})
+    },
+
+    navToHome() {
+      uni.switchTab({url: '/pages/home/index'})
+    },
+
+    navToStore(id) {
+      uni.navigateTo({url: '/pagesInn/inn/innHome?id=' + 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']
+      }
+
+      await this.fetchList()
+    },
+
+    async fetchList() {
+      let that = this
+      let param
+      if (this.videoId) {
+        param = {
+          videoId: this.videoId,
+          limit: 2
+        }
+      } else {
+        param = {
+          cityName: this.cityName,
+          limit: 2
+        }
+      }
+      const res = await randomList(param)
+      if (res.success) {
+        res.data?.forEach(item => this.list.push(item))
+        if (!this.ready && this.list.length === 0) {
+          uni.showModal({
+            title: '',
+            content: '当前城市还没有视频，可以先看看其他城市的喔~',
+            cancelText: '返回',
+            cancelColor: '#3A87FC',
+            confirmText: '选择城市',
+            confirmColor: '#3A87FC',
+            success(res) {
+              if (res.confirm) {
+                that.navToCity()
+              } else if (res.cancel) {
+                that.navToHome()
+              }
+            }
+          })
+        }
+        that.ready = true
+        if (that.list.length > 0) that.handleVideoPlay()
+      }
+    },
+
+    async changeLike(item) {
+      const videoId = item['id']
+      if (item['hasLike']) {
+        const res = await removeLikeVideo(videoId)
+        if (res.success) {
+          item['hasLike'] = false
+          item['likeCount'] = res.data['likeCount']
+        }
+      } else {
+        const res = await likeVideo(videoId)
+        if (res.success) {
+          item['hasLike'] = true
+          item['likeCount'] = res.data['likeCount']
+        }
+      }
+    },
+
+    async changeFav(item) {
+      const videoId = item['id']
+      if (item['hasFavorite']) {
+        const res = await removeFavoriteVideo(videoId)
+        if (res.success) {
+          item['hasFavorite'] = false
+          item['favoriteCount'] = res.data['favoriteCount']
+        }
+      } else {
+        const res = await addVideo(videoId)
+        if (res.success) {
+          item['hasFavorite'] = true
+          item['favoriteCount'] = res.data['favoriteCount']
+        }
+      }
+    },
+
+    onChange(event) {
+      this.current = event.detail.current
+      if (this.current + 2 >= this.list.length) this.fetchList()
+      this.handleVideoPlay()
+    },
+
+    handleVideoPlay() {
+      for (let i = 0; i < this.list.length; i++) {
+        let id = `video-${i}`
+        let videoContext = uni.createVideoContext(id)
+        videoContext.pause()
+        if (this.current === i) videoContext.play()
+      }
+    },
+
+    controlVideo() {
+      let id = `video-${current.value}`
+      this.currentContext = uni.createVideoContext(id)
+      if (this.showPlay) {
+        this.currentContext.play()
+      } else {
+        this.currentContext.pause()
+      }
+      this.showPlay = !this.showPlay
+    },
+
+    dialogClose() {
+      this.showDialog = false
+    },
+
+    dialogOpen() {
+      this.comment = ''
+      this.page = 1
+      this.replyList = []
+      this.fetchReply()
+    },
+
+    async fetchReply() {
+      const id = this.list[this.current]['id']
+      const res = await getReplyList(id, this.page)
+      if (res.success && res.data['records']?.length > 0) {
+        res.data['records']?.forEach(item => {
+          item.time = uni.$u.timeFrom(Date.parse(item.createTime))
+          this.replyList.push(item)
+        })
+        this.page++
+      }
+    },
+
+    async onSubmit() {
+      if (this.comment.trim().length === 0) return
+      const videoId = this.list[this.current]['id']
+      const res = await submitReply(videoId, this.comment)
+      if (res.success) {
+        uni.showToast({
+          title: '评论已发布',
+          icon: 'none',
+          success() {
+            this.list[this.current]['replyCount']++
+            this.showDialog = false
+          }
+        })
+      }
+    }
   }
 }
+
+
 </script>
 
 <style scoped lang="less">
@@ -328,6 +334,7 @@ video {
     color: #FFFFFF;
     font-size: 36rpx;
     line-height: 52rpx;
+    white-space: pre-wrap;
     z-index: 10;
   }
 
diff --git a/pkg_product/views/healthList.vue b/pkg_product/views/healthList.vue
index dc2024f..7bb4b36 100644
--- a/pkg_product/views/healthList.vue
+++ b/pkg_product/views/healthList.vue
@@ -58,7 +58,7 @@
         <view class="tc" v-else>
           <image class="img-nodata" :src="webUrl+'/20240106205121705480.png'" mode="scaleToFill"
                  v-if="tabIndex===0"/>
-          <image class="img-nodata" :src="webUrl+'/20240106205115520933.png'" mode="scaleToFill" v-else/>
+          <image class="img-nodata" :src="webUrl+'/20240219170514226953.png'" mode="scaleToFill" v-else/>
         </view>
       </view>
     </view>
diff --git a/pkg_user/views/myCoupons.vue b/pkg_user/views/myCoupons.vue
index b6a798a..6413c58 100644
--- a/pkg_user/views/myCoupons.vue
+++ b/pkg_user/views/myCoupons.vue
@@ -95,7 +95,7 @@ export default {
   .zero-coupons {
     position: absolute;
     left: 50%;
-    top: 50%;
+    top: 40%;
     transform: translate(-50%,-50%);
     width: 400rpx;
     height: 366rpx;
diff --git a/pkg_user/views/myFavorite.vue b/pkg_user/views/myFavorite.vue
index ee37e90..a898f10 100644
--- a/pkg_user/views/myFavorite.vue
+++ b/pkg_user/views/myFavorite.vue
@@ -9,10 +9,13 @@
       </view>
     </view>
 
-    <view class="manage flex jc-end ai-center" @click="changeManage">
+    <view class="manage flex jc-end ai-center" @click="changeManage" v-if="!isManage">
       <image :src="webUrl+'/20240107224533038041.png'" mode="scaleToFill"/>
       管理
     </view>
+    <view class="manage flex jc-end ai-center" style="color:#C41617" @click="changeManage" v-else>
+      退出管理
+    </view>
     <!--商品列表-->
     <scroll-view class="scroll-box" :class="{'manage-state':isManage}" scroll-y
                  @scrolltolower="fetchProduct()" v-if="tabsIndex===0">
@@ -25,11 +28,11 @@
                       v-if="isManage"/>
         <image class="cover flex-0" :src="item['image']" mode="scaleToFill" @click="navToGoods(item['productId'])"/>
 
-        <view>
-          <view class="more-t bold">{{ item['storeName'] }}</view>
-          <view class="sub">规格:{{ item['sku'] }}</view>
+        <view style="width: 100%">
+          <view class="more-t bold" @click="navToGoods(item['productId'])">{{ item['storeName'] }}</view>
+          <view class="sub" @click="navToGoods(item['productId'])">规格:{{ item['sku'] }}</view>
           <view class="flex jc-between ai-end">
-            <view class="price flex ai-end">
+            <view class="price flex ai-end" @click="navToGoods(item['productId'])">
               <text style="color:#E92727">￥</text>
               <text style="color:#E92727;font-size: 32rpx;line-height: 48rpx">{{ item['price'] }}</text>
               <text style="margin-left: 10rpx;text-decoration:line-through">￥{{ item['otPrice'] }}</text>
@@ -59,7 +62,7 @@
           <view class="flex jc-between ai-start" style="width: 594rpx">
             <view>
               <view class="one-t bold">{{ item['name'] }}</view>
-              <view class="sub">{{ item['time'] === '刚刚' ? '刚刚' : item['time'] + '前收藏' }}</view>
+              <view class="sub">{{ item['time'] === '刚刚' ? '刚刚' : item['time'] + '收藏' }}</view>
             </view>
             <view class="btn-nav flex jc-center ai-center" :style="{'margin-right':(isManage?48:0)+'rpx'}"
                   @click="navToStore(item['hotelId'])">进店逛逛
@@ -108,247 +111,261 @@
   </view>
 </template>
 
-<script setup>
-import {computed, onMounted, ref} from '@vue/composition-api'
-import {VUE_APP_RESOURCES_URL as webUrl} from '../../config/index'
+<script>
 import {getProductList, getStoreList, getVideoList, removeFavorite} from "@/api/favorite";
 import {postCartAdd} from "@/api/store";
 import CheckboxIcon from "@/components/CheckboxIcon.vue";
 
-const ready = ref(false)
-onMounted(() => {
-  ready.value = true
-  fetchProduct()
-})
-
-const navToGoods = (id) => {
-  uni.navigateTo({
-    url: "/pages/shop/GoodsCon/index?id=" + id
-  })
-}
-
-// 导航
-const tabs = ref([
-  {key: 0, label: '商品'},
-  {key: 1, label: '店铺'},
-  {key: 2, label: '视频'},
-])
-const tabsIndex = ref(0)
-const changeTabs = (index) => {
-  if (isManage.value) return
-  tabsIndex.value = index
-  page.value = 1
-  fetchData()
-}
-
-const fetchData = () => {
-  switch (tabsIndex.value) {
-    case 0:
-      fetchProduct()
-      break
-    case 1:
-      fetchStore()
-      break
-    case 2:
-      fetchVideo()
-      break
-  }
-}
-
-const tabsVertical = computed(() => {
-  if (tabsIndex.value === 0) return 1
-  if (tabsIndex.value === 1) return -1
-  if (tabsIndex.value === 2) return 0
-})
-
-// 管理
-const isManage = ref(false)
-const changeManage = () => {
-  isManage.value = !isManage.value
-}
-const isAll = ref(false)
-
-const selectCount = computed(() => {
-  let count = 0, countList
-  switch (tabsIndex.value) {
-    case 0:
-      countList = productList.value
-      break
-    case 1:
-      countList = storeList.value
-      break
-    case 2:
-      countList = videoList.value
-      break
-  }
-
-  countList.forEach(item => {
-    if (item['state']) count++
-  })
-  return count
-})
-const onChange = (state, mark) => {
-  if (mark[0] === -1) {
-    isAll.value = state
-    handleAll(state)
-    return
-  }
-
-  switch (tabsIndex.value) {
-    case 0:
-      productList.value[mark]['state'] = state
-      break
-    case 1:
-      storeList.value[mark]['state'] = state
-      break
-    case 2:
-      videoList.value[mark]['state'] = state
-      break
-  }
-}
-
-const handleAll = (state) => {
-  switch (tabsIndex.value) {
-    case 0:
-      productList.value.forEach(item => item.state = state)
-      break
-    case 1:
-      storeList.value.forEach(item => item.state = state)
-      break
-    case 2:
-      videoList.value.forEach(item => item.state = state)
-      break
-  }
-}
-
-const remove = async () => {
-  uni.showModal({
-    title: '确认删除已选项目?',
-    content: '',
-    showCancel: true,
-    cancelText: '取消',
-    confirmText: '确认',
-    success: async (r) => {
-      if (r.confirm) {
-        let ids = []
-        switch (tabsIndex.value) {
-          case 0:
-            productList.value.forEach(item => {
-              if (item['state']) ids.push(item.id)
-            })
-            break
-          case 1:
-            storeList.value.forEach(item => {
-              if (item['state']) ids.push(item.id)
-            })
-            break
-          case 2:
-            videoList.value.forEach(item => {
-              if (item['state']) ids.push(item.id)
-            })
-            break
-        }
-
-        const res = await removeFavorite(ids)
-        if (res.success) {
-          isAll.value = false
-          fetchData()
-          removeAfter()
-        }
-      }
+export default {
+  components: {CheckboxIcon},
+  data() {
+    return {
+      ready: false,
+      webUrl: this.$VUE_APP_RESOURCES_URL,
+      tabs: [
+        {key: 0, label: '商品'},
+        {key: 1, label: '店铺'},
+        {key: 2, label: '视频'},
+      ],
+      tabsIndex: 0,
+      isManage: false,
+      isAll: false,
+      page: 1,
+      productList: [],
+      storeList: [],
+      videoList: [],
     }
-  })
-}
+  },
+  computed: {
+    tabsVertical: function () {
+      if (this.tabsIndex === 0) return 1
+      if (this.tabsIndex === 1) return -1
+      if (this.tabsIndex === 2) return 0
+    },
+    selectCount: function () {
+      let count = 0, countList
+      switch (this.tabsIndex) {
+        case 0:
+          countList = this.productList
+          break
+        case 1:
+          countList = this.storeList
+          break
+        case 2:
+          countList = this.videoList
+          break
+      }
 
-const removeAfter = () => {
-  switch (tabsIndex.value) {
-    case 0:
-      productList.value = productList.value.filter(item => !item['state'])
-      break
-    case 1:
-      storeList.value = storeList.value.filter(item => !item['state'])
-      break
-    case 2:
-      videoList.value = videoList.value.filter(item => !item['state'])
-      break
+      countList.forEach(item => {
+        if (item['state']) count++
+      })
+      return count
+    }
+  },
+  mounted() {
+    this.ready = true
+    this.fetchProduct()
+  },
+  methods: {
+    navToGoods(id) {
+      uni.navigateTo({
+        url: "/pages/shop/GoodsCon/index?id=" + id
+      })
+    },
+
+    changeTabs(index) {
+      if (this.isManage) return
+      this.tabsIndex = index
+      this.page = 1
+      this.fetchData()
+    },
+
+    fetchData() {
+      switch (this.tabsIndex) {
+        case 0:
+          this.fetchProduct()
+          break
+        case 1:
+          this.fetchStore()
+          break
+        case 2:
+          this.fetchVideo()
+          break
+      }
+    },
+
+    changeManage() {
+      this.isManage = !this.isManage
+    },
+
+    onChange(state, mark) {
+      if (mark[0] === -1) {
+        this.isAll = state
+        this.handleAll(state)
+        return
+      }
+
+      switch (this.tabsIndex) {
+        case 0:
+          this.productList[mark]['state'] = state
+          this.isAll = this.selectCount === this.productList.length
+          break
+        case 1:
+          this.storeList[mark]['state'] = state
+          this.isAll = this.selectCount === this.storeList.length
+          break
+        case 2:
+          this.videoList[mark]['state'] = state
+          this.isAll = this.selectCount === this.videoList.length
+          break
+      }
+    },
+
+    handleAll(state) {
+      switch (this.tabsIndex) {
+        case 0:
+          this.productList.forEach(item => item.state = state)
+          break
+        case 1:
+          this.storeList.forEach(item => item.state = state)
+          break
+        case 2:
+          this.videoList.forEach(item => item.state = state)
+          break
+      }
+    },
+
+    async remove() {
+      let that = this
+      uni.showModal({
+        title: '确认删除已选项目?',
+        content: '',
+        showCancel: true,
+        cancelText: '取消',
+        confirmText: '确认',
+        success: async (r) => {
+          if (r.confirm) {
+            let ids = []
+            switch (that.tabsIndex) {
+              case 0:
+                that.productList.forEach(item => {
+                  if (item['state']) ids.push(item.id)
+                })
+                break
+              case 1:
+                that.storeList.forEach(item => {
+                  if (item['state']) ids.push(item.id)
+                })
+                break
+              case 2:
+                that.videoList.forEach(item => {
+                  if (item['state']) ids.push(item.id)
+                })
+                break
+            }
+
+            const res = await removeFavorite(ids)
+            if (res.success) {
+              that.isAll = false
+              that.fetchData()
+              that.removeAfter()
+            }
+          }
+        }
+      })
+    },
+
+    removeAfter() {
+      switch (this.tabsIndex) {
+        case 0:
+          this.productList = this.productList.filter(item => !item['state'])
+          break
+        case 1:
+          this.storeList = this.storeList.filter(item => !item['state'])
+          break
+        case 2:
+          this.videoList = this.videoList.filter(item => !item['state'])
+          break
+      }
+    },
+
+    async fetchProduct() {
+      let that = this
+      if (that.page === 1) {
+        that.productList = []
+      }
+      const res = await getProductList(that.page)
+      if (res.success) {
+        res.data['records']?.forEach(item => {
+          item.state = false
+          that.productList.push(item)
+        })
+        that.page++
+      }
+    },
+
+    async fetchStore() {
+      let that = this
+      if (that.page === 1) {
+        that.storeList = []
+      }
+      const res = await getStoreList(that.page)
+      if (res.success) {
+        res.data['records']?.forEach(item => {
+          item.time = uni.$u.timeFrom(Date.parse(item.createTime))
+          item.state = false
+          that.storeList.push(item)
+        })
+        that.page++
+      }
+    },
+
+    async fetchVideo() {
+      let that = this
+      if (that.page === 1) {
+        that.videoList = []
+      }
+      const res = await getVideoList(that.page)
+      if (res.success) {
+        res.data['records']?.forEach(item => {
+          item.state = false
+          that.videoList.push(item)
+        })
+        that.page++
+      }
+    },
+
+    async addCart(item) {
+      const param = {
+        productId: item.productId,
+        uniqueId: item.uniqueId,
+        cartNum: 1
+      }
+      const res = await postCartAdd(param)
+      if (res.success) {
+        uni.showToast({
+          title: res.msg,
+          icon: 'none'
+        }).catch()
+      }
+    },
+
+    navToStore(id) {
+      uni.navigateTo({
+        url: '/pagesInn/inn/innHome?id=' + id
+      })
+    },
+
+    navToVideo(videoId) {
+      if (this.isManage) return
+      uni.navigateTo({
+        url: '/pkg-video/views/watch?videoId=' + videoId
+      })
+    }
   }
 }
 
-// 列表
-const page = ref(1)
-const productList = ref([])
-const fetchProduct = async () => {
-  if (page.value === 1) {
-    productList.value = []
-  }
-  const res = await getProductList(page.value)
-  if (res.success) {
-    res.data['records']?.forEach(item => {
-      item.state = false
-      productList.value.push(item)
-    })
-    page.value++
-  }
-}
 
-const storeList = ref([])
-const fetchStore = async () => {
-  if (page.value === 1) {
-    storeList.value = []
-  }
-  const res = await getStoreList(page.value)
-  if (res.success) {
-    res.data['records']?.forEach(item => {
-      item.time = uni.$u.timeFrom(Date.parse(item.createTime))
-      item.state = false
-      storeList.value.push(item)
-    })
-    page.value++
-  }
-}
-
-const videoList = ref([])
-const fetchVideo = async () => {
-  if (page.value === 1) {
-    videoList.value = []
-  }
-  const res = await getVideoList(page.value)
-  if (res.success) {
-    res.data['records']?.forEach(item => {
-      item.state = false
-      videoList.value.push(item)
-    })
-    page.value++
-  }
-}
-
-const addCart = async (item) => {
-  const param = {
-    productId: item.productId,
-    uniqueId: item.uniqueId,
-    cartNum: 1
-  }
-  const res = await postCartAdd(param)
-  if (res.success) {
-    uni.showToast({
-      title: res.msg,
-      icon: 'none'
-    }).catch()
-  }
-}
-
-const navToStore = (id) => {
-  uni.navigateTo({
-    url: '/pagesInn/inn/innHome?id=' + id
-  })
-}
-
-const navToVideo = (videoId) => {
-  if (isManage.value) return
-  uni.navigateTo({
-    url: '/pkg-video/views/watch?videoId=' + videoId
-  })
-}
 </script>
 
 <style scoped lang="less">
diff --git a/pkg_user/views/withdrawalLog.vue b/pkg_user/views/withdrawalLog.vue
index 888dc88..29b8308 100644
--- a/pkg_user/views/withdrawalLog.vue
+++ b/pkg_user/views/withdrawalLog.vue
@@ -31,34 +31,42 @@
   </scroll-view>
 </template>
 
-<script setup>
-import {onMounted, ref} from '@vue/composition-api'
-import {VUE_APP_RESOURCES_URL as webUrl} from '../../config/index'
+<script>
 import {payoutLog} from "@/api/user";
 
-const ready = ref(false)
-onMounted(() => {
-  fetchData()
-  ready.value = true
-})
-const list = ref([])
-const page = ref(1)
-const fetchData = async () => {
-  const res = await payoutLog(page.value)
-  if (res.success) {
-    let count = 0
-    for (let i = 0; i < res.data.length; i++) {
-      count++
-      list.value.push(res.data[i])
+export default {
+  data() {
+    return {
+      webUrl: this.$VUE_APP_RESOURCES_URL,
+      ready: false,
+      list: [],
+      page: 1,
+    }
+  },
+  mounted() {
+    this.fetchData()
+    this.ready = true
+  },
+  methods: {
+    async fetchData() {
+      const res = await payoutLog(this.page)
+      if (res.success) {
+        let count = 0
+        for (let i = 0; i < res.data.length; i++) {
+          count++
+          this.list.push(res.data[i])
+        }
+        if (count < 10 && this.page === 1) this.scrollToLower()
+      }
+    },
+
+    scrollToLower() {
+      this.page++
+      this.fetchData()
     }
-    if (count < 10 && page.value === 1) scrollToLower()
   }
 }
 
-const scrollToLower = () => {
-  page.value++
-  fetchData()
-}
 </script>
 
 <style scoped lang="less">