From cab9f836af2302d78681729b5b158368de2a3247 Mon Sep 17 00:00:00 2001
From: wwz <1144797966@qq.com>
Date: Tue, 11 Mar 2025 16:42:37 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85=E5=AE=8C?=
 =?UTF-8?q?=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/api/api.js                             |  19 ++-
 common/api/pay.js                             |   9 ++
 common/api/shop/index.js                      |  27 ++++
 common/js/websocket.js                        |   2 +-
 components/CustomNavbar.vue                   |  11 +-
 components/payPassword.vue                    |   7 +-
 pages/index/indexs.vue                        |   4 +-
 pages/order/components/IntegralInput.vue      | 152 ++++++++++++++++++
 pages/order/components/orderInfoAfter.vue     | 117 +++++++++-----
 pages/order/coupon.vue                        |  17 +-
 pages/order/detail.vue                        | 126 +++++++++++----
 pages/product/components/confirmorder.vue     |   9 +-
 pages/product/index.vue                       |  13 +-
 .../user/member/components/registermember.vue |  39 ++---
 stores/order.js                               |  46 +++---
 stores/pay.js                                 |  34 +++-
 16 files changed, 506 insertions(+), 126 deletions(-)
 create mode 100644 pages/order/components/IntegralInput.vue

diff --git a/common/api/api.js b/common/api/api.js
index 727ac77..18f86bf 100644
--- a/common/api/api.js
+++ b/common/api/api.js
@@ -21,7 +21,6 @@ export const APIuserlogin = (data) => {
 	})
 }
 
-
 //用户信息获取
 export const APIuser = (data) => {
 	return request({
@@ -31,3 +30,21 @@ export const APIuser = (data) => {
 		toast: false
 	})
 }
+
+//获取手机号
+export const APIuserphone = (data) => {
+	return request({
+		url: url + '/user/phone',
+		method: 'post',
+		data: data
+	})
+}
+
+//文件上传
+export const APIuserupload = (data) => {
+	return request({
+		url: url + '/user/common/upload',
+		method: 'post',
+		data: data
+	})
+}
\ No newline at end of file
diff --git a/common/api/pay.js b/common/api/pay.js
index adfe022..27096fe 100644
--- a/common/api/pay.js
+++ b/common/api/pay.js
@@ -20,4 +20,13 @@ export const APIpayltPayOrder = (data) => {
 		method: 'post',
 		data: data
 	})
+}
+
+// 会员退款
+export const APIrefundVip = (data) => {
+	return request({
+		url: urlOrder + '/pay/vipPay',
+		method: 'post',
+		data: data
+	})
 }
\ No newline at end of file
diff --git a/common/api/shop/index.js b/common/api/shop/index.js
index 9d788b7..61f3575 100644
--- a/common/api/shop/index.js
+++ b/common/api/shop/index.js
@@ -11,4 +11,31 @@ export const APIgeocodelocation = (data) => {
 		method: 'get',
 		data: data
 	})
+}
+
+//001-会员积分账户信息
+export const APImemberPointsmyPoints = (data) => {
+	return request({
+		url: urlAccount + '/user/points/memberPoints/myPoints',
+		method: 'get',
+		data: data
+	})
+}
+
+//002-获取订单可用积分及抵扣金额（支付页面使用）
+export const APImemberPointscalcUsablePoints = (data) => {
+	return request({
+		url: urlAccount + '/user/points/memberPoints/calcUsablePoints',
+		method: 'get',
+		data: data
+	})
+}
+
+//003-根据积分计算可抵扣金额
+export const APImemberPointscalcDeductionAmount = (data) => {
+	return request({
+		url: urlAccount + '/user/points/memberPoints/calcDeductionAmount',
+		method: 'get',
+		data: data
+	})
 }
\ No newline at end of file
diff --git a/common/js/websocket.js b/common/js/websocket.js
index e8cdcd1..a3fd63f 100644
--- a/common/js/websocket.js
+++ b/common/js/websocket.js
@@ -78,7 +78,7 @@ const useWebSocket = (options = {}) => {
 				isConnected.value = true;
 				reconnectAttempts.value = 0;
 				// 监听初始化成功在开启心跳
-				startHeartbeat();
+				// startHeartbeat();
 			},
 			fail: () => {
 				console.error('WebSocket 连接失败，尝试重连');
diff --git a/components/CustomNavbar.vue b/components/CustomNavbar.vue
index d3d16f1..f3765fc 100644
--- a/components/CustomNavbar.vue
+++ b/components/CustomNavbar.vue
@@ -34,7 +34,8 @@
 		watch,
 		onMounted,
 		computed,
-		toRefs
+		toRefs,
+		watchEffect
 	} from 'vue';
 
 	const store = useNavbarStore();
@@ -63,7 +64,7 @@
 
 	const navbarStyle = computed(() => {
 		return {
-			// height: `${height}px`,
+			// height: `${height}px`,store.showSearch=fa
 			backgroundColor: store.scrollTop >= 44 ? '#fff' : 'transparent'
 		};
 	});
@@ -72,6 +73,12 @@
 		oneStyle: {},
 		towStyle: {}
 	});
+	
+	watchEffect(()=>{
+		if(store.showSearch>44){
+			
+		}
+	})
 	onMounted(() => {
 		// #ifdef MP-WEIXIN || MP-ALIPAY
 		const menuButtonInfo = uni.getMenuButtonBoundingClientRect();
diff --git a/components/payPassword.vue b/components/payPassword.vue
index 3e48b6b..db71cc5 100644
--- a/components/payPassword.vue
+++ b/components/payPassword.vue
@@ -22,6 +22,7 @@
 	import {
 		ref,
 		defineProps,
+		defineExpose,
 		defineEmits
 	} from 'vue';
 
@@ -34,7 +35,7 @@
 	});
 
 	// 定义向父组件发送事件
-	const emits = defineEmits(['inputComplete', 'close']);
+	const emits = defineEmits(['inputComplete', 'close', 'closeModal']);
 
 	// 存储输入的密码
 	const password = ref('');
@@ -56,6 +57,10 @@
 		emits('close');
 		password.value = '';
 	};
+	// 将方法暴露给父组件
+	defineExpose({
+		closeModal
+	});
 </script>
 
 <style scoped>
diff --git a/pages/index/indexs.vue b/pages/index/indexs.vue
index ffbcc02..38fcda3 100644
--- a/pages/index/indexs.vue
+++ b/pages/index/indexs.vue
@@ -42,9 +42,9 @@
 	import {
 		productStore
 	} from '@/stores/user.js';
-	const shopExtend = uni.cache.get('shopTable').shopExtendMap
-
+	const shopExtend = uni.cache.get('shopUserInfo')? uni.cache.get('shopUserInfo').shopExtendList[0] : ''
 	const scanCodehandle = async (i) => {
+		console.log(11)
 		const store = productStore();
 		await store.scanCodeactions()
 	}
diff --git a/pages/order/components/IntegralInput.vue b/pages/order/components/IntegralInput.vue
new file mode 100644
index 0000000..6e5856a
--- /dev/null
+++ b/pages/order/components/IntegralInput.vue
@@ -0,0 +1,152 @@
+<template>
+	<view class="integral-modal" v-if="visible">
+		<view class="modal-mask" @click="closeModal"></view>
+		<view class="modal-content">
+			<view class="input-wrapper">
+				<input type="number" v-model="inputValue" :min="minValue" :max="maxValue" @input="handleInput"
+					placeholder="请输入积分" />
+			</view>
+			<view class="instructions">{{ instructions }}</view>
+			<up-button type="primary" @click="confirmIntegral" text="确定"></up-button>
+			<button style="margin-top: 20rpx;" @click="IntegralInputclose">取消</button>
+		</view>
+	</view>
+</template>
+
+<script setup>
+	import {
+		ref,
+		defineProps,
+		defineEmits
+	} from 'vue';
+
+	// 定义接收的属性
+	const props = defineProps({
+		visible: {
+			type: Boolean,
+			default: false
+		},
+		minValue: {
+			type: Number,
+			default: 1
+		},
+		maxValue: {
+			type: Number,
+			default: 100
+		},
+		instructions: {
+			type: String,
+			default: '请输入有效积分值'
+		}
+	});
+
+	// 定义事件发射器
+	const emits = defineEmits(['confirm', 'close','IntegralInputclose']);
+
+	// 定义响应式变量
+	const inputValue = ref('');
+
+	// 处理输入事件，确保输入为整数且在有效范围内
+	const handleInput = (e) => {
+		// 兼容不同平台获取输入值的方式
+		let value = e.detail ? e.detail.value : (e.target ? e.target.value : '');
+		// if (value > props.maxValue || value < props.minValue) {
+		// 	inputValue.value = value > props.maxValue ? props.maxValue : props.minValue
+		// 	return false;
+		// }
+		// 只允许输入数字，去除非数字字符
+		value = value.replace(/\D/g, '');
+		if (value) {
+			value = parseInt(value, 10);
+			// 限制输入值在最小和最大值之间
+			// if (value < props.minValue) {
+			// 	value = props.minValue;
+			// } else if (value > props.maxValue) {
+			// 	value = props.maxValue;
+			// }
+			inputValue.value = value.toString();
+		} else {
+			inputValue.value = '';
+		}
+	};
+
+	// 确认积分并返回值给父组件
+	const confirmIntegral = () => {
+		console.log(inputValue.value, 444)
+		if (inputValue.value < props.minValue || inputValue.value > props.maxValue) {
+			uni.showToast({
+				title: '输入的积分值不在有效范围内',
+				icon: 'none'
+			});
+			return false;
+		}
+		if (inputValue.value) {
+			const value = parseInt(inputValue.value, 10);
+			if (value >= props.minValue && value <= props.maxValue) {
+				emits('confirm', value);
+				emits('close');
+			} else {
+				uni.showToast({
+					title: '输入的积分值不在有效范围内',
+					icon: 'none'
+				});
+			}
+		} else {
+			uni.showToast({
+				title: '请输入有效的积分值',
+				icon: 'none'
+			});
+		}
+	};
+
+	const IntegralInputclose = () => {
+		emits('IntegralInputclose');
+	}
+
+	// 关闭模态框
+	const closeModal = () => {
+		emits('close');
+	};
+</script>
+
+<style scoped>
+	.integral-modal {
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		width: 100%;
+		height: 100%;
+		z-index: 999;
+	}
+
+	.modal-mask {
+		position: absolute;
+		top: 0;
+		left: 0;
+		width: 100%;
+		height: 100%;
+		background-color: rgba(0, 0, 0, 0.5);
+	}
+
+	.modal-content {
+		position: absolute;
+		bottom: 0;
+		left: 0;
+		width: 100%;
+		background-color: #fff;
+		padding: 20px;
+		box-sizing: border-box;
+		border-top-left-radius: 10px;
+		border-top-right-radius: 10px;
+		text-align: center;
+	}
+
+	.input-wrapper {
+		margin-bottom: 15px;
+	}
+
+	.instructions {
+		margin-bottom: 20px;
+		color: #666;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/order/components/orderInfoAfter.vue b/pages/order/components/orderInfoAfter.vue
index f2b71f4..54dc009 100644
--- a/pages/order/components/orderInfoAfter.vue
+++ b/pages/order/components/orderInfoAfter.vue
@@ -6,7 +6,7 @@
 			</view>
 
 			<!-- 先付款 -->
-			<view class="tabBox">
+			<view class="tabBox" v-if="listinfo.status == 'unpaid'">
 				<view class="tab">
 					<view v-for="(item,index) in tebtypeList" :key="index"
 						:class="is_type==index?'tab_item'+(is_type+1)+' tab_item  active ':'tab_item'"
@@ -132,8 +132,8 @@
 							<view class="favorable_right" :class="{column:item.value}" v-if="item.type=='product'">
 								<view :class="{column:item.value}">
 									<view class="favorable_right_text" v-if="item.value.uniqueIds">
-										<text>{{item.value.uniqueIds}}个</text>
-										<text>-￥{{item.value.Productroll}}</text>
+										<text>{{item.value.uniqueIds}}张</text>
+										<text>￥-{{item.value.Productroll}}</text>
 									</view>
 								</view>
 								<up-icon name="arrow-right" color="#575B66" size="16"
@@ -146,25 +146,18 @@
 								<up-icon name="arrow-right" color="#575B66" size="16"
 									v-if="listinfo.status == 'unpaid' ||  listinfo.status == 'paying'"></up-icon>
 							</view>
-							<!-- 积分 -->
-							<view class="favorable_right" v-if="item.type=='points'" @click.stop="pointsChange">
-								<text class="favorable_right_text" style="color: #666;margin-right: 16rpx;"
-									v-if="calcUsablePointsData.usable">
-									使用 {{ calcUsablePointsData.pointsNum}}
-									积分抵扣￥{{calcUsablePointsData.pointsNum/calcUsablePointsData.equivalentPoints}}
-								</text>
-								<text class="favorable_right_text"
-									style="color: #666;margin-right: 16rpx;color: #DE4D3A;" v-else>
-									{{calcUsablePointsData.unusableReason||''}}
-								</text>
 
-								<up-checkbox-group iconPlacement="right" @change="pointsChange">
-									<up-checkbox v-model="isPointsChecked"
-										:disabled="freeCheck||!calcUsablePointsData.usable" :checked="isPointsChecked"
-										activeColor="#E8AD7B" shape="circle" icon-size="18" size="18">
-									</up-checkbox>
-								</up-checkbox-group>
+							<!-- 积分 -->
+							<view class="favorable_right" v-if="item.type=='points'"
+								@click.stop="calcUsablePointsData.showModal = true">
+								<text class="favorable_right_text" style="color: #666;margin-right: 16rpx;"
+									v-if="calcUsablePointsData.integral">
+									使用 {{ calcUsablePointsData.integral}}
+									积分抵扣￥{{props.listinfo.pointsDiscountAmount}}
+								</text>
+								<up-icon v-else name="arrow-right" color="#575B66" size="16"></up-icon>
 							</view>
+
 						</view>
 					</view>
 				</block>
@@ -236,6 +229,10 @@
 				<text class="info">{{ listinfo.seatNum || ""}}</text>
 			</view>
 		</view>
+		<IntegralInput :visible="calcUsablePointsData.showModal" :minValue="calcUsablePointsData.minIntegral"
+			:maxValue="calcUsablePointsData.maxIntegral" :instructions="calcUsablePointsData.instructionText"
+			@confirm="handleConfirm" @close="calcUsablePointsData.showModal = false"
+			@IntegralInputclose="IntegralInputclose" />
 	</view>
 
 </template>
@@ -252,6 +249,14 @@
 		defineExpose
 	} from 'vue'
 
+	import IntegralInput from './IntegralInput.vue';
+
+	import {
+		APImemberPointsmyPoints,
+		APImemberPointscalcUsablePoints,
+		APImemberPointscalcDeductionAmount
+	} from '@/common/api/shop/index.js'
+
 	// 定义自定义事件
 	const emits = defineEmits(['customevent', 'istype']);
 
@@ -315,15 +320,6 @@
 		}
 	})
 
-	const calcUsablePointsData = reactive({
-		usable: '',
-		pointsNum: '',
-		equivalentPoints: '',
-		unusableReason: '',
-
-	})
-	const isPointsChecked = ref(false)
-
 	const is_type = ref(0)
 	// 监听送餐/打包切换
 	const tabClick = (item, index) => {
@@ -342,20 +338,12 @@
 
 	}
 
-	const childOnShow = () => {}
-
-	// * 监听优惠券/商品券选择
-	const changeCoupon = (data) => {}
-
-	const setPayAmount = (cartLists) => {}
-
-	// * 积分状态监听
-	const pointsChange = () => {}
-
 	// 跳转
 	const goUrl = (item) => {
 		switch (item.type) {
 			case 'coupon':
+				// 清空积分
+				IntegralInputclose()
 				uni.pro.navigateTo('/pages/order/coupon', {
 					type: "confirm_order_coupon",
 					shopId: uni.cache.get('orderVIP').shopId,
@@ -365,6 +353,11 @@
 				})
 				break;
 			case 'product':
+				// 清空积分
+				IntegralInputclose()
+				// 清空优惠卷
+				props.listinfo.coupondiscountAmount = 0
+				favorablelist[1].value = ''
 				uni.pro.navigateTo('/pages/order/coupon', {
 					type: "confirm_order_product",
 					shopId: uni.cache.get('orderVIP').shopId,
@@ -373,11 +366,52 @@
 					shoppingCart: JSON.stringify(props.listinfo.combinedArray)
 				})
 				break;
+			case 'points':
+				if (calcUsablePointsData.usable == 0) {
+					uni.showToast({
+						title: '此次订单不可用积分!'
+					})
+					return false;
+				}
+				calcUsablePointsData.showModal = true
+				break;
 		}
 	}
 
+	// 积分
+	const calcUsablePointsData = reactive({
+		minIntegral: 1, //最小
+		maxIntegral: '', //最多积分
+		instructionText: '',
+		unusableReason: '',
+		showModal: false,
+		integral: ''
+	})
+	const handleConfirm = async (integral) => {
+		calcUsablePointsData.integral = integral
+		props.listinfo.pointsDiscountAmount = await APImemberPointscalcDeductionAmount({
+			points: integral,
+			userId: props.orderVIP.id,
+			orderAmount: props.listinfo.totalCost
+		})
+		emits('clickPointsamount', props.listinfo.pointsDiscountAmount);
+	};
+
 	// * 获取积分相关信息
-	const getCalcUsablePoints = async () => {}
+	const getCalcUsablePoints = async (data) => {
+		Object.assign(calcUsablePointsData, data);
+		calcUsablePointsData.minIntegral = data.minDeductionPoints
+		calcUsablePointsData.maxIntegral = data.maxUsablePoints
+		calcUsablePointsData.instructionText = `请输入 ${ data.minDeductionPoints} - ${data.maxUsablePoints} 之间的积分`
+
+	}
+
+	// 积分取消清空
+	const IntegralInputclose = async () => {
+		calcUsablePointsData.integral = null
+		props.listinfo.pointsDiscountAmount = 0
+		calcUsablePointsData.showModal = false
+	}
 
 	// * 复制订单号
 	const copyHandle = (e) => {
@@ -394,7 +428,8 @@
 
 	// 将方法暴露给父组件
 	defineExpose({
-		dataprocessing
+		dataprocessing,
+		getCalcUsablePoints
 	});
 </script>
 
diff --git a/pages/order/coupon.vue b/pages/order/coupon.vue
index 82f0a71..881dc3d 100644
--- a/pages/order/coupon.vue
+++ b/pages/order/coupon.vue
@@ -64,11 +64,14 @@
 			</view>
 		</view>
 
-		<view style="height:120rpx;" v-if="Orderinfo.typeOrder == 2"></view>
+		<view style="height:120rpx;"></view>
 
 		<view class="btnBox" v-if="Orderinfo.typeOrder == 2">
 			<view class="btn" @click="cancelCoupon">确定</view>
 		</view>
+		<view class="btnBox" v-else>
+			<button style="margin-top: 20rpx;" @click="IntegralInputclose">取消</button>
+		</view>
 	</view>
 </template>
 
@@ -256,12 +259,24 @@
 		console.log(res)
 
 	}
+	// 商品取消
 	const cancelCoupon = () => {
 		uni.$emit('returnData', Selectedlist.value);
 		uni.navigateBack({
 			delta: 1
 		});
 	}
+
+	// 优惠卷取消
+	const IntegralInputclose = () => {
+		uni.$emit('returnData', {
+			typeOrder: Orderinfo.typeOrder,
+		});
+		uni.navigateBack({
+			delta: 1
+		});
+	}
+
 	onMounted(async () => {
 		// 获取当前页面栈
 		const pages = getCurrentPages();
diff --git a/pages/order/detail.vue b/pages/order/detail.vue
index c4e87a4..98a9b24 100644
--- a/pages/order/detail.vue
+++ b/pages/order/detail.vue
@@ -1,17 +1,19 @@
 <template>
 	<view class="container">
-		<view class="headStatus"
-			v-if="listinfo.status == 'unpaid' ||  listinfo.status == 'paying'||listinfo.status=='closed'">
+		<view class="headStatus">
 			<view class="status">
-				<up-icon name="checkmark-circle-fill" color="#03C061" size="23"></up-icon>
-				<view class="statusName" v-if="listinfo.status == 'unpaid' ||  listinfo.status == 'paying'">
-					待支付
-				</view>
-				<view class="statusName" v-if="listinfo.status=='closed'">已完成</view>
+				<up-icon v-if="listinfo.status =='done'||listinfo.status =='unpaid'" name="checkmark-circle-fill"
+					color="#03C061" size="23"></up-icon>
+				<view class="statusName" v-if="listinfo.status == 'unpaid'">待支付</view>
+				<view class="statusName" v-if="listinfo.status=='done'">已完成</view>
+				<view class="statusName" v-if="listinfo.status=='refund'">退单</view>
+				<view class="statusName" v-if="listinfo.status=='part-refund'">部分退单</view>
+				<view class="statusName" v-if="listinfo.status=='cancelled'">取消订单</view>
+			</view>
+			<view class="time" v-if="listinfo.createTime">下单时间：{{ listinfo.createTime }}</view>
+			<view class="time" v-if="listinfo.paidTime && (listinfo.status!='cancelled' ||listinfo.status!='unpaid')">
+				付款时间：{{listinfo.paidTime}}
 			</view>
-			<view class="time" v-if="listinfo.status == 'unpaid' ||  listinfo.status == 'paying'">
-				下单时间：{{ listinfo.createTime }}</view>
-			<view class="time" v-if="listinfo.status=='closed'">付款时间：{{listinfo.paidTime}}</view>
 		</view>
 
 		<view class="wxQrcode" v-if="shopQrcode">
@@ -33,7 +35,8 @@
 
 		<!-- 先下单后支付 -->
 		<orderInfoAfter ref="orderInfoAfterRef" :rechargeFreeChecked="rechargeFreeChecked" :freeCheck="freeCheck"
-			:listinfo="listinfo" :orderVIP="orderVIP" :ordershopUserInfo='ordershopUserInfo' @istype="istype">
+			:listinfo="listinfo" :orderVIP="orderVIP" :ordershopUserInfo='ordershopUserInfo' @istype="istype"
+			@clickPointsamount='clickPointsamount'>
 		</orderInfoAfter>
 
 		<!-- 先支付后下单 -->
@@ -60,7 +63,8 @@
 		</block> -->
 
 		<!-- 支付方式 -->
-		<paymentMethodes ref="paymentMethodref" :orderVIP="orderVIP" @groupChange="groupChange">
+		<paymentMethodes ref="paymentMethodref" :orderVIP="orderVIP" @groupChange="groupChange"
+			v-if="listinfo.status == 'unpaid'">
 		</paymentMethodes>
 		<!-- <paymentMethodes ref="paymentMethodes" :rechargeFreeChecked="rechargeFreeChecked"
 			v-if="orderVIP&&listinfo.status == 'unpaid' ||  listinfo.status == 'paying'" :freeCheck="freeCheck"
@@ -81,7 +85,7 @@
 			</view>
 		</view>
 		<view style="width: 100%;height: 200rpx;"> </view>
-		<payPassword :isShow="ispws" @inputComplete="accountPayevent" @close="ispws = false" />
+		<payPassword ref="payPasswordref" :isShow="ispws" @inputComplete="accountPayevent" @close="ispws = false" />
 	</view>
 </template>
 
@@ -103,6 +107,11 @@
 		APIshopUserInfo
 	} from '@/common/api/member.js'
 
+	import {
+		APImemberPointsmyPoints,
+		APImemberPointscalcUsablePoints
+	} from '@/common/api/shop/index.js'
+
 	import {
 		useCartStore
 	} from '@/stores/order.js';
@@ -144,8 +153,9 @@
 	const listinfo = reactive({
 		combinedArray: {},
 		Productroll: 0,
-		coupondiscountAmount: "",
-		couponInfoList: ''
+		coupondiscountAmount: 0,
+		couponInfoList: '',
+		pointsDiscountAmount: 0
 	})
 
 	// 会员信息
@@ -213,13 +223,15 @@
 				0 ? listinfo.Seatcharge : 0);
 			listinfo.originAmount = Math.round(sum * 100) / 100;
 
-			// 打包费packFee  计算购物车商品费用totalPrices  餐位费Seatcharge  商品卷Productroll 优惠卷coupondiscountAmount
+			// 打包费packFee  计算购物车商品费用totalPrices  餐位费Seatcharge  商品卷Productroll 优惠卷coupondiscountAmount 积分listinfo.pointsDiscountAmount
 			let sums = (is_type.value != 0 ? listinfo.packFee : 0) + listinfo.totalPrices + (is_type.value ==
 				0 ? listinfo.Seatcharge : 0) - (listinfo.Productroll || 0) - (listinfo
-				.coupondiscountAmount || 0);
+				.coupondiscountAmount || 0) - (listinfo.pointsDiscountAmount || 0);
 			listinfo.totalCost = Math.round(sums * 100) / 100;
-			console.log(listinfo.totalCost)
-			// totalCost.value = Math.round(sums * 100) / 100;
+			// 积分
+			if (listinfo.totalCost) {
+				await memberPointscalcUsablePoints()
+			}
 		}
 	});
 
@@ -263,13 +275,23 @@
 
 	// 这是优惠卷传的值
 	const handleReturnData = async (data) => {
-		console.log(data)
 		// 这是优惠卷
 		if (data.typeOrder == 1) {
-			// 优惠卷减去的金额
-			listinfo.coupondiscountAmount = data.item.discountAmount
-			uniqueIds.value.push(data.item.id)
-			orderInfoAfterRef.value.dataprocessing(data)
+			if (data.item) {
+				// 优惠卷减去的金额
+				listinfo.coupondiscountAmount = data.item.discountAmount
+				uniqueIds.value.push(data.item.id)
+				orderInfoAfterRef.value.dataprocessing(data)
+			} else {
+				if (listinfo.coupondiscountAmount > 0) {
+					listinfo.coupondiscountAmount = 0
+					uniqueIds.value.pop()
+					orderInfoAfterRef.value.dataprocessing({
+						typeOrder: 1,
+						item: ''
+					})
+				}
+			}
 		} else {
 			// 筛选出商品卷的id
 			uniqueIds.value = [...uniqueIds.value, ...new Set(data.map(item => item.id))]
@@ -295,7 +317,7 @@
 			orderId: orderId.value,
 			vipPrice: orderVIP.value.isVip == 1 && ordershopUserInfo.value.isMemberPrice == 1 ? 1 :
 			0, //是否使用会员价0否1是
-			allPack: is_type.value == 0 ? 0 : 1, //是否整单打包
+			userAllPack: is_type.value == 0 ? 0 : 1, //是否整单打包
 			seatNum: is_type.value == 0 ? listinfo.seatNum : 0, //用餐人数
 			originAmount: listinfo.originAmount, //订单原金额（包含打包费+餐位费） 不含折扣价格
 			discountRatio: 1, //折扣比例(计算时 向上取整保留 两位小数)   写死1
@@ -305,7 +327,7 @@
 			couponList: uniqueIds.value, //用户使用的卡券
 			orderAmount: listinfo.totalCost, // 最中订单金额
 			roundAmount: 0, //抹零金额 减免多少钱
-			pointsDiscountAmount: 0, //积分抵扣金额(tb_points_basic_setting表)
+			pointsDiscountAmount: listinfo.pointsDiscountAmount, //积分抵扣金额(tb_points_basic_setting表)
 			pointsNum: 0, //(扣除各类折扣 enable_deduction后使用)
 			remark: '', //用户备注
 		}
@@ -317,22 +339,68 @@
 		})
 		if (res) {
 			await orderorderInfo()
-			// uni.redirectTo({
-			// 	url: '/order/detail?orderId=' + res.id
-			// });
 		}
 	}
 
+	//002-获取订单可用积分及抵扣金额（支付页面使用）
+	const memberPointscalcUsablePoints = async () => {
+		let res = await APImemberPointscalcUsablePoints({
+			userId: orderVIP.value.id,
+			orderAmount: listinfo.totalCost,
+		})
+		orderInfoAfterRef.value.getCalcUsablePoints(res)
+	}
+
+	// 
+	const clickPointsamount = (Pointsamount) => {
+		listinfo.pointsDiscountAmount = Pointsamount
+	}
+
+	const payPasswordref = ref(null)
 	// 余额支付
 	const accountPayevent = async (pwd) => {
 		console.log('输入的密码是：', pwd);
 		ispws.value = false;
+		let checkOrderPay = {
+			userId: uni.cache.get('userInfo').id,
+			orderId: orderId.value,
+			vipPrice: orderVIP.value.isVip == 1 && ordershopUserInfo.value.isMemberPrice == 1 ? 1 :
+			0, //是否使用会员价0否1是
+			userAllPack: is_type.value == 0 ? 0 : 1, //是否整单打包
+			seatNum: is_type.value == 0 ? listinfo.seatNum : 0, //用餐人数
+			originAmount: listinfo.originAmount, //订单原金额（包含打包费+餐位费） 不含折扣价格
+			discountRatio: 1, //折扣比例(计算时 向上取整保留 两位小数)   写死1
+			discountAmount: 0, //手动优惠金额  写死0
+			productCouponDiscountAmount: listinfo.Productroll, //商品优惠券抵扣金额
+			fullCouponDiscountAmount: listinfo.coupondiscountAmount, //满减优惠券抵扣金额
+			couponList: uniqueIds.value, //用户使用的卡券
+			orderAmount: listinfo.totalCost, // 最中订单金额
+			roundAmount: 0, //抹零金额 减免多少钱
+			pointsDiscountAmount: listinfo.pointsDiscountAmount, //积分抵扣金额(tb_points_basic_setting表)
+			pointsNum: 0, //(扣除各类折扣 enable_deduction后使用)
+			remark: '', //用户备注
+		}
+		try {
+			let res = await storeMemberpay.balancePayOrder({
+				checkOrderPay,
+				payType: paymentmethod.payType,
+				pwd: pwd,
+				shopUserId: orderVIP.value.id,
+				buyerRemark: '',
+				returnUrl: ''
+			})
+			await orderorderInfo()
+		} catch (error) {
+			//TODO handle the exception
+		}
+		payPasswordref.value.closeModal()
 	}
 
 	onUnmounted(() => {
 		uni.$off('returnData', handleReturnData);
 	});
 
+
 	onMounted(async () => {
 		// 获取当前页面栈
 		const pages = getCurrentPages();
diff --git a/pages/product/components/confirmorder.vue b/pages/product/components/confirmorder.vue
index f8731d3..d7c1ab5 100644
--- a/pages/product/components/confirmorder.vue
+++ b/pages/product/components/confirmorder.vue
@@ -42,7 +42,7 @@
 
 								<view class="price">
 									<view class="priceAmount">
-										￥{{shopInfo.isVip ==1 && shopInfo.isMemberPrice==1?item.memberPrice:item.salePrice}}
+										￥{{shopInfo.isVip ==1 && shopInfo.isMemberPrice==1?item.memberPrice:item.price}}
 									</view>
 									<view class="num">x{{item.num}}</view>
 								</view>
@@ -57,7 +57,6 @@
 
 				<!-- 订单内容区域 -->
 				<view class="content_box">
-					<text class="placeNum">购物车</text>
 					<view class="content">
 						<view class="title"> {{ shopInfo.name }} </view>
 						<view class="list_item" v-for="(item,index) in cartList" :key="item.id">
@@ -218,7 +217,7 @@
 				return total + parseFloat(item.memberPrice) * parseFloat(item.num);
 			} else {
 				// salePrice销售价
-				return total + parseFloat(item.salePrice) * parseFloat(item.num);
+				return total + parseFloat(item.price) * parseFloat(item.num);
 			}
 		}, 0);
 		console.log(cartone)
@@ -436,7 +435,7 @@
 				.head {
 					display: flex;
 					justify-content: space-between;
-					padding: 32rpx 0;
+					// padding: 32rpx 0;
 
 					.head_left {
 						display: flex;
@@ -780,7 +779,7 @@
 
 			.head_bg {
 				height: 456rpx;
-				background: linear-gradient(180deg, #E8AD7B 0%, #F5F5F5 100%);
+				// background: linear-gradient(180deg, #E8AD7B 0%, #F5F5F5 100%);
 				position: absolute;
 				left: 0;
 				right: 0;
diff --git a/pages/product/index.vue b/pages/product/index.vue
index 12805b8..188c27a 100644
--- a/pages/product/index.vue
+++ b/pages/product/index.vue
@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<Nav v-if="store.scrollTop>=44" />
+		<Nav />
 		<!-- 顶部面板 -->
 		<view class="top--panel">
 			<image class="panelimgbackground"
@@ -98,7 +98,7 @@
 									<view class="Controls" v-else>
 										<view class="btn" v-if="item.cartNumber != '0'">
 											<up-icon name="minus-circle-fill" color="#E9AB7A" size="25"></up-icon>
-											<view class="btnClick" @click.stop="shoppingcart(item,index,'-','单')">
+											<view class="btnClick" @click.stop="singleclick(item,'-')">
 											</view>
 										</view>
 										<text class="num"> {{ ifcartNumber(item)  }} </text>
@@ -106,7 +106,7 @@
 											v-if="item.suitNum>1">{{item.suitNum<99?item.suitNum:'99+'}}</text>
 										<view class="btn">
 											<up-icon name="plus-circle-fill" color="#E9AB7A" size="25"></up-icon>
-											<view class="btnClick" @click.stop="shoppingcart(item,index,'+','单')">
+											<view class="btnClick" @click.stop="singleclick(item,'+')">
 											</view>
 										</view>
 									</view>
@@ -419,7 +419,7 @@
 	store.updateNavbarConfig({
 		showBack: true, //左边返回键
 		rightText: '', //右边文字
-		showSearch: true, //true是标题其他事文字
+		showSearch: false, //true是标题其他事文字
 		title: '',
 		isTransparent: false,
 		hasPlaceholder: false //是否要占位符
@@ -561,6 +561,11 @@
 		uni.$u.debounce(store.scrollTop = res.scrollTop, 500)
 		uni.$u.debounce(navScroll.value = res.scrollTop, 500)
 		uni.$u.debounce(mainScroll(res), 500)
+		if(res.scrollTop >= 44){
+			store.showSearch = true
+		}else{
+			store.showSearch = false
+		}
 	});
 
 	// 点击详情
diff --git a/pages/user/member/components/registermember.vue b/pages/user/member/components/registermember.vue
index b0c6082..a238a0e 100644
--- a/pages/user/member/components/registermember.vue
+++ b/pages/user/member/components/registermember.vue
@@ -92,6 +92,9 @@
 		APIshopUser
 	} from '@/common/api/member.js'
 
+	import {
+		APIuserphone
+	} from '@/common/api/api.js'
 
 	const props = defineProps({
 		shopUserInfo: {
@@ -167,8 +170,7 @@
 		//#ifdef MP-WEIXIN
 		let avatarUrl = e.detail.avatarUrl
 		uni.uploadFile({
-			url: uni.conf.baseUrl + '/common/upload',
-			// url: uni.conf.baseUrl + '/common/upload',
+			url: uni.conf.baseUrl + '/account/user/common/upload',
 			filePath: avatarUrl,
 			header: {
 				environment: 'app',
@@ -202,7 +204,7 @@
 				let avatarUrl = res.tempFilePaths[0]; // 获取文件路径
 
 				my.uploadFile({
-					url: uni.conf.baseUrl + '/common/upload',
+					url: uni.conf.baseUrl + '/account/user/common/upload',
 					filePath: avatarUrl,
 					header: {
 						environment: 'app',
@@ -236,8 +238,8 @@
 
 	// 确定生日
 	const confirmTime = (e) => {
-		this.calendarShow = false;
-		this.birthDay = this.getDate(e.value);
+		calendarShow.value = false;
+		formInfo.birthDay = getDate(e.value);
 	}
 
 	// 获取手机号
@@ -247,14 +249,13 @@
 			uni.login({
 				provider: 'weixin',
 				success: async (data) => {
-					console.log(data)
-					// let res = await APIshopUser({
-					// 	code: data.code,
-					// 	encryptedData: d.detail.encryptedData,
-					// 	iv: d.detail.iv,
-					// 	source: "wechar"
-					// })
-					formInfo.telephone = res.data
+					let res = await APIuserphone({
+						code: data.code,
+						encryptedData: d.detail.encryptedData,
+						iv: d.detail.iv,
+						source: "wechar"
+					})
+					formInfo.telephone = res
 				}
 			})
 		}
@@ -267,11 +268,11 @@
 				console.log(res)
 				my.getPhoneNumber({
 					success: async (data) => {
-						let res = await this.api.userwxlogins({
+						let res = await APIuserphone({
 							encryptedData: JSON.parse(data.response).response,
 							source: "alipay"
 						})
-						this.telephone = res.data
+						formInfo.telephone = res
 						// console.log(this.phonetitle)
 					}
 				});
@@ -331,12 +332,12 @@
 			});
 			return;
 		}
-		let res = await this.api.openMember({
-			id: uni.cache.get('userInfo').id,
-			shopId: uni.cache.get('shopId'),
+		let res = await APIshopUser({
+			// id: uni.cache.get('userInfo').id,
+			// shopId: uni.cache.get('shopId'),
 			nickName: formInfo.nickName,
 			headImg: userHeadImg.value,
-			telephone: formInfo.telephone,
+			phone: formInfo.telephone,
 			birthDay: formInfo.birthDay
 		})
 		if (res.code == 0) {
diff --git a/stores/order.js b/stores/order.js
index 34b02db..ab706ce 100644
--- a/stores/order.js
+++ b/stores/order.js
@@ -16,11 +16,19 @@ export const useCartStore = defineStore('cart', () => {
 	// const isTableFee = uni.cache.get('ordershopUserInfo').isTableFee //此店是否免桌位费
 	// const tableFee = uni.cache.get('ordershopUserInfo').tableFee //一个餐位费多钱
 
-	// 计算单个商品的打包费用（向下取整并保留两位小数）
-	const itemSinglePackFee = (item) => {
-		const fee = item.packFee * item.cartNumber;
-		// 先将结果乘以 100，向下取整，再除以 100 以保留两位小数
-		return Math.floor(fee * 100) / 100
+	// 计算向上取整
+	const roundUpToTwoDecimals = (num, i) => {
+		// 先将数字乘以 100 并转换为字符串保留足够的小数位
+		let temp = (num * 100).toFixed(10);
+		// 向上取整
+		let rounded = null
+		if (i == 'upward') {
+			rounded = Math.ceil(parseFloat(temp));
+		} else {
+			rounded = Math.floor(parseFloat(temp));
+		}
+		// 再除以 100 得到保留两位小数的结果
+		return rounded / 100;
 	};
 
 	// 计算购物车商品总价格
@@ -43,7 +51,8 @@ export const useCartStore = defineStore('cart', () => {
 			}
 		}, 0);
 		// 向上取整并保留两位小数
-		return cart = Math.ceil(cart * 100) / 100;
+		let result = roundUpToTwoDecimals(cart, 'upward')
+		return result;
 	});
 
 	// 计算商品卷所选择的总价格
@@ -64,34 +73,33 @@ export const useCartStore = defineStore('cart', () => {
 			}
 		}, 0);
 		// 向上取整并保留两位小数
-		return cart = Math.ceil(cart * 100) / 100;
+		let result = roundUpToTwoDecimals(cart, 'upward')
+		return result;
 	});
 
 	// 桌位置
 	const getTotalSeatcharge = (seatNum) => computed(() => {
 		// 是否免除桌位费 0 否 1 是
-		let tableFeeTotals = 0
+		let cart = 0
 
-		if (uni.cache.get('ordershopUserInfo').isTableFee == 0 && (seatNum || uni.cache.get('dinersNum'))) {
-			tableFeeTotals = Math.ceil(parseFloat((seatNum || uni.cache.get('dinersNum'))) * parseFloat(
+		if (uni.cache.get('ordershopUserInfo').isTableFee == 0 && seatNum) {
+			cart = Math.ceil(parseFloat(seatNum) * parseFloat(
 				uni.cache.get('ordershopUserInfo').tableFee) * 100) / 100;
 		}
-		console.log(uni.cache.get('ordershopUserInfo').isTableFee,seatNum,22222)
-		return Math.floor(tableFeeTotals * 100) / 100;
+		// 向下取整并保留两位小数
+		let result = roundUpToTwoDecimals(cart, 'downward')
+		return result;
 	});
 
 	// 计算购物车总打包费用（向下取整并保留两位小数）
 	const getTotalPackFee = (cartList) => computed(() => {
-		let total = 0;
-		for (const item of cartList) {
-			total += itemSinglePackFee(item);
-		}
-		return Math.floor(total * 100) / 100 ? Math.floor(total * 100) / 100 : 0;
-		// 同样对总费用进行向下取整并保留两位小数处理
+		const total = cartList.reduce((sum, item) => {
+			return sum + item.packAmount * (item.packNumber || (item.num - item.returnNum));
+		}, 0);
+		return Math.floor(total * 100) / 100;
 	});
 
 	return {
-		itemSinglePackFee,
 		getTotalPackFee,
 		getTotalSeatcharge,
 		getTotalTotalPrices,
diff --git a/stores/pay.js b/stores/pay.js
index 6bef341..86fdc6e 100644
--- a/stores/pay.js
+++ b/stores/pay.js
@@ -8,7 +8,8 @@ import {
 
 import {
 	APIpayltPayOrder,
-	APIpayltPayVip
+	APIpayltPayVip,
+	APIrefundVip
 } from '@/common/api/pay.js'
 
 import {
@@ -182,6 +183,37 @@ export const Memberpay = defineStore('memberpay', {
 			})
 		},
 
+		//会员支付
+		balancePayOrder(data) {
+			return new Promise(async (resolve, reject) => {
+				try {
+					let res = await APIrefundVip({
+						shopId: uni.cache.get('shopId'),
+						checkOrderPay: data.checkOrderPay,
+						pwd: data.pwd,
+						payType: 'accountPay',
+						returnUrl: data.returnUrl,
+						buyerRemark: data.buyerRemark,
+						shopUserId: data.shopUserId,
+					})
+					if (res) {
+						uni.showLoading({
+							title: '加载中...',
+							mask: true
+						})
+					}
+				} catch (e) {
+					uni.showToast({
+						title: "支付失败"
+					})
+					setTimeout(() => {
+						uni.hideLoading()
+					}, 1000)
+					reject(false)
+				}
+			})
+		},
+
 		// 生成订单
 		actionscreateOrder(data) {
 			return new Promise(async (resolve, reject) => {