diff --git a/api/order.js b/api/order.js
index 29beff4..49cb8fd 100644
--- a/api/order.js
+++ b/api/order.js
@@ -9,6 +9,14 @@
 // +----------------------------------------------------------------------
 import request from "@/utils/request.js";
 
+/**
+ * 校验支付密码是否正确
+ * @param numType 
+ */
+export function verifyPwd(data) {
+	return request.post("order/verifyPwd", data);
+}
+
 /**
  * 上传对公账户凭证
  * @param numType boolean true 购物车数量,false=购物车产品数量
diff --git a/components/payPwd/index.vue b/components/payPwd/index.vue
new file mode 100644
index 0000000..fdf46c7
--- /dev/null
+++ b/components/payPwd/index.vue
@@ -0,0 +1,92 @@
+<template>
+	<uni-popup ref="payModal" type="center" safeArea :animation="true">
+		<view class="payModal">
+			<view class="payModal-title">{{code == 101?'未设置密码':'支付密码错误'}}</view>
+			<view class="payModal-btns">
+				<view class="wrap" style="display: flex;flex: 1;" v-if="code == 101">
+					<view class="payModal-btns-left payModal-common" @click="handleClick(1)">设置密码</view>
+					<view class="payModal-btns-right payModal-common" @click="handleClick(2)">取消</view>
+				</view>
+				<view class="wrap" style="display: flex;flex: 1;" v-else>
+					<view class="payModal-btns-left payModal-common" @click="handleClick(1)">忘记密码</view>
+					<view class="payModal-btns-right payModal-common" @click="handleClick(2)">重试</view>
+				</view>
+			</view>
+		</view>
+	</uni-popup>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				code: ''
+			}
+		},
+		methods: {
+
+			// 打开
+			handleOpen(code) {
+				this.code = code;
+				this.$refs.payModal.open();
+			},
+
+			// 关闭
+			handleClose() {
+				this.$refs.payModal.close();
+			},
+
+			handleClick(type) {
+				if (type == 1) {
+					this.$emit('left', this.code);
+				} else {
+					this.$emit("right", this.code);
+				}
+			}
+		}
+	}
+</script>
+
+
+<style lang="scss">
+	.payModal {
+		width: 600rpx;
+		background-color: #fff;
+		border-radius: 30rpx;
+
+		.payModal-title {
+			text-align: center;
+			padding: 40rpx 50rpx 50rpx;
+			font-size: 30rpx;
+			color: #333;
+			border-bottom: 2rpx solid #e6e6e6;
+		}
+
+		.payModal-btns {
+			display: flex;
+			flex: 1;
+
+			.payModal-btns-left {
+				height: 88rpx;
+				line-height: 88rpx;
+				flex: 1;
+				text-align: center;
+				font-weight: bold;
+				border-right: 2rpx solid #e6e6e6;
+				color: #333;
+			}
+
+			.payModal-btns-right {
+				color: #2a5ac2;
+			}
+
+			.payModal-common {
+				height: 88rpx;
+				line-height: 88rpx;
+				flex: 1;
+				text-align: center;
+				font-weight: bold;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/components/payment/index.vue b/components/payment/index.vue
index 280bfa8..c4e609c 100644
--- a/components/payment/index.vue
+++ b/components/payment/index.vue
@@ -4,8 +4,8 @@
 			<view class="title acea-row row-center-wrapper">
 				选择付款方式<text class="iconfont icon-guanbi" @click='close'></text>
 			</view>
-			<view class="item acea-row row-between-wrapper" @click='goPay(item.number || 0 , item.value)' v-for="(item,index) in payMode" v-if="item.payStatus==1"
-			 :key="index">
+			<view class="item acea-row row-between-wrapper" @click='goPay(item.number || 0 , item.value)'
+				v-for="(item,index) in payMode" v-if="item.payStatus==1" :key="index">
 				<view class="left acea-row row-between-wrapper">
 					<view class="iconfont" :class="item.icon"></view>
 					<view class="text">
@@ -20,6 +20,12 @@
 			</view>
 		</view>
 		<view class="mask" ref="close" @click='close' v-if="pay_close"></view>
+
+		<!-- 支付密码 键盘 -->
+		<popups ref="popups" :isPay="true" @confirm="handleConfirm" @clear="handleClear" @change="handleChange" />
+
+		<!-- 密码错误事件处理 -->
+		<payPwd ref="payPwd" @left="handleLeft" @right="handleRight"></payPwd>
 	</view>
 </template>
 
@@ -36,9 +42,16 @@
 	import {
 		orderPay,
 		integralOrderPay,
-		presellOrderPay
+		presellOrderPay,
+		verifyPwd
 	} from '@/api/order.js';
+	import payPwd from "@/components/payPwd/index.vue";
+	import popups from "@/components/popups/index.vue";
 	export default {
+		components: {
+			payPwd,
+			popups
+		},
 		props: {
 			payMode: {
 				type: Array,
@@ -73,12 +86,10 @@
 		},
 		data() {
 			return {
-
+				type: ''
 			};
 		},
-		mounted:function(){
-			
-		},
+
 		methods: {
 			close: function() {
 				this.$emit('onChangeFun', {
@@ -106,13 +117,15 @@
 					// #endif
 				} else if (paytype == 'balance') {
 					type = 'balance';
-				}else if(paytype == 'alipay'){
+				} else if (paytype == 'alipay') {
 					// #ifndef MP
 					type = 'alipay';
 					// #endif					
 					// #ifdef MP
 					type = 'alipayQr';
 					// #endif
+				} else if (paytype == 'public') {
+					type = 'public';
 				}
 				if (!that.order_id) return that.$util.Tips({
 					title: '请选择要支付的订单'
@@ -120,14 +133,72 @@
 				if (paytype == 'balance' && parseFloat(number) < parseFloat(that.totalPrice)) return that.$util.Tips({
 					title: '余额不足！'
 				});
-				uni.showLoading({
-					title: '支付中'
+
+				this.type = type;
+
+				if (paytype == 'balance' || paytype == 'merBalance') {
+					this.$refs.popups.handleOpen();
+				} else {
+					uni.showLoading({
+						title: '订单支付中'
+					});
+					this.trueOrderPay();
+				}
+			},
+
+			// 输入密码回调
+			handleConfirm(e) {
+				// 验证密码是否正确
+				verifyPwd({
+					withdrawal_pwd: e
+				}).then(res => {
+					// 密码是否有效 状态码判断
+					const code = res.data.code;
+
+					if (code == 100) { //密码正确
+						uni.showLoading({
+							title: '订单支付中',
+							mask: true
+						});
+						this.trueOrderPay();
+					} else {
+						this.$refs.payPwd.handleOpen(code);
+					}
+				}).catch(err => {
+					console.log(err)
+				})
+			},
+
+			handleClear() {},
+			handleChange() {},
+
+			// 弹框左边按钮 101 未设置密码  102 忘记密码 都去设置密码
+			handleLeft(code) {
+				uni.navigateTo({
+					url: "/pages/users/user_modify_pwd/index?type=payPwd"
 				});
-				let orderApi = that.order_type === 1 ? presellOrderPay : that.order_type === 2 ? integralOrderPay : orderPay		
+				this.$refs.payPwd.handleClose();
+			},
+
+			// 弹框右边按钮 取消 重试
+			handleRight(code) {
+				if (code == 101) { //取消
+					this.$refs.payPwd.handleClose(code);
+				} else {
+					this.$refs.payPwd.handleClose();
+					this.$refs.popups.handleOpen();
+				}
+			},
+
+			trueOrderPay() {
+				let that = this;
+				let orderApi = that.order_type === 1 ? presellOrderPay : that.order_type === 2 ? integralOrderPay :
+					orderPay
 				orderApi(that.order_id, {
-					type: type,
+					type: that.type,
 					// #ifdef H5
-					return_url: that.returnUrl!=='' ? 'http://'+window.location.host+that.returnUrl : 'http://'+window.location.host+'/pages/users/order_list/index',
+					return_url: that.returnUrl !== '' ? 'http://' + window.location.host + that.returnUrl :
+						'http://' + window.location.host + '/pages/users/order_list/index',
 					// #endif
 				}).then(res => {
 					let status = res.data.status,
@@ -135,7 +206,7 @@
 						jsConfig = res.data.result.config,
 						callback_key = res.data.result.pay_key,
 						goPages = that.returnUrl ? that.returnUrl : '/pages/users/order_list/index';
-					switch (status) {			
+					switch (status) {
 						case 'ORDER_EXIST':
 						case 'EXTEND_ORDER':
 						case 'PAY_ERROR':
@@ -146,13 +217,13 @@
 							});
 							return that.$util.Tips({
 								title: res.message
-							});							
+							});
 							break;
 						case 'success':
 							uni.hideLoading();
 							this.$emit('onChangeFun', {
 								action: 'payClose'
-							});							
+							});
 							return that.$util.Tips({
 								title: '支付成功',
 								icon: 'success'
@@ -166,20 +237,21 @@
 							uni.hideLoading();
 							this.$emit('onChangeFun', {
 								action: 'payClose'
-							});				
+							});
 							uni.navigateTo({
-								url: '/pages/order_pay_back/index?keyCode='+callback_key+'&url='+jsConfig,
-							})	
-							return 								
-							break;	
-						// #ifndef MP
+								url: '/pages/order_pay_back/index?keyCode=' + callback_key + '&url=' +
+									jsConfig,
+							})
+							return
+							break;
+							// #ifndef MP
 						case "wechat":
 						case "weixin":
 						case "weixinApp":
 							jsConfig.timeStamp = jsConfig.timestamp;
 							// #ifndef APP-PLUS
-							that.$wechat.pay(jsConfig).then(res => {	
-								console.log('测试支付数据无效的success：'+res.data)
+							that.$wechat.pay(jsConfig).then(res => {
+								console.log('测试支付数据无效的success：' + res.data)
 								this.$emit('onChangeFun', {
 									action: 'payClose'
 								});
@@ -187,34 +259,34 @@
 								return that.$util.Tips({
 									title: '支付成功',
 									icon: 'success'
-								}, {	
+								}, {
 									tab: 5,
 									url: goPages + 'status=1'
 								});
 							}).catch(res => {
-								console.log('测试支付数据无效的catch：'+res.data)
-								if (res.errMsg == 'chooseWXPay:cancel'){
-									if(that.isCall){
+								console.log('测试支付数据无效的catch：' + res.data)
+								if (res.errMsg == 'chooseWXPay:cancel') {
+									if (that.isCall) {
 										return that.$util.Tips({
 											title: '取消支付'
 										});
-									}else{
+									} else {
 										return that.$util.Tips({
 											title: '取消支付'
-										}, {	
+										}, {
 											tab: 5,
 											url: goPages + '?status=0'
 										});
 									}
-								} 
+								}
 							})
 							// #endif
 							// #ifdef APP-PLUS
-							let mp_pay_name=''
-							if(uni.requestOrderPayment){
-								mp_pay_name='requestOrderPayment'
-							}else{
-								mp_pay_name='requestPayment'
+							let mp_pay_name = ''
+							if (uni.requestOrderPayment) {
+								mp_pay_name = 'requestOrderPayment'
+							} else {
+								mp_pay_name = 'requestPayment'
 							}
 							uni[mp_pay_name]({
 								provider: 'wxpay',
@@ -226,20 +298,20 @@
 									return that.$util.Tips({
 										title: '支付成功',
 										icon: 'success'
-									}, {	
+									}, {
 										tab: 5,
 										url: goPages + 'status=1'
 									});
 								},
 								fail: (e) => {
-									if(that.isCall){
+									if (that.isCall) {
 										return that.$util.Tips({
 											title: '取消支付'
 										});
-									}else{
+									} else {
 										return that.$util.Tips({
 											title: '取消支付'
-										}, {	
+										}, {
 											tab: 5,
 											url: goPages + '?status=0'
 										});
@@ -251,16 +323,16 @@
 							});
 							// #endif
 							break;
-						// #endif
-						// #ifdef MP
+							// #endif
+							// #ifdef MP
 						case "routine":
 							jsConfig.timeStamp = jsConfig.timestamp;
 							that.toPay = true;
-							let mp_pay_name=''
-							if(uni.requestOrderPayment){
-								mp_pay_name='requestOrderPayment'
-							}else{
-								mp_pay_name='requestPayment'
+							let mp_pay_name = ''
+							if (uni.requestOrderPayment) {
+								mp_pay_name = 'requestOrderPayment'
+							} else {
+								mp_pay_name = 'requestPayment'
 							}
 							uni[mp_pay_name]({
 								...jsConfig,
@@ -269,19 +341,20 @@
 									that.$emit('onChangeFun', {
 										action: 'payClose'
 									});
-									if (that.BargainId || that.combinationId || that.pinkId || that.seckillId)
+									if (that.BargainId || that.combinationId || that.pinkId || that
+										.seckillId)
 										return that.$util.Tips({
 											title: '支付成功',
 											icon: 'success'
-										}, {	
+										}, {
 											tab: 5,
 											url: goPages + '?status=1'
 										});
-									
+
 									return that.$util.Tips({
 										title: '支付成功',
 										icon: 'success'
-									}, {		
+									}, {
 										tab: 5,
 										url: goPages + '?status=1'
 									});
@@ -296,7 +369,7 @@
 									});
 								},
 								complete: function(e) {
-									uni.hideLoading();									
+									uni.hideLoading();
 									//关闭当前页面跳转至订单状态
 									if (res.errMsg == 'requestPayment:cancel') return that.$util.Tips({
 										title: '取消支付'
@@ -307,7 +380,7 @@
 								},
 							})
 							break;
-						// #endif
+							// #endif
 						case "balance":
 							uni.hideLoading();
 							that.$emit('onChangeFun', {
@@ -318,9 +391,19 @@
 								title: res.message
 							});
 							break;
-						// #ifdef H5
+							// #ifdef H5
+						case "public":
+							uni.hideLoading();
+							that.$emit('onChangeFun', {
+								action: 'payClose'
+							});
+							//余额不足
+							return that.$util.Tips({
+								title: "下单成功,请上传付款凭证!"
+							});
+							break;
 						case 'h5':
-							let host = window.location.protocol+"//"+window.location.host;
+							let host = window.location.protocol + "//" + window.location.host;
 							let url = `${host}/pages/order_pay_status/index?order_id=${orderId}`
 							let eUrl = encodeURIComponent(url)
 							let jsurl = jsConfig.mweb_url || jsConfig.h5_url
@@ -329,9 +412,9 @@
 								location.href = locations;
 							}, 100);
 							break;
-						// #endif	
-							
-						// #ifdef APP-PLUS
+							// #endif	
+
+							// #ifdef APP-PLUS
 						case 'alipayApp':
 							uni.requestPayment({
 								provider: 'alipay',
@@ -343,11 +426,11 @@
 									return that.$util.Tips({
 										title: '支付成功',
 										icon: 'success'
-									}, {	
+									}, {
 										tab: 5,
 										url: goPages + 'status=1'
 									});
-							
+
 								},
 								fail: (e) => {
 									return that.$util.Tips({
@@ -358,8 +441,8 @@
 									uni.hideLoading();
 								},
 							});
-						break;
-						// #endif
+							break;
+							// #endif
 					}
 				}).catch(err => {
 					uni.hideLoading();
@@ -463,4 +546,4 @@
 		font-size: 0.3rpx;
 		color: #999;
 	}
-</style>
+</style>
\ No newline at end of file
diff --git a/components/popups/index.vue b/components/popups/index.vue
index cd3a3aa..7368a9b 100644
--- a/components/popups/index.vue
+++ b/components/popups/index.vue
@@ -1,37 +1,80 @@
 <template>
-	<uni-popup ref="popup" type="bottom" mask-background-color="rgba(0,0,0,0)" safeArea backgroundColor="#fff"
-		:animation="true" @maskClick="maskClick">
-		<view class="keyboard">
-			<view class="keyboard-left">
-				<block v-for="(item,indx) in keys" :key="indx">
-					<view class="keyboard-left-item word active" v-if="item != 'del'" @click="handleClick(item)">
-						{{item}}
+	<view>
+		<uni-popup ref="popup" type="bottom" :mask-background-color="isPay?'rgba(0,0,0,.8)':'transparent'" safeArea
+			backgroundColor="transparent" :animation="true" @maskClick="maskClick">
+			<view class="popup-wrap" :style="{'border-radius':isPay?'': 0}">
+				<view class="paybox" v-if="isPay">
+					<view class="paybox-title">
+						<view class="paybox-title-left"></view>
+						<view class="paybox-title-middle">请输入支付密码</view>
+						<view class="paybox-titler-right" @click="handleClose">
+							<u-icon name="close" size="18" color="#666" />
+						</view>
 					</view>
-					<view class="keyboard-left-item active del" v-else @click="handleClick(item)">
-						<image style="width: 48rpx;height: 48rpx;" src="@/static/del.webp" />
+					<view class="paybox-input">
+						<u-code-input v-model="value" mode="box" dot readonly></u-code-input>
 					</view>
-				</block>
+				</view>
+
+				<view class="keyboard">
+					<view class="keyboard-left" :style="{width:isPay?'100%':''}">
+						<block v-for="(item,indx) in keys" :key="indx">
+							<view class="keyboard-left-item active del" v-if="item=='del'" @click="handleClick(item)">
+								<image style="width: 48rpx;height: 48rpx;" src="@/static/del.webp" />
+							</view>
+
+							<view class="keyboard-left-item word active"
+								:style="{width:isPay?'0%':'',border:isPay?'0':''}" v-else-if="item == '.'"
+								@click="handleClick(item)">
+								{{isPay?'':item}}
+							</view>
+
+							<view class="keyboard-left-item word active"
+								:style="{width:(isPay && item == '0')?'66.66%':''}" v-else @click="handleClick(item)">
+								{{item}}
+							</view>
+						</block>
+					</view>
+					<view class="keyboard-right" :style="{width:isPay?'0%':''}">
+						<view class="keyboard-right-clear word active" @click="handleClear">清空</view>
+						<view class="keyboard-right-pay word active-pay" @click="handlePay">{{txt}}</view>
+					</view>
+				</view>
 			</view>
-			<view class="keyboard-right">
-				<view class="keyboard-right-clear word active" @click="handleClear">清空</view>
-				<view class="keyboard-right-pay word active-pay" @click="handlePay">付款</view>
-			</view>
-		</view>
-	</uni-popup>
+		</uni-popup>
+	</view>
 </template>
 
 <script>
 	export default {
 		name: "popups",
+		props: {
+			txt: {
+				type: String,
+				default: '付款'
+			},
+			isPay: {
+				type: Boolean,
+				default: false
+			}
+		},
 		data() {
 			return {
 				keys: [1, 2, 3, 4, 5, 6, 7, 8, 9, 0, '.', 'del'],
-				value: ''
+				value: '',
+			}
+		},
+
+		watch: {
+			value(newVal, oldVal) {
+				// 输入密码走此处
+				if (newVal.length == 6 && this.isPay) {
+					this.handlePay();
+				}
 			}
 		},
 
 		methods: {
-
 			// 键盘点击
 			handleClick(item) {
 				if (this.value.length >= 10) return;
@@ -48,11 +91,16 @@
 					else
 						this.value = this.value.substring(0, this.value.length - 1);
 				} else if (item == 0) {
-					if (this.value) {
-						if (this.value.lastIndexOf('.') != -1 && this.value.length - this.value.lastIndexOf('.') == 3)
-							return;
-
+					if (this.isPay) {
 						this.value = this.value + item;
+					} else {
+						if (this.value) {
+							if (this.value.lastIndexOf('.') != -1 && this.value.length - this.value.lastIndexOf('.') == 3)
+								return;
+							this.value = this.value + item;
+						} else {
+							this.value = this.value + item;
+						}
 					}
 				} else {
 					if (this.value.lastIndexOf('.') != -1 && this.value.length - this.value.lastIndexOf('.') == 3) return;
@@ -81,6 +129,8 @@
 
 			// 开启
 			handleOpen() {
+				this.value = '';
+				console.log('123:' + this.value);
 				this.$refs.popup.open();
 			},
 
@@ -89,7 +139,6 @@
 				this.$refs.popup.close();
 			},
 
-
 			maskClick() {
 				// 如果最后一位是. 去除
 				if (this.value && this.value.endsWith('.')) {
@@ -101,10 +150,46 @@
 	}
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
+	.popup-wrap {
+		background-color: #fff;
+		border-radius: 30rpx 30rpx 0 0;
+
+		.paybox {
+			.paybox-title {
+				display: flex;
+				justify-content: space-between;
+				padding: 40rpx;
+
+				.paybox-title-left {}
+
+				.paybox-title-middle {
+					font-size: 30rpx;
+					font-weight: bold;
+					color: #333;
+				}
+
+				.paybox-titler-right {}
+			}
+
+			.paybox-input {
+				display: flex;
+				justify-content: center;
+				margin-bottom: 40rpx;
+
+				/deep/.u-code-input__item {
+					background-color: #E6E6E6;
+					border-radius: 8rpx;
+					border: 0 !important;
+				}
+			}
+		}
+	}
+
 	.keyboard {
 		display: flex;
 		padding-bottom: 20rpx;
+		border-top: 2rpx solid #E6E6E6;
 
 		.keyboard-left {
 			width: 75%;
diff --git a/components/popups/index_backup.vue b/components/popups/index_backup.vue
new file mode 100644
index 0000000..166054a
--- /dev/null
+++ b/components/popups/index_backup.vue
@@ -0,0 +1,167 @@
+<template>
+	<uni-popup ref="popup" type="bottom" mask-background-color="rgba(0,0,0,0)" safeArea backgroundColor="#fff"
+		:animation="true" @maskClick="maskClick">
+
+		<view style="padding:40rpx;display: flex;justify-content: center;align-items: center;">
+			<u-code-input v-model="value" mode="box" dot readonly></u-code-input>
+		</view>
+
+		<view class="keyboard">
+			<view class="keyboard-left">
+				<block v-for="(item,indx) in keys" :key="indx">
+					<view class="keyboard-left-item word active" v-if="item != 'del'" @click="handleClick(item)">
+						{{item}}
+					</view>
+					<view class="keyboard-left-item active del" v-else @click="handleClick(item)">
+						<image style="width: 48rpx;height: 48rpx;" src="@/static/del.webp" />
+					</view>
+				</block>
+			</view>
+			<view class="keyboard-right">
+				<view class="keyboard-right-clear word active" @click="handleClear">清空</view>
+				<view class="keyboard-right-pay word active-pay" @click="handlePay">付款</view>
+			</view>
+		</view>
+	</uni-popup>
+</template>
+
+<script>
+	export default {
+		name: "popups",
+		data() {
+			return {
+				keys: [1, 2, 3, 4, 5, 6, 7, 8, 9, 0, '.', 'del'],
+				value: ''
+			}
+		},
+
+		methods: {
+
+			// 键盘点击
+			handleClick(item) {
+				if (this.value.length >= 10) return;
+				if (item == ".") {
+					if (!this.value) {
+						this.value = '0.';
+					} else {
+						if (this.value.indexOf('.') > -1) return;
+						this.value = this.value + item;
+					}
+				} else if (item == 'del') {
+					if (this.value == "0.")
+						this.value = this.value.substring(0, 0);
+					else
+						this.value = this.value.substring(0, this.value.length - 1);
+				} else if (item == 0) {
+					if (this.value) {
+						if (this.value.lastIndexOf('.') != -1 && this.value.length - this.value.lastIndexOf('.') == 3)
+							return;
+
+						this.value = this.value + item;
+					}
+				} else {
+					if (this.value.lastIndexOf('.') != -1 && this.value.length - this.value.lastIndexOf('.') == 3) return;
+					this.value = this.value + item;
+				}
+
+				this.$emit('change', this.value);
+			},
+
+			// 清空
+			handleClear() {
+				this.value = '';
+				this.$emit('clear');
+			},
+
+			// 付款
+			handlePay() {
+				// 如果最后一位是. 去除
+				if (this.value && this.value.endsWith('.')) {
+					this.value = this.value.replace('.', '');
+				}
+
+				this.$emit('confirm', this.value);
+				this.handleClose();
+			},
+
+			// 开启
+			handleOpen() {
+				this.$refs.popup.open();
+			},
+
+			// 关闭
+			handleClose() {
+				this.$refs.popup.close();
+			},
+
+			maskClick() {
+				// 如果最后一位是. 去除
+				if (this.value && this.value.endsWith('.')) {
+					this.value = this.value.replace('.', '');
+				}
+				this.$emit('change', this.value);
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.keyboard {
+		display: flex;
+		padding-bottom: 20rpx;
+
+		.keyboard-left {
+			width: 75%;
+			display: flex;
+			flex-wrap: wrap;
+
+			.keyboard-left-item {
+				width: 33.3%;
+				height: 120rpx;
+				line-height: 102rpx;
+				border-bottom: 2rpx solid #E6E6E6;
+				border-right: 2rpx solid #E6E6E6;
+			}
+
+			.del {
+				display: flex;
+				justify-content: center;
+				align-items: center;
+			}
+		}
+
+		.keyboard-right {
+			width: 25%;
+
+			.keyboard-right-clear {
+				width: 100%;
+				height: 240rpx;
+				line-height: 226rpx;
+			}
+
+			.keyboard-right-pay {
+				width: 100%;
+				height: 240rpx;
+				line-height: 226rpx;
+				text-align: center;
+				background-color: #40AE36;
+				color: #fff !important;
+			}
+		}
+
+		.word {
+			font-weight: 600;
+			font-size: 34rpx;
+			color: #000000;
+			text-align: center;
+		}
+
+		.active:active {
+			background-color: rgba(232, 232, 232, 0.5);
+		}
+
+		.active-pay:active {
+			opacity: .9;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/mixins/password.js b/mixins/password.js
new file mode 100644
index 0000000..e69de29
diff --git a/pages/payment/get_payment.vue b/pages/payment/get_payment.vue
index 8638768..5db7432 100644
--- a/pages/payment/get_payment.vue
+++ b/pages/payment/get_payment.vue
@@ -63,9 +63,9 @@
 		<popups ref="popups" @confirm="handleConfirm" @clear="handleClear" @change="handleChange"></popups>
 	</view>
 </template>
-
 <script>
 	var that;
+
 	import {
 		getProductInfo,
 		addCart,
@@ -128,6 +128,10 @@
 			this.mer_id = opt.mer_id;
 		},
 
+		onReady() {
+			this.$refs.payModal.open();
+		},
+
 		onShow() {
 			if (!this.isLogin) {
 				Cache.set("login_back_url_weixin", "/" + getCurrentPages()[0].route + "?mer_id=" + this.mer_id);
diff --git a/pages/users/order_confirm/index.vue b/pages/users/order_confirm/index.vue
index b549a87..db90e4b 100644
--- a/pages/users/order_confirm/index.vue
+++ b/pages/users/order_confirm/index.vue
@@ -482,8 +482,11 @@
 		<areaWindow ref="areaWindow" :display="display" :address='addressInfoArea' :cityShow='cityShow'
 			@submit="OnAreaAddress" @changeClose="changeAddressClose"></areaWindow>
 
-		<!-- 支付密码 -->
-		<!-- <popups></popups> -->
+		<!-- 支付密码 键盘 -->
+		<popups ref="popups" :isPay="true" @confirm="handleConfirm" @clear="handleClear" @change="handleChange" />
+
+		<!-- 密码错误事件处理 -->
+		<payPwd ref="payPwd" @left="handleLeft" @right="handleRight"></payPwd>
 	</view>
 </template>
 <script>
@@ -504,7 +507,8 @@
 		getOrderConfirm,
 		getCouponsOrderPrice,
 		orderCreate,
-		createOrder
+		createOrder,
+		verifyPwd
 	} from '@/api/order.js';
 	import {
 		getAddressDefault,
@@ -537,6 +541,7 @@
 	import discountDetails from '@/components/discountDetails/index.vue';
 	import addInvoicing from '@/components/addInvoicing';
 	import parser from "@/components/jyf-parser/jyf-parser";
+	import payPwd from "@/components/payPwd/index.vue";
 	import {
 		mapGetters
 	} from "vuex";
@@ -555,6 +560,7 @@
 	import popups from "@/components/popups/index.vue";
 	export default {
 		components: {
+			payPwd,
 			couponListWindow,
 			addressWindow,
 			orderGoods,
@@ -635,14 +641,12 @@
 					video: 'width:100%;'
 				},
 				radioList: [{
-						title: this.deliveryName,
-						check: true
-					},
-					{
-						title: '到店核销',
-						check: false
-					}
-				],
+					title: this.deliveryName,
+					check: true
+				}, {
+					title: '到店核销',
+					check: false
+				}],
 				payType: 'weixin', //支付方式
 				openType: 1, //优惠券打开方式 1=使用
 				active: 0, //支付方式切换
@@ -748,7 +752,8 @@
 				addressInfoArea: [],
 				timeranges: [],
 				isShow: false,
-				moneyInfo: {}
+				moneyInfo: {},
+				orderData: {}, //支付参数
 			};
 		},
 		computed: {
@@ -909,6 +914,7 @@
 					})
 				})
 			},
+
 			/*获取发票说明*/
 			getAgreement() {
 				let that = this
@@ -918,6 +924,7 @@
 					that.protocol = res.data.sys_receipt_agree
 				})
 			},
+
 			/*获取发票说明*/
 			getCouponAgreement() {
 				let that = this
@@ -1664,9 +1671,11 @@
 				let that = this
 				that.$set(that.order_extend[that.virtualIndex], 'value', e.detail.value);
 			},
+
 			getTime(index) {
 				this.virtualIndex = index;
 			},
+
 			SubOrder: function(e) {
 				let that = this,
 					data = {};
@@ -1808,30 +1817,81 @@
 					}
 				})
 
-
-
-				if (data.payType == 'balance' && parseFloat(that.userInfo.now_money) < parseFloat(that.totalPrice))
+				if (data.pay_type == 'balance' && parseFloat(that.userInfo.now_money) < parseFloat(that.totalPrice))
 					return that.$util.Tips({
 						title: '余额不足！'
 					});
 
+
 				// 设置支付密码
+				if (data.pay_type == 'balance' || data.pay_type == 'merBalance') {
+					this.orderData = data;
+					this.$refs.popups.handleOpen();
+				} else {
+					this.truePayOrder(data);
+				}
+			},
 
+			// 输入密码回调
+			handleConfirm(e) {
+				// 验证密码是否正确
+				verifyPwd({
+					withdrawal_pwd: e
+				}).then(res => {
 
+					// 密码是否有效 状态码判断
+					const code = res.data.code;
 
-				uni.showLoading({
-					title: '订单支付中',
-					mask: true
+					if (code == 100) { //密码正确
+						this.$set(this.orderData, 'withdrawal_pwd', e);
+						uni.showLoading({
+							title: '订单支付中',
+							mask: true
+						});
+						this.truePayOrder(this.orderData);
+					} else {
+						this.$refs.payPwd.handleOpen(code);
+					}
+				}).catch(err => {
+					console.log(err)
+				})
+			},
+
+			// 弹框左边按钮 101 未设置密码  102 忘记密码 都去设置密码
+			handleLeft(code) {
+				uni.navigateTo({
+					url: "/pages/users/user_modify_pwd/index?type=payPwd"
 				});
+				this.$refs.payPwd.handleClose();
+			},
+
+			// 弹框右边按钮 取消 重试
+			handleRight(code) {
+				if (code == 101) { //取消
+					this.$refs.payPwd.handleClose(code);
+				} else {
+					this.$refs.payPwd.handleClose();
+					this.$refs.popups.handleOpen();
+				}
+			},
+
+			// 提交订单
+			truePayOrder(data) {
+				if (!data) data = this.orderData;
+
 				// #ifdef MP
 				openPaySubscribe().then(() => {
 					that.payment(data);
 				});
 				// #endif
 				// #ifndef MP
-				that.payment(data);
+				this.payment(data);
 				// #endif
 			},
+
+			handleClear() {},
+			handleChange() {},
+
 			// 打开配送方式弹窗
 			openShowBox(item, index) {
 				if (item.delivery_way.length == 2 && this.order_model != 2) {
diff --git a/pages/users/order_list/index.vue b/pages/users/order_list/index.vue
index 1355e98..88f63cd 100644
--- a/pages/users/order_list/index.vue
+++ b/pages/users/order_list/index.vue
@@ -440,6 +440,13 @@
 					title: '可用余额:',
 					number: 0,
 					payStatus: this.$store.getters.globalData.yue_pay_status
+				}, {
+					name: "对公转账",
+					icon: "icon-yuezhifu",
+					value: 'public',
+					title: '对公转账:',
+					number: 0,
+					payStatus: this.$store.getters.globalData.yue_pay_status
 				}],
 				pay_close: false,
 				pay_order_id: '',