From a87b95dc0c086cde00ddc81653dab16bae449fd3 Mon Sep 17 00:00:00 2001
From: donqi <ydq0308@qq.com>
Date: Sat, 25 Jun 2022 18:05:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B8=88=E5=82=85=E5=9C=88=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=8C=E5=BC=80=E5=8F=91=E4=B8=AD=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/default-toast/bg-toast.vue | 11 ++--
 pages/index/index.vue                 |  2 +-
 pages/index/msg-home.vue              | 85 ++-------------------------
 pages/product/shop-detail.vue         |  7 ++-
 style/default.css                     |  4 ++
 5 files changed, 23 insertions(+), 86 deletions(-)

diff --git a/components/default-toast/bg-toast.vue b/components/default-toast/bg-toast.vue
index b4b27d1..d33685c 100644
--- a/components/default-toast/bg-toast.vue
+++ b/components/default-toast/bg-toast.vue
@@ -1,6 +1,9 @@
 <template>
 	<view>
-		
+		<view class="padding-xl text-gray text-center">
+			<view class="big-icon padding-tb" :class="'cuIcon-' + icon"></view>
+			<view class="text-lg">开发中，敬请期待</view>
+		</view>
 	</view>
 </template>
 
@@ -8,13 +11,13 @@
 	export default {
 		name: 'bg-toast',
 		props: {
-			content: {
+			icon: {
 				type: String,
 				default: ''
 			},
-			cancelMsg: {
+			msg: {
 				type: String,
-				default: '取消'
+				default: ''
 			}
 		},
 		data() {
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 1f49c43..dbd3285 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -72,7 +72,7 @@
 			index,
 			workerCircle,
 			personalCenter,
-			// msgPage
+			msgPage
 			// publishHome
 		},
 		data() {
diff --git a/pages/index/msg-home.vue b/pages/index/msg-home.vue
index b29cae9..5ed8648 100644
--- a/pages/index/msg-home.vue
+++ b/pages/index/msg-home.vue
@@ -4,91 +4,18 @@
 		<cu-custom :bgColor="'bg-main-color'">
 			<block slot="content">我的消息</block>
 		</cu-custom>
-		<!-- 消息列表 -->
-		<view class="cu-list menu-avatar">
-			<view class="cu-item">
-				<view class="cu-avatar round lg" style="background-image:url(https://ossweb-img.qq.com/images/lol/web201310/skin/big10001.jpg);"></view>
-				<view class="content">
-					<view class="text-grey">凯尔</view>
-					<view class="text-gray text-sm flex">
-						<view class="text-cut">
-							<text class="cuIcon-infofill text-red  margin-right-xs"></text>
-							我已天理为凭，踏入这片荒芜，不再受凡人的枷锁遏制。我已天理为凭，踏入这片荒芜，不再受凡人的枷锁遏制。
-						</view> </view>
-				</view>
-				<view class="action">
-					<view class="text-grey text-xs">22:20</view>
-					<view class="cu-tag round bg-grey sm">5</view>
-				</view>
-			</view>
-			<view class="cu-item">
-				<view class="cu-avatar round lg" style="background-image:url(https://ossweb-img.qq.com/images/lol/img/champion/Taric.png);">
-					<view class="cu-tag badge">99+</view>
-				</view>
-				<view class="content">
-					<view class="text-grey">
-						<view class="text-cut">瓦洛兰之盾-塔里克</view>
-						<view class="cu-tag round bg-orange sm">战士</view>
-					</view>
-					<view class="text-gray text-sm flex">
-						<view class="text-cut">
-							塔里克是保护者星灵，用超乎寻常的力量守护着符文之地的生命、仁爱以及万物之美。塔里克由于渎职而被放逐，离开了祖国德玛西亚，前去攀登巨神峰寻找救赎，但他找到的却是来自星界的更高层的召唤。现在的塔里克与古代巨神族的神力相融合，以瓦洛兰之盾的身份，永不疲倦地警惕着阴险狡诈的虚空腐化之力。
-						</view>
-					</view>
-				</view>
-				<view class="action">
-					<view class="text-grey text-xs">22:20</view>
-					<view class="cuIcon-notice_forbid_fill text-gray"></view>
-				</view>
-			</view>
-			<view class="cu-item ">
-				<view class="cu-avatar radius lg" style="background-image:url(https://ossweb-img.qq.com/images/lol/img/champion/Morgana.png);"></view>
-				<view class="content">
-					<view class="text-pink"><view class="text-cut">莫甘娜</view></view>
-					<view class="text-gray text-sm flex"> <view class="text-cut">凯尔，你被自己的光芒变的盲目！</view></view>
-				</view>
-				<view class="action">
-					<view class="text-grey text-xs">22:20</view>
-					<view class="cu-tag round bg-red sm">5</view>
-				</view>
-			</view>
-			<view class="cu-item grayscale">
-				<view class="cu-avatar radius lg" style="background-image:url(https://ossweb-img.qq.com/images/lol/web201310/skin/big81007.jpg);"></view>
-				<view class="content">
-					<view><view class="text-cut">伊泽瑞尔</view>
-						<view class="cu-tag round bg-orange sm">断开连接...</view>
-					</view>
-					<view class="text-gray text-sm flex"> <view class="text-cut"> 等我回来一个打十个</view></view>
-				</view>
-				<view class="action">
-					<view class="text-grey text-xs">22:20</view>
-					<view class="cu-tag round bg-red sm">5</view>
-				</view>
-			</view>
-			<view class="cu-item cur">
-				<view class="cu-avatar radius lg" style="background-image:url(https://ossweb-img.qq.com/images/lol/web201310/skin/big81020.jpg);">
-					<view class="cu-tag badge"></view>
-				</view>
-				<view class="content">
-					<view>
-						<view class="text-cut">瓦罗兰大陆-睡衣守护者-新手保护营</view>
-						<view class="cu-tag round bg-orange sm">6人</view>
-					</view>
-					<view class="text-gray text-sm flex">
-						<view class="text-cut"> 伊泽瑞尔：<text class="cuIcon-locationfill text-orange margin-right-xs"></text> 传送中...</view></view>
-				</view>
-				<view class="action">
-					<view class="text-grey text-xs">22:20</view>
-					<view class="cuIcon-notice_forbid_fill text-gray"></view>
-				</view>
-			</view>
-		</view>
+		<bg-toast :icon="'repair'" :msg="'开发中'"></bg-toast>
 	</view>
 </template>
 
 <script>
+	import bgToast from '@/components/default-toast/bg-toast.vue';
+	
 	export default {
 		name: 'msgPage',
+		components: {
+			bgToast
+		},
 		data() {
 			return {
 				
diff --git a/pages/product/shop-detail.vue b/pages/product/shop-detail.vue
index 519aa06..89caf6a 100644
--- a/pages/product/shop-detail.vue
+++ b/pages/product/shop-detail.vue
@@ -238,8 +238,11 @@
 				this.loadProductData(params);
 			},
 			showDetails(productItem) {
-				uni.navigateTo({
-					url: '../product/product-detail'
+				let params = {
+					goodsId: productItem.goodsId
+				}
+				uni.navigateTo({
+					url: '/pages/product/product-detail?params=' + encodeURIComponent(JSON.stringify(params))
 				});
 			},
 			getLastSplitAreaName(mergeName) {
diff --git a/style/default.css b/style/default.css
index e6318ed..63f4b1c 100644
--- a/style/default.css
+++ b/style/default.css
@@ -107,4 +107,8 @@
 	border-radius: 10rpx;
 	padding: 11rpx;
 	box-sizing: content-box;
+}
+
+.big-icon {
+	font-size: 111rpx !important;
 }
\ No newline at end of file