From 15a14118d59eb08217bff7764edbe25d5cfc2c43 Mon Sep 17 00:00:00 2001
From: Suk1No <674874220@qq.com>
Date: Sat, 23 Aug 2025 15:39:20 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A1=AE=E5=AE=9A=E6=94=B6=E8=B4=A7=E5=AF=B9?=
 =?UTF-8?q?=E6=8E=A5=E3=80=81=E5=B0=8F=E7=A8=8B=E5=BA=8F=E9=A6=96=E9=A1=B5?=
 =?UTF-8?q?=E8=BD=AE=E6=92=AD=E5=9B=BE=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 order-app/src/api/order.js              |  3 +
 order-app/src/pages/confirm/confirm.vue |  8 +++
 order-app/src/pages/index/index.vue     | 79 ++++++++++++++-----------
 order-app/src/pages/order/order.vue     | 27 ++++++++-
 4 files changed, 83 insertions(+), 34 deletions(-)

diff --git a/order-app/src/api/order.js b/order-app/src/api/order.js
index e9d7d3b..451873e 100644
--- a/order-app/src/api/order.js
+++ b/order-app/src/api/order.js
@@ -19,4 +19,7 @@ export const hasCollectApi = (parm) => {
 }
 export const cancelCollectApi = (parm) => {
 	return http.post("/wxapi/collect/cancelCollect", parm)
+}
+export const confirmOrderApi = (parm) => {
+	return http.post("/wxapi/order/confirmOrder", parm)
 }
\ No newline at end of file
diff --git a/order-app/src/pages/confirm/confirm.vue b/order-app/src/pages/confirm/confirm.vue
index f53bbff..758861e 100644
--- a/order-app/src/pages/confirm/confirm.vue
+++ b/order-app/src/pages/confirm/confirm.vue
@@ -51,6 +51,9 @@
 		computed,
 		onMounted
 	} from 'vue'
+	import {
+		carStore
+	} from '../../store/car.js'
 	import {
 		orderStore
 	} from '../../store/order.js'
@@ -68,6 +71,7 @@
 	} from '@dcloudio/uni-app';
 	//获取store
 	const store = orderStore()
+	const carstore = carStore()
 	const astore = addressStore()
 	const goods = computed(() => {
 		return store.orderList
@@ -203,7 +207,11 @@
 		if (res && res.code == 200) {
 			//清空购物车
 			store.orderList = []
+			carstore.carList = []
 			uni.navigateBack()
+			uni.navigateTo({
+				url: '../order/order'
+			});
 		}
 	}
 	onLoad(() => {
diff --git a/order-app/src/pages/index/index.vue b/order-app/src/pages/index/index.vue
index aa5a9d0..3c9855c 100644
--- a/order-app/src/pages/index/index.vue
+++ b/order-app/src/pages/index/index.vue
@@ -1,23 +1,25 @@
 <template>
-
-	<u-swiper name='images' border-radius='1' :duration='duration' :interval='interval' :height="height"
-		:list="swiperList">
-	</u-swiper>
+	<!-- <u-swiper name='images' border-radius='1' :duration='duration' :interval='interval' :height="height" :list="swiperList">
+	</u-swiper> -->
+	<swiper class="swipper-container" circular :indicator-dots="indicatorDots" :autoplay="autoplay" :interval="interval"
+		:duration="duration">
+		<swiper-item @click="toDetails(item.sysGoods)" v-for="(item,index) in swiperList" :key='index'>
+			<image class="imgs" :src='item.images'></image>
+		</swiper-item>
+	</swiper>
 	<u-divider margin-top='20' margin-bottom='20' color="#F3AF28">店长推荐</u-divider>
 	<view class="wrap">
 		<u-waterfall v-model="flowList" ref="uWaterfall">
 			<template v-slot:left="{leftList}">
-				<view @click="toDetails(item)" class="demo-warter" v-for="(item, index) in leftList" :key="index">
+				<view class="demo-warter" v-for="(item, index) in leftList" :key="index">
 					<!-- 警告：微信小程序中需要hx2.8.11版本才支持在template中结合其他组件，比如下方的lazy-load组件 -->
-
-					<u-lazy-load threshold="-450" border-radius="10" :image="item.goodsImage.split(',')[0]" :index="index"></u-lazy-load>
+					<u-lazy-load @click="toDetails(item)" threshold="-450" border-radius="10"
+						:image="item.goodsImage.split(',')[0]" :index="index"></u-lazy-load>
 					<view class="demo-title">
-
 						{{item.goodsName}}
 					</view>
 					<view class="price-item">
 						<view class="demo-price">
-
 							{{item.specs[0].goodsPrice}}元
 						</view>
 						<view class="demo-title">
@@ -28,16 +30,14 @@
 				</view>
 			</template>
 			<template v-slot:right="{rightList}">
-				<view @click="toDetails(item)" class="demo-warter" v-for="(item, index) in rightList" :key="index">
-
-					<u-lazy-load threshold="-450" border-radius="10" :image="item.goodsImage.split(',')[0]" :index="index"></u-lazy-load>
+				<view class="demo-warter" v-for="(item, index) in rightList" :key="index">
+					<u-lazy-load @click="toDetails(item)" threshold="-450" border-radius="10"
+						:image="item.goodsImage.split(',')[0]" :index="index"></u-lazy-load>
 					<view class="demo-title">
-
 						{{item.goodsName}}
 					</view>
 					<view class="price-item">
 						<view class="demo-price">
-
 							{{item.specs[0].goodsPrice}}元
 						</view>
 						<view class="demo-title">
@@ -52,16 +52,16 @@
 </template>
 
 <script setup>
+	import {
+		getSwipperListApi,
+		getHotListApi
+	} from '../../api/home.js'
 	import {
 		ref
 	} from 'vue';
 	import {
 		onLoad
 	} from '@dcloudio/uni-app';
-	import {
-		getSwipperListApi,
-		getHotListApi
-	} from '../../api/home.js'
 	const carimg = ref('/static/goodscar.png')
 	//轮播图高度
 	const height = ref('400')
@@ -73,26 +73,14 @@
 	const interval = ref(2000)
 	//滑动动画时长
 	const duration = ref(500)
-
-	//定义轮播图的数据,创建一个空数组
+	//定义轮播图的数据
 	const swiperList = ref([])
-	//列表数据,默认空数组
-	const flowList = ref([])	//跳转详情
-	const toDetails = (item) => {
-		//在起始页面跳转到details.vue页面并传递参数
-		// uni.navigateTo({
-		// 	url: '../detail/detail?goods=' + JSON.stringify(item)
-		// });
-		
-		uni.navigateTo({
-		    url: '../detail/detail?goods=' + encodeURIComponent(JSON.stringify(item))
-		});
-	}
+	//列表数据
+	const flowList = ref([])
 	//获取轮播图数据
 	const getSwipperList = async () => {
 		let res = await getSwipperListApi()
 		if (res && res.code == 200) {
-			console.log(res.data)
 			swiperList.value = res.data;
 		}
 	}
@@ -103,6 +91,14 @@
 			flowList.value = res.data;
 		}
 	}
+	//跳转详情
+	const toDetails = (item) => {
+		console.log(item)
+		//在起始页面跳转到details.vue页面并传递参数
+		uni.navigateTo({
+			url: '../detail/detail?goods=' + JSON.stringify(item)
+		});
+	}
 	onLoad(() => {
 		getSwipperList()
 		getHotList()
@@ -117,6 +113,23 @@
 		justify-content: center;
 	}
 
+	/* 设置轮播图容器高度 */
+	.swipper-container {
+		height: 150px;
+	}
+
+	/* 设置swipper-container元素下面的item样式 */
+	.swipper-container .item {
+		height: 100%;
+		text-align: center;
+		line-height: 150px;
+	}
+
+	.imgs {
+		height: 400rpx;
+		width: 100%;
+	}
+
 	.logo {
 		height: 200rpx;
 		width: 200rpx;
diff --git a/order-app/src/pages/order/order.vue b/order-app/src/pages/order/order.vue
index 9f21a60..5a50458 100644
--- a/order-app/src/pages/order/order.vue
+++ b/order-app/src/pages/order/order.vue
@@ -49,6 +49,8 @@
 								<view class="bottom">
 									<view @click="cancel(res,index)" v-if="res.status == '0'" class="exchange btn">取消订单
 									</view>
+									<view @click="confirmOrderBtn(res,index)" v-if="res.status == '1'"
+										class="evaluate btn">确定收货</view>
 									<view @click="commentBtn(res)" v-if="res.status == '2'" class="evaluate btn">评价
 									</view>
 								</view>
@@ -74,7 +76,8 @@
 	} from '@dcloudio/uni-app';
 	import {
 		getOrderListApi,
-		cancelOrderApi
+		cancelOrderApi,
+		confirmOrderApi
 	} from '../../api/order.js'
 	import {
 		addCommentApi
@@ -217,6 +220,28 @@
 			}
 		});
 	}
+	const confirmOrderBtn = (item, index) => {
+		console.log(index)
+		uni.showModal({
+			title: '提示',
+			content: '确定收货吗？',
+			success: async function(res) {
+				if (res.confirm) {
+					console.log('用户点击确定收货');
+					console.log(item)
+					let res = await confirmOrderApi({
+						orderId: item.orderId
+					})
+					if (res && res.code == 200) {
+						change(swiperCurrent.value)
+						getOrderList(swiperCurrent.value);
+					}
+				} else if (res.cancel) {
+					console.log('用户点击取消');
+				}
+			}
+		});
+	}
 	//评论提交
 	const confirmBtn = async () => {
 		console.log('确定')