From ac11e4fcc0e002df15d81e056101fdfaa715f084 Mon Sep 17 00:00:00 2001
From: duan <1004387497@qq.com>
Date: Thu, 23 May 2024 13:50:20 +0800
Subject: [PATCH 1/8] =?UTF-8?q?=E6=94=AF=E4=BB=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/js/api.js                    |  4 ++
 pages/order_detail/order_detail.vue | 74 +++++++++++++++++++++--------
 pages/product/placeOrder.vue        |  2 +-
 3 files changed, 59 insertions(+), 21 deletions(-)

diff --git a/common/js/api.js b/common/js/api.js
index 598dcac..13ba547 100644
--- a/common/js/api.js
+++ b/common/js/api.js
@@ -71,6 +71,10 @@ export default {
 	shopUserInfo(data) { 
 		return uni.api.get("/user/shopUserInfo", data);
 	},
+	// 优惠券数量
+	userCoupon(data) {
+		return uni.api.get("/user/userCoupon", data);
+	},
 	// 优惠加倍
 	yhqDouble(data) { //查询订单支付状态
 		return uni.api.post("/order/yhqDouble", data);
diff --git a/pages/order_detail/order_detail.vue b/pages/order_detail/order_detail.vue
index 3dee1c0..50b08a2 100644
--- a/pages/order_detail/order_detail.vue
+++ b/pages/order_detail/order_detail.vue
@@ -82,10 +82,10 @@
 			<view>
 				<image src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/drder/hongbao.png"
 					style="width: 30rpx;height: 30.24rpx;;" mode=""></image>
-				红包/低佣券
+				红包/抵用券
 			</view>
 			<view @click="orderfoodindex">
-				<!-- {{info.couponDetail.name}} -->
+				可用优惠券{{couponAmount}}张
 			</view>
 		</view>
 		<!-- 支付方式 -->
@@ -118,7 +118,8 @@
 					</u-radio>
 				</u-radio-group>
 				<view style="font-weight: 400;font-size: 24rpx;color: #333333;margin-left: 60rpx;">
-					会员卡余额{{ amountVIP.amount}} <text style="font-weight: 500;font-size: 28rpx;margin-left: 16rpx;color: #FF4C11;"
+					会员卡余额{{ amountVIP.amount}} <text
+						style="font-weight: 500;font-size: 28rpx;margin-left: 16rpx;color: #FF4C11;"
 						@click="goRecharge">去充值</text>
 				</view>
 			</view>
@@ -197,7 +198,9 @@
 				amountVIP: null,
 				radiovalue1: '1',
 				vipId: null,
-				orderInfo: ''
+				orderInfo: '',
+				// 可用优惠券数据
+				couponAmount: 0
 			};
 		},
 
@@ -213,9 +216,10 @@
 			this.handlemessage()
 			uni.$on('message', this.getMessage)
 
-// 获取余额
-this.getAount()
-
+			// 获取余额
+			this.getAount()
+			// 获取可用优惠券数量
+			this.getcoupon()
 			this.vipId = uni.cache.get('userInfo').id
 		},
 		onShow() {
@@ -223,32 +227,39 @@ this.getAount()
 		},
 		created() {
 			uni.$on('emitclickorderfood', (num) => {
-				console.log(num)
-				// 总金额  couponsAmount 优惠卷购买金额   couponsPrice优惠金额
+				// 总金额  couponsAmount 优惠卷购买金额   couponsPrice优惠金额 等于1是团购/不等于1
 				if (num.clickiconone == 1) {
-					this.listinfo.amount = (Number(this.listinfo.amounts) - Number(num.couponsPrice)).toFixed(2)
+					this.listinfo.amount = (Number(this.listinfo.amounts) + Number(num.couponsPrice) - Number(num
+						.couponsAmount)).toFixed(2)
 				} else {
-					this.listinfo.amount = (Number(this.listinfo.amounts) + Number(num.couponsAmount) - Number(num
-						.couponsPrice)).toFixed(2)
+					this.listinfo.amount = (Number(this.listinfo.amounts) - Number(num.couponsAmount)).toFixed(2)
 				}
 				this.emitorderfoodform = num
 				// this.num += num
 			})
 		},
 		methods: {
-		async	getAount(){
+			async getcoupon() {
+				let res = await this.api.userCoupon({
+					"orderNum": this.listinfo.amount,
+					"userId": uni.cache.get('userInfo').id,
+				})
+				if (res.code == 0) {
+					this.couponAmount = res.data
+				}
+			},
+			async getAount() {
 				let res = await this.api.shopUserInfo({
 					// shopId:店铺ID
 					"shopId": uni.cache.get('shopUser'),
 					"userId": uni.cache.get('userInfo').id,
 				})
-				if(res.code==0){
-					
+				if (res.code == 0) {
+
 					this.amountVIP = res.data
 				}
 			},
 			getMessage(msg) {
-				console.log('tiaoshi1', msg)
 				if (msg.status != 'success') {
 					uni.showToast({
 						title: msg.msg,
@@ -260,7 +271,6 @@ this.getAount()
 				} else {
 					switch (msg.type) {
 						case 'createOrder': //去结算
-							console.log('tiaoshi2', msg)
 							this.listinfoid = msg.data.id //下单需要的id 
 							this.orderInfo = msg.data
 							this.showpopupclickdd()
@@ -330,23 +340,38 @@ this.getAount()
 			},
 			// 去充值
 			goRecharge() {
-				uni.pro.navigateTo('/pages/member/index')
+				uni.pro.navigateTo('/pages/member/index', {
+					shopId_id: uni.cache.get('shopUser')
+				})
 			},
 			// 余额支付
 			async accountPayevent(id) {
+				console.log(this.amountVIP, '会员信息')
+
 				let res = await this.api.accountPay({
 					orderId: id,
 					memberId: this.vipId
 				})
 				console.log(res, '调试12')
 				if (res) {
-
+					this.ispayPws()
 				} else {
 					setTimeout(() => {
 						this.goRecharge()
 					}, 1000)
 				}
 			},
+			// 是否有支付密码
+			ispayPws() {
+				// 先判断是否设置支付密码。0是没设置。没设置的情况下跳转到设置页面。有的话输入支付密码
+				if (this.amountVIP.isPwd == 0) {
+					uni.pro.navigateTo('/pages/user/repairpassword', {
+						shopId_id: uni.cache.get('shopUser')
+					})
+				} else {
+
+				}
+			},
 			async showpopupclickdd(i) {
 				let res = await this.api.payorderPay({
 					orderId: this.listinfoid
@@ -400,7 +425,16 @@ this.getAount()
 							}
 						});
 					} else {
-						this.accountPayevent(this.listinfoid)
+						// 判断是否有绑定支付密码
+						let isVip =  uni.cache.get('userInfo').isPwd
+						console.log(isVip,'调试 123')
+						if (isVip == 0) {
+							uni.pro.navigateTo('/pages/user/repairpassword', {
+								shopId_id: uni.cache.get('shopUser')
+							})
+						} else {
+							this.accountPayevent(this.listinfoid)
+						}
 					}
 
 					// #endif	
diff --git a/pages/product/placeOrder.vue b/pages/product/placeOrder.vue
index 3fa5e09..36c8e68 100644
--- a/pages/product/placeOrder.vue
+++ b/pages/product/placeOrder.vue
@@ -31,7 +31,7 @@
 				<view>
 					<image src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/drder/hongbao.png"
 						style="width: 30rpx;height: 30.24rpx;;" mode=""></image>
-					红包/低佣券
+					红包/抵用券
 				</view>
 				<view>
 					{{info.couponDetail.name}}

From dd5adf82b8b8e7db63cef583e0dc4db5c4b4ac94 Mon Sep 17 00:00:00 2001
From: duan <1004387497@qq.com>
Date: Thu, 23 May 2024 16:39:56 +0800
Subject: [PATCH 2/8] =?UTF-8?q?=E6=89=AB=E7=A0=81=E6=94=AF=E4=BB=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 framework/11-api.js                           |   1 +
 pages.json                                    |   2 +-
 pages/order_detail/components/payPassword.vue | 192 +++++++++++++++
 pages/order_detail/order_detail.vue           | 135 ++++++----
 uni_modules/cc-defineKeyboard/changelog.md    |   8 +
 .../cc-defineKeyboard/cc-defineKeyboard.scss  |  43 ++++
 .../cc-defineKeyboard/cc-defineKeyboard.vue   | 115 +++++++++
 uni_modules/cc-defineKeyboard/package.json    |  87 +++++++
 uni_modules/cc-defineKeyboard/readme.md       | 232 ++++++++++++++++++
 9 files changed, 761 insertions(+), 54 deletions(-)
 create mode 100644 pages/order_detail/components/payPassword.vue
 create mode 100644 uni_modules/cc-defineKeyboard/changelog.md
 create mode 100644 uni_modules/cc-defineKeyboard/components/cc-defineKeyboard/cc-defineKeyboard.scss
 create mode 100644 uni_modules/cc-defineKeyboard/components/cc-defineKeyboard/cc-defineKeyboard.vue
 create mode 100644 uni_modules/cc-defineKeyboard/package.json
 create mode 100644 uni_modules/cc-defineKeyboard/readme.md

diff --git a/framework/11-api.js b/framework/11-api.js
index 21865c5..fa274dc 100644
--- a/framework/11-api.js
+++ b/framework/11-api.js
@@ -127,6 +127,7 @@ async function request(options) {
 						}
 					})
 				}
+				return res
 			}
 		} else {
 			uni.hideLoading()
diff --git a/pages.json b/pages.json
index bfa7aea..607816b 100644
--- a/pages.json
+++ b/pages.json
@@ -231,7 +231,7 @@
 			"style": {
 				"navigationBarTitleText": "订单详情"
 			}
-		}
+		}		
 	],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
diff --git a/pages/order_detail/components/payPassword.vue b/pages/order_detail/components/payPassword.vue
new file mode 100644
index 0000000..08be0cd
--- /dev/null
+++ b/pages/order_detail/components/payPassword.vue
@@ -0,0 +1,192 @@
+<template>
+	<view class="page">
+		<view>
+			<view class="pay-title">
+				<text>请输入6位支付密码</text>
+			</view>
+			<view class="pay-password" @click="onPayUp">
+				<view class="list">
+					<text v-show="passwordArr.length >= 1">●</text>
+				</view>
+				<view class="list">
+					<text v-show="passwordArr.length >= 2">●</text>
+				</view>
+				<view class="list">
+					<text v-show="passwordArr.length >= 3">●</text>
+				</view>
+				<view class="list">
+					<text v-show="passwordArr.length >= 4">●</text>
+				</view>
+				<view class="list">
+					<text v-show="passwordArr.length >= 5">●</text>
+				</view>
+				<view class="list">
+					<text v-show="passwordArr.length >= 6">●</text>
+				</view>
+			</view>
+			<view class="hint" @click="gopaypassword">
+				<text>忘记支付密码？</text>
+			</view>
+		</view>
+		<!-- ref:唯一ref  passwrdType：密码样式pay keyInfo：密码输入返回事件 -->
+		<cc-defineKeyboard ref="CodeKeyboard" passwrdType="pay" @KeyInfo="KeyInfo"></cc-defineKeyboard>
+
+	</view>
+</template>
+
+<script>
+	export default {
+		components: {
+
+		},
+		data() {
+			return {
+				// AffirmStatus: 1,
+				passwordArr: [],
+				oldPasswordArr: [],
+				newPasswordArr: [],
+				afPasswordArr: [],
+			};
+		},
+		onLoad() {
+
+		},
+		methods: {
+			// 忘记支付密码
+			gopaypassword() {
+				uni.pro.navigateTo('/pages/user/repairpassword', {
+					// shopId_id: uni.cache.get('shopUser')
+				})
+			},
+			/**
+			 * 唤起键盘
+			 */
+			onPayUp() {
+				this.$refs.CodeKeyboard.show();
+			},
+			/**
+			 * 支付键盘回调
+			 * @param {Object} val
+			 */
+			KeyInfo(val) {
+
+				if (val.index >= 6) {
+					return;
+				}
+				// 判断是否输入的是删除键
+				if (val.keyCode === 8) {
+					// 删除最后一位
+					this.passwordArr.splice(val.index + 1, 1)
+				}
+				// 判断是否输入的是.
+				else if (val.keyCode == 190) {
+					// 输入.无效
+				} else {
+					this.passwordArr.push(val.key);
+				}
+
+				// uni.showModal({
+				//     title: '温馨提示',
+				//     content: '输入密码是 = ' + JSON.stringify(this.passwordArr)
+				// })
+
+				// 判断是否等于6
+				if (this.passwordArr.length === 6) {
+					// this.AffirmStatus = this.AffirmStatus + 1;
+					let str = ''
+					this.passwordArr.forEach(res => {
+						str += res
+					})
+					this.$emit('accountPayevent', str)
+					this.passwordArr = [];
+				}
+				// 判断到哪一步了
+				// if (this.AffirmStatus === 1) {
+				//     this.oldPasswordArr = this.passwordArr;
+				// } else if (this.AffirmStatus === 2) {
+				//     this.newPasswordArr = this.passwordArr;
+				// } else if (this.AffirmStatus === 3) {
+				//     this.afPasswordArr = this.passwordArr;
+				// } else if (this.AffirmStatus === 4) {
+				//     console.log(this.oldPasswordArr.join(''));
+				//     console.log(this.newPasswordArr.join(''));
+				//     console.log(this.afPasswordArr.join(''));
+				//     uni.showToast({
+				//         title: '修改成功',
+				//         icon: 'none'
+				//     })
+				//     setTimeout(() => {
+				//         uni.navigateBack();
+				//     }, 2000)
+				// }
+				this.$forceUpdate();
+			}
+
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	$base: #555; // 基础颜色
+
+	.page {
+		position: absolute;
+		left: 0;
+		top: 0;
+		width: 100%;
+		height: 100%;
+		background-color: #FFFFFF;
+	}
+
+	.pay-title {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		width: 100%;
+		height: 200rpx;
+
+		text {
+			font-size: 28rpx;
+			color: #555555;
+		}
+	}
+
+	.pay-password {
+		display: flex;
+		align-items: center;
+		width: 90%;
+		height: 80rpx;
+		margin: 20rpx auto;
+		border: 2rpx solid $base;
+
+		.list {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			width: 16.666%;
+			height: 100%;
+			border-right: 2rpx solid #EEEEEE;
+
+			text {
+				font-size: 32rpx;
+			}
+		}
+
+		.list:nth-child(6) {
+			border-right: none;
+		}
+	}
+
+	.hint {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		width: 100%;
+		height: 100rpx;
+
+		text {
+			font-size: 28rpx;
+			color: $base;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/order_detail/order_detail.vue b/pages/order_detail/order_detail.vue
index b96d81e..9cf03ad 100644
--- a/pages/order_detail/order_detail.vue
+++ b/pages/order_detail/order_detail.vue
@@ -176,12 +176,18 @@
 				</view>
 			</view>
 		</view>
+		<!-- 支付密码 -->
+		<payPassword ref="payPwd" @accountPayevent="accountPayevent" v-show="ispws"></payPassword>
 	</view>
 </template>
 
 <script>
 	import webSocketUtils from '@/common/js/websocket.js'
+	import payPassword from './components/payPassword.vue'
 	export default {
+		components: {
+			payPassword
+		},
 		data() {
 			return {
 				height: '',
@@ -200,7 +206,10 @@
 				vipId: null,
 				orderInfo: '',
 				// 可用优惠券数据
-				couponAmount: 0
+				couponAmount: 0,
+				// 输入支付密码
+				passwordArr: [],
+				ispws: false
 			};
 		},
 
@@ -208,6 +217,8 @@
 			uni.$off('getMessage')
 		},
 		onLoad(e) {
+			// 获取用户信息
+			this.loginwxuserInfo()
 			// console.log(e, 140)
 			let res = JSON.parse(e.tableId)
 			this.listinfo.detailList = res
@@ -239,6 +250,14 @@
 			})
 		},
 		methods: {
+async loginwxuserInfo() {
+				let res = await this.api.loginwxuserInfo({
+					userId: uni.cache.get('userInfo').id
+				})
+				if (res.code == 0) {
+					uni.cache.set('userInfo', res.data);
+				}
+			},
 			async getcoupon() {
 				let res = await this.api.userCoupon({
 					"orderNum": this.listinfo.amount,
@@ -344,45 +363,19 @@
 					shopId_id: uni.cache.get('shopUser')
 				})
 			},
-			// 余额支付
-			async accountPayevent(id) {
-				console.log(this.amountVIP, '会员信息')
-
-				let res = await this.api.accountPay({
-					orderId: id,
-					memberId: this.vipId
-				})
-				console.log(res, '调试12')
-				if (res) {
-					this.ispayPws()
-				} else {
-					setTimeout(() => {
-						this.goRecharge()
-					}, 1000)
-				}
-			},
-			// 是否有支付密码
-			ispayPws() {
-				// 先判断是否设置支付密码。0是没设置。没设置的情况下跳转到设置页面。有的话输入支付密码
-				if (this.amountVIP.isPwd == 0) {
-					uni.pro.navigateTo('/pages/user/repairpassword', {
-						shopId_id: uni.cache.get('shopUser')
-					})
-				} else {
-
-				}
-			},
+		
 			async showpopupclickdd(i) {
-				let res = await this.api.payorderPay({
-					orderId: this.listinfoid
-				}) //判断是否支付成功
-				if (res.code == 0) {
-					uni.showLoading({
-						title: '加载中',
-						mask: true
-					})
-					// #ifdef MP-WEIXIN
-					if (this.radiovalue1 == 1) {
+				if (this.radiovalue1 == 1) {
+					let res = await this.api.payorderPay({
+						orderId: this.listinfoid
+					}) //判断是否支付成功
+					if (res.code == 0) {
+						// uni.showLoading({
+						// 	title: '加载中',
+						// 	mask: true
+						// })
+						// #ifdef MP-WEIXIN
+						// 微信支付还是余额支付
 						uni.requestPayment({
 							provider: 'wxpay', //支付类型-固定值
 							partnerid: res.data.appId, // 微信支付商户号
@@ -395,7 +388,7 @@
 								uni.showToast({
 									title: "支付成功"
 								})
-								uni.cache.set('shopUser','')//删除shopUser
+								uni.cache.set('shopUser', '') //删除shopUser
 								this.paymodfiyOrderInfo()
 								setTimeout(res => {
 									uni.redirectTo({
@@ -425,25 +418,61 @@
 								console.log(data, '成功与否')
 							}
 						});
-					} else {
-						// 判断是否有绑定支付密码
-						let isVip =  uni.cache.get('userInfo').isPwd
-						console.log(isVip,'调试 123')
-						if (isVip == 0) {
-							uni.pro.navigateTo('/pages/user/repairpassword', {
-								shopId_id: uni.cache.get('shopUser')
-							})
-						} else {
-							this.accountPayevent(this.listinfoid)
-						}
+						// #endif	
+					}
+				} else {
+					// 判断是否有绑定支付密码
+					// 先判断是否设置支付密码。0是没设置。没设置的情况下跳转到设置页面。有的话输入支付密码
+					let isVip = uni.cache.get('userInfo').isPwd
+					if (isVip == 0) {
+						uni.pro.navigateTo('/pages/user/repairpassword', {
+							// shopId_id: uni.cache.get('shopUser')
+						})
+					} else {
+						this.ispws = true
+						this.$nextTick(() => {
+							this.$refs.payPwd.onPayUp();
+						})
 					}
-
-					// #endif	
 				}
 			},
+			// 余额支付
+			async accountPayevent(pwd) {
+				this.ispws = false
+				let res = await this.api.accountPay({
+					orderId: this.listinfoid,
+					memberId: this.amountVIP.id,
+					pwd: pwd
+				})
+				console.log(res, '是否支付成功')
+				if(res.code ==0){
+					uni.showToast({
+						icon: 'none',
+						title: '支付成功',
+						success:()=>{
+							setTimeout(()=>{
+							uni.redirectTo({
+								url: '/pages/order/order_detail?orderId=' + this.listinfoid
+							});	
+							},2000)
+						
+						}
+					})
+				}
+				if(res.data==1){
+				 setTimeout(() => {
+				 	// 去充值
+				 	this.goRecharge()
+				 }, 2000)
+				}
+				
+				
+			},
+
 			clickselect(b) {
 				this.pay_type = b
 			},
+
 		},
 		mounted() {
 			//#ifdef MP-WEIXIN || H5
diff --git a/uni_modules/cc-defineKeyboard/changelog.md b/uni_modules/cc-defineKeyboard/changelog.md
new file mode 100644
index 0000000..01b8a8e
--- /dev/null
+++ b/uni_modules/cc-defineKeyboard/changelog.md
@@ -0,0 +1,8 @@
+## 2.0（2023-08-03）
+修复小程序bug
+## 1.0.2（2023-06-21）
+组件优化 增加键盘高度
+## 1.0.1（2023-06-21）
+组件优化
+## 1.0.0（2023-06-21）
+组件初始化
diff --git a/uni_modules/cc-defineKeyboard/components/cc-defineKeyboard/cc-defineKeyboard.scss b/uni_modules/cc-defineKeyboard/components/cc-defineKeyboard/cc-defineKeyboard.scss
new file mode 100644
index 0000000..694fece
--- /dev/null
+++ b/uni_modules/cc-defineKeyboard/components/cc-defineKeyboard/cc-defineKeyboard.scss
@@ -0,0 +1,43 @@
+.page-total{
+	position: fixed;
+	left: 0;
+	bottom: 0;
+	width: 100%;
+	background-color: #f6f6f6;
+}
+
+.key-list{
+	display: flex;
+	flex-wrap: wrap;
+	align-items: center;
+	padding: 1% 3%;
+	height: 90%;
+	margin-top: 20rpx;
+	.list{
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		width: 32%;
+		height: 92rpx;
+		background-color: #FFFFFF;
+		border-radius: 10rpx;
+		box-shadow: 0 0 10rpx rgba(0,0,0,0.1);
+		margin-right: 1.7%;
+		margin-bottom: 16rpx;
+		text{
+			font-size: 38rpx;
+			font-weight: bold;
+			color: #222222;
+		}
+	}
+	.list:nth-child(3n){
+		margin-right: 0;
+	}
+	.special{
+		background-color: #f6f6f6;
+		box-shadow: none;
+		text{
+			color: #959595;
+		}
+	}
+}
\ No newline at end of file
diff --git a/uni_modules/cc-defineKeyboard/components/cc-defineKeyboard/cc-defineKeyboard.vue b/uni_modules/cc-defineKeyboard/components/cc-defineKeyboard/cc-defineKeyboard.vue
new file mode 100644
index 0000000..a8875eb
--- /dev/null
+++ b/uni_modules/cc-defineKeyboard/components/cc-defineKeyboard/cc-defineKeyboard.vue
@@ -0,0 +1,115 @@
+<template>
+	<view class="page-total" v-show="isShow">
+		<view class="key-list">
+			<view class="list" v-for="(item,index) in keyList" 
+			:class="{'special':item.keyCode==190||item.keyCode==8}"
+			@click="onKeyList(item,index)"
+			:key="item.keyCode">
+				<text>{{item.key}}</text>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				isShow: false,
+				keyList: [
+					{
+						key: 1,
+						en: '',
+						keyCode: 49,
+					},{
+						key: 2,
+						en: 'ABC',
+						keyCode: 50,
+					},{
+						key: 3,
+						en: 'ABC',
+						keyCode: 51,
+					},{
+						key: 4,
+						en: 'ABC',
+						keyCode: 52,
+					},{
+						key: 5,
+						en: 'ABC',
+						keyCode: 53,
+					},{
+						key: 6,
+						en: 'ABC',
+						keyCode: 54,
+					},{
+						key: 7,
+						en: 'ABC',
+						keyCode: 55,
+					},{
+						key: 8,
+						en: 'ABC',
+						keyCode: 56,
+					},{
+						key: 9,
+						en: 'ABC',
+						keyCode: 57,
+					},{
+						key: '.',
+						en: 'ABC',
+						keyCode: 190,
+					},{
+						key: 0,
+						en: 'ABC',
+						keyCode: 48,
+					},{
+						key: 'del',
+						en: 'DEL',
+						keyCode: 8,
+					},
+				],
+				keyIndex: -1,
+			};
+		},
+		props:{
+			passwrdType: {
+				type: String,
+				default: 'pay'
+			}
+		},
+		methods:{
+			show(){
+				this.isShow = true;
+			},
+			hide(){
+				this.isShow = false;
+			},
+			/**
+			 * 密码键盘按下
+			 * @param {Object} item
+			 * @param {Number} index
+			 */
+			onKeyList(item,index){
+				let KeyInfo = item;	
+				// 删除键
+				if(KeyInfo.keyCode === 8 && this.keyIndex > -1){
+					this.keyIndex--;
+				}
+				// 不是删除键
+				if(KeyInfo.keyCode != 8){
+					if(this.passwrdType == 'pay' && this.keyIndex >= 5){
+						console.log('支付键盘');
+						this.keyIndex = -1;
+						return;
+					}
+					this.keyIndex++;
+				}
+				KeyInfo.index = this.keyIndex;
+				this.$emit('KeyInfo',KeyInfo);
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	@import 'cc-defineKeyboard.scss';
+</style>
diff --git a/uni_modules/cc-defineKeyboard/package.json b/uni_modules/cc-defineKeyboard/package.json
new file mode 100644
index 0000000..39fc622
--- /dev/null
+++ b/uni_modules/cc-defineKeyboard/package.json
@@ -0,0 +1,87 @@
+{
+  "id": "cc-defineKeyboard",
+  "displayName": "自定义支付密码输入键盘Keyboard和支付设置输入框Input",
+  "version": "2.0",
+  "description": "自定义支付密码输入键盘Keyboard和支付设置输入框Input",
+  "keywords": [
+    "支付密码",
+    "键盘",
+    "",
+    "支付密码输入键盘",
+    "Keyboard",
+    "",
+    "自定义键盘"
+],
+  "repository": "",
+  "engines": {
+    "HBuilderX": "^3.7.0"
+  },
+  "dcloudext": {
+    "type": "component-vue",
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": ""
+  },
+  "uni_modules": {
+    "dependencies": [],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "Vue": {
+          "vue2": "y",
+          "vue3": "y"
+        },
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "y"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+          "QQ": "y",
+          "钉钉": "y",
+          "快手": "y",
+          "飞书": "y",
+          "京东": "y"
+        },
+        "快应用": {
+          "华为": "y",
+          "联盟": "y"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/uni_modules/cc-defineKeyboard/readme.md b/uni_modules/cc-defineKeyboard/readme.md
new file mode 100644
index 0000000..34182fd
--- /dev/null
+++ b/uni_modules/cc-defineKeyboard/readme.md
@@ -0,0 +1,232 @@
+# cc-defineKeyboard
+
+
+#### 使用方法 
+```使用方法	
+<!-- ref:唯一ref  passwrdType：密码样式pay keyInfo：密码输入监测事件 -->
+<cc-defineKeyboard ref="CodeKeyboard" passwrdType="pay" @KeyInfo="KeyInfo"></cc-defineKeyboard>
+						
+/** * 唤起键盘 */
+onPayUp() {
+	this.$refs.CodeKeyboard.show();
+},
+
+/*** 支付键盘回调* @param {Object} val */
+
+KeyInfo(val) {
+
+				if (val.index >= 6) {
+					return;
+				}
+				// 判断是否输入的是删除键
+				if (val.keyCode === 8) {
+					// 删除最后一位
+					this.passwordArr.splice(val.index + 1, 1)
+				}
+				// 判断是否输入的是.
+				else if (val.keyCode == 190) {
+					// 输入.无效
+				} else {
+					this.passwordArr.push(val.key);
+				}
+
+				uni.showModal({
+					title: '温馨提示',
+					content: '输入密码是 = ' + JSON.stringify(this.passwordArr)
+				})
+}
+
+
+```
+
+#### HTML代码实现部分
+```html
+
+<template>
+	<view class="page">
+		<view>
+			<view class="pay-title">
+				<text v-show="AffirmStatus === 1">请输入6位支付密码</text>
+				<text v-show="AffirmStatus === 2">请设置6位支付密码</text>
+				<text v-show="AffirmStatus === 3">请确认6位支付密码</text>
+			</view>
+			<view class="pay-password" @click="onPayUp">
+				<view class="list">
+					<text v-show="passwordArr.length >= 1">●</text>
+				</view>
+				<view class="list">
+					<text v-show="passwordArr.length >= 2">●</text>
+				</view>
+				<view class="list">
+					<text v-show="passwordArr.length >= 3">●</text>
+				</view>
+				<view class="list">
+					<text v-show="passwordArr.length >= 4">●</text>
+				</view>
+				<view class="list">
+					<text v-show="passwordArr.length >= 5">●</text>
+				</view>
+				<view class="list">
+					<text v-show="passwordArr.length >= 6">●</text>
+				</view>
+			</view>
+			<view class="hint">
+				<text>忘记支付密码？</text>
+			</view>
+		</view>
+		<!-- ref:唯一ref  passwrdType：密码样式pay keyInfo：密码输入返回事件 -->
+		<cc-defineKeyboard ref="CodeKeyboard" passwrdType="pay" @KeyInfo="KeyInfo"></cc-defineKeyboard>
+	
+	</view>
+</template>
+
+<script>
+	export default {
+		components: {
+
+		},
+		data() {
+			return {
+				AffirmStatus: 1,
+				passwordArr: [],
+				oldPasswordArr: [],
+				newPasswordArr: [],
+				afPasswordArr: [],
+			};
+		},
+		onLoad() {
+
+		},
+		methods: {
+			/**
+			 * 唤起键盘
+			 */
+			onPayUp() {
+				this.$refs.CodeKeyboard.show();
+			},
+			/**
+			 * 支付键盘回调
+			 * @param {Object} val
+			 */
+			KeyInfo(val) {
+
+
+				if (val.index >= 6) {
+					return;
+				}
+				// 判断是否输入的是删除键
+				if (val.keyCode === 8) {
+					// 删除最后一位
+					this.passwordArr.splice(val.index + 1, 1)
+				}
+				// 判断是否输入的是.
+				else if (val.keyCode == 190) {
+					// 输入.无效
+				} else {
+					this.passwordArr.push(val.key);
+				}
+
+				uni.showModal({
+					title: '温馨提示',
+					content: '输入密码是 = ' + JSON.stringify(this.passwordArr)
+				})
+
+
+				// 判断是否等于6
+				if (this.passwordArr.length === 6) {
+					this.passwordArr = [];
+					this.AffirmStatus = this.AffirmStatus + 1;
+				}
+				// 判断到哪一步了
+				if (this.AffirmStatus === 1) {
+					this.oldPasswordArr = this.passwordArr;
+				} else if (this.AffirmStatus === 2) {
+					this.newPasswordArr = this.passwordArr;
+				} else if (this.AffirmStatus === 3) {
+					this.afPasswordArr = this.passwordArr;
+				} else if (this.AffirmStatus === 4) {
+					console.log(this.oldPasswordArr.join(''));
+					console.log(this.newPasswordArr.join(''));
+					console.log(this.afPasswordArr.join(''));
+					uni.showToast({
+						title: '修改成功',
+						icon: 'none'
+					})
+					setTimeout(() => {
+						uni.navigateBack();
+					}, 2000)
+				}
+				this.$forceUpdate();
+			}
+
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	$base: orangered; // 基础颜色
+
+	.page {
+		position: absolute;
+		left: 0;
+		top: 0;
+		width: 100%;
+		height: 100%;
+		background-color: #FFFFFF;
+	}
+
+	.pay-title {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		width: 100%;
+		height: 200rpx;
+
+		text {
+			font-size: 28rpx;
+			color: #555555;
+		}
+	}
+
+	.pay-password {
+		display: flex;
+		align-items: center;
+		width: 90%;
+		height: 80rpx;
+		margin: 20rpx auto;
+		border: 2rpx solid $base;
+
+		.list {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			width: 16.666%;
+			height: 100%;
+			border-right: 2rpx solid #EEEEEE;
+
+			text {
+				font-size: 32rpx;
+			}
+		}
+
+		.list:nth-child(6) {
+			border-right: none;
+		}
+	}
+
+	.hint {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		width: 100%;
+		height: 100rpx;
+
+		text {
+			font-size: 28rpx;
+			color: $base;
+		}
+	}
+</style>
+
+
+```

From 7cea9eb62848fd4d73448118b298d971df20306c Mon Sep 17 00:00:00 2001
From: duan <1004387497@qq.com>
Date: Fri, 24 May 2024 09:28:14 +0800
Subject: [PATCH 3/8] =?UTF-8?q?=E6=94=AF=E4=BB=98=E8=81=94=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components => components}/payPassword.vue |   0
 manifest.json                                 | 220 +++++++++---------
 pages/index/index.vue                         |   2 +-
 pages/order_detail/order_detail.vue           |  95 ++++----
 pages/product/placeOrder.vue                  | 101 ++++++--
 .../cc-defineKeyboard/cc-defineKeyboard.vue   |   6 +-
 .../{ => 新建文件夹}/uni-scss/changelog.md    |   0
 .../{ => 新建文件夹}/uni-scss/index.scss      |   0
 .../{ => 新建文件夹}/uni-scss/package.json    |   0
 .../{ => 新建文件夹}/uni-scss/readme.md       |   0
 .../uni-scss/styles/index.scss                |   0
 .../uni-scss/styles/setting/_border.scss      |   0
 .../uni-scss/styles/setting/_color.scss       |   0
 .../uni-scss/styles/setting/_radius.scss      |   0
 .../uni-scss/styles/setting/_space.scss       |   0
 .../uni-scss/styles/setting/_styles.scss      |   0
 .../uni-scss/styles/setting/_text.scss        |   0
 .../uni-scss/styles/setting/_variables.scss   |   0
 .../uni-scss/styles/tools/functions.scss      |   0
 .../{ => 新建文件夹}/uni-scss/theme.scss      |   0
 .../{ => 新建文件夹}/uni-scss/variables.scss  |   0
 21 files changed, 254 insertions(+), 170 deletions(-)
 rename {pages/order_detail/components => components}/payPassword.vue (100%)
 rename uni_modules/{ => 新建文件夹}/uni-scss/changelog.md (100%)
 rename uni_modules/{ => 新建文件夹}/uni-scss/index.scss (100%)
 rename uni_modules/{ => 新建文件夹}/uni-scss/package.json (100%)
 rename uni_modules/{ => 新建文件夹}/uni-scss/readme.md (100%)
 rename uni_modules/{ => 新建文件夹}/uni-scss/styles/index.scss (100%)
 rename uni_modules/{ => 新建文件夹}/uni-scss/styles/setting/_border.scss (100%)
 rename uni_modules/{ => 新建文件夹}/uni-scss/styles/setting/_color.scss (100%)
 rename uni_modules/{ => 新建文件夹}/uni-scss/styles/setting/_radius.scss (100%)
 rename uni_modules/{ => 新建文件夹}/uni-scss/styles/setting/_space.scss (100%)
 rename uni_modules/{ => 新建文件夹}/uni-scss/styles/setting/_styles.scss (100%)
 rename uni_modules/{ => 新建文件夹}/uni-scss/styles/setting/_text.scss (100%)
 rename uni_modules/{ => 新建文件夹}/uni-scss/styles/setting/_variables.scss (100%)
 rename uni_modules/{ => 新建文件夹}/uni-scss/styles/tools/functions.scss (100%)
 rename uni_modules/{ => 新建文件夹}/uni-scss/theme.scss (100%)
 rename uni_modules/{ => 新建文件夹}/uni-scss/variables.scss (100%)

diff --git a/pages/order_detail/components/payPassword.vue b/components/payPassword.vue
similarity index 100%
rename from pages/order_detail/components/payPassword.vue
rename to components/payPassword.vue
diff --git a/manifest.json b/manifest.json
index 4b6f8c1..64b255c 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,111 +1,111 @@
 {
-	"name": "cashier_weapp",
-	"appid": "__UNI__8092421",
-	"description": "",
-	"versionName": "1.0.0",
-	"versionCode": "100",
-	"transformPx": false,
-	/* 5+App特有相关 */
-	"app-plus": {
-		"usingComponents": true,
-		"nvueStyleCompiler": "uni-app",
-		"compilerVersion": 3,
-		"splashscreen": {
-			"alwaysShowBeforeRender": true,
-			"waiting": true,
-			"autoclose": true,
-			"delay": 0
-		},
-		/* 模块配置 */
-		"modules": {
-			"Barcode": {}
-		},
-		/* 应用发布信息 */
-		"distribute": {
-			/* android打包配置 */
-			"android": {
-				"permissions": [
-					"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-					"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-					"<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-					"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.CAMERA\"/>",
-					"<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
-					"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-					"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-					"<uses-feature android:name=\"android.hardware.camera\"/>",
-					"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
-				]
-			},
-			/* ios打包配置 */
-			"ios": {
-				"dSYMs": false
-			},
-			/* SDK配置 */
-			"sdkConfigs": {
-				"ad": {}
-			}
-		}
-	},
-	/* 快应用特有相关 */
-	"quickapp": {},
-	/* 小程序特有相关 */
-	"mp-weixin": {
-		"appid": "wxd88fffa983758a30",
-		"setting": {
-			"urlCheck": false,
-			"minified": true,
-			"es6": true,
-			"postcss": true
-		},
-		"usingComponents": true,
-		"libVersion": "latest",
-		"permission": {
-			"scope.userLocation": {
-				"desc": "你的位置信息将用于小程序位置接口的效果展示"
-			}
-		},
-		"requiredPrivateInfos": ["getLocation", "onLocationChange", "chooseLocation", "chooseAddress"]
-	},
-	"h5": {
-		"devServer": {
-			"https": false,
-			"disableHostCheck": false,
-			"proxy": {
-				"/api": {
-					"target": "https://wxcashiertest.sxczgkj.cn/cashierService",
-					// "target" : "https://ky.sxczgkj.cn",
-					"ws": false,
-					"changeOrigin": true, //是否跨域
-					"secure": false, // 设置支持https协议的代理
-					"pathRewrite": {
-						"^/api": "" //需要rewrite重写的,
-					}
-				}
-			}
-		},
-		"template": "template.h5.html",
-		"router": {
-			"mode": "history",
-			"base": "/h5/"
-		}
-	},
-	"mp-alipay": {
-		"usingComponents": true
-	},
-	"mp-baidu": {
-		"usingComponents": true
-	},
-	"mp-toutiao": {
-		"usingComponents": true
-	},
-	"uniStatistics": {
-		"enable": false
-	},
-	"vueVersion": "2"
-}
\ No newline at end of file
+    "name" : "cashier_weapp",
+    "appid" : "__UNI__8092421",
+    "description" : "",
+    "versionName" : "1.0.0",
+    "versionCode" : "100",
+    "transformPx" : false,
+    /* 5+App特有相关 */
+    "app-plus" : {
+        "usingComponents" : true,
+        "nvueStyleCompiler" : "uni-app",
+        "compilerVersion" : 3,
+        "splashscreen" : {
+            "alwaysShowBeforeRender" : true,
+            "waiting" : true,
+            "autoclose" : true,
+            "delay" : 0
+        },
+        /* 模块配置 */
+        "modules" : {
+            "Barcode" : {}
+        },
+        /* 应用发布信息 */
+        "distribute" : {
+            /* android打包配置 */
+            "android" : {
+                "permissions" : [
+                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
+                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+                ]
+            },
+            /* ios打包配置 */
+            "ios" : {
+                "dSYMs" : false
+            },
+            /* SDK配置 */
+            "sdkConfigs" : {
+                "ad" : {}
+            }
+        }
+    },
+    /* 快应用特有相关 */
+    "quickapp" : {},
+    /* 小程序特有相关 */
+    "mp-weixin" : {
+        "appid" : "wxd88fffa983758a30",
+        "setting" : {
+            "urlCheck" : false,
+            "minified" : true,
+            "es6" : true,
+            "postcss" : true
+        },
+        "usingComponents" : true,
+        "libVersion" : "latest",
+        "permission" : {
+            "scope.userLocation" : {
+                "desc" : "你的位置信息将用于小程序位置接口的效果展示"
+            }
+        },
+        "requiredPrivateInfos" : [ "getLocation", "onLocationChange", "chooseLocation", "chooseAddress" ]
+    },
+    "h5" : {
+        "devServer" : {
+            "https" : false,
+            "disableHostCheck" : false,
+            "proxy" : {
+                "/api" : {
+                    "target" : "https://wxcashiertest.sxczgkj.cn/cashierService",
+                    // "target" : "https://ky.sxczgkj.cn",
+                    "ws" : false,
+                    "changeOrigin" : true, //是否跨域
+                    "secure" : false, // 设置支持https协议的代理
+                    "pathRewrite" : {
+                        "^/api" : "" //需要rewrite重写的,
+                    }
+                }
+            }
+        },
+        "template" : "template.h5.html",
+        "router" : {
+            "mode" : "history",
+            "base" : "/h5/"
+        }
+    },
+    "mp-alipay" : {
+        "usingComponents" : true
+    },
+    "mp-baidu" : {
+        "usingComponents" : true
+    },
+    "mp-toutiao" : {
+        "usingComponents" : true
+    },
+    "uniStatistics" : {
+        "enable" : false
+    },
+    "vueVersion" : "2"
+}
diff --git a/pages/index/index.vue b/pages/index/index.vue
index d73ef17..046b8e2 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -137,7 +137,7 @@
 								</view>
 
 							</view>
-						</view>
+						</view> 
 					</view>
 					<u-loadmore height='40' :status="form.status" iconSize='24' fontSize='24' />
 					<!-- </scroll-view> -->
diff --git a/pages/order_detail/order_detail.vue b/pages/order_detail/order_detail.vue
index 9cf03ad..328b037 100644
--- a/pages/order_detail/order_detail.vue
+++ b/pages/order_detail/order_detail.vue
@@ -183,7 +183,7 @@
 
 <script>
 	import webSocketUtils from '@/common/js/websocket.js'
-	import payPassword from './components/payPassword.vue'
+	import payPassword from '@/components/payPassword.vue'
 	export default {
 		components: {
 			payPassword
@@ -207,14 +207,19 @@
 				orderInfo: '',
 				// 可用优惠券数据
 				couponAmount: 0,
-				// 输入支付密码
+				// 输入支付密码     123
 				passwordArr: [],
-				ispws: false
+				ispws: false,
+				numValue: 0
 			};
 		},
 
 		onUnload() {
 			uni.$off('getMessage')
+			// uni.showToast({
+			// 	title: this.radiovalue1 + '-110',
+			// 	duration:5000
+			// })
 		},
 		onLoad(e) {
 			// 获取用户信息
@@ -232,6 +237,7 @@
 			// 获取可用优惠券数量
 			this.getcoupon()
 			this.vipId = uni.cache.get('userInfo').id
+
 		},
 		onShow() {
 
@@ -250,7 +256,7 @@
 			})
 		},
 		methods: {
-async loginwxuserInfo() {
+			async loginwxuserInfo() {
 				let res = await this.api.loginwxuserInfo({
 					userId: uni.cache.get('userInfo').id
 				})
@@ -279,6 +285,7 @@ async loginwxuserInfo() {
 				}
 			},
 			getMessage(msg) {
+
 				if (msg.status != 'success') {
 					uni.showToast({
 						title: msg.msg,
@@ -339,23 +346,24 @@ async loginwxuserInfo() {
 			},
 			// 去结算
 			showpopupclick() {
-
-				let data = { //定义socket数据传参
-					"skuId": '',
-					"num": '', //数量
-					"type": "createOrder", //“addcart:添加购物车，create0rder:生成订单，clearCart:庆康购物车”，
-					"couponsId": this.emitorderfoodform.id ? this.emitorderfoodform.id : '', //优惠券ID,
-					"isYhq": this.emitorderfoodform.id ? 1 : 0, // 是否使用优惠券（ 1： 使用， 0： 不使用）,
-					"isBuyYhq": this.emitorderfoodform.clickiconone == 1 ? 1 : 0, // 是否购买优惠券（ 1： 购买， 0： 不够买）
-					"productId": '', //商品id
-					"shopId": uni.cache.get('shopUser'),
-					"userId": uni.cache.get('userInfo').id,
-					// tableId:uni.cache.get('tableCode')
+				if (this.numValue == 0) {
+					let data = { //定义socket数据传参
+						"skuId": '',
+						"num": '', //数量
+						"type": "createOrder", //“addcart:添加购物车，create0rder:生成订单，clearCart:庆康购物车”，
+						"couponsId": this.emitorderfoodform.id ? this.emitorderfoodform.id : '', //优惠券ID,
+						"isYhq": this.emitorderfoodform.id ? 1 : 0, // 是否使用优惠券（ 1： 使用， 0： 不使用）,
+						"isBuyYhq": this.emitorderfoodform.clickiconone == 1 ? 1 : 0, // 是否购买优惠券（ 1： 购买， 0： 不够买）
+						"productId": '', //商品id
+						"shopId": uni.cache.get('shopUser'),
+						"userId": uni.cache.get('userInfo').id,
+						// tableId:uni.cache.get('tableCode')
+					}
+					this.numValue = 1
+					uni.$u.debounce(this.socketSendMsg(data), 500)
+				} else {
+					this.showpopupclickdd()
 				}
-				console.log(data)
-				uni.$u.debounce(this.socketSendMsg(data), 500)
-
-
 			},
 			// 去充值
 			goRecharge() {
@@ -363,8 +371,10 @@ async loginwxuserInfo() {
 					shopId_id: uni.cache.get('shopUser')
 				})
 			},
-		
+
 			async showpopupclickdd(i) {
+				console.log(this.radiovalue1, '调试121')
+
 				if (this.radiovalue1 == 1) {
 					let res = await this.api.payorderPay({
 						orderId: this.listinfoid
@@ -403,16 +413,14 @@ async loginwxuserInfo() {
 								// });
 							},
 							fail: (err) => {
-								setTimeout(() => {
 									uni.showToast({
 										icon: 'none',
 										title: '支付失败'
 									})
 									uni.hideLoading()
-								}, 2000)
-								uni.redirectTo({
-									url: '/pages/order/order_detail?orderId=' + this.listinfoid
-								});
+								// uni.redirectTo({
+								// 	url: '/pages/order/order_detail?orderId=' + this.listinfoid
+								// });
 							},
 							complete: (data) => {
 								console.log(data, '成功与否')
@@ -444,29 +452,30 @@ async loginwxuserInfo() {
 					memberId: this.amountVIP.id,
 					pwd: pwd
 				})
-				console.log(res, '是否支付成功')
-				if(res.code ==0){
+				if (res.code == 0) {
 					uni.showToast({
 						icon: 'none',
 						title: '支付成功',
-						success:()=>{
-							setTimeout(()=>{
-							uni.redirectTo({
-								url: '/pages/order/order_detail?orderId=' + this.listinfoid
-							});	
-							},2000)
-						
+						success: () => {
+							setTimeout(res => {
+								uni.redirectTo({
+									url: '/pages/order/successful?orderId=' + this
+										.listinfoid + '&orderInfo=' + JSON.stringify(
+											this.orderInfo)
+								});
+							}, 1000)
+
+
 						}
 					})
+				} else if (res.data == 1) {
+					setTimeout(() => {
+						// 去充值
+						this.goRecharge()
+					}, 2000)
 				}
-				if(res.data==1){
-				 setTimeout(() => {
-				 	// 去充值
-				 	this.goRecharge()
-				 }, 2000)
-				}
-				
-				
+
+
 			},
 
 			clickselect(b) {
diff --git a/pages/product/placeOrder.vue b/pages/product/placeOrder.vue
index 36c8e68..b9a5e31 100644
--- a/pages/product/placeOrder.vue
+++ b/pages/product/placeOrder.vue
@@ -49,7 +49,7 @@
 
 		</view>
 		<!-- 支付方式 -->
-		<view class="payType" v-if="false">
+		<view class="payType">
 			<view class="">
 				支付方式
 			</view>
@@ -77,12 +77,14 @@
 						</view>
 					</u-radio>
 				</u-radio-group>
-				<view style="font-weight: 400;font-size: 24rpx;color: #333333;">
-					会员卡余额${{ amount}} <text style="font-weight: 500;font-size: 28rpx;color: #FF4C11;"
+				<view style="font-weight: 400;font-size: 24rpx;color: #333333;margin-left: 60rpx;">
+					会员卡余额{{ amountVIP.amount}} <text
+						style="font-weight: 500;font-size: 28rpx;margin-left: 16rpx;color: #FF4C11;"
 						@click="goRecharge">去充值</text>
 				</view>
 			</view>
 		</view>
+
 		<view class="placeBottom">
 			<view class="">
 				<text style="font-size: 24rpx;font-weight: bold;"> 合计 </text><text
@@ -94,14 +96,19 @@
 			</view>
 			<button class="btnStyle" @click="sumbitFrom">提交订单</button>
 		</view>
+		<payPassword ref="payPwd" @accountPayevent="accountPayevent" v-show="ispws"></payPassword>
 	</view>
 </template>
 
 <script>
+	import payPassword from '@/components/payPassword.vue'
 	export default {
+		components: {
+			payPassword
+		},
 		onLoad(e) {
 			this.getInfo(e.id)
-			this.orderIds= e.id
+			this.orderIds = e.id
 			this.amount = uni.cache.get('userInfo').amount
 			this.vipId = uni.cache.get('userInfo').id
 		},
@@ -111,13 +118,56 @@
 				Quantity: 1,
 				radiovalue1: '1',
 				amount: 0,
-				orderIds:null,
-				vipId:null
+				orderIds: null,
+				vipId: null,
+				ispws: false,
+				amountVIP: null,
 			}
 		},
 		methods: {
+			async getAount() {
+				let res = await this.api.shopUserInfo({
+					// shopId:店铺ID
+					"shopId":this.info.shopId,
+					"userId": uni.cache.get('userInfo').id
+				})
+				if (res.code == 0) {
+					this.amountVIP = res.data
+				}
+			},
+			// 余额支付
+			async accountPayevent(pwd) {
+				this.ispws = false
+				let res = await this.api.accountPay({
+					orderId: this.listinfoid,
+					memberId: this.amountVIP.id,
+					pwd: pwd
+				})
+				if (res.code == 0) {
+					uni.showToast({
+						icon: 'none',
+						title: '支付成功',
+						success: () => {
+							setTimeout(res => {
+								uni.redirectTo({
+									url: '/pages/order/successful?orderId=' + this
+										.listinfoid + '&orderInfo=' + JSON.stringify(
+											this.orderInfo)
+								});
+							}, 1000)
+						}
+					})
+				} else if (res.data == 1) {
+					setTimeout(() => {
+						// 去充值
+						this.goRecharge()
+					}, 2000)
+				}
+			},
 			goRecharge() {
-				// uni.pro.to
+				uni.pro.navigateTo('/pages/member/index', {
+					shopId_id: uni.cache.get('shopUser')
+				})
 			},
 			async sumbitFrom() {
 				// radiovalue1:为1的时候微信支付,为2是会员卡,需要输入支付密码
@@ -134,13 +184,30 @@
 						// 调用支付接口
 						this.payEvent(res.data.id)
 					}
-				}else{
-					let res = await this.api.accountPay({
-						orderId: this.orderIds,
-						memberId:this.vipId
-					})
-					if (res.code == 0) {
+				} else {
+					// let res = await this.api.accountPay({
+					// 	orderId: this.orderIds,
+					// 	memberId:this.vipId
+					// })
+					// if (res.code == 0) {
+					// }
+
+					// 先判断是否设置支付密码。0是没设置。没设置的情况下跳转到设置页面。有的话输入支付密码
+					let isVip = uni.cache.get('userInfo').isPwd
+					if (isVip == 0) {
+						uni.pro.navigateTo('/pages/user/repairpassword', {
+							// shopId_id: uni.cache.get('shopUser')
+						})
+					} else {
+						this.ispws = true
+						this.$nextTick(() => {
+							this.$refs.payPwd.onPayUp();
+						})
 					}
+
+
+
+
 				}
 			},
 			async payEvent(id) {
@@ -184,6 +251,8 @@
 				})
 				if (res.code == 0) {
 					this.info = res.data
+					// 获取余额
+					this.getAount()
 				}
 			}
 		}
@@ -296,6 +365,12 @@
 			>view:last-child {
 				margin-top: 32rpx;
 			}
+
+			.dfs {
+				display: flex;
+				align-items: center;
+			}
+
 		}
 
 		.placeBottom {
diff --git a/uni_modules/cc-defineKeyboard/components/cc-defineKeyboard/cc-defineKeyboard.vue b/uni_modules/cc-defineKeyboard/components/cc-defineKeyboard/cc-defineKeyboard.vue
index a8875eb..a63e3f4 100644
--- a/uni_modules/cc-defineKeyboard/components/cc-defineKeyboard/cc-defineKeyboard.vue
+++ b/uni_modules/cc-defineKeyboard/components/cc-defineKeyboard/cc-defineKeyboard.vue
@@ -94,17 +94,17 @@
 				if(KeyInfo.keyCode === 8 && this.keyIndex > -1){
 					this.keyIndex--;
 				}
+				this.$emit('KeyInfo',KeyInfo);
 				// 不是删除键
 				if(KeyInfo.keyCode != 8){
-					if(this.passwrdType == 'pay' && this.keyIndex >= 5){
-						console.log('支付键盘');
+						console.log(this.keyIndex,'支付键盘');
+					if( this.keyIndex =	 4){
 						this.keyIndex = -1;
 						return;
 					}
 					this.keyIndex++;
 				}
 				KeyInfo.index = this.keyIndex;
-				this.$emit('KeyInfo',KeyInfo);
 			}
 		}
 	}
diff --git a/uni_modules/uni-scss/changelog.md b/uni_modules/新建文件夹/uni-scss/changelog.md
similarity index 100%
rename from uni_modules/uni-scss/changelog.md
rename to uni_modules/新建文件夹/uni-scss/changelog.md
diff --git a/uni_modules/uni-scss/index.scss b/uni_modules/新建文件夹/uni-scss/index.scss
similarity index 100%
rename from uni_modules/uni-scss/index.scss
rename to uni_modules/新建文件夹/uni-scss/index.scss
diff --git a/uni_modules/uni-scss/package.json b/uni_modules/新建文件夹/uni-scss/package.json
similarity index 100%
rename from uni_modules/uni-scss/package.json
rename to uni_modules/新建文件夹/uni-scss/package.json
diff --git a/uni_modules/uni-scss/readme.md b/uni_modules/新建文件夹/uni-scss/readme.md
similarity index 100%
rename from uni_modules/uni-scss/readme.md
rename to uni_modules/新建文件夹/uni-scss/readme.md
diff --git a/uni_modules/uni-scss/styles/index.scss b/uni_modules/新建文件夹/uni-scss/styles/index.scss
similarity index 100%
rename from uni_modules/uni-scss/styles/index.scss
rename to uni_modules/新建文件夹/uni-scss/styles/index.scss
diff --git a/uni_modules/uni-scss/styles/setting/_border.scss b/uni_modules/新建文件夹/uni-scss/styles/setting/_border.scss
similarity index 100%
rename from uni_modules/uni-scss/styles/setting/_border.scss
rename to uni_modules/新建文件夹/uni-scss/styles/setting/_border.scss
diff --git a/uni_modules/uni-scss/styles/setting/_color.scss b/uni_modules/新建文件夹/uni-scss/styles/setting/_color.scss
similarity index 100%
rename from uni_modules/uni-scss/styles/setting/_color.scss
rename to uni_modules/新建文件夹/uni-scss/styles/setting/_color.scss
diff --git a/uni_modules/uni-scss/styles/setting/_radius.scss b/uni_modules/新建文件夹/uni-scss/styles/setting/_radius.scss
similarity index 100%
rename from uni_modules/uni-scss/styles/setting/_radius.scss
rename to uni_modules/新建文件夹/uni-scss/styles/setting/_radius.scss
diff --git a/uni_modules/uni-scss/styles/setting/_space.scss b/uni_modules/新建文件夹/uni-scss/styles/setting/_space.scss
similarity index 100%
rename from uni_modules/uni-scss/styles/setting/_space.scss
rename to uni_modules/新建文件夹/uni-scss/styles/setting/_space.scss
diff --git a/uni_modules/uni-scss/styles/setting/_styles.scss b/uni_modules/新建文件夹/uni-scss/styles/setting/_styles.scss
similarity index 100%
rename from uni_modules/uni-scss/styles/setting/_styles.scss
rename to uni_modules/新建文件夹/uni-scss/styles/setting/_styles.scss
diff --git a/uni_modules/uni-scss/styles/setting/_text.scss b/uni_modules/新建文件夹/uni-scss/styles/setting/_text.scss
similarity index 100%
rename from uni_modules/uni-scss/styles/setting/_text.scss
rename to uni_modules/新建文件夹/uni-scss/styles/setting/_text.scss
diff --git a/uni_modules/uni-scss/styles/setting/_variables.scss b/uni_modules/新建文件夹/uni-scss/styles/setting/_variables.scss
similarity index 100%
rename from uni_modules/uni-scss/styles/setting/_variables.scss
rename to uni_modules/新建文件夹/uni-scss/styles/setting/_variables.scss
diff --git a/uni_modules/uni-scss/styles/tools/functions.scss b/uni_modules/新建文件夹/uni-scss/styles/tools/functions.scss
similarity index 100%
rename from uni_modules/uni-scss/styles/tools/functions.scss
rename to uni_modules/新建文件夹/uni-scss/styles/tools/functions.scss
diff --git a/uni_modules/uni-scss/theme.scss b/uni_modules/新建文件夹/uni-scss/theme.scss
similarity index 100%
rename from uni_modules/uni-scss/theme.scss
rename to uni_modules/新建文件夹/uni-scss/theme.scss
diff --git a/uni_modules/uni-scss/variables.scss b/uni_modules/新建文件夹/uni-scss/variables.scss
similarity index 100%
rename from uni_modules/uni-scss/variables.scss
rename to uni_modules/新建文件夹/uni-scss/variables.scss

From 2e3061a967174d3ff24ba05d6a7108cf18ae3089 Mon Sep 17 00:00:00 2001
From: duan <1004387497@qq.com>
Date: Fri, 24 May 2024 13:48:51 +0800
Subject: [PATCH 4/8] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/js/api.js                    |  3 +-
 pages/login/login.vue               |  2 +
 pages/member/index.vue              |  2 +-
 pages/member/list.vue               |  3 +-
 pages/order_detail/order_detail.vue | 12 +----
 pages/product/placeOrder.vue        | 71 +++++++++++++----------------
 pages/user/information.vue          |  4 +-
 pages/user/repairpassword.vue       | 11 +++++
 pages/user/user.vue                 |  9 +++-
 9 files changed, 59 insertions(+), 58 deletions(-)

diff --git a/common/js/api.js b/common/js/api.js
index 9f3ea91..90c3576 100644
--- a/common/js/api.js
+++ b/common/js/api.js
@@ -16,6 +16,7 @@ export default {
 	accountPay(data) {
 		return uni.api.get("/pay/accountPay", data);
 	},
+	
 	// 下单
 	creatGroupOrder(data) {
 		return uni.api.post("/groupOrderInfo/creatGroupOrder", data);
@@ -142,7 +143,7 @@ export default {
 		return uni.api.get("/distirict/comShopList", data);
 	},
 	loginOut(data) { //退出登录
-		return uni.api.post("/loginOut", data);
+		return uni.api.post("/login /loginOut", data);
 	},
 	productqueryShopIdByTableCode(data) { //通过桌码获取shopId
 		return uni.api.get("/product/queryShopIdByTableCode", data);
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 1f10dec..ca1a4a0 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -51,12 +51,14 @@
 			<view class="toLogins" @click="showbox = !showbox">其他手机号登录/注册</view>
 			<!-- #endif -->
 			<view class="agreement flex-start">
+				<!-- #ifdef APP-PLUS || H5 -->
 				<u-checkbox-group><u-checkbox shape="circle" @change="radioChange"
 						size="24"></u-checkbox></u-checkbox-group>
 				<text>阅读并同意零点八零</text>
 				<view class="agreement-Item" @click="Privacy(1)">《用户协议》</view>
 				及
 				<view class="agreement-Item" @click="Privacy(2)">《隐私政策》</view>
+				<!-- #endif -->
 			</view>
 		</view>
 		<!-- #ifdef APP-PLUS || H5 -->
diff --git a/pages/member/index.vue b/pages/member/index.vue
index 26abab1..a815054 100644
--- a/pages/member/index.vue
+++ b/pages/member/index.vue
@@ -49,7 +49,7 @@
 			}
 		},
 		onLoad(e) {
-			console.log(e)
+			console.log(e,'调试')
 			if (e.type == 'list') {//从列表进来的
 				this.paygetShopByMember(e.shopId_id)
 			}else{
diff --git a/pages/member/list.vue b/pages/member/list.vue
index 77c64aa..2756d75 100644
--- a/pages/member/list.vue
+++ b/pages/member/list.vue
@@ -11,9 +11,10 @@
 				<view class="towcontentitemone flex-start">
 					<image class="towcontentitemoneimage" :src="item.logo" mode="aspectFill"></image>
 					<text class="towcontentitemonetext" style="color: #333333;">{{item.chainName}}</text>
+					<!-- 余额：<text class="towcontentitemtheretext">{{userInfo.amount || '0.00'}}</text> -->
 				</view>
 				<view class="towcontentitemtow flex-between">
-					<text class="towcontentitemtowetext" style="color:#333333;">{{item.is_vip}}</text>
+					<text class="towcontentitemtowetext" style="color:#333333;">余额:{{item.amount}}</text>
 					<text>{{item.shopName}}</text>
 				</view>
 			</view>
diff --git a/pages/order_detail/order_detail.vue b/pages/order_detail/order_detail.vue
index 328b037..17c59b7 100644
--- a/pages/order_detail/order_detail.vue
+++ b/pages/order_detail/order_detail.vue
@@ -222,8 +222,7 @@
 			// })
 		},
 		onLoad(e) {
-			// 获取用户信息
-			this.loginwxuserInfo()
+			
 			// console.log(e, 140)
 			let res = JSON.parse(e.tableId)
 			this.listinfo.detailList = res
@@ -256,14 +255,7 @@
 			})
 		},
 		methods: {
-			async loginwxuserInfo() {
-				let res = await this.api.loginwxuserInfo({
-					userId: uni.cache.get('userInfo').id
-				})
-				if (res.code == 0) {
-					uni.cache.set('userInfo', res.data);
-				}
-			},
+		
 			async getcoupon() {
 				let res = await this.api.userCoupon({
 					"orderNum": this.listinfo.amount,
diff --git a/pages/product/placeOrder.vue b/pages/product/placeOrder.vue
index b9a5e31..c9e5042 100644
--- a/pages/product/placeOrder.vue
+++ b/pages/product/placeOrder.vue
@@ -122,13 +122,14 @@
 				vipId: null,
 				ispws: false,
 				amountVIP: null,
+				listinfoid: null
 			}
 		},
 		methods: {
 			async getAount() {
 				let res = await this.api.shopUserInfo({
 					// shopId:店铺ID
-					"shopId":this.info.shopId,
+					"shopId": this.info.shopId,
 					"userId": uni.cache.get('userInfo').id
 				})
 				if (res.code == 0) {
@@ -138,10 +139,10 @@
 			// 余额支付
 			async accountPayevent(pwd) {
 				this.ispws = false
-				let res = await this.api.accountPay({
+				let res = await this.api.payOrderPay({
 					orderId: this.listinfoid,
-					memberId: this.amountVIP.id,
-					pwd: pwd
+					payType: "deposit",
+					pwd
 				})
 				if (res.code == 0) {
 					uni.showToast({
@@ -166,49 +167,40 @@
 			},
 			goRecharge() {
 				uni.pro.navigateTo('/pages/member/index', {
-					shopId_id: uni.cache.get('shopUser')
+					shopId_id: this.info.shopId
 				})
 			},
 			async sumbitFrom() {
-				// radiovalue1:为1的时候微信支付,为2是会员卡,需要输入支付密码
-				if (this.radiovalue1 == 1) {
-					let payMoney = this.info.salePrice * this.Quantity
-					let res = await this.api.creatGroupOrder({
-						num: this.Quantity,
-						proId: this.info.proId,
-						shopId: this.info.shopId,
-						payAmount: payMoney,
-						orderAmount: payMoney
-					})
-					if (res.code == 0) {
+				let payMoney = this.info.salePrice * this.Quantity
+				let res = await this.api.creatGroupOrder({
+					num: this.Quantity,
+					proId: this.info.proId,
+					shopId: this.info.shopId,
+					payAmount: payMoney,
+					orderAmount: payMoney
+				})
+				if (res.code == 0) {
+					this.listinfoid = res.data.id
+					// radiovalue1:为1的时候微信支付,为2是会员卡,需要输入支付密码
+					if (this.radiovalue1 == 1) {
 						// 调用支付接口
 						this.payEvent(res.data.id)
-					}
-				} else {
-					// let res = await this.api.accountPay({
-					// 	orderId: this.orderIds,
-					// 	memberId:this.vipId
-					// })
-					// if (res.code == 0) {
-					// }
-
-					// 先判断是否设置支付密码。0是没设置。没设置的情况下跳转到设置页面。有的话输入支付密码
-					let isVip = uni.cache.get('userInfo').isPwd
-					if (isVip == 0) {
-						uni.pro.navigateTo('/pages/user/repairpassword', {
-							// shopId_id: uni.cache.get('shopUser')
-						})
 					} else {
-						this.ispws = true
-						this.$nextTick(() => {
-							this.$refs.payPwd.onPayUp();
-						})
+						// 先判断是否设置支付密码。0是没设置。没设置的情况下跳转到设置页面。有的话输入支付密码
+						let isVip = uni.cache.get('userInfo').isPwd
+						if (isVip == 0) {
+							uni.pro.navigateTo('/pages/user/repairpassword', {
+								// shopId_id: uni.cache.get('shopUser')
+							})
+						} else {
+							this.ispws = true
+							this.$nextTick(() => {
+								this.$refs.payPwd.onPayUp();
+							})
+						}
 					}
-
-
-
-
 				}
+
 			},
 			async payEvent(id) {
 				let res = await this.api.payOrderPay({
@@ -217,7 +209,6 @@
 					orderType: 'group'
 				})
 				if (res) {
-					console.log(res, '调试1')
 					uni.requestPayment({
 						provider: 'wxpay', //支付类型-固定值
 						partnerid: res.data.appId, // 微信支付商户号
diff --git a/pages/user/information.vue b/pages/user/information.vue
index 9e260ed..442100d 100644
--- a/pages/user/information.vue
+++ b/pages/user/information.vue
@@ -10,7 +10,7 @@
 				</button> -->
 				<!-- <image class="onecontentboximage" :src="userHeadImg" mode="" @click="uploadImg"></image> -->
 				<button type="default" class="btn" open-type="chooseAvatar" @chooseavatar="uploadImg">
-					<view class="" :style="'background-image:url('+userHeadImg+');'" style="width: 200rxp;height: 200rpx;"></view>
+					<view class="" :style="'background-image:url('+userHeadImg+');'" style="width: 180rxp;height: 180rpx;"></view>
 				</button>
 
 
@@ -223,8 +223,6 @@
 		border-radius: 100%;
 		padding: 0;
 		>view{
-			width: 200rpx;
-			height: 200rpx;
 			border-radius: 100%;
 		}
 	}
diff --git a/pages/user/repairpassword.vue b/pages/user/repairpassword.vue
index 0e9ce5c..6b400ba 100644
--- a/pages/user/repairpassword.vue
+++ b/pages/user/repairpassword.vue
@@ -52,6 +52,7 @@
 			};
 		},
 		onLoad() {
+			
 			if (uni.cache.get('userInfo').isPwd != 0) {
 				uni.setNavigationBarTitle({
 					title: '忘记支付密码', // 标题文本，必须是字符串
@@ -84,6 +85,14 @@
 					}, 60000);
 				}
 			},
+			async loginwxuserInfo() {
+				let res = await this.api.loginwxuserInfo({
+					userId: uni.cache.get('userInfo').id
+				})
+				if (res.code == 0) {
+					uni.cache.set('userInfo', res.data);
+				}
+			},
 			async userInfosavePayPassword() {
 
 				if (this.form.mobile.length != 11 && this.isPwd == 0) {
@@ -145,6 +154,8 @@
 							icon: 'none'
 						});
 					}
+					// 获取用户信息
+					this.loginwxuserInfo()
 					setTimeout(() => {
 						uni.navigateBack();
 					}, 1000);
diff --git a/pages/user/user.vue b/pages/user/user.vue
index c3fd150..e67be35 100644
--- a/pages/user/user.vue
+++ b/pages/user/user.vue
@@ -23,7 +23,7 @@
 			<!-- #endif -->
 			<view class="boxtop_top flex-between">
 				<view class="boxtop_topleft">
-					<view class="flex-start" v-if="userInfo.nickName">
+					<view class="flex-start" v-if="userInfo.nickName" @click="clickinformation">
 						<image style="width: 108rpx; height: 108rpx; border-radius: 50%;" v-if="userInfo.headImg"
 							:src="userInfo.headImg" mode="aspectFill">
 						</image>
@@ -33,7 +33,7 @@
 						<text>去登录</text>
 					</view>
 				</view>
-				<image style="width: 44rpx; height: 42.26rpx;"
+				<image style="width: 44rpx; height: 42.26rpx;" @click="clickphone()"
 					src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/user/kf.png" mode="aspectFill">
 			</view>
 
@@ -99,6 +99,11 @@
 			}
 		},
 		methods: {
+			clickphone() {
+				uni.makePhoneCall({
+					phoneNumber: uni.cache.get('userInfo').custPhone
+				});
+			},
 			clickinformation() {
 				uni.pro.navigateTo('user/information')
 			},

From 48b569f49d84beffa08c4e79f4be379c5340d0b0 Mon Sep 17 00:00:00 2001
From: duan <1004387497@qq.com>
Date: Sat, 25 May 2024 10:54:28 +0800
Subject: [PATCH 5/8] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 framework/0-conf.js                           |   5 +-
 .../group_order/components/groupMerchants.vue |   2 +-
 pages/index/drinks.vue                        |   2 +-
 pages/index/hotlist.vue                       |   2 +-
 pages/index/tothestore.vue                    |   2 +-
 pages/order/successful.vue                    |   3 -
 pages/order_detail/order_detail.vue           |   2 +-
 pages/product/generalstore.vue                |   2 +-
 pages/product/index.vue                       |   1 +
 pages/product/placeOrder.vue                  |  35 +++--
 .../cc-defineKeyboard/cc-defineKeyboard.vue   | 137 +++++++++---------
 11 files changed, 100 insertions(+), 93 deletions(-)

diff --git a/framework/0-conf.js b/framework/0-conf.js
index e488114..116446d 100644
--- a/framework/0-conf.js
+++ b/framework/0-conf.js
@@ -3,10 +3,10 @@ const debug = process.env.NODE_ENV == 'development' ? true : false;
 const proxyApi = "/api"
 // #endif
 // #ifdef MP-WEIXIN || APP
-// const proxyApi = 'http://192.168.2.133:9889/cashierService' // 王伟
+// const proxyApi = 'http://192.168.2.96:9889/cashierService' // 王伟
 // const proxyApi = 'http://192.168.2.74:9888/cashierService' // 帆哥
-const proxyApi = 'https://wxcashiertest.sxczgkj.cn/cashierService' // 测试
 // const proxyApiwws = 'ws://192.168.2.74:9888/cashierService' // 测试
+const proxyApi = 'https://wxcashiertest.sxczgkj.cn/cashierService' // 测试
 const proxyApiwws = 'wss://wxcashiertest.sxczgkj.cn/cashierService' // 测试
 
 // #endif
@@ -19,6 +19,7 @@ const baseUrlwws = 'ws://cashier.sxczgkj.cn/cashierService'
 // const baseUrl = debug ? proxyApi : 'https://cashier.sxczgkj.cn/cashierService'// 线上
 // const baseUrlwws = debug ? proxyApiwws : 'wss://cashier.sxczgkj.cn/cashierService' // 线上
 const baseUrl = 'https://wxcashiertest.sxczgkj.cn/cashierService'// 测试
+// const baseUrl = 'http://192.168.2.96:9889/cashierService' 
 const baseUrlwws ='wss://wxcashiertest.sxczgkj.cn/cashierService' // 测试
 // #endif
 
diff --git a/pages/group_order/components/groupMerchants.vue b/pages/group_order/components/groupMerchants.vue
index 3738326..7a04763 100644
--- a/pages/group_order/components/groupMerchants.vue
+++ b/pages/group_order/components/groupMerchants.vue
@@ -10,7 +10,7 @@
 		</view>
 		<view class="addreeStyle">
 			<image src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/drder/dingwei.png"
-				style="width: 17.9rpx;height: 22rpx;margin-right: 6rpx;" mode=""></image>{{info.distances}}km |
+				style="width: 17.9rpx;height: 22rpx;margin-right: 6rpx;" mode=""></image>{{info.distances}} |
 			{{info.address}}
 		</view>
 		<view class="rightStyle">
diff --git a/pages/index/drinks.vue b/pages/index/drinks.vue
index c4910ef..5be53c1 100644
--- a/pages/index/drinks.vue
+++ b/pages/index/drinks.vue
@@ -35,7 +35,7 @@
 									{{item.shopName}}
 								</view>
 								<view>
-									龙首.{{item.distances}}km
+									{{item.distances}}
 								</view>
 							</view>
 							<view class="fivecontent_item_nav_lefttopstart flex-start">
diff --git a/pages/index/hotlist.vue b/pages/index/hotlist.vue
index 124f88a..e531358 100644
--- a/pages/index/hotlist.vue
+++ b/pages/index/hotlist.vue
@@ -47,7 +47,7 @@
 										</image>
 										<view> {{item.productName}}</view>
 									</view>
-									<text class="fivecontent_item_boxitemlefttow_t">{{item.distances}}km</text>
+									<text class="fivecontent_item_boxitemlefttow_t">{{item.distances}}</text>
 								</view>
 								<view class="fivecontent_item_boxitemlefthere flex-start">
 									<view class="fivecontent_item_boxitemlefthere_one flex-start">
diff --git a/pages/index/tothestore.vue b/pages/index/tothestore.vue
index 55e77ab..22209cb 100644
--- a/pages/index/tothestore.vue
+++ b/pages/index/tothestore.vue
@@ -27,7 +27,7 @@
 								{{item.address.length>7?item.address.substring(0,7)+'...':item.address}}
 							</view>
 							<view class="fivecontent_itemoneboxtow_t">
-								{{item.distances}}km
+								{{item.distances}}
 							</view>
 						</view>
 					</view>
diff --git a/pages/order/successful.vue b/pages/order/successful.vue
index 405aefb..1409dc7 100644
--- a/pages/order/successful.vue
+++ b/pages/order/successful.vue
@@ -148,9 +148,6 @@
 			}, 1000)
 			this.getinfo(e.orderId)
 			this.orderInfo = JSON.parse(e.orderInfo)
-			console.log('调试1', e)
-			console.log('调试2', JSON.parse(e.orderInfo))
-			console.log('调试3', this.orderInfo)
 		},
 		computed: {
 			HeighT() { //手机类型的尺寸
diff --git a/pages/order_detail/order_detail.vue b/pages/order_detail/order_detail.vue
index 17c59b7..f6cd4e7 100644
--- a/pages/order_detail/order_detail.vue
+++ b/pages/order_detail/order_detail.vue
@@ -426,7 +426,7 @@
 					let isVip = uni.cache.get('userInfo').isPwd
 					if (isVip == 0) {
 						uni.pro.navigateTo('/pages/user/repairpassword', {
-							// shopId_id: uni.cache.get('shopUser')
+							shopId_id: uni.cache.get('shopUser')
 						})
 					} else {
 						this.ispws = true
diff --git a/pages/product/generalstore.vue b/pages/product/generalstore.vue
index 54b78c9..7bc480d 100644
--- a/pages/product/generalstore.vue
+++ b/pages/product/generalstore.vue
@@ -17,7 +17,7 @@
 				<image class="contentitemthere_image"
 					src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/product/d.png" mode="aspectFill"></image>
 				<view class="contentitemthere_t">
-					距您{{item.distances}}km<text v-if="item.address">,{{item.address}}</text>
+					距您{{item.distances}}<text v-if="item.address">,{{item.address}}</text>
 				</view>
 				<u-icon name="arrow-right" color="#999999" size="28"></u-icon>
 			</view>
diff --git a/pages/product/index.vue b/pages/product/index.vue
index 94aca6d..f593443 100644
--- a/pages/product/index.vue
+++ b/pages/product/index.vue
@@ -467,6 +467,7 @@
 			bottom: 0;
 			left: 0;
 			width: 100%;
+			height: 180rpx;
 			padding: 24rpx 28rpx;
 			background: #FFFFFF;
 			z-index: 999;
diff --git a/pages/product/placeOrder.vue b/pages/product/placeOrder.vue
index c9e5042..188325a 100644
--- a/pages/product/placeOrder.vue
+++ b/pages/product/placeOrder.vue
@@ -40,16 +40,16 @@
 			<view style="background-color: #F6F6F6;height: 2rpx;width: 100%;margin: 16rpx 0;"></view>
 			<view class="jiesuanmoney">
 				<text>
-					优惠<text style="color: #FF4C11;font-weight: 500;">￥{{info.save * Quantity}}</text>
+					优惠<text style="color: #FF4C11;font-weight: 500;">￥{{calculateEvent(info.save)}}</text>
 				</text>
 				<text>
-					小计<text style="color: #FF4C11;font-weight: 500;">￥{{info.salePrice * Quantity}}</text>
+					小计<text style="color: #FF4C11;font-weight: 500;">￥{{calculateEvent(info.salePrice) }}</text>
 				</text>
 			</view>
 
 		</view>
 		<!-- 支付方式 -->
-		<view class="payType">
+		<view class="payType" >
 			<view class="">
 				支付方式
 			</view>
@@ -65,9 +65,8 @@
 							</text>
 						</view>
 					</u-radio>
-					<view style="margin: 22rpx 0;width: 100%;height: 2rpx;background-color: #E5E5E5;">
-					</view>
-					<u-radio activeColor="#ffd158" name="2">
+					<view style="margin: 22rpx 0;width: 100%;height: 2rpx;background-color: #E5E5E5;" v-if="info.isUseVip==1">					</view>
+					<u-radio activeColor="#ffd158" name="2" v-if="info.isUseVip==1">
 						<view class="dfs">
 							<image style="width:44rpx;height:44rpx"
 								src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/drder/wechat.png" mode="">
@@ -77,7 +76,7 @@
 						</view>
 					</u-radio>
 				</u-radio-group>
-				<view style="font-weight: 400;font-size: 24rpx;color: #333333;margin-left: 60rpx;">
+				<view style="font-weight: 400;font-size: 24rpx;color: #333333;margin-left: 60rpx;" v-if="info.isUseVip==1">
 					会员卡余额{{ amountVIP.amount}} <text
 						style="font-weight: 500;font-size: 28rpx;margin-left: 16rpx;color: #FF4C11;"
 						@click="goRecharge">去充值</text>
@@ -88,11 +87,12 @@
 		<view class="placeBottom">
 			<view class="">
 				<text style="font-size: 24rpx;font-weight: bold;"> 合计 </text><text
-					style="font-size: 32rpx;font-weight: bold;color:#FF4C11"> ￥{{info.salePrice * Quantity}} </text>
+					style="font-size: 32rpx;font-weight: bold;color:#FF4C11"> ￥{{calculateEvent(info.salePrice)}}
+				</text>
 				<text style="font-size: 24rpx;font-weight: 400;color: #	999;">含优惠卷包￥0</text>
 			</view>
 			<view class="">
-				共{{Quantity}}件 已优惠￥{{info.save * Quantity}}
+				共{{Quantity}}件 已优惠￥{{calculateEvent(info.save) }}
 			</view>
 			<button class="btnStyle" @click="sumbitFrom">提交订单</button>
 		</view>
@@ -140,11 +140,16 @@
 			async accountPayevent(pwd) {
 				this.ispws = false
 				let res = await this.api.payOrderPay({
-					orderId: this.listinfoid,
+					orderId: this.listinfoid.id,
 					payType: "deposit",
 					pwd
 				})
 				if (res.code == 0) {
+					let orderInfo = {
+						createdAt:this.listinfoid.createTime,
+						orderNo:this.listinfoid.orderNo,
+						orderAmount:this.calculateEvent(this.info.salePrice)
+					}
 					uni.showToast({
 						icon: 'none',
 						title: '支付成功',
@@ -152,8 +157,7 @@
 							setTimeout(res => {
 								uni.redirectTo({
 									url: '/pages/order/successful?orderId=' + this
-										.listinfoid + '&orderInfo=' + JSON.stringify(
-											this.orderInfo)
+										.listinfoid.id + '&orderInfo=' + JSON.stringify(orderInfo)
 								});
 							}, 1000)
 						}
@@ -165,6 +169,9 @@
 					}, 2000)
 				}
 			},
+			calculateEvent(d) {
+				return (d * 1000 * this.Quantity)/1000
+			},
 			goRecharge() {
 				uni.pro.navigateTo('/pages/member/index', {
 					shopId_id: this.info.shopId
@@ -180,7 +187,7 @@
 					orderAmount: payMoney
 				})
 				if (res.code == 0) {
-					this.listinfoid = res.data.id
+					this.listinfoid = res.data
 					// radiovalue1:为1的时候微信支付,为2是会员卡,需要输入支付密码
 					if (this.radiovalue1 == 1) {
 						// 调用支付接口
@@ -190,7 +197,7 @@
 						let isVip = uni.cache.get('userInfo').isPwd
 						if (isVip == 0) {
 							uni.pro.navigateTo('/pages/user/repairpassword', {
-								// shopId_id: uni.cache.get('shopUser')
+								shopId_id: uni.cache.get('shopUser')
 							})
 						} else {
 							this.ispws = true
diff --git a/uni_modules/cc-defineKeyboard/components/cc-defineKeyboard/cc-defineKeyboard.vue b/uni_modules/cc-defineKeyboard/components/cc-defineKeyboard/cc-defineKeyboard.vue
index a63e3f4..6a5f80d 100644
--- a/uni_modules/cc-defineKeyboard/components/cc-defineKeyboard/cc-defineKeyboard.vue
+++ b/uni_modules/cc-defineKeyboard/components/cc-defineKeyboard/cc-defineKeyboard.vue
@@ -1,11 +1,14 @@
 <template>
 	<view class="page-total" v-show="isShow">
 		<view class="key-list">
-			<view class="list" v-for="(item,index) in keyList" 
-			:class="{'special':item.keyCode==190||item.keyCode==8}"
-			@click="onKeyList(item,index)"
-			:key="item.keyCode">
-				<text>{{item.key}}</text>
+			<view class="list" v-for="(item,index) in keyList" :class="{'special':item.keyCode==190||item.keyCode==8}"
+				@click="onKeyList(item,index)" :key="item.keyCode">
+				<block v-if="item.keyCode!=8">
+					<text>{{item.key}}</text>
+				</block>
+				<block v-else>
+					<image style="width: 80rpx;height: 80rpx;" src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/drder/tuige.png" mode=""></image>
+				</block>
 			</view>
 		</view>
 	</view>
@@ -16,71 +19,69 @@
 		data() {
 			return {
 				isShow: false,
-				keyList: [
-					{
-						key: 1,
-						en: '',
-						keyCode: 49,
-					},{
-						key: 2,
-						en: 'ABC',
-						keyCode: 50,
-					},{
-						key: 3,
-						en: 'ABC',
-						keyCode: 51,
-					},{
-						key: 4,
-						en: 'ABC',
-						keyCode: 52,
-					},{
-						key: 5,
-						en: 'ABC',
-						keyCode: 53,
-					},{
-						key: 6,
-						en: 'ABC',
-						keyCode: 54,
-					},{
-						key: 7,
-						en: 'ABC',
-						keyCode: 55,
-					},{
-						key: 8,
-						en: 'ABC',
-						keyCode: 56,
-					},{
-						key: 9,
-						en: 'ABC',
-						keyCode: 57,
-					},{
-						key: '.',
-						en: 'ABC',
-						keyCode: 190,
-					},{
-						key: 0,
-						en: 'ABC',
-						keyCode: 48,
-					},{
-						key: 'del',
-						en: 'DEL',
-						keyCode: 8,
-					},
-				],
+				keyList: [{
+					key: 1,
+					en: '',
+					keyCode: 49,
+				}, {
+					key: 2,
+					en: 'ABC',
+					keyCode: 50,
+				}, {
+					key: 3,
+					en: 'ABC',
+					keyCode: 51,
+				}, {
+					key: 4,
+					en: 'ABC',
+					keyCode: 52,
+				}, {
+					key: 5,
+					en: 'ABC',
+					keyCode: 53,
+				}, {
+					key: 6,
+					en: 'ABC',
+					keyCode: 54,
+				}, {
+					key: 7,
+					en: 'ABC',
+					keyCode: 55,
+				}, {
+					key: 8,
+					en: 'ABC',
+					keyCode: 56,
+				}, {
+					key: 9,
+					en: 'ABC',
+					keyCode: 57,
+				}, {
+					key: '.',
+					en: 'ABC',
+					keyCode: 190,
+				}, {
+					key: 0,
+					en: 'ABC',
+					keyCode: 48,
+				}, {
+					key: 'del',
+					en: 'DEL',
+					keyCode: 8,
+				}, ],
 				keyIndex: -1,
 			};
 		},
-		props:{
+		props: {
 			passwrdType: {
 				type: String,
 				default: 'pay'
 			}
 		},
-		methods:{
-			show(){
+		methods: {
+			show() {
 				this.isShow = true;
 			},
-			hide(){
+			hide() {
 				this.isShow = false;
 			},
 			/**
@@ -88,17 +89,17 @@
 			 * @param {Object} item
 			 * @param {Number} index
 			 */
-			onKeyList(item,index){
-				let KeyInfo = item;	
+			onKeyList(item, index) {
+				let KeyInfo = item;
 				// 删除键
-				if(KeyInfo.keyCode === 8 && this.keyIndex > -1){
+				if (KeyInfo.keyCode === 8 && this.keyIndex > -1) {
 					this.keyIndex--;
 				}
-				this.$emit('KeyInfo',KeyInfo);
+				this.$emit('KeyInfo', KeyInfo);
 				// 不是删除键
-				if(KeyInfo.keyCode != 8){
-						console.log(this.keyIndex,'支付键盘');
-					if( this.keyIndex =	 4){
+				if (KeyInfo.keyCode != 8) {
+					console.log(this.keyIndex, '支付键盘');
+					if (this.keyIndex = 4) {
 						this.keyIndex = -1;
 						return;
 					}
@@ -112,4 +113,4 @@
 
 <style scoped lang="scss">
 	@import 'cc-defineKeyboard.scss';
-</style>
+</style>
\ No newline at end of file

From af720a1bab23305a85d337a4b8572aaa96bd6b30 Mon Sep 17 00:00:00 2001
From: duan <1004387497@qq.com>
Date: Mon, 27 May 2024 13:36:21 +0800
Subject: [PATCH 6/8] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/js/api.js                    | 2 +-
 pages/index/coupons/index.vue       | 4 +++-
 pages/order_detail/order_detail.vue | 4 ++--
 pages/product/placeOrder.vue        | 7 ++++++-
 pages/user/coupon.vue               | 3 ++-
 5 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/common/js/api.js b/common/js/api.js
index 90c3576..d891428 100644
--- a/common/js/api.js
+++ b/common/js/api.js
@@ -143,7 +143,7 @@ export default {
 		return uni.api.get("/distirict/comShopList", data);
 	},
 	loginOut(data) { //退出登录
-		return uni.api.post("/login /loginOut", data);
+		return uni.api.post("/login/loginOut", data);
 	},
 	productqueryShopIdByTableCode(data) { //通过桌码获取shopId
 		return uni.api.get("/product/queryShopIdByTableCode", data);
diff --git a/pages/index/coupons/index.vue b/pages/index/coupons/index.vue
index 8abed28..f81b8fa 100644
--- a/pages/index/coupons/index.vue
+++ b/pages/index/coupons/index.vue
@@ -124,6 +124,7 @@
 			};
 		},
 		onLoad(e) {
+			console.log(e,'调试1')
 			try {
 				this.orderfood = e.orderfood //等于0扫码点餐下单
 				this.amount = e.amount
@@ -193,7 +194,8 @@
 					userId: uni.cache.get('userInfo').id,
 					status: 0,
 					page: this.form.page,
-					size: this.form.size
+					size: this.form.size,
+					orderId:''
 				})
 				try {
 					this.totalnumber = res.data.total
diff --git a/pages/order_detail/order_detail.vue b/pages/order_detail/order_detail.vue
index f6cd4e7..c04e5be 100644
--- a/pages/order_detail/order_detail.vue
+++ b/pages/order_detail/order_detail.vue
@@ -316,8 +316,8 @@
 			orderfoodindex() {
 				uni.pro.navigateTo('index/coupons/index', {
 					orderfood: 0,
+					orderId :this.listinfoid,
 					amount: this.listinfo.amounts
-
 				})
 			},
 			copyHandle(e) {
@@ -423,7 +423,7 @@
 				} else {
 					// 判断是否有绑定支付密码
 					// 先判断是否设置支付密码。0是没设置。没设置的情况下跳转到设置页面。有的话输入支付密码
-					let isVip = uni.cache.get('userInfo').isPwd
+					let isVip =  uni.cache.get('userInfo').isPwd
 					if (isVip == 0) {
 						uni.pro.navigateTo('/pages/user/repairpassword', {
 							shopId_id: uni.cache.get('shopUser')
diff --git a/pages/product/placeOrder.vue b/pages/product/placeOrder.vue
index 188325a..21cb975 100644
--- a/pages/product/placeOrder.vue
+++ b/pages/product/placeOrder.vue
@@ -108,6 +108,8 @@
 		},
 		onLoad(e) {
 			this.getInfo(e.id)
+			
+			
 			this.orderIds = e.id
 			this.amount = uni.cache.get('userInfo').amount
 			this.vipId = uni.cache.get('userInfo').id
@@ -134,6 +136,7 @@
 				})
 				if (res.code == 0) {
 					this.amountVIP = res.data
+					
 				}
 			},
 			// 余额支付
@@ -194,7 +197,8 @@
 						this.payEvent(res.data.id)
 					} else {
 						// 先判断是否设置支付密码。0是没设置。没设置的情况下跳转到设置页面。有的话输入支付密码
-						let isVip = uni.cache.get('userInfo').isPwd
+						let isVip =  uni.cache.get('userInfo').isPwd
+						console.log(isVip,'调试1')
 						if (isVip == 0) {
 							uni.pro.navigateTo('/pages/user/repairpassword', {
 								shopId_id: uni.cache.get('shopUser')
@@ -249,6 +253,7 @@
 				})
 				if (res.code == 0) {
 					this.info = res.data
+					uni.cache.set('shopUser', res.data.shopId);
 					// 获取余额
 					this.getAount()
 				}
diff --git a/pages/user/coupon.vue b/pages/user/coupon.vue
index b1563a9..9c4e07e 100644
--- a/pages/user/coupon.vue
+++ b/pages/user/coupon.vue
@@ -109,7 +109,8 @@
 						userId: uni.cache.get('userInfo').id,
 						status: this.form.statuses,
 						page: this.form.page,
-						size: this.form.size
+						size: this.form.size,
+						orderId:""
 					})
 					if (res.data.pages < this.form.page) {
 						this.form.status = 'nomore'

From 2ea1f162b0ca7cfa75cc0a25b5c555e9876b8710 Mon Sep 17 00:00:00 2001
From: duan <1004387497@qq.com>
Date: Mon, 27 May 2024 13:55:36 +0800
Subject: [PATCH 7/8] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=94=AF=E4=BB=98?=
 =?UTF-8?q?=E9=98=B2=E6=8A=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/coupons/index.vue       | 1 -
 pages/order_detail/order_detail.vue | 7 +++++--
 pages/product/placeOrder.vue        | 7 +++++--
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/pages/index/coupons/index.vue b/pages/index/coupons/index.vue
index f81b8fa..570840d 100644
--- a/pages/index/coupons/index.vue
+++ b/pages/index/coupons/index.vue
@@ -124,7 +124,6 @@
 			};
 		},
 		onLoad(e) {
-			console.log(e,'调试1')
 			try {
 				this.orderfood = e.orderfood //等于0扫码点餐下单
 				this.amount = e.amount
diff --git a/pages/order_detail/order_detail.vue b/pages/order_detail/order_detail.vue
index c04e5be..98750d2 100644
--- a/pages/order_detail/order_detail.vue
+++ b/pages/order_detail/order_detail.vue
@@ -171,7 +171,7 @@
 						以优惠¥{{emitorderfoodform.couponsPrice}}
 					</view>
 				</view>
-				<view class="fixedview_tow" @click="showpopupclick">
+				<view class="fixedview_tow" @click="shopEvent">
 					立即付款
 				</view>
 			</view>
@@ -336,6 +336,10 @@
 					orderId: this.listinfoid
 				})
 			},
+			// 防抖去结算
+			shopEvent(){
+				uni.$u.throttle(this.showpopupclick, 500)
+			},
 			// 去结算
 			showpopupclick() {
 				if (this.numValue == 0) {
@@ -365,7 +369,6 @@
 			},
 
 			async showpopupclickdd(i) {
-				console.log(this.radiovalue1, '调试121')
 
 				if (this.radiovalue1 == 1) {
 					let res = await this.api.payorderPay({
diff --git a/pages/product/placeOrder.vue b/pages/product/placeOrder.vue
index 21cb975..6906170 100644
--- a/pages/product/placeOrder.vue
+++ b/pages/product/placeOrder.vue
@@ -94,7 +94,7 @@
 			<view class="">
 				共{{Quantity}}件 已优惠￥{{calculateEvent(info.save) }}
 			</view>
-			<button class="btnStyle" @click="sumbitFrom">提交订单</button>
+			<button class="btnStyle" @click="sumbitFroms">提交订单</button>
 		</view>
 		<payPassword ref="payPwd" @accountPayevent="accountPayevent" v-show="ispws"></payPassword>
 	</view>
@@ -180,6 +180,10 @@
 					shopId_id: this.info.shopId
 				})
 			},
+			// 防抖
+			sumbitFroms(){
+				uni.$u.throttle(this.sumbitFrom, 500)
+			},
 			async sumbitFrom() {
 				let payMoney = this.info.salePrice * this.Quantity
 				let res = await this.api.creatGroupOrder({
@@ -198,7 +202,6 @@
 					} else {
 						// 先判断是否设置支付密码。0是没设置。没设置的情况下跳转到设置页面。有的话输入支付密码
 						let isVip =  uni.cache.get('userInfo').isPwd
-						console.log(isVip,'调试1')
 						if (isVip == 0) {
 							uni.pro.navigateTo('/pages/user/repairpassword', {
 								shopId_id: uni.cache.get('shopUser')

From d67ab4d9b6f8f61a86eb087f32da438d68b343c8 Mon Sep 17 00:00:00 2001
From: duan <1004387497@qq.com>
Date: Mon, 27 May 2024 14:05:26 +0800
Subject: [PATCH 8/8] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=A4=B4=E5=83=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/user/information.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pages/user/information.vue b/pages/user/information.vue
index 442100d..7eb8eae 100644
--- a/pages/user/information.vue
+++ b/pages/user/information.vue
@@ -10,7 +10,7 @@
 				</button> -->
 				<!-- <image class="onecontentboximage" :src="userHeadImg" mode="" @click="uploadImg"></image> -->
 				<button type="default" class="btn" open-type="chooseAvatar" @chooseavatar="uploadImg">
-					<view class="" :style="'background-image:url('+userHeadImg+');'" style="width: 180rxp;height: 180rpx;"></view>
+					<view class="" :style="'background-image:url('+userHeadImg+');'" style="width: 180rxp;height: 180rpx; background-position: center;"></view>
 				</button>
 
 
@@ -218,8 +218,8 @@
 		}
 	}
 	.btn{
-		width: 200rpx;
-		height: 200rpx;
+		width: 180rpx;
+		height: 180rpx;
 		border-radius: 100%;
 		padding: 0;
 		>view{