更新订单管理模块，增加订单详情跳转用户订单

2024-09-29 15:40:51 +08:00
parent efc8485082
commit 1ff0b14f93
7 changed files with 209 additions and 54 deletions
--- a/pagesOrder/detail/components/list.vue
+++ b/pagesOrder/detail/components/list.vue
@@ -54,7 +54,7 @@
 			</view>
 			<view class="bg-gray u-p-20 u-m-t-20">
 				<view>备注</view>
-				<view class="u-m-t-10">无</view>
+				<view class="u-m-t-10">{{orderInfo.remark}}</view>
 			</view>
 		</view>

--- a/pagesOrder/detail/components/step.vue
+++ b/pagesOrder/detail/components/step.vue
@@ -22,9 +22,9 @@
 	})
 	const recoders = reactive({
 		list:[
-			{title:'2024-09-15 11：20：30',content:'[东风(id:124413)]使用代客下单提交。(未打印预结单)'},
-			{title:'2024-09-15 ',content:'[东风(id:124413)]使用代客下单提交。(未打印预结单)'},
-			{title:'2024-09-15 ',content:'[东风(id:124413)]使用代客下单提交。(未打印预结单)'}
+			{title:'2024-09-15',content:'[东风(id:124413)]使用代客下单提交。(未打印预结单)'},
+			{title:'2024-09-15',content:'[东风(id:124413)]使用代客下单提交。(未打印预结单)'},
+			{title:'2024-09-15',content:'[东风(id:124413)]使用代客下单提交。(未打印预结单)'}
 		],
 		active:0
 	})
--- a/pagesOrder/detail/components/user.vue
+++ b/pagesOrder/detail/components/user.vue
@@ -5,20 +5,20 @@
 		</template>
 		<view class="u-flex	u-row-between u-m-t-20 border-bottom u-p-b-20">
 			<view class="u-flex">
-				<up-avatar :size="30"></up-avatar>
-				<view class="color-666 u-m-l-30">未绑定手机号</view>
+				<up-avatar :size="30" :src="user.headImg"></up-avatar>
+				<view class="color-666 u-m-l-30">{{user.telephone||'未绑定手机号'}}</view>
 			</view>
 			<view>
-				<my-button :height="60" plain shape="circle">他的订单</my-button>
+				<my-button @click="toOrder" :height="60" plain shape="circle">他的订单</my-button>
 			</view>
 		</view>
 		<view class="u-flex u-m-t-20 u-row-between">
 			<view class="">
-				<view class="font-bold">0.00</view>
+				<view class="font-bold">{{user.amount}}</view>
 				<view class="color-666 u-m-t-10">余额</view>
 			</view>
 			<view class="">
-				<view class="font-bold">0.00</view>
+				<view class="font-bold">{{user.totalScore}}</view>
 				<view class="color-666 u-m-t-10">积分</view>
 			</view>
 			<view class="">
@@ -34,13 +34,30 @@
 	const props = defineProps({
 		orderInfo: {
 			type: Object,
-			default: () => {}
+			default: () => {
+				status:''
+			}
 		},
 		user: {
 			type: Object,
-			default: () => {}
+			default: () => {
+				return {
+					id:'',
+					headImg:'',
+					telephone:'',
+					amount:'0.00',
+					totalScore:'0.00'
+				}
+			}
 		}
 	})
+	
+	function toOrder(){
+		go.to('PAGES_ORDER_INDEX',{
+			userId:props.user.id||'',
+			type:'user'
+		})
+	}

 	function chooseUser() {
 		go.to('PAGES_CHOOSE_USER')
--- a/pagesOrder/detail/detail.vue
+++ b/pagesOrder/detail/detail.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="min-page bg-gray u-font-28 u-p-30">
-		<user-vue :orderInfo="orderDetail.info"></user-vue>
+		<user-vue :orderInfo="orderDetail.info" :user="user"></user-vue>
 		<view class="default-box-padding bg-fff border-r-12 u-m-t-20">
 			<text class="color-666">桌位号：</text>
 			<text class="font-bold">{{orderDetail.info.tableName}}</text>
@@ -8,7 +8,8 @@
 		<goods-list @printOrder="onPrintOrder" @tuikuan="onTuikuan" :orderInfo="orderDetail.info"
 			:data="orderDetail.goodsList" :seatFee="orderDetail.seatFee.totalAmount" @tuicai="onTuiCai"></goods-list>
 		<template v-if="orderDetail.seatFee.totalNumber&&orderDetail.seatFee.totalAmount">
-			<extra-vue @tuicai="onSeatFeeTuicai" @tuikuan="onSeatFeeTuiKuan" :orderInfo="orderDetail.info" :data="orderDetail.seatFee"></extra-vue>
+			<extra-vue @tuicai="onSeatFeeTuicai" @tuikuan="onSeatFeeTuiKuan" :orderInfo="orderDetail.info"
+				:data="orderDetail.seatFee"></extra-vue>
 		</template>
 		<order-vue :data="orderDetail.info" :table="options" :seatFee="orderDetail.seatFee"></order-vue>
 		<step-vue></step-vue>
@@ -36,6 +37,7 @@
 <script setup>
 	import * as Api from '@/http/yskApi/Instead.js'
 	import * as orderApi from '@/http/yskApi/order.js'
+	import {queryAllShopUser} from '@/http/yskApi/shop-user.js'
 	import {
 		objToArrary
 	} from '@/commons/utils/returrn-data.js'
@@ -59,20 +61,43 @@
 	import OrderDetail from './page.js'
 	const tuicai = reactive({
 		show: false,
-		isSeatFee:false,
+		isSeatFee: false,
 		selGoods: {}
 	})
-	
-	function onSeatFeeTuicai(seatFee){
+
+	function onSeatFeeTuicai(seatFee) {
 		tuicai.show = true
 		tuicai.isSeatFee = seatFee
 		tuicai.selGoods = seatFee
 	}
-	function onSeatFeeTuiKuan(seatFee){
+
+	function onSeatFeeTuiKuan(seatFee) {
+		console.log(seatFee);
+		const {
+			id,
+			productId,
+			productSkuId,
+			productName,
+			productSkuName,
+			cartId,
+			num,
+			priceAmount,
+			price
+		} = seatFee
 		go.to('PAGES_ORDER_TUIKUAN', {
-		
+			id,
+			cartId,
+			productId,
+			productSkuId,
+			productName,
+			num,
+			number: 0,
+			productSkuName: productSkuName || '',
+			priceAmount,
+			price
 		})
 	}
+
 	function onTuiCai(goods, index) {
 		console.log(goods);
 		tuicai.show = true
@@ -87,8 +112,8 @@
 		tuicai.selGoods.status = 'return'
 		tuicai.show = false
 	}
-	
-	
+
+
 	async function printDishes() {
 		try {
 			const res = await Api.$printDishes({
@@ -115,7 +140,17 @@
 	}

 	function onTuikuan(goods, index) {
-		const {id,productId,productSkuId,productName,productSkuName,cartId,num,priceAmount,price}=goods
+		const {
+			id,
+			productId,
+			productSkuId,
+			productName,
+			productSkuName,
+			cartId,
+			num,
+			priceAmount,
+			price
+		} = goods
 		go.to('PAGES_ORDER_TUIKUAN', {
 			id,
 			cartId,
@@ -123,14 +158,15 @@
 			productSkuId,
 			productName,
 			num,
-			number:0,
-			productSkuName:productSkuName||'',
-			priceAmount,price
+			number: 0,
+			productSkuName: productSkuName || '',
+			priceAmount,
+			price
 		})

 	}

-	
+
 	const uiPage = new OrderDetail()
 	setTimeout(() => {
 		uiPage.setVal('user', {
@@ -148,7 +184,7 @@

 	function toPay() {
 		go.to('PAGES_ORDER_PAY', {
-			tableId: options.tableId,
+			tableId: options.tableId|| orderDetail.info.tableId,
 			tableName: options.name,
 			masterId: options.masterId,
 			orderId: orderDetail.info.id,
@@ -166,6 +202,15 @@
 	const options = reactive({})
 	async function init() {
 		const res = await orderApi.tbOrderInfoDetail(options.id)
+		if(res.userId){
+			queryAllShopUser({id:res.userId}).then(res=>{
+				if(res.content[0]){
+					user.value=res.content[0]
+				}
+			})
+		}
+	
+		
 		if (res.detailList.length) {
 			uni.setStorageSync('useType', res.detailList[0].useType)
 		}
@@ -222,12 +267,17 @@
 	}

 	// 监听选择用户事件
-	let user = ref(null)
+	let user = ref({
+		headImg:'',
+		telephone:'',
+		amount:'0.00',
+		totalScore:'0.00'
+	})
 	//更新选择用户
 	function setUser(par) {
 		const submitPar = {
 			masterId: options.masterId,
-			tableId: options.tableId,
+			tableId: options.tableId|| orderDetail.info.tableId,
 			vipUserId: user.value.id ? user.value.id : '',
 			type: user.value.id ? 0 : 1 //0 设置 1 取消
 		}