diff --git a/api/order.js b/api/order.js
index f9df010..141e935 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/api/payment.js b/api/payment.js
index 4d7f58d..0b8bb14 100644
--- a/api/payment.js
+++ b/api/payment.js
@@ -16,6 +16,13 @@ export function addCart(data) {
 	return request.post(`user/cart/create`, data);
 }
 
+/**
+ * 根据店铺 获取商品
+ */
+export function getProductInfo1(data) {
+	return request.get(`order_mix`, data);
+}
+
 /**
  * 根据店铺id 获取店铺信息
  */
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/popups/index.vue b/components/popups/index.vue
new file mode 100644
index 0000000..4b9b696
--- /dev/null
+++ b/components/popups/index.vue
@@ -0,0 +1,248 @@
+<template>
+	<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="paybox-input">
+						<u-code-input v-model="value" mode="box" dot readonly></u-code-input>
+					</view>
+				</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>
+		</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: '',
+			}
+		},
+
+		watch: {
+			value(newVal, oldVal) {
+				// 输入密码走此处
+				if (newVal.length == 6 && this.isPay) {
+					this.handlePay();
+				}
+			}
+		},
+
+		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.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;
+					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.value = '';
+				console.log('123:' + this.value);
+				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" 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%;
+			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/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/pages/payment/get_payment.vue b/pages/payment/get_payment.vue
index 1cae073..07d2cbf 100644
--- a/pages/payment/get_payment.vue
+++ b/pages/payment/get_payment.vue
@@ -1,66 +1,73 @@
 <template>
 	<view class="container">
-		<view class="v-navbar">
+		<view v-if="!isWeixin" class="v-navbar">
 			<u-navbar title="提货付款" :safeAreaInsetTop="false" :fixed="false" @leftClick="leftClick" bgColor="transparent"
-				leftIconColor="#fff" :titleStyle="{color:'#fff',fontWeight:'bold',fontSize:'32rpx'}">
+				leftIconColor="#333" :titleStyle="{color:'#333',fontWeight:'bold',fontSize:'32rpx'}">
 			</u-navbar>
 		</view>
-		<view v-if="merchantInfo && !isEmpty">
-			<view class="v-desc">
-				<view>
-					<view class="v-desc-main">确认提货付款</view>
-					<view class="v-desc-sub">{{merchantInfo.merchant.mer_name}}</view>
-				</view>
-				<u-image :showLoading="true" :src="merchantInfo.merchant.mer_avatar" width="182rpx" height="182rpx"
-					:radius="10" />
+		<view style="height: 50rpx;"></view>
+		<view class="wrap">
+			<view class="shop">
+				<image src="@/static/shop_logo.webp" style="width: 62rpx;height: 54rpx;" />
+				<text class="shop-name" v-if="mer_name">{{mer_name||''}}</text>
 			</view>
 
 			<!-- 付款金额 -->
 			<view class="v-con">
-				<view class="v-con-text">付款金额</view>
-				<view class="v-con-input" style="margin-right: 10px;">
-					<text style="color: #303133;font-size:46rpx;">￥</text>
-					<u--input type="digit" fontSize="23" v-model="cartForm.total_amount" placeholder="请输入金额"
-						border="none" placeholderStyle="color:#999;font-size:30rpx" @input="validateDecimal">
+				<view class="v-con-text">订单金额</view>
+				<view class="v-con-input" @click="handleOpenKeyboard">
+					<text style="color: #303133;font-size:32rpx;">￥</text>
+					<u--input type="text" fontSize="23" height="112rpx" placeholder="请输入金额" border="none" readonly
+						v-model="cartForm.total_amount" placeholderStyle="color:#999;font-size:32rpx">
 					</u--input>
+					<view class="placeholder"></view>
 				</view>
 
-				<view class="v-wrap" v-if="cartForm.total_amount">
-					<view class="v-wrap-money">
-						<text class="icon">￥</text>
-						<text class="num">{{cartForm.total_amount}}</text>
-					</view>
-					<view class="v-wrap-desc">
-						<view class="v-wrap-desc-main">实物提货券</view>
-						<view class="v-wrap-desc-sub">即买即用</view>
+				<view class="v-con-group">
+					<view class="v-con-group-title">
+						<view class="v-con-group-title-left">套餐详情</view>
+						<view class="v-con-group-title-right" @click.stop="handleOpen">
+							<text>{{isOpen?'折叠':'展开'}}</text>
+							<u-icon :name="isOpen?'arrow-down' : 'arrow-right'" size="15"></u-icon>
+						</view>
 					</view>
+					<scroll-view scroll-y>
+						<view class="v-con-group-list" :style="{'max-height':isOpen?'400rpx':'0'}">
+							<block v-for="(item,indx) in merchantInfo" :key="indx">
+								<view class="v-con-group-list-item">
+									<image :src="item.image" :showLoading="true" style="width:86rpx;height:86rpx;" />
+									<text class="line1">{{item.store_name}}</text>
+								</view>
+							</block>
+						</view>
+					</scroll-view>
 				</view>
 			</view>
 
-			<view class="v-btn-wrap">
-				<view class="v-btn" @click="submitOrder">提交订单</view>
+			<view class="v-btn-wrap" @click="cartForm.total_amount?submitOrder():null">
+				<view class="v-btn">{{Number(cartForm.total_amount||0).toFixed(2)}}元 确认支付</view>
 			</view>
 
 			<!-- 登陆 -->
-			<authorize :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse" @onLoadFun="onLoadFun">
-			</authorize>
+			<authorize :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse" @onLoadFun="onLoadFun" />
 		</view>
 
 		<!-- 无商户信息提示 -->
-		<view v-else class="empty">
-			<image src="/static/images/no_thing.png"></image>
-			<text style="margin-top: 60rpx;">{{tips}}</text>
-			<!-- 登陆 -->
-			<authorize :isAuto="isAuto" :isGoIndex="false" :isShowAuth="isShowAuth" @authColse="authColse"
-				@onLoadFun="onLoadFun">
+		<!-- <view class="empty">
+			<authorize v-show="!isWeixin" ref="authRef" :isAuto="isAuto" :isGoIndex="false" :isShowAuth="isShowAuth"
+				@authColse="authColse" @onLoadFun="onLoadFun">
 			</authorize>
-		</view>
+		</view> -->
+
+		<!-- 键盘 -->
+		<popups ref="popups" @confirm="handleConfirm" @clear="handleClear" @change="handleChange"></popups>
 	</view>
 </template>
-
 <script>
+	var that;
+
 	import {
-		getProductInfo,
+		getProductInfo1,
 		addCart,
 		orderCheck
 	} from "@/api/payment.js";
@@ -69,17 +76,23 @@
 		mapGetters
 	} from "vuex";
 	import authorize from '@/components/Authorize';
-import { Toast } from "../../libs/uniApi";
+	import {
+		Toast
+	} from "../../libs/uniApi";
+	import popups from "@/components/popups/index.vue";
 	export default {
 		components: {
-			authorize
+			authorize,
+			popups
 		},
 		computed: {
 			...mapGetters(['isLogin']),
 		},
 		data() {
 			return {
-				isEmpty: false,
+				isEmpty: true,
+				// isWeixin: this.$wechat.isWeixin(),
+				isWeixin: false,
 				cartForm: {
 					product_id: '',
 					product_attr_unique: '',
@@ -103,29 +116,67 @@ import { Toast } from "../../libs/uniApi";
 				isAuto: false, //没有授权的不会自动授权
 				isShowAuth: false, //是否隐藏授权
 				mer_id: '',
-				tips: '暂未登陆~'
+				changeTxt: '展开',
+				isOpen: false,
+				keyBoardShow: false,
+				mer_name: ''
 			}
 		},
 
 		onLoad(opt) {
+			that = this;
 			this.mer_id = opt.mer_id;
 		},
+
 		onShow() {
 			if (!this.isLogin) {
 				Cache.set("login_back_url_weixin", "/" + getCurrentPages()[0].route + "?mer_id=" + this.mer_id);
 				this.isAuto = true;
 				this.isShowAuth = true;
+				if (this.isWeixin) {
+					this.$nextTick(() => {
+						this.$refs.authRef.toWecahtAuth();
+					})
+				}
 			} else {
-        this.checkForm.cart_id = [];
-				this.getProductInfoByMerid(this.mer_id);
+				this.checkForm.cart_id = [];
+				this.getProductInfoByMerid();
 			}
 		},
 		methods: {
-			validateDecimal(event) {
-				let val = (this.cartForm.total_amount.match(/^\d*(\.?\d{0,2})/g)[0]) || ''
-				this.$nextTick(() => {
-					this.cartForm.total_amount = val;
-				})
+			// 打开键盘
+			handleOpenKeyboard() {
+				if (!this.isLogin) {
+					Cache.set("login_back_url_weixin", "/" + getCurrentPages()[0].route + "?mer_id=" + this.mer_id);
+					this.isAuto = true;
+					this.isShowAuth = true;
+					if (this.isWeixin) {
+						this.$nextTick(() => {
+							this.$refs.authRef.toWecahtAuth();
+						})
+					}
+				} else {
+					this.$refs.popups.handleOpen();
+				}
+			},
+
+			// 键盘提交
+			handleConfirm(e) {
+				if (!e) return;
+				this.cartForm.total_amount = e;
+				this.submitOrder();
+			},
+
+			// 清空
+			handleClear() {
+				this.cartForm.total_amount = '';
+				this.merchantInfo = [];
+			},
+
+			// 输入数字
+			handleChange(e) {
+				this.cartForm.total_amount = e;
+				uni.$u.debounce(that.getProductInfoByMerid, 200)
 			},
 
 			leftClick(e) {
@@ -133,60 +184,94 @@ import { Toast } from "../../libs/uniApi";
 					url: '/pages/index/index'
 				})
 			},
+
 			// 授权关闭
 			authColse: function(e) {
 				this.isShowAuth = e;
 			},
+
 			onLoadFun() {
 				this.getProductInfoByMerid(this.mer_id);
 				this.isShowAuth = false;
 			},
 
 			// 提交订单
-			submitOrder() {
+			async submitOrder() {
 				if (!this.cartForm.total_amount) {
 					return this.$util.Tips({
 						title: "请输入付款金额！"
 					})
 				}
-				// 订单
-				this.cartForm.product_id = this.merchantInfo.product_id;
-				this.cartForm.product_type = this.merchantInfo.product_type;
-				this.cartForm.product_attr_unique = this.merchantInfo.sku[''].unique;
 
-				let that = this;
-				addCart(this.cartForm).then(res => {
-					// 购物车ID
-					that.checkForm.cart_id.push(res.data.cart_id);
+				// 循环加入购物车
+				for (var i = 0; i < that.merchantInfo.length; i++) {
+					let info = {
+						product_id: that.merchantInfo[i].product_id,
+						product_attr_unique: that.merchantInfo[i].unique,
+						cart_num: that.merchantInfo[i].num,
+						is_new: 1,
+						product_type: 0,
+						source: 999,
+						total_amount: that.cartForm.total_amount
+					};
+
+					try {
+						let res = await addCart(info);
+						that.checkForm.cart_id.push(res.data.cart_id);
+					} catch (e) {
+						return that.$util.Tips({
+							title: err.message || err.msg || err
+						})
+					}
+				}
+
+				if (that.checkForm.cart_id && that.checkForm.cart_id.length > 0) {
 					orderCheck(that.checkForm).then(res1 => {
 						uni.navigateTo({
-							url: "/pages/payment/settlement?cartId=" + this.checkForm
-								.cart_id + "&money=" + this.cartForm.total_amount +
-								"&merName=" + this.merchantInfo.merchant.mer_name,
+							url: "/pages/payment/settlement",
 							success: (res) => {
-								res.eventChannel.emit('datas', res1.data.platformConsumption);
+								uni.setStorageSync('datas', {
+									platformConsumption: res1.data.platformConsumption ||
+									[],
+									productData: that.merchantInfo,
+									checkForm: that.checkForm,
+									money: that.cartForm.total_amount,
+									merName: that.mer_name,
+									money: that.cartForm.total_amount,
+									key: res1.data.key
+								})
+							},
+							fail(err) {
+								console.log(err)
 							}
 						})
-					}).catch(err=>{
-            Toast(err.message || err)
-          });
-				}).catch((err) => {
-					this.$util.Tips({
-						title: err.message || err.msg || err
-					})
-				})
+					}).catch(err => {
+						Toast(err.message || err)
+					});
+				}
 			},
 
-			getProductInfoByMerid(merid) {
-				let that = this;
-				getProductInfo({
-					mer_id: merid
+			// 折叠商品
+			handleOpen() {
+				this.isOpen = !this.isOpen;
+			},
+
+			// 根据店铺获取商品
+			getProductInfoByMerid(merid, money) {
+				getProductInfo1({
+					mer_id: that.mer_id,
+					money: that.cartForm.total_amount
 				}).then(res => {
-					this.merchantInfo = res.data;
+					if (!that.cartForm.total_amount) {
+						this.mer_name = res.data.merchant;
+					} else {
+						that.merchantInfo = res.data.list;
+					}
 				}).catch((err) => {
-					this.tips = err.message || err.smg || err;
-					this.$util.Tips({
+					that.$util.Tips({
 						title: err.message || err.msg || err
+					}, () => {
+
 					})
 					// #ifdef APP
 					setTimeout(() => {
@@ -200,49 +285,6 @@ import { Toast } from "../../libs/uniApi";
 					that.isEmpty = true;
 					// #endif
 				})
-			},
-
-			// 图片保存
-			handleSavePic() {
-				// 获取要保存的图片路径或URL
-				let imageUrl = this.qrcodeUrl; // 这里使用了网络上的图片作为示例
-
-				// #ifdef H5
-				var a = document.createElement("a");
-				a.download = imageUrl;
-				a.href = imageUrl;
-				document.body.appendChild(a);
-				a.click();
-				a.remove();
-				// #endif
-
-				// #ifndef H5
-				let that = this;
-				uni.downloadFile({
-					url: imageUrl,
-					success(res) {
-						if (res.statusCode === 200) {
-							let tempFilePath = res.tempFilePath; // 临时文件路径
-							uni.saveImageToPhotosAlbum({
-								filePath: tempFilePath,
-								success() {
-									return that.$util.Tips({
-										title: '图片已保存至相册!'
-									});
-								},
-								fail(err) {
-									console.error('保存失败', err);
-								}
-							});
-						} else {
-							console.error('下载失败', res.statusCode);
-						}
-					},
-					fail(err) {
-						console.error('下载失败', err);
-					}
-				});
-				// #endif
 			}
 		}
 	}
@@ -250,11 +292,11 @@ import { Toast } from "../../libs/uniApi";
 
 <style lang="scss">
 	page {
-		background-color: #FCDFAD;
+		background-color: #F9F9F9;
 	}
 
 	.empty {
-		margin: 130rpx 0 150rpx;
+		margin: 0;
 		text-align: center;
 
 		image,
@@ -274,7 +316,7 @@ import { Toast } from "../../libs/uniApi";
 	.container {
 		position: relative;
 		height: 100vh;
-		background-image: url("https://lihai001.oss-cn-chengdu.aliyuncs.com/def/c582c202402291601584806.webp");
+		// background-image: url("https://lihai001.oss-cn-chengdu.aliyuncs.com/def/c582c202402291601584806.webp");
 		background-size: 100% auto;
 		background-repeat: no-repeat;
 		padding-top: var(--status-bar-height);
@@ -304,34 +346,56 @@ import { Toast } from "../../libs/uniApi";
 			}
 		}
 
+		.wrap {
+			margin: 0 52rpx 0 54rpx;
+		}
+
+		.shop {
+			display: flex;
+			align-items: center;
+			margin-bottom: 54rpx;
+
+			text {
+				margin-left: 32rpx;
+			}
+		}
+
 		.v-con {
-			position: absolute;
-			top: 436rpx;
-			left: 50%;
-			transform: translateX(-50%);
-			width: 710rpx;
-			height: 680rpx;
-			background: linear-gradient(180deg, #FEB992 0%, #FFFFFF 31%, #FFFFFF 100%);
-			border-radius: 20rpx;
-			margin: 0 auto;
-			box-shadow: 0 -4rpx 0px 0px #fff;
-			padding: 53rpx 30rpx 0 30rpx;
-			box-sizing: border-box;
+			margin: 0 auto 150rpx;
 
 			.v-con-text {
-				margin-bottom: 60rpx;
 				font-weight: 400;
-				font-size: 32rpx;
-				color: #2E2E2E;
-				line-height: 16rpx;
+				font-size: 30rpx;
+				color: #000000;
 			}
 
 			.v-con-input {
+				position: relative;
 				display: flex;
 				align-items: center;
-				margin-bottom: 83rpx;
-				padding: 0 0 40rpx 12rpx;
+				height: 112rpx;
+				margin-bottom: 32rpx;
 				border-bottom: 1rpx solid #D6D6D6;
+
+				/deep/.uni-input-input {
+					height: 112rpx;
+					font-weight: bold;
+					font-size: 72rpx;
+				}
+
+				text {
+					font-weight: 400;
+					font-size: 32rpx;
+					color: #000000;
+				}
+
+				.placeholder {
+					position: absolute;
+					top: 0;
+					left: 0;
+					width: 100%;
+					height: 100%;
+				}
 			}
 
 			.v-wrap {
@@ -340,9 +404,6 @@ import { Toast } from "../../libs/uniApi";
 				padding-left: 20rpx;
 				width: 666rpx;
 				height: 210rpx;
-				background-image: url("https://lihai001.oss-cn-chengdu.aliyuncs.com/def/2f9c2202402291652415355.webp");
-				background-size: 100% 100%;
-				background-repeat: no-repeat;
 
 				.v-wrap-money {
 					display: flex;
@@ -377,37 +438,92 @@ import { Toast } from "../../libs/uniApi";
 					}
 				}
 			}
-		}
 
-		.v-btn-wrap {
-			position: fixed;
-			z-index: 11;
-			bottom: 0;
-			left: 0;
-			display: flex;
-			justify-content: center;
-			align-items: center;
-			width: 100%;
-			height: 240rpx;
-			background-color: #FDD6A6;
 
-			.v-btn {
-				width: 650rpx;
-				height: 100rpx;
-				line-height: 100rpx;
-				background: #FF8056;
-				box-shadow: 0rpx 3rpx 3rpx 1rpx rgba(255, 94, 12, 0.4);
-				border-radius: 55rpx 55rpx 55rpx 55rpx;
-				border: 1rpx solid #FF8056;
-				font-weight: 600;
-				font-size: 32rpx;
-				color: #FFFFFF;
-				text-align: center;
+			.v-con-group {
+				.v-con-group-title {
+					display: flex;
+					justify-content: space-between;
+					align-items: center;
+					margin-bottom: 32rpx;
 
-				&:active {
-					opacity: .8;
+					.v-con-group-title-left {
+						font-weight: 400;
+						font-size: 30rpx;
+						color: #000000;
+					}
+
+					.v-con-group-title-right {
+						display: flex;
+						align-items: center;
+
+						text {
+							margin-right: 18rpx;
+							font-weight: 400;
+							font-size: 30rpx;
+							color: #000000;
+						}
+					}
+				}
+
+				.v-con-group-list {
+					transition: max-height linear .1s;
+
+					.v-con-group-list-item {
+						display: flex;
+						align-items: center;
+						margin-bottom: 14rpx;
+
+						text {
+							margin-left: 30rpx;
+							font-size: 26rpx;
+							color: #333333;
+						}
+					}
 				}
 			}
 		}
+
+		.v-btn-wrap {
+
+			width: 100%;
+			height: 90rpx;
+			line-height: 90rpx;
+			background: #40AE36;
+			border-radius: 10rpx;
+			font-weight: 400;
+			font-size: 32rpx;
+			color: #FFFFFF;
+			text-align: center;
+
+			// position: fixed;
+			// z-index: 11;
+			// bottom: 0;
+			// left: 0;
+			// display: flex;
+			// justify-content: center;
+			// align-items: center;
+			// width: 100%;
+			// height: 240rpx;
+			// background-color: #FDD6A6;
+
+			// .v-btn {
+			// 	width: 650rpx;
+			// 	height: 100rpx;
+			// 	line-height: 100rpx;
+			// 	background: #FF8056;
+			// 	box-shadow: 0rpx 3rpx 3rpx 1rpx rgba(255, 94, 12, 0.4);
+			// 	border-radius: 55rpx 55rpx 55rpx 55rpx;
+			// 	border: 1rpx solid #FF8056;
+			// 	font-weight: 600;
+			// 	font-size: 32rpx;
+			// 	color: #FFFFFF;
+			// 	text-align: center;
+
+			// 	&:active {
+			// 		opacity: .8;
+			// 	}
+			// }
+		}
 	}
 </style>
\ No newline at end of file
diff --git a/pages/payment/settlement.vue b/pages/payment/settlement.vue
index 295584a..a557ea8 100644
--- a/pages/payment/settlement.vue
+++ b/pages/payment/settlement.vue
@@ -1,990 +1,1052 @@
 <template>
-  <view :style="viewColor">
-    <view class='order-submission'>
-      <!-- 商品信息 -->
-      <view class="storeinfo-wrapper">
-        <view class="store-item">
-          <view class="store-title">
-            <text class="iconfont icon-shangjiadingdan"></text>
-            <view class="txt" @click="goStore(item.mer_id)">{{payForm.merName}}</view>
-            <text class="iconfont icon-xiangyou"></text>
-          </view>
+	<view :style="viewColor">
+		<view class='order-submission'>
+			<!-- 商品信息 -->
+			<view class="storeinfo-wrapper">
+				<view class="store-item">
+					<view class="store-title">
+						<text class="iconfont icon-shangjiadingdan"></text>
+						<view class="txt" @click="goStore(item.mer_id)">{{payForm.merName}}</view>
+						<text class="iconfont icon-xiangyou"></text>
+					</view>
 
-          <view class="product-item">
-            <view class="img-box">
-              <image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/89ad3202402292014108303.jpg" width="170rpx"
-                height="180rpx" />
-            </view>
-            <view class="content event_content">
-              <view class="name line1">
-                {{payForm.money}}元实物提货券
-              </view>
-              <view style="margin-top: 30rpx;color: #FF5C2D;">
-                ￥{{payForm.money}}
-              </view>
-            </view>
-          </view>
-        </view>
-      </view>
+					<block v-for="(item,indx) in productData" :key="indx">
+						<view class="product-item">
+							<view class="img-box">
+								<image :src="item.image" width="170rpx" height="180rpx" />
+							</view>
+							<view class="content event_content">
+								<view class="name line1">
+									{{item.store_name}}
+								</view>
+								<view style="margin-top: 30rpx;color: #FF5C2D;">
+									￥{{item.price}}
+								</view>
+							</view>
+						</view>
+					</block>
+				</view>
+			</view>
 
-      <view class='wrapper'>
-        <view class='item'>
-          <view style="font-weight: bold;">支付方式</view>
-          <view class='list'>
-            <!-- #ifdef H5 -->
-            <view class='payItem acea-row row-middle' :class='active==index ?"on":""' @tap='payItem(index)'
-              v-for="(item,index) in cartArr" :key='index' v-if="item.payStatus==1">
-              <view class='name acea-row row-center-wrapper'>
-                <view class='iconfont animated'
-                  :class='(item.icon) + " " + (animated==true&&active==index ?"bounceIn":"")'></view>
-                {{item.name}}
-              </view>
-              <view class='tip'>
-                {{item.title}}
-                <block v-if="item.value == 'balance'">
-                  {{userInfo.now_money}}
-                </block>
-                <block v-else-if="item.value == 'merBalance'">
-                  {{moneyInfo.extract_money}}
-                </block>
-              </view>
-            </view>
-            <!-- #endif -->
-            <!-- #ifdef MP || APP-PLUS -->
-            <view class='payItem acea-row row-middle' :class='active==index ?"on":""' @tap='payItem(index)'
-              v-for="(item,index) in cartArr" :key='index' v-if="item.payStatus==1">
-              <view class='name acea-row row-center-wrapper'>
-                <view class='iconfont animated'
-                  :class='(item.icon) + " " + (animated==true&&active==index ?"bounceIn":"")'></view>
-                {{item.name}}
-              </view>
-              <view class='tip'>
-                {{item.title}}
-                <block v-if="item.value == 'balance'">
-                  {{userInfo.now_money}}
-                </block>
-                <block v-else-if="item.value == 'merBalance'">
-                  {{moneyInfo.extract_money}}
-                </block>
-              </view>
-            </view>
-            <!-- #endif -->
-          </view>
-        </view>
-      </view>
+			<view class='wrapper'>
+				<view class='item'>
+					<view style="font-weight: bold;">支付方式</view>
+					<view class='list'>
+						<!-- #ifdef H5 -->
+						<view class='payItem acea-row row-middle' :class='active==index ?"on":""' @tap='payItem(index)'
+							v-for="(item,index) in cartArr" :key='index' v-if="item.payStatus==1">
+							<view class='name acea-row row-center-wrapper'>
+								<view class='iconfont animated'
+									:class='(item.icon) + " " + (animated==true&&active==index ?"bounceIn":"")'></view>
+								{{item.name}}
+							</view>
+							<view class='tip'>
+								{{item.title}}
+								<block v-if="item.value == 'balance'">
+									{{userInfo.now_money}}
+								</block>
+							</view>
+						</view>
+						<!-- #endif -->
+						<!-- #ifdef MP || APP-PLUS -->
+						<view class='payItem acea-row row-middle' :class='active==index ?"on":""' @tap='payItem(index)'
+							v-for="(item,index) in cartArr" :key='index' v-if="item.payStatus==1">
+							<view class='name acea-row row-center-wrapper'>
+								<view class='iconfont animated'
+									:class='(item.icon) + " " + (animated==true&&active==index ?"bounceIn":"")'></view>
+								{{item.name}}
+							</view>
+							<view class='tip'>
+								{{item.title}}
+								<block v-if="item.value == 'balance'">
+									{{userInfo.now_money}}
+								</block>
+							</view>
+						</view>
+						<!-- #endif -->
+					</view>
+				</view>
+			</view>
 
-      <view class='moneyList'>
-        <view class='item acea-row row-between-wrapper'>
-          <view>商品总价：</view>
-          <view class='money'>￥{{payForm.money}}</view>
-        </view>
+			<view class='moneyList'>
+				<view class='item acea-row row-between-wrapper'>
+					<view>商品总价：</view>
+					<view class='money'>￥{{payForm.money}}</view>
+				</view>
 
-        <view class='item acea-row row-between-wrapper'>
-          <view>补贴抵扣</view>
-          <block v-if="platformConsumption.length > 0" >
-            <view class='discount money red_packet' @click="couponTap3()">
-              <text v-if="consumption_id">-￥{{consumption_money||'0.00'}}</text>
-              <text v-else>有补贴补贴未选</text>
-              <text class='iconfont icon-jiantou'></text>
-            </view>
-          </block>
-          <block v-else>
-            <view class='discount'>暂无抵扣红包</view>
-          </block>
-        </view>
-      </view>
-      <view style='height:140rpx;'></view>
+				<view class='item acea-row row-between-wrapper'>
+					<view>补贴抵扣</view>
+					<block v-if="platformConsumption.length > 0">
+						<view class='discount money red_packet' @click="couponTap3()">
+							<text v-if="consumption_id">-￥{{consumption_money||'0.00'}}</text>
+							<text v-else>有补贴补贴未选</text>
+							<text class='iconfont icon-jiantou'></text>
+						</view>
+					</block>
+					<block v-else>
+						<view class='discount'>暂无抵扣红包</view>
+					</block>
+				</view>
+			</view>
+			<view style='height:140rpx;'></view>
 
-      <view class='footer acea-row row-between-wrapper'>
-        <view class="footer_count">
-          <view>
-            合计:
-            <text class='pColor' v-if="cartArr[4].payStatus == 1 && active == 4">￥0.00</text>
-            <text class='pColor' v-else>￥{{ total_coupon }}</text>
-          </view>
-        </view>
-        <view class='settlement' :class='couponData.status != "noAddress" ? "" : "disabled"' style='z-index:100'
-          @tap="SubOrder">{{couponData.status != "noAddress" ? '提交订单':'选择地址'}}</view>
-      </view>
-    </view>
-  </view>
+			<view class='footer acea-row row-between-wrapper'>
+				<view class="footer_count">
+					<view>
+						合计:
+						<text class='pColor' v-if="cartArr[4].payStatus == 1 && active == 4">￥0.00</text>
+						<text class='pColor' v-else>￥{{ total_coupon }}</text>
+					</view>
+				</view>
+				<view class='settlement' :class='couponData.status != "noAddress" ? "" : "disabled"' style='z-index:100'
+					@tap="SubOrder">{{couponData.status != "noAddress" ? '提交订单':'选择地址'}}</view>
+			</view>
+
+
+			<!-- 支付密码 键盘 -->
+			<popups ref="popups" :isPay="true" @confirm="handleConfirm" @clear="handleClear" @change="handleChange" />
+
+			<!-- 密码错误事件处理 -->
+			<payPwd ref="payPwd" @left="handleLeft" @right="handleRight"></payPwd>
+		</view>
+	</view>
 </template>
 <script>
-  // +----------------------------------------------------------------------
-  // | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
-  // +----------------------------------------------------------------------
-  // | Copyright (c) 2016~2021 https://www.crmeb.com All rights reserved.
-  // +----------------------------------------------------------------------
-  // | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
-  // +----------------------------------------------------------------------
-  // | Author: CRMEB Team <admin@crmeb.com>
-  // +----------------------------------------------------------------------
-  let app = getApp();
-  import {
-    orderConfirm,
-    createOrder
-  } from '@/api/order.js';
-  import {
-    getUserInfo,
-    getAdminApplyAPI
-  } from '@/api/user.js';
-  import {
-    openPaySubscribe
-  } from '@/utils/SubscribeMessage.js';
-  import {
-    mapGetters
-  } from "vuex";
-  import {
-    configMap
-  } from '@/utils';
-  import {
-    orderPay,
-    orderCheck
-  } from "@/api/payment.js";
+	// +----------------------------------------------------------------------
+	// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
+	// +----------------------------------------------------------------------
+	// | Copyright (c) 2016~2021 https://www.crmeb.com All rights reserved.
+	// +----------------------------------------------------------------------
+	// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
+	// +----------------------------------------------------------------------
+	// | Author: CRMEB Team <admin@crmeb.com>
+	// +----------------------------------------------------------------------
+	let app = getApp();
+	import {
+		orderConfirm,
+		createOrder
+	} from '@/api/order.js';
+	import {
+		getUserInfo,
+	} from '@/api/user.js';
+	import {
+		openPaySubscribe
+	} from '@/utils/SubscribeMessage.js';
+	import {
+		mapGetters
+	} from "vuex";
+	import {
+		configMap
+	} from '@/utils';
+	import {
+		orderPay,
+		orderCheck
+	} from "@/api/payment.js";
+	import {
+		verifyPwd
+	} from '@/api/order.js';
+	import payPwd from "@/components/payPwd/index.vue";
+	import popups from "@/components/popups/index.vue";
 
-  export default {
-    data() {
-      return {
-        platformConsumption: [],
-        //支付方式
-        cartArr: [{
-            "name": "微信支付",
-            "icon": "icon-weixin2",
-            value: 'weixin',
-            title: '微信快捷支付',
-            payStatus: 1,
-          },
-          {
-            name: "支付宝支付",
-            icon: "icon-icon34",
-            // #ifdef H5 || APP-PLUS
-            value: 'alipay',
-            // #endif
-            // #ifdef MP
-            value: 'alipayQr',
-            // #endif
-            title: '支付宝支付',
-            payStatus: this.$store.getters.globalData.alipay_open
-          },
-          {
-            "name": "余额支付",
-            "icon": "icon-icon-test",
-            value: 'balance',
-            title: '可用余额:',
-            payStatus: this.$store.getters.globalData.yue_pay_status,
-          },
-          {
-            "name": "商户余额",
-            "icon": "icon-icon-test",
-            value: 'merBalance',
-            title: '可用余额:',
-            payStatus: this.$store.getters.globalData.yue_pay_status,
-          },
-          {
-            "name": "线下支付",
-            "icon": "icon-yinhangqia",
-            value: 'offline',
-            title: '线下支付',
-            payStatus: 2,
-          }, {
-            "name": "先货后款",
-            "icon": "tan-a-lujing17324",
-            value: 'creditBuy',
-            title: `结算周期：${this.settle_cycle}天 日利率：${this.interest_rate}%`,
-            payStatus: '',
-          },
-        ],
-        tagStyle: {
-          img: 'width:100%;display:block;',
-          video: 'width:100%;'
-        },
-        radioList: [{
-          title: this.deliveryName,
-          check: true
-        }, {
-          title: '到店核销',
-          check: false
-        }],
-        payType: 'weixin', //支付方式
-        active: 0, //支付方式切换
-        address: {
-          address: false
-        }, //地址组件
-        couponId: 0, //优惠券id
-        cartId: '', //购物车id
-        userInfo: {}, //用户信息
-        moneyInfo: {}, //商户余额信息
-        coupon_price: 0, //优惠券抵扣金额
-        ChangePrice: 0, //使用积分抵扣变动后的金额
-        formIds: [], //收集formid
-        status: 0,
-        is_address: false,
-        toPay: false, //修复进入支付时页面隐藏从新刷新页面
-        cartInfo: [],
-        priceGroup: {},
-        animated: false,
-        totalPrice: 0,
-        offlinePostage: "",
+	export default {
+		components: {
+			payPwd,
+			popups
+		},
+		data() {
+			return {
+				platformConsumption: [],
+				//支付方式
+				cartArr: [{
+						"name": "微信支付",
+						"icon": "icon-weixin2",
+						value: 'weixin',
+						title: '微信快捷支付',
+						payStatus: 1,
+					},
+					{
+						name: "支付宝支付",
+						icon: "icon-icon34",
+						// #ifdef H5 || APP-PLUS
+						value: 'alipay',
+						// #endif
+						// #ifdef MP
+						value: 'alipayQr',
+						// #endif
+						title: '支付宝支付',
+						payStatus: this.$store.getters.globalData.alipay_open
+					},
+					{
+						"name": "余额支付",
+						"icon": "icon-icon-test",
+						value: 'balance',
+						title: '可用余额:',
+						payStatus: this.$store.getters.globalData.yue_pay_status,
+					},
+					{
+						"name": "线下支付",
+						"icon": "icon-yinhangqia",
+						value: 'offline',
+						title: '线下支付',
+						payStatus: 2,
+					}, {
+						"name": "先货后款",
+						"icon": "tan-a-lujing17324",
+						value: 'creditBuy',
+						title: `结算周期：${this.settle_cycle}天 日利率：${this.interest_rate}%`,
+						payStatus: '',
+					},
+				],
+				tagStyle: {
+					img: 'width:100%;display:block;',
+					video: 'width:100%;'
+				},
+				radioList: [{
+					title: this.deliveryName,
+					check: true
+				}, {
+					title: '到店核销',
+					check: false
+				}],
+				payType: 'weixin', //支付方式
+				active: 0, //支付方式切换
+				address: {
+					address: false
+				}, //地址组件
+				couponId: 0, //优惠券id
+				cartId: '', //购物车id
+				userInfo: {}, //用户信息
+				coupon_price: 0, //优惠券抵扣金额
+				ChangePrice: 0, //使用积分抵扣变动后的金额
+				formIds: [], //收集formid
+				status: 0,
+				is_address: false,
+				toPay: false, //修复进入支付时页面隐藏从新刷新页面
+				cartInfo: [],
+				priceGroup: {},
+				animated: false,
+				totalPrice: 0,
+				offlinePostage: "",
 
-        from: '',
-        orderStatus: '', //是否有地址
-        couponIndex: 0, //选择商铺优惠券索引
-        subCoupon: {}, //提交订单使用的优惠券
-        couponData: {},
-        orderPay: false,
-        pics: [],
-        extend: [],
-        virtualIndex: 0,
-        platformCoupon: [],
-        total_platform_coupon_price: 0,
-        enabledPlatformCoupon: false,
-        plantCoupon: false,
-        order_key: '',
-        product_type: '',
-        source: null,
-        settle_cycle: '', // 周期
-        type_id: '', //店铺类型
-        consumption_id: '', //补贴id
-        consumption_money: '', //补贴抵扣金额
-        total_coupon: '', //合计
-        payForm: {
-          cart_id: '',
-          address_id: '',
-          consumption_id: '',
-          use_coupon: '',
-          takes: '',
-          use_integral: '',
-          receipt_data: [],
-          mark: '',
-          pay_type: '',
-          money: '',
-          merName: '',
-          return_url: ''
-        },
-        checkForm: {
-        	address_id: '',
-        	cart_id: [],
-        	consumption_id: '',
-        	product_type: 0,
-        	source: 999,
-        	takes: [],
-        	use_coupon: {},
-        	use_integral: false
-        },
-      };
-    },
-    computed: {
-      ...mapGetters(['isLogin', 'viewColor']),
-      ...configMap(['hide_mer_status', 'yue_pay_status']),
-    },
-    watch: {
-      yue_pay_status(n) {
-        this.payMode[2].payStatus = n
-      }
-    },
-    onLoad: function(options) {
-      options.money = parseFloat(options.money).toFixed(2);
-      this.payForm.cart_id = options.cartId;
-      this.payForm.money = options.money;
-      this.payForm.merName = options.merName;
-      this.checkForm.cart_id = options.cartId.split(',');
-      this.total_coupon = options.money;
-      
-      // this.platformConsumption = [{
-      //   balance: "39000.00",
-      //   coupon_price: "50000.00",
-      //   coupon_title: "春耕采购余额",
-      //   coupon_user_id: 178,
-      //   describe: "仅限平台指定商家商品可使用",
-      //   end_time: "2025-07-01 00:00:00",
-      //   start_time: "2024-03-02 14:15:17",
-      //   uid: 889
-      // }]
+				from: '',
+				orderStatus: '', //是否有地址
+				couponIndex: 0, //选择商铺优惠券索引
+				subCoupon: {}, //提交订单使用的优惠券
+				couponData: {},
+				orderPay: false,
+				pics: [],
+				extend: [],
+				virtualIndex: 0,
+				platformCoupon: [],
+				total_platform_coupon_price: 0,
+				enabledPlatformCoupon: false,
+				plantCoupon: false,
+				order_key: '',
+				product_type: '',
+				source: null,
+				settle_cycle: '', // 周期
+				type_id: '', //店铺类型
+				consumption_id: '', //补贴id
+				consumption_money: '', //补贴抵扣金额
+				total_coupon: '', //合计
+				payForm: {
+					cart_id: '',
+					address_id: '',
+					consumption_id: '',
+					use_coupon: '',
+					takes: '',
+					use_integral: '',
+					receipt_data: [],
+					mark: '',
+					pay_type: '',
+					money: '',
+					merName: '',
+					return_url: '',
+					key: '',
+					source: 999,
+				},
+				checkForm: {
+					address_id: '',
+					cart_id: [],
+					consumption_id: '',
+					product_type: 0,
+					source: 999,
+					takes: [],
+					use_coupon: {},
+					use_integral: false,
+					key: ''
+				},
+				productData: [],
+				orderData: {}
+			};
+		},
+		computed: {
+			...mapGetters(['isLogin', 'viewColor']),
+			...configMap(['hide_mer_status', 'yue_pay_status']),
+		},
+		watch: {
+			yue_pay_status(n) {
+				this.payMode[2].payStatus = n
+			}
+		},
+		onLoad: function(options) {
+			// options.money = parseFloat(options.money).toFixed(2);
+			// this.payForm.cart_id = options.cartId;
+			// this.payForm.money = options.money;
+			// this.payForm.merName = options.merName;
+			// this.checkForm.cart_id = options.cartId.split(',');
+			// this.total_coupon = options.money;
 
-      const eventChannel = this.getOpenerEventChannel();
-      eventChannel.on('datas', (data) => {
-        this.platformConsumption = data;
-      })
+			// this.platformConsumption = [{
+			//   balance: "39000.00",
+			//   coupon_price: "50000.00",
+			//   coupon_title: "春耕采购余额",
+			//   coupon_user_id: 178,
+			//   describe: "仅限平台指定商家商品可使用",
+			//   end_time: "2025-07-01 00:00:00",
+			//   start_time: "2024-03-02 14:15:17",
+			//   uid: 889
+			// }]
 
-      // #ifdef H5
-      this.from = this.$wechat.isWeixin() ? 'weixin' : 'h5'
-      // #endif
-      // #ifdef MP
-      this.from = 'routine'
-      // #endif
-      // #ifdef APP-PLUS
-      this.from = 'weixin'
-      // #endif
 
-      if (!this.isLogin) {
-        this.isAuto = true;
-        this.isShowAuth = true
-      }
-    },
-    /**
-     * 生命周期函数--监听页面显示
-     */
-    onShow: function() {
-      this.getUserInfo()
-    },
+			let data = uni.getStorageSync("datas");
+			this.productData = data.productData;
+			this.platformConsumption = data.platformConsumption || [];
 
-    methods: {
-      couponTap3: function(item, index) {
-        uni.navigateTo({
-          url: '/pages/redpacket/redpacket',
-          success: (res) => {
-            res.eventChannel.emit('changeRedPacketInfo', this.platformConsumption)
-            uni.$once('changeRedPacket', (data) => {
-              this.consumption_id = data;
-              orderCheck({
-                ...this.checkForm,
-                consumption_id: this.consumption_id
-              }).then(res=>{
-                this.total_coupon = res.data.order_price;
-                this.consumption_money = res.data.consumption_money;
-                this.payForm.consumption_id = this.consumption_id;
-                // this.payForm.money = res.data.order_price;
-              })
-            })
-          }
-        })
-      },
-      // 授权关闭
-      authColse: function(e) {
-        console.log(e, 'authColse')
-        this.isShowAuth = e;
-      },
-      onLoadFun() {
-        this.isShowAuth = false;
-      },
+			this.checkForm.cart_id = data.checkForm.cart_id;
+			this.payForm.cart_id = this.checkForm.cart_id;
+			this.payForm.money = data.money;
+			this.payForm.merName = data.merName;
+			this.payForm.key = data.key;
+			this.total_coupon = data.money;
+			this.checkForm.key = data.key;
 
-      // 获取个人信息
-      getUserInfo() {
-        getUserInfo().then(res => {
-          this.userInfo = res.data;
-          this.loadMoneyInfo();
-        })
-      },
+			// #ifdef H5
+			this.from = this.$wechat.isWeixin() ? 'weixin' : 'h5'
+			// #endif
+			// #ifdef MP
+			this.from = 'routine'
+			// #endif
+			// #ifdef APP-PLUS
+			this.from = 'weixin'
+			// #endif
 
-      payItem: function(e) {
-        let that = this;
-        let active = e;
-        that.active = active;
-        // console.log(this.active);
-        that.animated = true;
-        that.payType = that.cartArr[active].value;
-        if (that.payType == 'weixin') {
-          that.payType = that.from
-        }
-      },
-      
-      loadMoneyInfo(){
-        //获取账户金额以及冻结金额 重新调了一次接口
-        getAdminApplyAPI(this.userInfo.service.mer_id).then(res => {
-          this.moneyInfo = res.data;
-        })
-      },
+			if (!this.isLogin) {
+				this.isAuto = true;
+				this.isShowAuth = true
+			}
+		},
+		/**
+		 * 生命周期函数--监听页面显示
+		 */
+		onShow: function() {
+			this.getUserInfo()
+		},
 
-      payment: function(data) {
-        let that = this;
-        createOrder(data).then(res => {
+		methods: {
+			couponTap3: function(item, index) {
+				uni.navigateTo({
+					url: '/pages/redpacket/redpacket',
+					success: (res) => {
+						res.eventChannel.emit('changeRedPacketInfo', this.platformConsumption)
+						uni.$once('changeRedPacket', (data) => {
+							this.consumption_id = data;
+							orderCheck({
+								...this.checkForm,
+								consumption_id: this.consumption_id
+							}).then(res => {
+								this.total_coupon = res.data.order_price;
+								this.consumption_money = res.data.consumption_money;
+								this.payForm.consumption_id = this.consumption_id;
+								// this.payForm.money = res.data.order_price;
+							})
+						})
+					}
+				})
+			},
+			// 授权关闭
+			authColse: function(e) {
+				console.log(e, 'authColse')
+				this.isShowAuth = e;
+			},
+			onLoadFun() {
+				this.isShowAuth = false;
+			},
 
-          let status = res.data.status,
-            orderId = res.data.result.order_id,
-            jsConfig = res.data.result.config,
-            // 暂不跳转
-            goPages = '/pages/order_pay_status/index?order_id=' + orderId + '&msg=' + res.message +
-            '&product_type=' + that.payForm.product_type + '&source=' + that.payForm.source,
-            goPagesOrder = '/pages/order_details/stay?order_id=' + orderId +
-            '&credit_buy=1&product_type=' + that.payForm.product_type;
+			// 获取个人信息
+			getUserInfo() {
+				getUserInfo().then(res => {
+					this.userInfo = res.data
+				})
+			},
 
-          that.orderPay = true;
-          uni.hideLoading();
-          switch (status) {
-            case 'ORDER_EXIST':
-            case 'EXTEND_ORDER':
-            case 'PAY_ERROR':
-            case 'error':
-              return that.$util.Tips({
-                title: res.message
-              }, {
-                tab: 5,
-                url: goPagesOrder
-              });
-              break;
-            case 'success':
-              return that.$util.Tips({
-                title: res.message,
-                icon: 'success'
-              }, {
-                tab: 5,
-                url: goPages
-              });
-              break;
-            case 'alipay':
-            case "alipayQr":
-              return;
-              break;
-              // #ifndef MP
-            case "wechat":
-            case "weixin":
-            case "weixinApp":
-              jsConfig.timeStamp = jsConfig.timestamp;
-              // #ifndef APP-PLUS
-              this.$wechat.pay(jsConfig).then(res => {
-                return that.$util.Tips({
-                  title: res.message,
-                  icon: 'success'
-                }, {
-                  tab: 4,
-                  url: goPages
-                });
-              }).catch(res => {
-                if (res.errMsg == 'chooseWXPay:cancel') 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'
-              }
-              uni[mp_pay_name]({
-                provider: 'wxpay',
-                orderInfo: jsConfig,
-                success: (e) => {
-                  // 暂不跳转
-                  let url = '/pages/order_pay_status/index?order_id=' + orderId +
-                    '&msg=支付成功' + '&product_type=' + that.product_type +
-                    '&source=' + that.source;
+			payItem: function(e) {
+				let that = this;
+				let active = e;
+				that.active = active;
+				// console.log(this.active);
+				that.animated = true;
+				that.payType = that.cartArr[active].value;
+				if (that.payType == 'weixin') {
+					that.payType = that.from
+				}
+			},
 
-                  return that.$util.Tips({
-                    title: '支付成功',
-                    icon: 'success'
-                  }, {
-                    tab: 4,
-                    url: url
-                  });
-                },
-                fail: (e) => {
-                  console.log(e, '111111111')
-                  // 暂不跳转
-                  let url = '/pages/order_pay_status/index?order_id=' + orderId +
-                    '&msg=取消支付' + '&product_type=' + that.product_type +
-                    '&source=' + that.source;
-                  return that.$util.Tips({
-                    title: '取消支付',
-                  }, {
-                    tab: 4,
-                    url: url
-                  });
-                },
-                complete: (res) => {
-                  uni.hideLoading();
-                },
-              });
-              // #endif
-              break;
-              // #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'
-              }
-              uni[mp_pay_name]({
-                ...jsConfig,
-                success: function(res) {
-                  uni.hideLoading();
-                  return that.$util.Tips({
-                    title: '支付成功',
-                    icon: 'success'
-                  }, {
-                    tab: 5,
-                    url: goPages
-                  });
-                },
-                fail: function(e) {
-                  // 暂不跳转
-                  let pages = '/pages/order_pay_status/index?order_id=' +
-                    orderId + '&msg=取消支付' + '&product_type=' + that
-                    .product_type + '&source=' + that.source;
-                  return that.$util.Tips({
-                    title: '取消支付'
-                  }, {
-                    tab: 5,
-                    url: pages + '&status=0'
-                  });
-                },
-              })
-              break;
-              // #endif
-            case "balance":
-              //余额
-              return that.$util.Tips({
-                title: res.msg
-              }, {
-                tab: 5,
-                url: goPages + '&status=1'
-              });
-              break;
-              // #ifdef H5
-            case 'h5':
-              let host = window.location.protocol + "//" + window.location.host;
-              let url =
-                `${host}/pages/order_pay_status/index?order_id=${orderId}&msg=${res.message}&product_type=${that.product_type}&source${that.source}`
-              let eUrl = encodeURIComponent(url)
-              let jsurl = jsConfig.mweb_url || jsConfig.h5_url
-              let locations = `${jsurl}&redirect_url=${eUrl}`
-              // 暂不跳转
-              setTimeout(() => {
-                location.href = locations;
-              }, 100);
-              break;
-              // #endif
-            default:
-              // 暂不跳转
-              let pages = '/pages/order_pay_status/index?order_id=' +
-                orderId + '&msg=取消支付' + '&product_type=' + that.product_type + '&source=' +
-                that.source
+			payment: function(data) {
+				let that = this;
+				createOrder(data).then(res => {
 
-              return that.$util.Tips({
-                title: '取消支付'
-              }, {
-                tab: 5,
-                url: pages + '&status=0'
-              });
-          }
-        }).catch(err => {
-          return that.$util.Tips({
-            title: err
-          });
-          uni.hideLoading();
-        });
-      },
+					let status = res.data.status,
+						orderId = res.data.result.order_id,
+						jsConfig = res.data.result.config,
+						// 暂不跳转
+						goPages = '/pages/order_pay_status/index?order_id=' + orderId + '&msg=' + res.message +
+						'&product_type=' + that.payForm.product_type + '&source=' + that.payForm.source,
+						goPagesOrder = '/pages/order_details/stay?order_id=' + orderId +
+						'&credit_buy=1&product_type=' + that.payForm.product_type;
 
-      SubOrder: function() {
-        let that = this,
-          data = {};
-        if (!that.payType) return that.$util.Tips({
-          title: '请选择支付方式'
-        });
+					that.orderPay = true;
+					uni.hideLoading();
+					switch (status) {
+						case 'ORDER_EXIST':
+						case 'EXTEND_ORDER':
+						case 'PAY_ERROR':
+						case 'error':
+							return that.$util.Tips({
+								title: res.message
+							}, {
+								tab: 5,
+								url: goPagesOrder
+							});
+							break;
+						case 'success':
+							return that.$util.Tips({
+								title: res.message,
+								icon: 'success'
+							}, {
+								tab: 5,
+								url: goPages
+							});
+							break;
+						case 'alipay':
+						case "alipayQr":
+							return;
+							break;
+							// #ifndef MP
+						case "wechat":
+						case "weixin":
+						case "weixinApp":
+							jsConfig.timeStamp = jsConfig.timestamp;
+							// #ifndef APP-PLUS
+							this.$wechat.pay(jsConfig).then(res => {
+								return that.$util.Tips({
+									title: res.message,
+									icon: 'success'
+								}, {
+									tab: 4,
+									url: goPages
+								});
+							}).catch(res => {
+								if (res.errMsg == 'chooseWXPay:cancel') 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'
+							}
+							uni[mp_pay_name]({
+								provider: 'wxpay',
+								orderInfo: jsConfig,
+								success: (e) => {
+									// 暂不跳转
+									let url = '/pages/order_pay_status/index?order_id=' + orderId +
+										'&msg=支付成功' + '&product_type=' + that.product_type +
+										'&source=' + that.source;
 
-        if (that.payType == 'balance' && this.userInfo.now_money < this.payForm.money) {
-          return that.$util.Tips({
-            title: '余额不足，请选择其他的支付方式！'
-          });
-        }
-        this.payForm.pay_type = that.payType;
-        uni.showLoading({
-          title: '订单支付中',
-          mask: true
-        });
+									return that.$util.Tips({
+										title: '支付成功',
+										icon: 'success'
+									}, {
+										tab: 4,
+										url: url
+									});
+								},
+								fail: (e) => {
+									console.log(e, '111111111')
+									// 暂不跳转
+									let url = '/pages/order_pay_status/index?order_id=' + orderId +
+										'&msg=取消支付' + '&product_type=' + that.product_type +
+										'&source=' + that.source;
+									return that.$util.Tips({
+										title: '取消支付',
+									}, {
+										tab: 4,
+										url: url
+									});
+								},
+								complete: (res) => {
+									uni.hideLoading();
+								},
+							});
+							// #endif
+							break;
+							// #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'
+							}
+							uni[mp_pay_name]({
+								...jsConfig,
+								success: function(res) {
+									uni.hideLoading();
+									return that.$util.Tips({
+										title: '支付成功',
+										icon: 'success'
+									}, {
+										tab: 5,
+										url: goPages
+									});
+								},
+								fail: function(e) {
+									// 暂不跳转
+									let pages = '/pages/order_pay_status/index?order_id=' +
+										orderId + '&msg=取消支付' + '&product_type=' + that
+										.product_type + '&source=' + that.source;
+									return that.$util.Tips({
+										title: '取消支付'
+									}, {
+										tab: 5,
+										url: pages + '&status=0'
+									});
+								},
+							})
+							break;
+							// #endif
+						case "balance":
+							//余额
+							return that.$util.Tips({
+								title: res.msg
+							}, {
+								tab: 5,
+								url: goPages + '&status=1'
+							});
+							break;
+							// #ifdef H5
+						case 'h5':
+							let host = window.location.protocol + "//" + window.location.host;
+							let url =
+								`${host}/pages/order_pay_status/index?order_id=${orderId}&msg=${res.message}&product_type=${that.product_type}&source${that.source}`
+							let eUrl = encodeURIComponent(url)
+							let jsurl = jsConfig.mweb_url || jsConfig.h5_url
+							let locations = `${jsurl}&redirect_url=${eUrl}`
+							// 暂不跳转
+							setTimeout(() => {
+								location.href = locations;
+							}, 100);
+							break;
+							// #endif
+						default:
+							// 暂不跳转
+							let pages = '/pages/order_pay_status/index?order_id=' +
+								orderId + '&msg=取消支付' + '&product_type=' + that.product_type + '&source=' +
+								that.source
 
-        // #ifdef MP
-        openPaySubscribe().then(() => {
-          that.payment(this.payForm);
-        });
-        // #endif
+							return that.$util.Tips({
+								title: '取消支付'
+							}, {
+								tab: 5,
+								url: pages + '&status=0'
+							});
+					}
+				}).catch(err => {
+					return that.$util.Tips({
+						title: err
+					});
+					uni.hideLoading();
+				});
+			},
 
-        // #ifndef MP
-        that.payment(this.payForm);
-        // #endif
-      }
-    }
-  }
+			SubOrder: function() {
+				let that = this,
+					data = {};
+				if (!that.payType) return that.$util.Tips({
+					title: '请选择支付方式'
+				});
+
+				if (that.payType == 'balance' && this.userInfo.now_money < this.payForm.money) {
+					return that.$util.Tips({
+						title: '余额不足，请选择其他的支付方式！'
+					});
+				}
+				this.payForm.pay_type = that.payType;
+
+				// 设置支付密码
+				if (that.payType == 'balance' || that.payType == 'merBalance') {
+					this.$refs.popups.handleOpen();
+				} else {
+					uni.showLoading({
+						title: '订单支付中',
+						mask: true
+					});
+					this.truePayOrder(data);
+				}
+			},
+
+
+			// 输入密码回调
+			handleConfirm(e) {
+				// 验证密码是否正确
+				verifyPwd({
+					withdrawal_pwd: e
+				}).then(res => {
+					// 密码是否有效 状态码判断
+					const code = res.data.code;
+					this.$set(this.payForm, 'withdrawal_pwd', e);
+
+					if (code == 100) { //密码正确
+						uni.showLoading({
+							title: '订单支付中',
+							mask: true
+						});
+						this.truePayOrder(this.payForm);
+					} 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();
+				}
+			},
+
+			handleClear() {},
+			handleChange() {},
+
+			truePayOrder() {
+				// #ifdef MP
+				openPaySubscribe().then(() => {
+					that.payment(this.payForm);
+				});
+				// #endif
+
+				// #ifndef MP
+				this.payment(this.payForm);
+				// #endif
+			}
+		}
+	}
 </script>
 
 <style lang="scss" scoped>
-  .order-submission .wrapper {
-    margin-bottom: 12rpx;
-    background-color: #fff;
-  }
+	.order-submission .wrapper {
+		margin-bottom: 12rpx;
+		background-color: #fff;
+	}
 
-  .order-submission .wrapper .item {
-    padding: 27rpx 30rpx;
-    font-size: 30rpx;
-    color: #282828;
-  }
+	.order-submission .wrapper .item {
+		padding: 27rpx 30rpx;
+		font-size: 30rpx;
+		color: #282828;
+	}
 
-  .order-submission .virtual_form {
-    padding: 0 30rpx;
-  }
+	.order-submission .virtual_form {
+		padding: 0 30rpx;
+	}
 
-  /deep/.order-submission .virtual_form .uni-input-wrapper {
-    text-align: right;
-  }
+	/deep/.order-submission .virtual_form .uni-input-wrapper {
+		text-align: right;
+	}
 
-  .order-submission .virtual_form .item-require {
-    color: red;
-    margin-right: 4rpx;
-  }
+	.order-submission .virtual_form .item-require {
+		color: red;
+		margin-right: 4rpx;
+	}
 
-  .order-submission .virtual_form .item {
-    border-bottom: 1rpx solid #EEEEEE;
-    padding: 27rpx 0;
-  }
+	.order-submission .virtual_form .item {
+		border-bottom: 1rpx solid #EEEEEE;
+		padding: 27rpx 0;
+	}
 
-  .upload {
-    display: -webkit-box;
-    display: -moz-box;
-    display: -webkit-flex;
-    display: -ms-flexbox;
-    display: flex;
-    -webkit-box-lines: multiple;
-    -moz-box-lines: multiple;
-    -o-box-lines: multiple;
-    -webkit-flex-wrap: wrap;
-    -ms-flex-wrap: wrap;
-    flex-wrap: wrap;
-  }
+	.upload {
+		display: -webkit-box;
+		display: -moz-box;
+		display: -webkit-flex;
+		display: -ms-flexbox;
+		display: flex;
+		-webkit-box-lines: multiple;
+		-moz-box-lines: multiple;
+		-o-box-lines: multiple;
+		-webkit-flex-wrap: wrap;
+		-ms-flex-wrap: wrap;
+		flex-wrap: wrap;
+	}
 
-  .order-submission .virtual_form .pictrue {
-    width: 156rpx;
-    height: 156rpx;
-    margin: 24rpx 20rpx 0 0;
-    position: relative;
-    font-size: 11px;
-    color: #bbb;
-    border-radius: 3rpx;
+	.order-submission .virtual_form .pictrue {
+		width: 156rpx;
+		height: 156rpx;
+		margin: 24rpx 20rpx 0 0;
+		position: relative;
+		font-size: 11px;
+		color: #bbb;
+		border-radius: 3rpx;
 
-    &:nth-child(4n) {
-      margin-right: 0;
-    }
+		&:nth-child(4n) {
+			margin-right: 0;
+		}
 
-    &:nth-last-child(1) {
-      border: 0.5px solid #ddd;
-      box-sizing: border-box;
-    }
+		&:nth-last-child(1) {
+			border: 0.5px solid #ddd;
+			box-sizing: border-box;
+		}
 
-    uni-image,
-    image {
-      width: 100%;
-      height: 100%;
-      border-radius: 1px;
+		uni-image,
+		image {
+			width: 100%;
+			height: 100%;
+			border-radius: 1px;
 
-      img {
-        -webkit-touch-callout: none;
-        -webkit-user-select: none;
-        -moz-user-select: none;
-        display: block;
-        position: absolute;
-        top: 0;
-        left: 0;
-        opacity: 0;
-        width: 100%;
-        height: 100%;
-      }
-    }
-  }
+			img {
+				-webkit-touch-callout: none;
+				-webkit-user-select: none;
+				-moz-user-select: none;
+				display: block;
+				position: absolute;
+				top: 0;
+				left: 0;
+				opacity: 0;
+				width: 100%;
+				height: 100%;
+			}
+		}
+	}
 
 
-  .order-submission .wrapper .item .discount {
-    font-size: 30rpx;
-    color: #999;
+	.order-submission .wrapper .item .discount {
+		font-size: 30rpx;
+		color: #999;
 
-    &.discount_voice {
-      overflow: hidden;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-      width: 500rpx;
-      text-align: right;
-    }
-  }
+		&.discount_voice {
+			overflow: hidden;
+			text-overflow: ellipsis;
+			white-space: nowrap;
+			width: 500rpx;
+			text-align: right;
+		}
+	}
 
-  .order-submission .wrapper .item .discount .iconfont {
-    color: #515151;
-    font-size: 30rpx;
-    margin-left: 15rpx;
-  }
+	.order-submission .wrapper .item .discount .iconfont {
+		color: #515151;
+		font-size: 30rpx;
+		margin-left: 15rpx;
+	}
 
-  .order-submission .wrapper .item .discount .num {
-    font-size: 32rpx;
-    margin-right: 20rpx;
-  }
+	.order-submission .wrapper .item .discount .num {
+		font-size: 32rpx;
+		margin-right: 20rpx;
+	}
 
-  .order-submission .wrapper .item input {
-    flex: 1;
-    height: 100%;
-    margin-left: 20rpx;
-    text-align: right;
-  }
+	.order-submission .wrapper .item input {
+		flex: 1;
+		height: 100%;
+		margin-left: 20rpx;
+		text-align: right;
+	}
 
-  .order-submission .wrapper .item .placeholder {
-    color: #ccc;
-  }
+	.order-submission .wrapper .item .placeholder {
+		color: #ccc;
+	}
 
-  .order-submission .wrapper .item .list {
-    margin-top: 35rpx;
-  }
+	.order-submission .wrapper .item .list {
+		margin-top: 35rpx;
+	}
 
-  .order-submission .wrapper .item .list .payItem {
-    border: 1px solid #eee;
-    border-radius: 6rpx;
-    height: 86rpx;
-    width: 100%;
-    box-sizing: border-box;
-    margin-top: 20rpx;
-    font-size: 28rpx;
-    color: #282828;
-  }
+	.order-submission .wrapper .item .list .payItem {
+		border: 1px solid #eee;
+		border-radius: 6rpx;
+		height: 86rpx;
+		width: 100%;
+		box-sizing: border-box;
+		margin-top: 20rpx;
+		font-size: 28rpx;
+		color: #282828;
+	}
 
-  .order-submission .wrapper .item .list .payItem.on {
-    border-color: var(--view-theme);
-    color: var(--view-theme);
-  }
+	.order-submission .wrapper .item .list .payItem.on {
+		border-color: var(--view-theme);
+		color: var(--view-theme);
+	}
 
-  .order-submission .wrapper .item .list .payItem .name {
-    width: 50%;
-    text-align: center;
-    border-right: 1px solid #eee;
-    justify-content: left;
-    padding-left: 80rpx;
-  }
+	.order-submission .wrapper .item .list .payItem .name {
+		width: 50%;
+		text-align: center;
+		border-right: 1px solid #eee;
+		justify-content: left;
+		padding-left: 80rpx;
+	}
 
-  .order-submission .wrapper .item .list .payItem .name .iconfont {
-    width: 44rpx;
-    height: 44rpx;
-    border-radius: 50%;
-    text-align: center;
-    line-height: 44rpx;
-    background-color: #fe960f;
-    color: #fff;
-    font-size: 30rpx;
-    margin-right: 15rpx;
-  }
+	.order-submission .wrapper .item .list .payItem .name .iconfont {
+		width: 44rpx;
+		height: 44rpx;
+		border-radius: 50%;
+		text-align: center;
+		line-height: 44rpx;
+		background-color: #fe960f;
+		color: #fff;
+		font-size: 30rpx;
+		margin-right: 15rpx;
+	}
 
-  .order-submission .wrapper .item .list .payItem .name .iconfont.icon-weixin2 {
-    background-color: #41b035;
-  }
+	.order-submission .wrapper .item .list .payItem .name .iconfont.icon-weixin2 {
+		background-color: #41b035;
+	}
 
-  .order-submission .wrapper .item .list .payItem .name .iconfont.icon-icon34 {
-    background-color: #4295D5;
-  }
+	.order-submission .wrapper .item .list .payItem .name .iconfont.icon-icon34 {
+		background-color: #4295D5;
+	}
 
-  .order-submission .wrapper .item .list .payItem .tip {
-    width: 49%;
-    text-align: center;
-    font-size: 26rpx;
-    color: #aaa;
-  }
+	.order-submission .wrapper .item .list .payItem .tip {
+		width: 49%;
+		text-align: center;
+		font-size: 26rpx;
+		color: #aaa;
+	}
 
-  .order-submission .moneyList {
-    margin-top: 12rpx;
-    background-color: #fff;
-    padding: 30rpx;
-  }
+	.order-submission .moneyList {
+		margin-top: 12rpx;
+		background-color: #fff;
+		padding: 30rpx;
+	}
 
-  .order-submission .moneyList .item {
-    font-size: 28rpx;
-    color: #282828;
-  }
+	.order-submission .moneyList .item {
+		font-size: 28rpx;
+		color: #282828;
+	}
 
-  .order-submission .moneyList .item~.item {
-    margin-top: 20rpx;
-  }
+	.order-submission .moneyList .item~.item {
+		margin-top: 20rpx;
+	}
 
-  .order-submission .moneyList .item .money {
-    color: #868686;
-  }
+	.order-submission .moneyList .item .money {
+		color: #868686;
+	}
 
-  .order-submission .footer {
-    width: 100%;
-    height: 100rpx;
-    height: calc(100rpx+ constant(safe-area-inset-bottom)); ///兼容 IOS<11.2/
-    height: calc(100rpx + env(safe-area-inset-bottom)); ///兼容 IOS>11.2/
-    background-color: #fff;
-    padding: 0 30rpx;
-    font-size: 28rpx;
-    color: #333;
-    box-sizing: border-box;
-    position: fixed;
-    bottom: 0;
-    left: 0;
-    z-index: 30;
+	.order-submission .footer {
+		width: 100%;
+		height: 100rpx;
+		height: calc(100rpx+ constant(safe-area-inset-bottom)); ///兼容 IOS<11.2/
+		height: calc(100rpx + env(safe-area-inset-bottom)); ///兼容 IOS>11.2/
+		background-color: #fff;
+		padding: 0 30rpx;
+		font-size: 28rpx;
+		color: #333;
+		box-sizing: border-box;
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		z-index: 30;
 
-    .footer_count {
-      font-size: 28rpx;
-    }
+		.footer_count {
+			font-size: 28rpx;
+		}
 
-    .coupon_price {
-      color: #999999;
-      font-size: 20rpx;
-      margin-top: 10rpx;
+		.coupon_price {
+			color: #999999;
+			font-size: 20rpx;
+			margin-top: 10rpx;
 
-      text {
-        color: #282828;
-        padding: 2rpx 10rpx;
-        background: #F5F5F5;
-        border-radius: 26rpx;
-        margin-left: 20rpx;
-        line-height: 30rpx;
-        height: 30rpx;
-        display: inline-block;
-      }
-    }
-  }
+			text {
+				color: #282828;
+				padding: 2rpx 10rpx;
+				background: #F5F5F5;
+				border-radius: 26rpx;
+				margin-left: 20rpx;
+				line-height: 30rpx;
+				height: 30rpx;
+				display: inline-block;
+			}
+		}
+	}
 
-  .pColor {
-    color: var(--view-priceColor);
-  }
+	.pColor {
+		color: var(--view-priceColor);
+	}
 
-  .order-submission .footer .settlement {
-    font-size: 30rpx;
-    color: #fff;
-    width: 240rpx;
-    height: 70rpx;
-    background-color: var(--view-theme);
-    border-radius: 50rpx;
-    text-align: center;
-    line-height: 70rpx;
+	.order-submission .footer .settlement {
+		font-size: 30rpx;
+		color: #fff;
+		width: 240rpx;
+		height: 70rpx;
+		background-color: var(--view-theme);
+		border-radius: 50rpx;
+		text-align: center;
+		line-height: 70rpx;
 
-    &.disabled {
-      background-color: #cccccc;
-    }
-  }
+		&.disabled {
+			background-color: #cccccc;
+		}
+	}
 
-  .storeinfo-wrapper {
-    .store-item {
-      margin-top: 12rpx;
-      background-color: #fff;
+	.storeinfo-wrapper {
+		.store-item {
+			margin-top: 12rpx;
+			background-color: #fff;
 
-      .store-title {
-        display: flex;
-        align-items: center;
-        padding: 28rpx 30rpx;
+			.store-title {
+				display: flex;
+				align-items: center;
+				padding: 28rpx 30rpx;
 
-        .icon-shangjiadingdan {
-          font-size: 32rpx;
-        }
+				.icon-shangjiadingdan {
+					font-size: 32rpx;
+				}
 
-        .icon-xiangyou {
-          font-size: 26rpx;
-          color: #999;
-        }
+				.icon-xiangyou {
+					font-size: 26rpx;
+					color: #999;
+				}
 
-        .txt {
-          margin: 0 8rpx;
-        }
-      }
+				.txt {
+					margin: 0 8rpx;
+				}
+			}
 
-      .product-item {
-        display: flex;
-        padding: 25rpx 30rpx;
-        border-top: 1px solid #F0F0F0;
+			.product-item {
+				display: flex;
+				padding: 25rpx 30rpx;
+				border-top: 1px solid #F0F0F0;
 
-        .img-box {
-          width: 130rpx;
-          height: 130rpx;
+				.img-box {
+					width: 130rpx;
+					height: 130rpx;
 
-          image {
-            width: 130rpx;
-            height: 130rpx;
-            border-radius: 16rpx;
-          }
-        }
+					image {
+						width: 130rpx;
+						height: 130rpx;
+						border-radius: 16rpx;
+					}
+				}
 
-        .content {
-          position: relative;
-          width: 550rpx;
-          margin-left: 30rpx;
-          font-size: 28rpx;
-          color: #282828;
-          overflow: hidden;
+				.content {
+					position: relative;
+					width: 550rpx;
+					margin-left: 30rpx;
+					font-size: 28rpx;
+					color: #282828;
+					overflow: hidden;
 
-          &.event_content {
-            .line1 {
-              width: 360rpx;
-            }
+					&.event_content {
+						.line1 {
+							width: 360rpx;
+						}
 
-            .price {
-              position: absolute;
-              top: 0;
-              right: 0;
-              margin-top: 0;
+						.price {
+							position: absolute;
+							top: 0;
+							right: 0;
+							margin-top: 0;
 
-              text {
-                display: block;
-                text-align: right;
-              }
-            }
-          }
+							text {
+								display: block;
+								text-align: right;
+							}
+						}
+					}
 
-          .label {
-            margin-top: 10rpx;
-            color: #868686;
-            font-size: 20rpx;
-          }
+					.label {
+						margin-top: 10rpx;
+						color: #868686;
+						font-size: 20rpx;
+					}
 
-          .price {
-            margin-top: 20rpx;
-            color: var(--view-priceColor);
-            position: relative;
+					.price {
+						margin-top: 20rpx;
+						color: var(--view-priceColor);
+						position: relative;
 
-            text {
-              margin-left: 10rpx;
-              color: #999;
-            }
+						text {
+							margin-left: 10rpx;
+							color: #999;
+						}
 
-            .delivery_type {
-              float: right;
+						.delivery_type {
+							float: right;
 
-              text {
-                color: var(--view-priceColor);
-                font-size: 20rpx;
-              }
-            }
-          }
-        }
-      }
-    }
-  }
+							text {
+								color: var(--view-priceColor);
+								font-size: 20rpx;
+							}
+						}
+					}
+				}
+			}
+		}
+	}
 
-  uni-checkbox-group,
-  .checkgroup {
-    width: 100%;
+	uni-checkbox-group,
+	.checkgroup {
+		width: 100%;
 
-    .checkbox {
-      float: right;
-    }
-  }
+		.checkbox {
+			float: right;
+		}
+	}
 
-  .total {
-    display: flex;
-    justify-content: flex-end;
-    padding-right: 30rpx;
-    padding-bottom: 30rpx;
-    font-size: 26rpx;
-    color: #282828;
+	.total {
+		display: flex;
+		justify-content: flex-end;
+		padding-right: 30rpx;
+		padding-bottom: 30rpx;
+		font-size: 26rpx;
+		color: #282828;
 
-    .price {
-      margin-left: 10rpx;
-      color: var(--view-priceColor);
-      font-size: 28rpx;
-      font-weight: bold;
+		.price {
+			margin-left: 10rpx;
+			color: var(--view-priceColor);
+			font-size: 28rpx;
+			font-weight: bold;
 
-      text {
-        font-size: 20rpx;
-      }
-    }
-  }
+			text {
+				font-size: 20rpx;
+			}
+		}
+	}
 
-  .red_packet {
-    color: #ff5c2d !important;
-    background-color: rgba(#ff5c2d, 0.3);
-    border-radius: 60rpx;
-    padding: 5rpx 10rpx;
-    padding-left: 20rpx;
-    font-size: 25rpx;
-  }
+	.red_packet {
+		color: #ff5c2d !important;
+		background-color: rgba(#ff5c2d, 0.3);
+		border-radius: 60rpx;
+		padding: 5rpx 10rpx;
+		padding-left: 20rpx;
+		font-size: 25rpx;
+	}
 </style>
\ No newline at end of file
diff --git a/pages/users/embody/embody.vue b/pages/users/embody/embody.vue
index 4db0222..82f5782 100644
--- a/pages/users/embody/embody.vue
+++ b/pages/users/embody/embody.vue
@@ -186,8 +186,15 @@
 			:order_id="currentTab"></cash>
 
 		<!-- 提现提示 -->
-		<u-modal :show="tipShow" title="提示" content='工作日当日10点前提现当日12点到账, 当日16点前提现当日18点到账, 当日18点后提现次日12点到账, 周末节假日提现, 下一工作日18点前到账'
+		<u-modal :show="tipShow" title="提示"
+			content='工作日当日10点前提现当日12点到账, 当日16点前提现当日18点到账, 当日18点后提现次日12点到账, 周末节假日提现, 下一工作日18点前到账'
 			@confirm="tipShow = false"></u-modal>
+
+		<!-- 支付密码 键盘 -->
+		<popups ref="popups" :isPay="true" @confirm="handleConfirm" @clear="handleClear" @change="handleChange" />
+
+		<!-- 密码错误事件处理 -->
+		<payPwd ref="payPwd" @left="handleLeft" @right="handleRight"></payPwd>
 	</view>
 </template>
 
@@ -198,7 +205,6 @@
 		getLisApplyAPI,
 		getAccountApplyAPI,
 		postAccountApplyAPI,
-
 	} from '@/api/user.js'
 	import {
 		extractCash,
@@ -217,10 +223,18 @@
 	import {
 		Toast
 	} from '../../../libs/uniApi';
+	import {
+		verifyPwd
+	} from '@/api/order.js';
+	import payPwd from "@/components/payPwd/index.vue";
+	import popups from "@/components/popups/index.vue";
+
 	export default {
 		components: {
 			cash,
-			authorize
+			authorize,
+			payPwd,
+			popups
 		},
 		data() {
 			return {
@@ -278,7 +292,8 @@
 				pay_close: false,
 				pay_type: [],
 				source: '',
-				merId: ''
+				merId: '',
+				modes: {}
 			};
 		},
 		computed: {
@@ -487,18 +502,20 @@
 					financial_bank_branch: this.mode.bank_address,
 					financial_type: 1
 				}
-				console.log(mode);
-				postCreateApplyAPI(this.merId, mode).then(res => {
+				this.modes = mode;
+
+				this.$refs.popups.handleOpen();
+			},
+
+			trueWithdraw() {
+				postCreateApplyAPI(this.merId, this.modes).then(res => {
 					// 提现申请
-					// that.postCreate(e.detail.value.extract_price)
 					Toast(res.message)
 					setTimeout(() => {
 						uni.navigateBack({
 							delta: 1
 						})
 					}, 1000)
-
-					console.log(res);
 				}).catch(err => {
 					Toast(err)
 					setTimeout(() => {
@@ -509,6 +526,53 @@
 
 				})
 			},
+
+			// 输入密码回调
+			handleConfirm(e) {
+				// 验证密码是否正确
+				verifyPwd({
+					withdrawal_pwd: e
+				}).then(res => {
+					// 密码是否有效 状态码判断
+					const code = res.data.code;
+					this.$set(this.modes, 'withdrawal_pwd', e);
+
+					if (code == 100) { //密码正确
+						uni.showLoading({
+							title: '订单支付中',
+							mask: true
+						});
+						this.trueWithdraw();
+					} 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();
+				}
+			},
+
+			handleClear() {},
+			handleChange() {},
+
+
 			async postCreate(price) {
 				const data = {
 					extract_money: price,
diff --git a/static/del.webp b/static/del.webp
new file mode 100644
index 0000000..7348c6e
Binary files /dev/null and b/static/del.webp differ
diff --git a/static/shop_logo.webp b/static/shop_logo.webp
new file mode 100644
index 0000000..0f535ee
Binary files /dev/null and b/static/shop_logo.webp differ