From c234c61dfc295970fd36ff2d0032d01e07e38a20 Mon Sep 17 00:00:00 2001
From: duan <1004387497@qq.com>
Date: Thu, 16 May 2024 09:35:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B7=B3=E8=BD=AC=E5=92=96?=
 =?UTF-8?q?=E5=95=A1=E5=AD=97=E6=AE=B5=E6=B2=A1=E6=9C=89=E4=BC=A0=E5=85=A5?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/components/diamond.vue | 10 +++++++++-
 pages/index/drinks.vue             | 22 +++++++++++++++++-----
 pages/index/freedaily.vue          | 23 +++++++++++++++--------
 3 files changed, 41 insertions(+), 14 deletions(-)

diff --git a/pages/index/components/diamond.vue b/pages/index/components/diamond.vue
index 9449fb8..d4abd84 100644
--- a/pages/index/components/diamond.vue
+++ b/pages/index/components/diamond.vue
@@ -38,7 +38,15 @@
 						});
 						break;
 					case 'relative':
-						uni.pro.navigateTo(item.absUrl, JSON.stringify(item));
+					uni.setStorage({
+						key: 'titleName',
+						data: item.name,
+					});
+					uni.setStorage({
+						key: 'itemData',
+						data: item,
+					});
+						uni.pro.navigateTo(item.absUrl, item.name);
 						break;
 					case 'scan':
 						if (!uni.utils.pluschooseImage()) {
diff --git a/pages/index/drinks.vue b/pages/index/drinks.vue
index c988765..89fbca0 100644
--- a/pages/index/drinks.vue
+++ b/pages/index/drinks.vue
@@ -150,11 +150,23 @@
 			}
 		},
 		onLoad(e) {
-			this.type = e.value
-			this.distiricttopCommon()
-			setTimeout(() => {
-				this.GetTop()
-			}, 1000)
+			let _this = this
+			uni.getStorage({
+				key: 'itemData',
+				success: function(res) {
+					console.log(res.data,'数据');
+					_this.type = res.data.value
+					_this.distiricttopCommon()
+					setTimeout(() => {
+						_this.GetTop()
+					}, 1000)
+				}
+			});
+			// this.type = e.value
+			// this.distiricttopCommon()
+			// setTimeout(() => {
+			// 	this.GetTop()
+			// }, 1000)
 		},
 		onShow() {
 			this.init_fn()
diff --git a/pages/index/freedaily.vue b/pages/index/freedaily.vue
index 10c6678..4adc971 100644
--- a/pages/index/freedaily.vue
+++ b/pages/index/freedaily.vue
@@ -43,8 +43,7 @@
 								免单状态
 							</view>
 						</view>
-						<view class="swiperitem" v-for="(item,index) in orderfindWiningUserlist"
-							:key="index">
+						<view class="swiperitem" v-for="(item,index) in orderfindWiningUserlist" :key="index">
 							<view class="swiper-item" style="margin-top: 32rpx;">
 								<view class="swiper_itemone">
 									{{item.orderAmount}}元
@@ -56,9 +55,8 @@
 									{{item.isRefund == true ? '已免单':'待免单'}}
 								</view>
 							</view>
-						</view
-						>
-					<!-- 	<swiper class="swiper" circular :autoplay='true' :vertical='true' interval="3000"
+						</view>
+						<!-- 	<swiper class="swiper" circular :autoplay='true' :vertical='true' interval="3000"
 							display-multiple-items="4">
 							<swiper-item class="swiperitem" v-for="(item,index) in orderfindWiningUserlist"
 								:key="index">
@@ -87,6 +85,9 @@
 </template>
 
 <script>
+	import {
+		forEach
+	} from 'lodash';
 	import navseat from '@/components/navseat.vue'
 	export default {
 		components: {
@@ -94,7 +95,7 @@
 		},
 		data() {
 			return {
-				titlename: '今日上新',
+				titlename: '',
 				opacity: false,
 				orderfindWiningUserlist: [],
 				form: {
@@ -110,8 +111,14 @@
 		},
 		onLoad(e) {
 			this.orderfindWiningUser()
-			let data = JSON.parse(e)
-			this.titlename = data.name
+			let _this = this
+			uni.getStorage({
+				key: 'titleName',
+				success: function(res) {
+					console.log(res.data);
+					_this.titlename = res.data
+				}
+			});
 		},
 		onPageScroll(e) {
 			if (e.scrollTop <= 44) { //搜索导航栏