From 98b216912370fa5648bb31220ecf62f016c0e43f Mon Sep 17 00:00:00 2001
From: huliyong <2783385703@qq.com>
Date: Fri, 3 Jan 2025 15:29:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E7=99=BB=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/user/productList.vue                   |  7 ++
 pages/index/index.vue                             |  1 +
 pages/index/tradingPlatform.vue                   |  6 +-
 pages_order/components/product/submit.vue         |  7 +-
 pages_order/order/offerOrBillLading.vue           | 12 ++--
 pages_order/product/productDetail.vue             | 83 ++++++++++++++++++-----
 pages_order/tradingPlatform/nowOrder.vue          | 16 ++---
 uni_modules/uv-empty/components/uv-empty/props.js |  8 +--
 8 files changed, 98 insertions(+), 42 deletions(-)

diff --git a/components/user/productList.vue b/components/user/productList.vue
index 6f898b2..b503c02 100644
--- a/components/user/productList.vue
+++ b/components/user/productList.vue
@@ -1,6 +1,7 @@
 <template>
 	<view class="page">
 		<view v-if="list.length>0" class="item"
+		@click="toDetail(item)"
 		v-for="(item, index) in list" :key="index">
 			<view class="top">
 				<view class="service">
@@ -106,6 +107,12 @@
 					index, // 当前显示的资源序号
 				})
 			},
+			toDetail(item){
+				this.$store.state.productDetail = item
+				uni.navigateTo({
+					url: '/pages_order/product/productDetail'
+				})
+			},
 		}
 	}
 </script>
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 634b5d9..c0134ab 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -84,6 +84,7 @@
 			},
 
 			goToPage(titleIndex) {
+				this.$store.state.orderDetail = {}
 				uni.navigateTo({
 					url: '/pages_order/order/offerOrBillLading?titleIndex=' + titleIndex
 				})
diff --git a/pages/index/tradingPlatform.vue b/pages/index/tradingPlatform.vue
index 91903d2..a14bf14 100644
--- a/pages/index/tradingPlatform.vue
+++ b/pages/index/tradingPlatform.vue
@@ -38,6 +38,7 @@
 				</view>
 				<view class="productList">
 					<productList :list="list" @previewVideo="previewVideo"/>
+					<uv-empty mode="list" v-if="list.length == 0"></uv-empty>
 				</view>
 			</view>
 		</view>
@@ -274,9 +275,10 @@
 
 <style scoped lang="scss">
 	.trading-platform {
+		background-color: #000;
 		background-image: url('../../static/image/index/1.png');
 		padding-bottom: 100rpx;
-
+		min-height: 100vh;
 		.frame {
 
 			display: flex;
@@ -293,7 +295,7 @@
 			.supplier {
 				// height: 70%;
 				padding: 20rpx 20rpx;
-				background-image: url('../../static/image/index/1.png');
+				// background-image: url('../../static/image/index/1.png');
 				color: #FFF;
 				font-size: 32rpx;
 
diff --git a/pages_order/components/product/submit.vue b/pages_order/components/product/submit.vue
index e874e59..ca0d779 100644
--- a/pages_order/components/product/submit.vue
+++ b/pages_order/components/product/submit.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="submit">
-		<view class=""
+		<!-- <view class=""
 		@click="$emit('share')">
 			<uv-icon 
 			size="40rpx"
@@ -17,7 +17,7 @@
 			<view class="">
 				购物车
 			</view>
-		</view>
+		</view> -->
 		<view class="btn"
 		@click="$emit('submit')">
 			{{ submiitTitle }}
@@ -30,7 +30,7 @@
 		name:"submit",
 		props : {
 			submiitTitle : {
-				default : '立即租赁',
+				default : '立即购买',
 				type : String,
 			}
 		},
@@ -57,6 +57,7 @@
 	justify-content: center;
 	align-items: center;
 	font-size: 24rpx;
+	z-index: 99;
 	.btn{
 		background: $uni-color;
 		width: 600rpx;
diff --git a/pages_order/order/offerOrBillLading.vue b/pages_order/order/offerOrBillLading.vue
index 331f6f5..a7b0920 100644
--- a/pages_order/order/offerOrBillLading.vue
+++ b/pages_order/order/offerOrBillLading.vue
@@ -84,12 +84,8 @@
 				<view class="item"
 				@click="$refs.productTypePicker.open()">
 					<view>商品类型</view>
-					<view class=""
-					v-if="form.productType != 0 && !form.productType">
-						请选择类型
-					</view>
-					<view v-else>
-						{{ form.productType == -1 ? '请选择类型' : productType[form.productType] }}
+					<view>
+						{{ form.productType == 2 ? '请选择类型' : productType[form.productType] }}
 					</view>
 					<view class="icon">
 						<uv-icon name="arrow-right" size="30rpx"></uv-icon>
@@ -285,7 +281,7 @@
 			this.titleIndex = options.titleIndex || 0;//默认供应商报价
 			this.type = options.type
 			
-			if(options.type = 'edit'){
+			if(options.type == 'edit'){
 				
 				this.form = this.$store.state.orderDetail
 				
@@ -334,7 +330,7 @@
 					"num": 1,
 					"price": '',
 					"transactionTime": dayjs(new Date()).format("YYYY-MM-DD"),
-					productType : 0,
+					productType : 2,
 				},
 				address: {
 					name: '请选择地址',
diff --git a/pages_order/product/productDetail.vue b/pages_order/product/productDetail.vue
index 43d797e..bfbc6d6 100644
--- a/pages_order/product/productDetail.vue
+++ b/pages_order/product/productDetail.vue
@@ -4,25 +4,26 @@
 		
 		<view class="swipe">
 			<uv-swiper 
-			:list="productDetail.image.split(',')" 
+			v-if="productDetail.picDetail"
+			:list="productDetail.picDetail.split(',')" 
 			indicator
 			height="350rpx"></uv-swiper>
 		</view>
 		
 		<view class="info">
 			<view class="title">
-				桌布租赁
+				{{ productDetail.specsName }}
 			</view>
 			<view class="info-line">
 				<view class="price">
-					￥<text>45.9</text>起
+					单价￥<text>{{ productDetail.price }}</text>
 				</view>
 				<view class="num">
-					已售1000+
-					<image src="../static/product/like.png" mode=""></image>
+					库存{{ productDetail.num }}
+					<!-- <image src="../static/product/like.png" mode=""></image> -->
 				</view>
 			</view>
-			<view class="tips">
+			<!-- <view class="tips">
 				<view class="tip">
 					专业设备
 				</view>
@@ -32,10 +33,10 @@
 				<view class="tip">
 					质量保证
 				</view>
-			</view>
+			</view> -->
 		</view>
 		
-		<view class="info-unit">
+		<!-- <view class="info-unit">
 			<uv-cell title="是否有桌布" isLink>
 				<template #icon>
 					<text class="text">桌布</text>
@@ -53,22 +54,60 @@
 					<text>上门取件·送货上门</text>
 				</template>
 			</uv-cell>
+		</view> -->
+		
+		<!-- <uv-parse :content="productDetail.content"></uv-parse> -->
+		
+		<view class="content"
+		v-if="productDetail.video">
+			<view class="title">
+				商品视频
+			</view>
+			
+			<view class="list-video">
+				<view class="video"
+				:key="index"
+				v-for="(item, index) in productDetail.video.split(',')">
+					<video :src="item"></video>
+				</view>
+			</view>
+		</view>
+		
+		<view class="content"
+		v-if="productDetail.report">
+			<view class="title">
+				检测报告
+			</view>
+			
+			<view class=""
+			style="padding: 0 30rpx;">
+				<uv-album 
+				:urls="productDetail.report.split(',')"></uv-album>
+			</view>
 		</view>
 		
-		<view class="content">
+		<view class="content"
+		v-if="productDetail.reportVideo">
 			<view class="title">
-				商品详情
+				检测视频
+			</view>
+			
+			<view class="list-video">
+				<view class="video"
+				:key="index"
+				v-for="(item, index) in productDetail.reportVideo.split(',')">
+					<video :src="item"></video>
+				</view>
 			</view>
-			<uv-parse :content="productDetail.content"></uv-parse>
 		</view>
 		
 		<!-- 分享和租赁按钮 -->
 		<submit 
-		@submit="$refs.submitUnitSelect.open()"
+		@submit="submit"
 		@share="share"/>
 		
 		<!-- 选择规格 -->
-		<submitUnitSelect ref="submitUnitSelect"/>
+		<!-- <submitUnitSelect ref="submitUnitSelect"/> -->
 	</view>
 </template>
 
@@ -83,13 +122,11 @@
 		data() {
 			return {
 				productDetail : {
-					image : 'https://cdn.uviewui.com/uview/swiper/swiper3.png,https://cdn.uviewui.com/uview/swiper/swiper2.png',
-					content : '',
 				}
 			}
 		},
 		onLoad(args) {
-			console.log(args);
+			this.productDetail = this.$store.state.productDetail
 		},
 		methods: {
 			// 分享商品
@@ -98,7 +135,9 @@
 			},
 			// 选择完成规格立即租赁下单
 			submit(){
-				
+				uni.navigateTo({
+					url: `/pages_order/tradingPlatform/nowOrder`,
+				});
 			}
 		}
 	}
@@ -106,6 +145,7 @@
 
 <style scoped lang="scss">
 .page{
+	padding-bottom: 120rpx;
 	.swipe{
 		
 	}
@@ -165,5 +205,14 @@
 			padding: 30rpx;
 		}
 	}
+	
+	.list-video{
+		display: flex;
+		flex-wrap: wrap;
+		video{
+			width: 750rpx;
+			height: 420rpx;
+		}
+	}
 }
 </style>
diff --git a/pages_order/tradingPlatform/nowOrder.vue b/pages_order/tradingPlatform/nowOrder.vue
index 6c8159d..84107fc 100644
--- a/pages_order/tradingPlatform/nowOrder.vue
+++ b/pages_order/tradingPlatform/nowOrder.vue
@@ -2,12 +2,12 @@
 	<view class="now-order">
 		<navbar :title="$t('pageTitle.immediateOrder')" leftClick @leftClick="$utils.navigateBack" />
 
-		<uv-swiper
+		<!-- <uv-swiper
 		v-if="fatherData.picDetail"
 		:list="fatherData.picDetail.split(',')" 
 		height="420rpx"
 		>
-		</uv-swiper>
+		</uv-swiper> -->
 
 		<view class="frame">
 			<view class="title">
@@ -34,7 +34,7 @@
 					</view>
 				</view> -->
 				<!--详情视频-->
-				<view class="item"
+				<!-- <view class="item"
 				v-if="fatherData.video">
 					<view>详情视频</view>
 					<view class="list-video">
@@ -44,18 +44,18 @@
 							<video :src="item"></video>
 						</view>
 					</view>
-				</view>
+				</view> -->
 				
 				<!--检测报告-->
-				<view class="item"
+				<!-- <view class="item"
 				v-if="fatherData.report">
 					<view>检测报告</view>
 					<view>
 						<uv-album :urls="fatherData.report.split(',')"></uv-album>
 					</view>
-				</view>
+				</view> -->
 				<!--检测视频-->
-				<view class="item"
+				<!-- <view class="item"
 				v-if="fatherData.reportVideo">
 					<view>检测视频</view>
 					<view class="list-video">
@@ -65,7 +65,7 @@
 							<video :src="item"></video>
 						</view>
 					</view>
-				</view>
+				</view> -->
 
 				<!--<uv-divider text="" :hairline="true"></uv-divider>-->
 
diff --git a/uni_modules/uv-empty/components/uv-empty/props.js b/uni_modules/uv-empty/components/uv-empty/props.js
index 26c282d..59968a6 100644
--- a/uni_modules/uv-empty/components/uv-empty/props.js
+++ b/uni_modules/uv-empty/components/uv-empty/props.js
@@ -18,7 +18,7 @@ export default {
 		// 文字大小
 		textSize: {
 			type: [String, Number],
-			default: 14
+			default: 30
 		},
 		// 图标的颜色
 		iconColor: {
@@ -28,7 +28,7 @@ export default {
 		// 图标的大小
 		iconSize: {
 			type: [String, Number],
-			default: 90
+			default: 180
 		},
 		// 选择预置的图标类型
 		mode: {
@@ -38,12 +38,12 @@ export default {
 		//  图标宽度，单位px
 		width: {
 			type: [String, Number],
-			default: 160
+			default: 320
 		},
 		// 图标高度，单位px
 		height: {
 			type: [String, Number],
-			default: 160
+			default: 320
 		},
 		// 是否显示组件
 		show: {