From 88218f6dce5222b8431a0f259a3247c867f40ceb Mon Sep 17 00:00:00 2001
From: fanfan <franceesfan@163.com>
Date: Tue, 2 Jul 2024 21:21:03 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/goods/detail.vue              |  6 ++++--
 pages/goods/seckillDetail.vue       |  7 ++++---
 pages/merchantTutorial/tutorial.vue | 13 ++++++++++---
 pages/news3/shopOrderDetails.vue    | 10 ++++++++--
 4 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/pages/goods/detail.vue b/pages/goods/detail.vue
index c2aa032..61d4278 100644
--- a/pages/goods/detail.vue
+++ b/pages/goods/detail.vue
@@ -1175,13 +1175,15 @@
 				const that = this;
 				// 构建页面参数
 				const res = await GoodsApi.goodsShortUrl({
-					page_url: encodeURIComponent('pages/goods/detail?refereeId=' + store.getters.userId + '&goodsId=' + this.goods
+					page_url: encodeURIComponent('pages/goods/detail?refereeId=' + store.getters.userId +
+						'&goodsId=' + this.goods
 						.goods_id),
 					page_title: that.goods.goods_name,
 				})
 				if (res.data.url) {
+					let storeInfo = JSON.parse(uni.getStorageSync("storeInfo"))
 					let str =
-						`型号：${that.goods.goods_name}\n零售价：￥${that.goods.goods_price_max}元\n会员价：￥${that.goods.goods_price_min}元\n编码：${that.goods.goods_no}\n小程序链接：${res.data.url}`
+						`【${storeInfo.store_name}】型号：${that.goods.goods_name}\n———————\n市场价：￥${that.goods.goods_price_max}元\n到手价：￥${that.goods.goods_price_min}元\n编码：${that.goods.goods_no}\n———————\n抢购链接：${res.data.url}`
 					uni.setClipboardData({
 						data: str, //	这里是个坑接受字符串类型 value转化为字符串
 						success: function() {
diff --git a/pages/goods/seckillDetail.vue b/pages/goods/seckillDetail.vue
index b3d8bbf..2a08395 100644
--- a/pages/goods/seckillDetail.vue
+++ b/pages/goods/seckillDetail.vue
@@ -997,7 +997,7 @@
 				})
 			},
 			toDetail(goods_id) {
-				let that=this
+				let that = this
 				uni.navigateTo({
 					url: '/pages/goods/seckillDetail?goodsId=' + goods_id + '&activeTimeId=' + that.activeTimeId +
 						'&sharpGoodsId=' + that.sharpGoodsId + "&isSeckill=" + true + '&isBuy=' + that
@@ -1094,8 +1094,9 @@
 					page_title: that.goods.goods_name,
 				})
 				if (res.data.url) {
+					let storeInfo = JSON.parse(uni.getStorageSync("storeInfo"))
 					let str =
-						`型号：${that.goods.goods_name}\n零售价：￥${that.goods.goods_price_max}元\n会员价：￥${that.goods.goods_price_min}元\n编码：${that.goods.goods_no}\n小程序链接：${res.data.url}`
+						`【${storeInfo.store_name}】型号：${that.goods.goods_name}\n———————\n市场价：￥${that.goods.goods_price_max}元\n到手价：￥${that.goods.goods_price_min}元\n编码：${that.goods.goods_no}\n———————\n抢购链接：${res.data.url}`
 					uni.setClipboardData({
 						data: str, //	这里是个坑接受字符串类型 value转化为字符串
 						success: function() {
@@ -1165,7 +1166,7 @@
 				imageUrl: app.goods.goods_image,
 				path: 'pages/goods/seckillDetail?refereeId=' + store.getters.userId +
 					'&goodsId=' + app.goods
-					.goods_id + '&activeTimeId=' + app.activeTimeId + '&sharpGoodsId=' + app.sharpGoodsId+ "&isSeckill=" +
+					.goods_id + '&activeTimeId=' + app.activeTimeId + '&sharpGoodsId=' + app.sharpGoodsId + "&isSeckill=" +
 					true + '&isBuy=' + app
 					.isBuy + '&seckillText=' + (app.activeInfo.status == 10 ?
 						'结束' : '开始')
diff --git a/pages/merchantTutorial/tutorial.vue b/pages/merchantTutorial/tutorial.vue
index c6e096b..8653f13 100644
--- a/pages/merchantTutorial/tutorial.vue
+++ b/pages/merchantTutorial/tutorial.vue
@@ -5,10 +5,13 @@
 				<u-navbar title="商家教程" :border-bottom="false" :background="background"></u-navbar>
 			</view>
 			<view class="top-title">
-				软件使用教学
+				软件操作 流量运营教学
 			</view>
 			<view class="top-marker">
-				系统教学 · 通俗易懂 · 智能搜索
+				系统教学 · 通俗易懂 · 一学就会
+			</view>
+			<view class="top-marker">
+				软件操作教学 · 流量运营课堂
 			</view>
 		</view>
 		<view class="park-center">
@@ -127,6 +130,10 @@
 	}
 </style>
 <style lang="scss" scoped>
+	::v-deep .u-empty {
+		padding: 100rpx 0;
+	}
+	
 	.warp {
 		display: flex;
 		align-items: center;
@@ -145,7 +152,7 @@
 
 		.park-top {
 			width: 100%;
-			height: 380rpx;
+			height: 420rpx;
 			background: url(https://www.royaum.com.cn/static/user/courseBg.png);
 			background-size: 100%;
 
diff --git a/pages/news3/shopOrderDetails.vue b/pages/news3/shopOrderDetails.vue
index a829a0f..dd1b11d 100644
--- a/pages/news3/shopOrderDetails.vue
+++ b/pages/news3/shopOrderDetails.vue
@@ -65,7 +65,7 @@
 					<!-- 	<view class="orderInfo">
 						<text>订单号：{{orderInfo.order_no}}</text>
 					</view> -->
-					<view class="list" v-for="(item,index) in orderInfo.goods" :key="index">
+					<view class="list" v-for="(item,index) in orderInfo.goods" :key="index" @click="handleTargetGoods(item.goods_id)">
 						<image :src="item.goods_image" mode="aspectFill" class="thumb"></image>
 						<view class="item">
 							<view class="title">{{item.goods_name}}</view>
@@ -291,7 +291,13 @@
 		onShow() {
 			this.getOrderDetail(this.order_id)
 		},
-		methods: {
+		methods: {
+			// 跳转到商品详情页面
+			handleTargetGoods(goodsId) {
+				uni.redirectTo({
+					url: '/pages/goods/detail?goodsId=' + goodsId // 目标页面路径
+				})
+			},
 			// 获取当前订单信息
 			getOrderDetail() {
 				const app = this