From e05ded55132d6a49b671ec8da8079ed7078489bb Mon Sep 17 00:00:00 2001
From: "DESKTOP-GMUNQ1B\\k" <1154079537@qq.com>
Date: Mon, 18 Mar 2024 18:05:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=AB=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/payment.js                               |   10 +-
 components/cu-keyboard/cu-keyboard.vue       |  308 +++
 components/cu-keyboard/exmple.vue            |   41 +
 components/uni-transition/uni-transition.vue |  279 +++
 pages/order_details/stay.vue                 |  334 +++-
 pages/payment/get_payment.vue                |  366 ++--
 pages/payment/get_payment_backup.vue         |  425 +++++
 pages/payment/settlement.vue                 | 1765 +++++++++---------
 pages/users/order_list/index.vue             |   10 +-
 static/mono-keyboard/backspace.png           |  Bin 0 -> 2688 bytes
 static/mono-keyboard/backspace_dark.png      |  Bin 0 -> 2431 bytes
 static/shop_logo.webp                        |  Bin 0 -> 1424 bytes
 12 files changed, 2451 insertions(+), 1087 deletions(-)
 create mode 100644 components/cu-keyboard/cu-keyboard.vue
 create mode 100644 components/cu-keyboard/exmple.vue
 create mode 100644 components/uni-transition/uni-transition.vue
 create mode 100644 pages/payment/get_payment_backup.vue
 create mode 100644 static/mono-keyboard/backspace.png
 create mode 100644 static/mono-keyboard/backspace_dark.png
 create mode 100644 static/shop_logo.webp

diff --git a/api/payment.js b/api/payment.js
index 441e510..1fe4701 100644
--- a/api/payment.js
+++ b/api/payment.js
@@ -16,11 +16,19 @@ export function addCart(data) {
 	return request.post(`user/cart/create`, data);
 }
 
+/**
+ * 根据店铺id 获取店铺信息
+ */
+// export function getProductInfo(data) {
+// 	return request.get(`scanPay/product`, data);
+// }
+
+
 /**
  * 根据店铺id 获取店铺信息
  */
 export function getProductInfo(data) {
-	return request.get(`scanPay/product`, data);
+	return request.get(`order_mix`, data);
 }
 
 /**
diff --git a/components/cu-keyboard/cu-keyboard.vue b/components/cu-keyboard/cu-keyboard.vue
new file mode 100644
index 0000000..8601054
--- /dev/null
+++ b/components/cu-keyboard/cu-keyboard.vue
@@ -0,0 +1,308 @@
+<template>
+	<view class="key-container" @click="hide" v-show="showMask">
+		<uni-transition :modeClass="['slide-bottom']" :show="show" :styles="{height:'100vh'}" :duration="duration">
+			<view class="key-content" @click.stop>
+				<slot></slot>
+				{{value}}
+				<view class="key-box block flex">
+					<view class="key-left">
+						<view class="key-top flex flex-wrap">
+							<view class="btn-box" v-for="(item,index) in numArr" :key="index">
+								<button hover-class="active" class="cu-btn key-btn text-black text-xl"
+									@click.stop="keydown(item)">{{item}}</button>
+							</view>
+						</view>
+						<view class="key-bottom">
+							<view class="btn-zero">
+								<button hover-class="active" class="cu-btn key-btn text-black text-xl"
+									@click.stop="keydown('0')">0</button>
+							</view>
+							<view class="btn-point">
+								<button hover-class="active" class="cu-btn key-btn text-black text-xl"
+									@click.stop="keydown('.')">.</button>
+							</view>
+						</view>
+					</view>
+					<view class="key-right">
+						<view class="del">
+							<button hover-class="active" class="cu-btn key-btn text-black text-xl" @click.stop="del">
+								<text class="zm iconbackspace text-xl"></text>
+							</button>
+						</view>
+						<view class="confirm">
+							<button hover-class="active" :style="[confirmStyle]" class="cu-btn" @click.stop="confirm">
+								<text class="confirm-text">{{confirmText}}</text>
+							</button>
+						</view>
+					</view>
+				</view>
+			</view>
+		</uni-transition>
+	</view>
+</template>
+
+<script>
+	/**
+	 * 付款组件
+	 * @property {Number} duration - 弹出动画时长，默认为300
+	 * @event {Function} change - 数字改变触发，参数为数字
+	 * @event {Function} confirm - 付款时触发，参数为数字
+	 * @event {Function} hide - 关闭键盘触发，参数为空
+	 */
+	// 使用方法,查看同级目录exmple
+	import uniTransition from '../uni-transition/uni-transition.vue'
+	export default {
+		components: {
+			uniTransition
+		},
+		props: {
+			duration: {
+				type: Number, //弹出动画时常
+				default: 300
+			},
+			confirmText: {
+				type: String,
+				default: '付款'
+			},
+			confirmStyle: {
+				type: Object,
+				default: () => {
+					return {
+						backgroundColor: '#57BE6D'
+					}
+				}
+			}
+		},
+		data() {
+			return {
+				value: '', //输出的值
+				show: false, //显示键盘
+				showMask: false, //遮罩层
+				numArr: [1, 2, 3, 4, 5, 6, 7, 8, 9]
+			}
+		},
+
+		watch: {
+			value(newval, oldval) {
+				this.$emit("change", newval);
+			}
+		},
+		methods: {
+			close() {
+				this.show = false;
+				setTimeout(() => {
+					this.showMask = false;
+				}, this.duration)
+			},
+			open() {
+				this.value = '';
+				this.show = true;
+				this.showMask = true;
+			},
+			del() {
+				if (this.value.length) {
+					setTimeout(() => {
+						this.value = this.value.slice(0, this.value.length - 1);
+					}, 10);
+				}
+			},
+			keydown(e) {
+				if (this.value.lastIndexOf('.') != -1 && this.value.length - this.value.lastIndexOf('.') == 3) return;
+				if (this.value.length >= 9) return;
+
+				switch (e) {
+					case '.':
+						// 当输入为点的时候，如果第一次输入点，则补零
+						if (!this.value.length) {
+							this.value = '0.';
+						} else {
+							if (this.value.indexOf('.') > -1) {
+								// 如果已经有点，则无效
+							} else {
+								this.value = this.value + '' + e;
+							}
+						}
+						break;
+					case '0':
+						if (this.value.length === 0) {
+							this.value = this.value + '' + e;
+						}
+						if (Number(this.value) === 0 && this.value.indexOf('.') == -1) {
+							// 当输入为零的时候，如果value转换成数字为零，且没有点则无效
+						} else {
+							this.value = this.value + '' + e;
+						}
+						break;
+					default:
+						this.value = this.value + '' + e;
+						break;
+				}
+			},
+			hide() {
+				this.$emit('hide');
+				this.close();
+			},
+			confirm() {
+				this.$emit('confirm', this.value);
+				this.close();
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	@font-face {
+		font-family: 'zm';
+		/* project id 2442084 */
+		src: url('https://at.alicdn.com/t/font_2442084_o72ps3802ih.eot');
+		src: url('https://at.alicdn.com/t/font_2442084_o72ps3802ih.eot?#iefix') format('embedded-opentype'),
+			url('https://at.alicdn.com/t/font_2442084_o72ps3802ih.woff2') format('woff2'),
+			url('https://at.alicdn.com/t/font_2442084_o72ps3802ih.woff') format('woff'),
+			url('https://at.alicdn.com/t/font_2442084_o72ps3802ih.ttf') format('truetype'),
+			url('https://at.alicdn.com/t/font_2442084_o72ps3802ih.svg#zm') format('svg');
+	}
+
+	.zm {
+		font-family: "zm" !important;
+		font-size: 16px;
+		font-style: normal;
+		-webkit-font-smoothing: antialiased;
+		-moz-osx-font-smoothing: grayscale;
+	}
+
+	.iconbackspace:before {
+		content: "\ef11";
+	}
+
+	.flex {
+		display: flex;
+	}
+
+	.flex-wrap {
+		flex-wrap: wrap;
+	}
+
+	.cu-btn {
+		position: relative;
+		border: 0rpx;
+		display: inline-flex;
+		align-items: center;
+		justify-content: center;
+		box-sizing: border-box;
+		padding: 0 30rpx;
+		font-size: 28rpx;
+		height: 64rpx;
+		line-height: 1;
+		text-align: center;
+		text-decoration: none;
+		overflow: visible;
+		margin-left: initial;
+		transform: translate(0rpx, 0rpx);
+		margin-right: initial;
+	}
+
+	.cu-btn::after {
+		display: none;
+	}
+
+	.text-xl {
+		font-size: 36rpx;
+		font-weight: bold;
+		font-family: 'microsoft-yahei';
+	}
+
+	.text-black {
+		color: #333;
+	}
+
+	.active {
+		background-color: #ddd !important;
+		transform: translate(2rpx, 2rpx);
+	}
+
+	.key-container {
+		position: fixed;
+		bottom: 0;
+		top: 0;
+		left: 0;
+		right: 0;
+
+		.key-content {
+			position: absolute;
+			bottom: 0;
+			width: 100vw;
+			background-color: #F7F7F7;
+		}
+	}
+
+	.key-box {
+		width: 100%;
+		box-sizing: border-box;
+		padding: 10rpx 10rpx 0;
+
+		.key-left {
+			width: 75%;
+		}
+
+		.key-right {
+			width: 25%;
+			display: flex;
+			flex-direction: column;
+		}
+
+		.key-bottom {
+			width: 100%;
+			display: flex;
+		}
+	}
+
+	.del {
+		width: 100%;
+	}
+
+	.btn-box {
+		width: 33.33%;
+		padding: 0 10rpx 10rpx 0;
+		box-sizing: border-box;
+	}
+
+	.btn-zero {
+		width: 66.66%;
+		padding: 0 10rpx 10rpx 0;
+		box-sizing: border-box;
+	}
+
+	.btn-point {
+		width: 33.33%;
+		padding: 0 10rpx 10rpx 0;
+		box-sizing: border-box;
+	}
+
+	.key-right {
+		flex-shrink: 0;
+	}
+
+	.key-btn {
+		background-color: #fff;
+		width: 100%;
+		height: 90rpx;
+	}
+
+	.confirm {
+		width: 100%;
+		flex: 1;
+		padding: 10rpx 0 10rpx 0;
+		box-sizing: border-box;
+
+		button {
+			width: 100%;
+			height: 100%;
+
+			.confirm-text {
+				color: #fff;
+				display: block;
+				font-size: 32rpx;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/components/cu-keyboard/exmple.vue b/components/cu-keyboard/exmple.vue
new file mode 100644
index 0000000..7de20ae
--- /dev/null
+++ b/components/cu-keyboard/exmple.vue
@@ -0,0 +1,41 @@
+<template>
+	<view class="container">
+		<button type="default" @click="open">打开键盘</button>
+		{{value}}
+		<cu-keyboard ref="cukeyboard" @change="change" @confirm="confirm" @hide="hide"></cu-keyboard>
+	</view>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			value:''
+		}
+	},
+	mounted() {
+
+	},
+	methods: {
+		change(e){
+			this.value = e;
+			console.log("数字改变",e);			
+		},
+		open(){
+			console.log("打开键盘");
+			this.$refs.cukeyboard.open();
+		},
+		confirm(e){
+			console.log("付款",e);
+		},
+		hide(){
+			console.log("关闭键盘")
+		}
+		
+	}
+}
+</script>
+
+<style>
+
+</style>
diff --git a/components/uni-transition/uni-transition.vue b/components/uni-transition/uni-transition.vue
new file mode 100644
index 0000000..908a939
--- /dev/null
+++ b/components/uni-transition/uni-transition.vue
@@ -0,0 +1,279 @@
+<template>
+	<view v-if="isShow" ref="ani" class="uni-transition" :class="[ani.in]" :style="'transform:' +transform+';'+stylesObject"
+	 @click="change">
+		 <slot></slot>
+	</view>
+</template>
+
+<script>
+	// #ifdef APP-NVUE
+	const animation = uni.requireNativePlugin('animation');
+	// #endif
+	/**
+	 * Transition 过渡动画
+	 * @description 简单过渡动画组件
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=985
+	 * @property {Boolean} show = [false|true] 控制组件显示或隐藏
+     * @property {Array} modeClass = [fade|slide-top|slide-right|slide-bottom|slide-left|zoom-in|zoom-out] 过渡动画类型
+     *  @value fade 渐隐渐出过渡
+     *  @value slide-top 由上至下过渡
+     *  @value slide-right 由右至左过渡
+     *  @value slide-bottom 由下至上过渡
+     *  @value slide-left 由左至右过渡
+     *  @value zoom-in 由小到大过渡
+     *  @value zoom-out 由大到小过渡
+	 * @property {Number} duration 过渡动画持续时间
+	 * @property {Object} styles 组件样式，同 css 样式，注意带’-‘连接符的属性需要使用小驼峰写法如：`backgroundColor:red`
+	 */
+	export default {
+		name: 'uniTransition',
+		props: {
+			show: {
+				type: Boolean,
+				default: false
+			},
+			modeClass: {
+				type: Array,
+				default () {
+					return []
+				}
+			},
+			duration: {
+				type: Number,
+				default: 300
+			},
+			styles: {
+				type: Object,
+				default () {
+					return {}
+				}
+			}
+		},
+		data() {
+			return {
+				isShow: false,
+				transform: '',
+				ani: { in: '',
+					active: ''
+				}
+			};
+		},
+		watch: {
+			show: {
+				handler(newVal) {
+					if (newVal) {
+						this.open()
+					} else {
+						this.close()
+					}
+				},
+				immediate: true
+			}
+		},
+		computed: {
+			stylesObject() {
+				let styles = {
+					...this.styles,
+					'transition-duration': this.duration / 1000 + 's'
+				}
+				let transfrom = ''
+				for (let i in styles) {
+					let line = this.toLine(i)
+					transfrom += line + ':' + styles[i] + ';'
+				}
+				return transfrom
+			}
+		},
+		created() {
+			// this.timer = null
+			// this.nextTick = (time = 50) => new Promise(resolve => {
+			// 	clearTimeout(this.timer)
+			// 	this.timer = setTimeout(resolve, time)
+			// 	return this.timer
+			// });
+		},
+		methods: {
+			change() {
+				this.$emit('click', {
+					detail: this.isShow
+				})
+			},
+			open() {
+				clearTimeout(this.timer)
+				this.isShow = true
+				this.transform = ''
+				this.ani.in = ''
+				for (let i in this.getTranfrom(false)) {
+					if (i === 'opacity') {
+						this.ani.in = 'fade-in'
+					} else {
+						this.transform += `${this.getTranfrom(false)[i]} `
+					}
+				}
+				this.$nextTick(() => {
+					setTimeout(() => {
+						this._animation(true)
+					}, 50)
+				})
+
+			},
+			close(type) {
+				clearTimeout(this.timer)
+				this._animation(false)
+			},
+			_animation(type) {
+				let styles = this.getTranfrom(type)
+				// #ifdef APP-NVUE
+				if(!this.$refs['ani']) return
+				animation.transition(this.$refs['ani'].ref, {
+					styles,
+					duration: this.duration, //ms
+					timingFunction: 'ease',
+					needLayout: false,
+					delay: 0 //ms
+				}, () => {
+					if (!type) {
+						this.isShow = false
+					}
+					this.$emit('change', {
+						detail: this.isShow
+					})
+				})
+				// #endif
+				// #ifndef APP-NVUE
+				this.transform = ''
+				for (let i in styles) {
+					if (i === 'opacity') {
+						this.ani.in = `fade-${type?'out':'in'}`
+					} else {
+						this.transform += `${styles[i]} `
+					}
+				}
+				this.timer = setTimeout(() => {
+					if (!type) {
+						this.isShow = false
+					}
+					this.$emit('change', {
+						detail: this.isShow
+					})
+
+				}, this.duration)
+				// #endif
+
+			},
+			getTranfrom(type) {
+				let styles = {
+					transform: ''
+				}
+				this.modeClass.forEach((mode) => {
+					switch (mode) {
+						case 'fade':
+							styles.opacity = type ? 1 : 0
+							break;
+						case 'slide-top':
+							styles.transform += `translateY(${type?'0':'-100%'}) `
+							break;
+						case 'slide-right':
+							styles.transform += `translateX(${type?'0':'100%'}) `
+							break;
+						case 'slide-bottom':
+							styles.transform += `translateY(${type?'0':'100%'}) `
+							break;
+						case 'slide-left':
+							styles.transform += `translateX(${type?'0':'-100%'}) `
+							break;
+						case 'zoom-in':
+							styles.transform += `scale(${type?1:0.8}) `
+							break;
+						case 'zoom-out':
+							styles.transform += `scale(${type?1:1.2}) `
+							break;
+					}
+				})
+				return styles
+			},
+			_modeClassArr(type) {
+				let mode = this.modeClass
+				if (typeof(mode) !== "string") {
+					let modestr = ''
+					mode.forEach((item) => {
+						modestr += (item + '-' + type + ',')
+					})
+					return modestr.substr(0, modestr.length - 1)
+				} else {
+					return mode + '-' + type
+				}
+			},
+			// getEl(el) {
+			// 	console.log(el || el.ref || null);
+			// 	return el || el.ref || null
+			// },
+			toLine(name) {
+				return name.replace(/([A-Z])/g, "-$1").toLowerCase();
+			}
+		}
+	}
+</script>
+
+<style>
+	.uni-transition {
+		transition-timing-function: ease;
+		transition-duration: 0.3s;
+		transition-property: transform, opacity;
+	}
+
+	.fade-in {
+		opacity: 0;
+	}
+
+	.fade-active {
+		opacity: 1;
+	}
+
+	.slide-top-in {
+		/* transition-property: transform, opacity; */
+		transform: translateY(-100%);
+	}
+
+	.slide-top-active {
+		transform: translateY(0);
+		/* opacity: 1; */
+	}
+
+	.slide-right-in {
+		transform: translateX(100%);
+	}
+
+	.slide-right-active {
+		transform: translateX(0);
+	}
+
+	.slide-bottom-in {
+		transform: translateY(100%);
+	}
+
+	.slide-bottom-active {
+		transform: translateY(0);
+	}
+
+	.slide-left-in {
+		transform: translateX(-100%);
+	}
+
+	.slide-left-active {
+		transform: translateX(0);
+		opacity: 1;
+	}
+
+	.zoom-in-in {
+		transform: scale(0.8);
+	}
+
+	.zoom-out-active {
+		transform: scale(1);
+	}
+
+	.zoom-out-in {
+		transform: scale(1.2);
+	}
+</style>
diff --git a/pages/order_details/stay.vue b/pages/order_details/stay.vue
index 6489bcf..28595ba 100644
--- a/pages/order_details/stay.vue
+++ b/pages/order_details/stay.vue
@@ -11,7 +11,7 @@
 						<view class='state'>请在{{orderInfo.cancel_time}}前完成支付!</view>
 						<view>{{orderInfo.add_time_y}}<text class='time'>{{orderInfo.create_time}}</text></view>
 					</view>
-				</view>	
+				</view>
 				<view class='nav'>
 					<view class='navCon acea-row row-between-wrapper'>
 						<view class="on">待付款</view>
@@ -35,8 +35,11 @@
 			</view>
 			<!--预售（代付款）-->
 			<view v-else class="presell_bg_header">
-				<view class='header presell_header' :style="{ 'background-image': `url(${domain}/static/diy/presell_header${keyColor}.png)`}">
-					<view class="presell_payment" v-if="orderInfo.orderList"><text class="iconfont icon-shijian1"></text>{{orderInfo.orderList[0].orderProduct[0].cart_info.productPresell.presell_type==1?'待支付':'待付定金'}}</view>
+				<view class='header presell_header'
+					:style="{ 'background-image': `url(${domain}/static/diy/presell_header${keyColor}.png)`}">
+					<view class="presell_payment" v-if="orderInfo.orderList"><text
+							class="iconfont icon-shijian1"></text>{{orderInfo.orderList[0].orderProduct[0].cart_info.productPresell.presell_type==1?'待支付':'待付定金'}}
+					</view>
 					<view class='data'>
 						<view class='state'>请在{{orderInfo.cancel_time}}前完成支付,超时订单将自动取消</view>
 					</view>
@@ -53,35 +56,47 @@
 			</view>
 			<!-- 店铺商品列表 -->
 			<view class="order-wrapper" v-for="(item,index) in orderInfo.orderList" :key="index">
-				<view class="title" @click="goStore(item)">{{item.merchant.mer_name}}<text class="iconfont icon-xiangyou"></text>
+				<view class="title" @click="goStore(item)">{{item.merchant.mer_name}}<text
+						class="iconfont icon-xiangyou"></text>
 				</view>
 				<view class="goods-box">
-					<view v-for="(goods,j) in item.orderProduct" :key="goods.order_product_id" @click="goProduct(goods)">
+					<view v-for="(goods,j) in item.orderProduct" :key="goods.order_product_id"
+						@click="goProduct(goods)">
 						<view v-if="item.activity_type === 2">
 							<view class="item">
 								<image :src="goods.cart_info.product.image"></image>
 								<view class="info-box">
-									<view class="name line1"><text class="event_name event_bg">预售</text>{{goods.cart_info.product.store_name}}</view>
+									<view class="name line1"><text
+											class="event_name event_bg">预售</text>{{goods.cart_info.product.store_name}}
+									</view>
 									<view class="msg">{{goods.cart_info.productAttr.sku}}</view>
-									<view  class="event_ship event_color">发货时间：
+									<view class="event_ship event_color">发货时间：
 										<!--全款预售-->
-										<text v-if="goods.cart_info.productPresell.presell_type === 1">{{ goods.cart_info.productPresell.delivery_type === 1 ? '支付成功后' : '预售结束后' }}{{ goods.cart_info.productPresell.delivery_day }}天内</text>
+										<text
+											v-if="goods.cart_info.productPresell.presell_type === 1">{{ goods.cart_info.productPresell.delivery_type === 1 ? '支付成功后' : '预售结束后' }}{{ goods.cart_info.productPresell.delivery_day }}天内</text>
 										<!--定金预售-->
-										<text v-if="goods.cart_info.productPresell.presell_type === 2">{{ goods.cart_info.productPresell.delivery_type === 1 ? '支付尾款后' : '预售结束后' }}{{ goods.cart_info.productPresell.delivery_day }}天内</text>
+										<text
+											v-if="goods.cart_info.productPresell.presell_type === 2">{{ goods.cart_info.productPresell.delivery_type === 1 ? '支付尾款后' : '预售结束后' }}{{ goods.cart_info.productPresell.delivery_day }}天内</text>
 									</view>
 								</view>
-								<view class="num"><text class="font-color">￥{{goods.cart_info.productPresellAttr.presell_price}}</text></br>x{{goods.product_num}}</view>
+								<view class="num"><text
+										class="font-color">￥{{goods.cart_info.productPresellAttr.presell_price}}</text></br>x{{goods.product_num}}
+								</view>
 							</view>
 							<view class="event_progress" v-if="goods.cart_info.productPresell.presell_type !=1">
 								<view class="progress_list">
 									<view class="progress_name">阶段一： 等待买家付款</view>
-									<view class="progress_price">商品定金  <text class="align_right">￥{{ item.pay_price }}</text></view>
-									<view class="progress_pay">定金需付款<text class="align_right gColor">￥{{ item.pay_price }}</text></view>
+									<view class="progress_price">商品定金 <text
+											class="align_right">￥{{ item.pay_price }}</text></view>
+									<view class="progress_pay">定金需付款<text
+											class="align_right gColor">￥{{ item.pay_price }}</text></view>
 								</view>
 								<view class="progress_list">
 									<view class="progress_name">阶段二： 未开始</view>
-									<view class="progress_price">商品尾款  <text class="align_right">￥{{ item.presellOrder.pay_price }}</text></view>
-									<view class="progress_pay">尾款需付款<text class="align_right gColor">￥{{ item.presellOrder.pay_price }}</text></view>
+									<view class="progress_price">商品尾款 <text
+											class="align_right">￥{{ item.presellOrder.pay_price }}</text></view>
+									<view class="progress_pay">尾款需付款<text
+											class="align_right gColor">￥{{ item.presellOrder.pay_price }}</text></view>
 								</view>
 							</view>
 						</view>
@@ -92,7 +107,8 @@
 								<view class="msg">{{goods.cart_info.productAttr.sku}}</view>
 								<view class='price acea-row row-middle'>
 									<text>￥{{goods.cart_info.productAttr.price}}</text>
-									<image v-if="goods.cart_info.productAttr.show_svip_price" class="svip-img" :src="`${domain}/static/images/svip.png`"></image>
+									<image v-if="goods.cart_info.productAttr.show_svip_price" class="svip-img"
+										:src="`${domain}/static/images/svip.png`"></image>
 								</view>
 							</view>
 							<view class="num">x{{goods.product_num}}</view>
@@ -134,11 +150,30 @@
 				</view>
 			</view>
 			<view v-if="orderInfo.orderList && orderInfo.orderList[0].order_extend" class='wrapper'>
-				<view v-for="(item,index) in orderInfo.orderList[0].order_extend" :key="index" v-if="item" class='item acea-row row-between'>
-					<view>{{index}}：</view>
-					<view v-if="!Array.isArray(item)" class='conter'>{{item}}</view>
+				<view v-for="(item,index) in orderInfo.orderList[0].order_extend" :key="index" v-if="item"
+					class='item acea-row row-between'>
+					<!-- <view>{{index}}：</view> -->
+					<view v-if="!Array.isArray(item)" class='conter' style="width: 100%;">
+						<view class="conter-item">
+							<text class="conter-item-name">公司名称:</text>
+							<text>{{item.company_name}}</text>
+						</view>
+						<view class="conter-item">
+							<text class="conter-item-name">对公账号:</text>
+							<text>{{item.corporate_account}}</text>
+						</view>
+						<view class="conter-item">
+							<text class="conter-item-name">开户行:</text>
+							<text>{{item.corporate_bank}}</text>
+						</view>
+						<view class="conter-item">
+							<text class="conter-item-name">开户行地址:</text>
+							<text>{{item.corporate_bank_address}}</text>
+						</view>
+					</view>
 					<view v-else class='conter virtual_image'>
-						<image v-for="(pic,i) in item" :key="i" class="picture" :src="pic" @click="getPhotoClickIdx(item,i)"></image>
+						<image v-for="(pic,i) in item" :key="i" class="picture" :src="pic"
+							@click="getPhotoClickIdx(item,i)"></image>
 					</view>
 				</view>
 			</view>
@@ -155,10 +190,20 @@
 					<view>积分抵扣：</view>
 					<view class='conter'>-￥{{orderInfo.integral_price}}</view>
 				</view>
-				<view class='item acea-row row-between'>
+				<view class='item acea-row row-between' v-if="orderInfo.pay_type != 10">
 					<view>实付款：</view>
 					<view class='conter'>￥{{orderInfo.pay_price}}</view>
 				</view>
+
+				<view class='item acea-row row-between' v-else>
+					<view>付款凭证：</view>
+					<view class='conter'>
+						<image style="width: 400rpx;height:340rpx"
+							src="http://lihai001.oss-cn-chengdu.aliyuncs.com/def/2023-12-05/202312051513438570.jpg">
+						</image>
+						<!-- <image :src="orderInfo.orderList[0].order_extend.corporate_voucher"></image> -->
+					</view>
+				</view>
 				<!-- <view class='actualPay acea-row row-right'>实付款：<text class='money font-color'>￥{{orderInfo.pay_price}}</text></view> -->
 			</view>
 			<view class="content-clip"></view>
@@ -167,8 +212,9 @@
 				<view class='bnt bgColor' @tap='pay_open(orderInfo.order_id)'>立即付款</view>
 			</view>
 		</view>
-		<payment :payMode='payMode' :pay_close="pay_close" @onChangeFun='onChangeFun' :order_id="pay_order_id" :totalPrice='totalPrice'></payment>
-	
+		<payment :payMode='payMode' :pay_close="pay_close" @onChangeFun='onChangeFun' :order_id="pay_order_id"
+			:totalPrice='totalPrice'></payment>
+
 	</view>
 </template>
 
@@ -184,17 +230,37 @@
 	// | Author: CRMEB Team <admin@crmeb.com>
 	// +----------------------------------------------------------------------
 	let app = getApp();
-	import { HTTP_REQUEST_URL } from '@/config/app';
-	import { goShopDetail } from '@/libs/order.js'
-	import { groupOrderDetail, orderAgain, orderTake, orderDel, unOrderCancel} from '@/api/order.js';
-	import { openOrderRefundSubscribe } from '@/utils/SubscribeMessage.js';
-	import { getUserInfo } from '@/api/user.js';
+	import {
+		HTTP_REQUEST_URL
+	} from '@/config/app';
+	import {
+		goShopDetail
+	} from '@/libs/order.js'
+	import {
+		groupOrderDetail,
+		orderAgain,
+		orderTake,
+		orderDel,
+		unOrderCancel
+	} from '@/api/order.js';
+	import {
+		openOrderRefundSubscribe
+	} from '@/utils/SubscribeMessage.js';
+	import {
+		getUserInfo
+	} from '@/api/user.js';
 	import payment from '@/components/payment';
 	import orderGoods from "@/components/orderGoods";
 	import ClipboardJS from "@/plugin/clipboard/clipboard.js";
-	import { configMap } from "@/utils";
-	import { mapGetters } from "vuex";
-	import { toLogin } from '@/libs/login.js';
+	import {
+		configMap
+	} from "@/utils";
+	import {
+		mapGetters
+	} from "vuex";
+	import {
+		toLogin
+	} from '@/libs/login.js';
 	export default {
 		components: {
 			payment,
@@ -240,7 +306,7 @@
 				pay_close: false,
 				pay_order_id: '',
 				totalPrice: '0',
-				imgUrl:HTTP_REQUEST_URL,
+				imgUrl: HTTP_REQUEST_URL,
 				invoice: {
 					invoice: false,
 					add: false,
@@ -248,15 +314,19 @@
 			};
 		},
 		watch: {
-			alipay_open(n){
+			alipay_open(n) {
 				this.payMode[1].payStatus = n
 			},
-			yue_pay_status(n){
+			yue_pay_status(n) {
 				this.payMode[2].payStatus = n
 			}
 		},
-		computed: configMap({hide_mer_status:0,alipay_open:0,yue_pay_status:0},
-		mapGetters(['isLogin','uid','viewColor','keyColor'])),
+		computed: configMap({
+				hide_mer_status: 0,
+				alipay_open: 0,
+				yue_pay_status: 0
+			},
+			mapGetters(['isLogin', 'uid', 'viewColor', 'keyColor'])),
 		onLoad: function(options) {
 			if (options.order_id) {
 				this.$set(this, 'order_id', options.order_id);
@@ -295,19 +365,20 @@
 				});
 			},
 			// 去店铺
-			goStore(item){
-				if(this.hide_mer_status != 1){
+			goStore(item) {
+				if (this.hide_mer_status != 1) {
 					uni.navigateTo({
-						url:`/pages/store/home/index?id=${item.merchant.mer_id}`
+						url: `/pages/store/home/index?id=${item.merchant.mer_id}`
 					})
 				}
 			},
 			// 商品详情
-			goProduct(goods){
-				goods.activity_id = goods.cart_info && goods.cart_info.activeSku && goods.cart_info.activeSku.product_group_id
+			goProduct(goods) {
+				goods.activity_id = goods.cart_info && goods.cart_info.activeSku && goods.cart_info.activeSku
+					.product_group_id
 				goShopDetail(goods, '').then(res => {
 					uni.navigateTo({
-						url:`/pages/goods_details/index?id=${goods.product_id}`
+						url: `/pages/goods_details/index?id=${goods.product_id}`
 					})
 				})
 			},
@@ -316,10 +387,10 @@
 			 */
 			call: function(item) {
 				let that = this
-				if(item.merchant.service_phone){
+				if (item.merchant.service_phone) {
 					uni.showModal({
 						title: '提示',
-						content: '暂无在线客服，确定拨打客服电话:'+item.merchant.service_phone+'吗？',
+						content: '暂无在线客服，确定拨打客服电话:' + item.merchant.service_phone + '吗？',
 						success: function(res) {
 							if (res.confirm) {
 								uni.makePhoneCall({
@@ -328,7 +399,7 @@
 							}
 						}
 					})
-				}else{
+				} else {
 					return that.$util.Tips({
 						title: '暂无可用客服'
 					})
@@ -382,7 +453,7 @@
 				this.pay_close = false;
 				this.pay_order_id = '';
 				uni.redirectTo({
-					url:'/pages/users/order_list/index?status=1'
+					url: '/pages/users/order_list/index?status=1'
 				})
 			},
 			/**
@@ -483,15 +554,18 @@
 	}
 </style>
 <style scoped lang="scss">
-	.event_bg{
+	.event_bg {
 		background: #FF7F00;
 	}
-	.event_color{
+
+	.event_color {
 		color: #FF7F00;
 	}
+
 	.presell_bg_header {
-		background: linear-gradient(90deg, var(--view-bntColor21) 0%,var(--view-bntColor22) 100%);
+		background: linear-gradient(90deg, var(--view-bntColor21) 0%, var(--view-bntColor22) 100%);
 	}
+
 	.goodCall {
 		text-align: center;
 		width: 100%;
@@ -502,10 +576,12 @@
 		line-height: 86rpx;
 		background: #fff;
 		color: #282828;
+
 		.icon-kefu {
 			font-size: 32rpx;
 			margin-right: 15rpx;
 		}
+
 		/* #ifdef MP */
 		button {
 			display: flex;
@@ -515,89 +591,110 @@
 			font-size: 30rpx;
 			color: #e93323;
 		}
+
 		/* #endif */
 	}
+
 	.order-details .header {
 		padding: 0 30rpx;
 		height: 150rpx;
 		background-image: linear-gradient(to right, var(--view-bntColor21) 0%, var(--view-bntColor22) 100%);
-		&.presell_header{
+
+		&.presell_header {
 			background-repeat: no-repeat;
 			background-size: cover;
 			padding: 35rpx 50rpx;
-			.data{
+
+			.data {
 				margin: 8rpx 0 0 26rpx;
-				.state{
+
+				.state {
 					font-weight: normal;
 					font-size: 24rpx;
 				}
 			}
 		}
 	}
+
 	.order-details .header.on {
 		background-color: #666 !important;
 	}
+
 	.order-details .header .pictrue {
 		width: 110rpx;
 		height: 110rpx;
 	}
+
 	.order-details .header .pictrue image {
 		width: 100%;
 		height: 100%;
 	}
+
 	.order-details .header .data {
 		color: rgba(255, 255, 255, 0.8);
 		font-size: 24rpx;
 		margin-left: 27rpx;
 	}
+
 	.order-details .header .data.on {
 		margin-left: 0;
 	}
+
 	.order-details .header .data .state {
 		font-size: 30rpx;
 		font-weight: bold;
 		color: #fff;
 		margin-bottom: 7rpx;
 	}
-	.presell_header .presell_payment{
+
+	.presell_header .presell_payment {
 		color: #fff;
 		font-size: 30rpx;
 		font-weight: bold;
 		margin-left: 26rpx;
-		.iconfont{
+
+		.iconfont {
 			font-weight: normal;
 			margin-right: 8rpx;
 		}
 	}
+
 	.order-details .nav {
 		background-color: #fff;
 		font-size: 26rpx;
 		color: #282828;
 		padding: 25rpx 0;
 	}
+
 	.order-details .nav .navCon {
 		padding: 0 40rpx;
 	}
+
 	.order-details .nav .on {
 		color: var(--view-theme);
 	}
+
 	.order-details .nav .progress {
 		padding: 0 65rpx;
 		margin-top: 10rpx;
 	}
+
 	.order-details .nav .progress .line {
 		width: 100rpx;
 		height: 2rpx;
 		background-color: #939390;
 	}
+
 	.order-details .nav .progress .iconfont {
 		font-size: 25rpx;
 		color: #939390;
 		margin-top: -2rpx;
-		&.t-color{
+
+		&.t-color {
 			color: var(--view-theme);
 		}
 	}
+
 	.order-details .address {
 		font-size: 26rpx;
 		color: #868686;
@@ -605,52 +702,81 @@
 		margin-top: 13rpx;
 		padding: 35rpx 30rpx;
 	}
+
 	.order-details .address .name {
 		font-size: 30rpx;
 		color: #282828;
 		margin-bottom: 15rpx;
 	}
+
 	.order-details .address .name .phone {
 		margin-left: 40rpx;
 	}
+
 	.order-details .line {
 		width: 100%;
 		height: 3rpx;
 	}
+
 	.order-details .line image {
 		width: 100%;
 		height: 100%;
 		display: block;
 	}
+
 	.order-details .wrapper {
 		background-color: #fff;
 		margin-top: 12rpx;
 		padding: 30rpx;
 	}
+
 	.order-details .wrapper .item {
 		font-size: 28rpx;
 		color: #282828;
 	}
+
 	.order-details .wrapper .item~.item {
 		margin-top: 20rpx;
 	}
+
 	.order-details .wrapper .item .conter {
 		color: #868686;
 		width: 460rpx;
 		text-align: right;
 	}
+
+	.order-details .wrapper .item .conter-item {
+		display: flex;
+		justify-content: space-between;
+		margin-bottom: 20rpx;
+
+		.conter-item-name {
+			width: 140rpx;
+			white-space: nowrap;
+		}
+
+		text {
+			&:nth-child(2) {
+				width: 80%;
+			}
+		}
+	}
+
 	.order-details .wrapper .item .virtual_image {
 		margin-left: 50rpx;
 	}
-	.order-details .wrapper .item .virtual_image .picture{
+
+	.order-details .wrapper .item .virtual_image .picture {
 		width: 106rpx;
 		height: 106rpx;
 		border-radius: 8rpx;
 		margin-right: 10rpx;
-		&:last-child{
+
+		&:last-child {
 			margin-right: 0;
 		}
 	}
+
 	.order-details .wrapper .item .conter .copy {
 		font-size: 20rpx;
 		color: #333;
@@ -659,15 +785,18 @@
 		padding: 3rpx 15rpx;
 		margin-left: 24rpx;
 	}
+
 	.order-details .wrapper .actualPay {
 		border-top: 1px solid #eee;
 		margin-top: 30rpx;
 		padding-top: 30rpx;
 	}
+
 	.order-details .wrapper .actualPay .money {
 		font-weight: bold;
 		font-size: 30rpx;
 	}
+
 	.order-details .footer {
 		width: 100%;
 		position: fixed;
@@ -680,11 +809,13 @@
 		height: calc(100rpx + env(safe-area-inset-bottom)); ///兼容 IOS>11.2/
 		box-sizing: border-box;
 	}
-	.content-clip{
+
+	.content-clip {
 		height: 120rpx;
 		height: calc(120rpx+ constant(safe-area-inset-bottom)); ///兼容 IOS<11.2/
 		height: calc(120rpx + env(safe-area-inset-bottom)); ///兼容 IOS>11.2/
 	}
+
 	.order-details .footer .bnt {
 		width: 176rpx;
 		height: 60rpx;
@@ -694,21 +825,26 @@
 		color: #fff;
 		font-size: 27rpx;
 	}
-	.bgColor{
+
+	.bgColor {
 		background-color: var(--view-theme);
 	}
+
 	.order-details .footer .bnt.cancel {
 		color: #aaa;
 		border: 1px solid #ddd;
 	}
+
 	.order-details .footer .bnt~.bnt {
 		margin-left: 18rpx;
 	}
+
 	.order-details .writeOff {
 		background-color: #fff;
 		margin-top: 13rpx;
 		padding-bottom: 30rpx;
 	}
+
 	.order-details .writeOff .title {
 		font-size: 30rpx;
 		color: #282828;
@@ -717,6 +853,7 @@
 		padding: 0 30rpx;
 		line-height: 87rpx;
 	}
+
 	.order-details .writeOff .grayBg {
 		background-color: #f2f5f7;
 		width: 590rpx;
@@ -725,26 +862,31 @@
 		margin: 50rpx auto 0 auto;
 		padding-top: 55rpx;
 	}
+
 	.order-details .writeOff .grayBg .pictrue {
 		width: 290rpx;
 		height: 290rpx;
 		margin: 0 auto;
 	}
+
 	.order-details .writeOff .grayBg .pictrue image {
 		width: 100%;
 		height: 100%;
 		display: block;
 	}
+
 	.order-details .writeOff .gear {
 		width: 590rpx;
 		height: 30rpx;
 		margin: 0 auto;
 	}
+
 	.order-details .writeOff .gear image {
 		width: 100%;
 		height: 100%;
 		display: block;
 	}
+
 	.order-details .writeOff .num {
 		background-color: #f0c34c;
 		width: 590rpx;
@@ -756,32 +898,39 @@
 		text-align: center;
 		padding-top: 4rpx;
 	}
+
 	.order-details .writeOff .rules {
 		margin: 46rpx 30rpx 0 30rpx;
 		border-top: 1px solid #f0f0f0;
 		padding-top: 10rpx;
 	}
+
 	.order-details .writeOff .rules .item {
 		margin-top: 20rpx;
 	}
+
 	.order-details .writeOff .rules .item .rulesTitle {
 		font-size: 28rpx;
 		color: #282828;
 	}
+
 	.order-details .writeOff .rules .item .rulesTitle .iconfont {
 		font-size: 30rpx;
 		color: #333;
 		margin-right: 8rpx;
 		margin-top: 5rpx;
 	}
+
 	.order-details .writeOff .rules .item .info {
 		font-size: 28rpx;
 		color: #999;
 		margin-top: 7rpx;
 	}
+
 	.order-details .writeOff .rules .item .info .time {
 		margin-left: 20rpx;
 	}
+
 	.order-details .map {
 		height: 86rpx;
 		font-size: 30rpx;
@@ -792,6 +941,7 @@
 		background-color: #fff;
 		padding: 0 30rpx;
 	}
+
 	.order-details .map .place {
 		font-size: 26rpx;
 		width: 176rpx;
@@ -800,20 +950,24 @@
 		line-height: 50rpx;
 		text-align: center;
 	}
+
 	.order-details .map .place .iconfont {
 		font-size: 27rpx;
 		height: 27rpx;
 		line-height: 27rpx;
 		margin: 2rpx 3rpx 0 0;
 	}
+
 	.order-details .address .name .iconfont {
 		font-size: 34rpx;
 		margin-left: 10rpx;
 	}
+
 	.refund {
 		padding: 0 30rpx 30rpx;
 		margin-top: 24rpx;
 		background-color: #fff;
+
 		.title {
 			display: flex;
 			align-items: center;
@@ -821,73 +975,85 @@
 			color: #333;
 			height: 86rpx;
 			border-bottom: 1px solid #f5f5f5;
+
 			image {
 				width: 32rpx;
 				height: 32rpx;
 				margin-right: 10rpx;
 			}
 		}
+
 		.con {
 			padding-top: 25rpx;
 			font-size: 28rpx;
 			color: #868686;
 		}
 	}
-	.order-wrapper{
+
+	.order-wrapper {
 		margin-top: 15rpx;
-		.title{
+
+		.title {
 			display: flex;
 			align-items: center;
 			height: 86rpx;
-			padding:0 30rpx;
+			padding: 0 30rpx;
 			border-bottom: 1px solid #f0f0f0;
 			background-color: #fff;
-			.iconfont{
+
+			.iconfont {
 				font-size: 24rpx;
 				color: #666;
 				margin-top: 6rpx;
 				margin-left: 5rpx;
 			}
 		}
-		.goods-box{
-			.item{
+
+		.goods-box {
+			.item {
 				display: flex;
 				padding: 25rpx 30rpx 25rpx 30rpx;
 				background-color: #fff;
-				image{
+
+				image {
 					width: 130rpx;
 					height: 130rpx;
 					border-radius: 16rpx;
 				}
-				.info-box{
+
+				.info-box {
 					display: flex;
 					flex-direction: column;
 					justify-content: space-between;
 					margin-left: 25rpx;
 					width: 450rpx;
-					.msg{
+
+					.msg {
 						color: #868686;
 						font-size: 20rpx;
 					}
-					.price{
+
+					.price {
 						font-size: 26rpx;
 						color: var(--view-priceColor);
 					}
-					.svip-img{
+
+					.svip-img {
 						width: 65rpx;
 						height: 28rpx;
 						margin: 4rpx 0 0 4rpx;
 					}
 				}
-				.num{
+
+				.num {
 					flex: 1;
 					text-align: right;
 					font-size: 26rpx;
 					color: #868686;
 				}
 			}
-			
-			 .event_name{
+
+			.event_name {
 				display: inline-block;
 				margin-right: 9rpx;
 				color: #fff;
@@ -897,14 +1063,17 @@
 				text-align: center;
 				border-radius: 6rpx;
 			}
-			.event_ship{
+
+			.event_ship {
 				font-size: 20rpx;
 				margin-top: 10rpx;
 			}
 		}
-		.event_progress{
+
+		.event_progress {
 			margin-top: 20rpx;
 			background: #fff;
+
 			.progress_name {
 				padding-left: 30rpx;
 				height: 60rpx;
@@ -913,7 +1082,8 @@
 				font-weight: bold;
 				position: relative;
 				color: var(--view-theme);
-				&::before{
+
+				&::before {
 					content: "";
 					display: inline-block;
 					width: 5rpx;
@@ -924,19 +1094,23 @@
 					left: 0;
 				}
 			}
-			.align_right{
+
+			.align_right {
 				float: right;
 				font-weight: bold;
 			}
-			.gColor{
+
+			.gColor {
 				color: var(--view-theme);
 			}
-			.progress_price{
+
+			.progress_price {
 				padding: 20rpx 30rpx;
 				color: #999999;
 				font-size: 22rpx;
 			}
-			.progress_pay{
+
+			.progress_pay {
 				padding: 25rpx 30rpx;
 				background: var(--view-minorColor);
 				font-size: 26rpx;
@@ -944,4 +1118,4 @@
 			}
 		}
 	}
-</style>
+</style>
\ No newline at end of file
diff --git a/pages/payment/get_payment.vue b/pages/payment/get_payment.vue
index 78e7720..15b438e 100644
--- a/pages/payment/get_payment.vue
+++ b/pages/payment/get_payment.vue
@@ -5,41 +5,47 @@
 				leftIconColor="#fff" :titleStyle="{color:'#fff',fontWeight:'bold',fontSize:'32rpx'}">
 			</u-navbar>
 		</view>
-    <view style="height: 150rpx;"></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: 150rpx;"></view> -->
+		<view class="wrap">
+			<view class="shop">
+				<image src="@/static/shop_logo.webp" style="width: 62rpx;height: 54rpx;" />
+				<text class="shop-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">
+					<text style="color: #303133;font-size:32rpx;">￥</text>
+					<u--input type="text" fontSize="23" height="112rpx" placeholder="请输入金额" border="none"
+						v-model="cartForm.total_amount" placeholderStyle="color:#999;font-size:32rpx"
+						@input="validateDecimal">
 					</u--input>
 				</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" v-if="cartForm.total_amount" @click="submitOrder">
+				<view class="v-btn">{{cartForm.total_amount}}元 确认支付</view>
 			</view>
 
 			<!-- 登陆 -->
@@ -48,18 +54,19 @@
 		</view>
 
 		<!-- 无商户信息提示 -->
-		<view v-else class="empty">
+		<!-- <view class="empty">
 			<image src="/static/images/no_thing.png"></image>
 			<text style="margin-top: 60rpx;">{{tips}}</text>
-			<!-- 登陆 -->
-			<authorize v-show="!isWeixin" ref="authRef" :isAuto="isAuto" :isGoIndex="false" :isShowAuth="isShowAuth" @authColse="authColse"
-				@onLoadFun="onLoadFun">
-			</authorize>
-		</view>
+			
+		<authorize v-show="!isWeixin" ref="authRef" :isAuto="isAuto" :isGoIndex="false" :isShowAuth="isShowAuth"
+			@authColse="authColse" @onLoadFun="onLoadFun">
+		</authorize>
+	</view> -->
 	</view>
 </template>
 
 <script>
+	var that;
 	import {
 		getProductInfo,
 		addCart,
@@ -70,18 +77,20 @@
 		mapGetters
 	} from "vuex";
 	import authorize from '@/components/Authorize';
-import { Toast } from "../../libs/uniApi";
+	import {
+		Toast
+	} from "../../libs/uniApi";
 	export default {
 		components: {
-			authorize
+			authorize,
 		},
 		computed: {
 			...mapGetters(['isLogin']),
 		},
 		data() {
 			return {
-				isEmpty: false,
-        isWeixin: this.$wechat.isWeixin(),
+				isEmpty: true,
+				isWeixin: this.$wechat.isWeixin(),
 				cartForm: {
 					product_id: '',
 					product_attr_unique: '',
@@ -105,34 +114,43 @@ import { Toast } from "../../libs/uniApi";
 				isAuto: false, //没有授权的不会自动授权
 				isShowAuth: false, //是否隐藏授权
 				mer_id: '',
-				tips: '暂未登陆~'
+				tips: '暂未登陆~',
+				changeTxt: '展开',
+				isOpen: true,
+				keyBoardShow: false,
+				mer_name: ''
 			}
 		},
 
 		onLoad(opt) {
+			that = this;
 			this.mer_id = opt.mer_id;
+
 		},
 		onShow() {
+			this.getProductInfoByMerid(this.mer_id);
 			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.tips = '加载中...';
-          this.$nextTick(()=>{
-            this.$refs.authRef.toWecahtAuth();
-          })
-        }
+				if (this.isWeixin) {
+					this.tips = '加载中...';
+					this.$nextTick(() => {
+						this.$refs.authRef.toWecahtAuth();
+					})
+				}
 			} else {
-        this.checkForm.cart_id = [];
+				this.checkForm.cart_id = [];
 				this.getProductInfoByMerid(this.mer_id);
 			}
+
 		},
 		methods: {
 			validateDecimal(event) {
-				let val = (this.cartForm.total_amount.match(/^\d*(\.?\d{0,2})/g)[0]) || ''
-				this.$nextTick(() => {
-					this.cartForm.total_amount = val;
+				let val = (that.cartForm.total_amount.match(/^\d*(\.?\d{0,2})/g)[0]) || ''
+				that.$nextTick(() => {
+					that.cartForm.total_amount = val;
+					uni.$u.throttle(that.getProductInfoByMerid, 30)
 				})
 			},
 
@@ -141,59 +159,92 @@ 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);
-					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,
-							success: (res) => {
-								res.eventChannel.emit('datas', res1.data.platformConsumption);
-							}
+				// 循环加入购物车
+				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
 						})
-					}).catch(err=>{
-            Toast(err.message || err)
-          });
-				}).catch((err) => {
-					this.$util.Tips({
-						title: err.message || err.msg || err
+					}
+				}
+
+				orderCheck(that.checkForm).then(res1 => {
+					uni.navigateTo({
+						url: "/pages/payment/settlement",
+						success: (res) => {
+							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
+							})
+						},
+						fail(err) {
+							console.log(err)
+						}
 					})
-				})
+				}).catch(err => {
+					Toast(err.message || err)
+				});
 			},
 
-			getProductInfoByMerid(merid) {
-				let that = this;
+			hide(e) {
+				this.keyBoardShow = false;
+			},
+
+			handleOpen() {
+				this.isOpen = !this.isOpen;
+			},
+
+			getProductInfoByMerid(merid, money) {
+				if (!that.cartForm.total_amount) return;
 				getProductInfo({
-					mer_id: merid
+					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;
+						this.mer_name = res.data.merInfo;
+					}
 				}).catch((err) => {
-					this.tips = err.message || err.smg || err;
-					this.$util.Tips({
+					that.tips = err.message || err.smg || err;
+					that.$util.Tips({
 						title: err.message || err.msg || err
 					})
 					// #ifdef APP
@@ -256,9 +307,9 @@ import { Toast } from "../../libs/uniApi";
 	}
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
 	page {
-		background-color: #FCDFAD;
+		background-color: #fff;
 	}
 
 	.empty {
@@ -282,7 +333,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);
@@ -312,34 +363,49 @@ 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;
+			margin: 0 auto 150rpx;
 			box-shadow: 0 -4rpx 0px 0px #fff;
-			padding: 53rpx 30rpx 0 30rpx;
-			box-sizing: border-box;
 
 			.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;
+				}
 			}
 
 			.v-wrap {
@@ -348,9 +414,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;
@@ -385,37 +448,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/get_payment_backup.vue b/pages/payment/get_payment_backup.vue
new file mode 100644
index 0000000..92d24f9
--- /dev/null
+++ b/pages/payment/get_payment_backup.vue
@@ -0,0 +1,425 @@
+<template>
+	<view class="container">
+		<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'}">
+			</u-navbar>
+		</view>
+		<view style="height: 150rpx;"></view>
+		<view v-if="merchantInfo.length>0 && !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>
+
+			<!-- 付款金额 -->
+			<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">
+					</u--input>
+				</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>
+				</view>
+			</view>
+
+			<view class="v-btn-wrap">
+				<view class="v-btn" @click="submitOrder">提交订单</view>
+			</view>
+
+			<!-- 登陆 -->
+			<authorize :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse" @onLoadFun="onLoadFun">
+			</authorize>
+		</view>
+
+		<!-- 无商户信息提示 -->
+		<view v-else class="empty">
+			<image src="/static/images/no_thing.png"></image>
+			<text style="margin-top: 60rpx;">{{tips}}</text>
+			<!-- 登陆 -->
+			<authorize v-show="!isWeixin" ref="authRef" :isAuto="isAuto" :isGoIndex="false" :isShowAuth="isShowAuth"
+				@authColse="authColse" @onLoadFun="onLoadFun">
+			</authorize>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		getProductInfo,
+		addCart,
+		orderCheck
+	} from "@/api/payment.js";
+	import Cache from '@/utils/cache';
+	import {
+		mapGetters
+	} from "vuex";
+	import authorize from '@/components/Authorize';
+	import {
+		Toast
+	} from "../../libs/uniApi";
+	export default {
+		components: {
+			authorize
+		},
+		computed: {
+			...mapGetters(['isLogin']),
+		},
+		data() {
+			return {
+				isEmpty: true,
+				isWeixin: this.$wechat.isWeixin(),
+				cartForm: {
+					product_id: '',
+					product_attr_unique: '',
+					cart_num: 1,
+					is_new: 1,
+					product_type: 0,
+					source: 999,
+					total_amount: ''
+				},
+				merchantInfo: '',
+				checkForm: {
+					address_id: '',
+					cart_id: [],
+					consumption_id: '',
+					product_type: 0,
+					source: 999,
+					takes: [],
+					use_coupon: {},
+					use_integral: false
+				},
+				isAuto: false, //没有授权的不会自动授权
+				isShowAuth: false, //是否隐藏授权
+				mer_id: '',
+				tips: '暂未登陆~'
+			}
+		},
+
+		onLoad(opt) {
+			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.tips = '加载中...';
+					this.$nextTick(() => {
+						this.$refs.authRef.toWecahtAuth();
+					})
+				}
+			} else {
+				this.checkForm.cart_id = [];
+				this.getProductInfoByMerid(this.mer_id);
+			}
+		},
+		methods: {
+			validateDecimal(event) {
+				let val = (this.cartForm.total_amount.match(/^\d*(\.?\d{0,2})/g)[0]) || ''
+				this.$nextTick(() => {
+					this.cartForm.total_amount = val;
+				})
+			},
+
+			leftClick(e) {
+				uni.switchTab({
+					url: '/pages/index/index'
+				})
+			},
+			// 授权关闭
+			authColse: function(e) {
+				this.isShowAuth = e;
+			},
+			onLoadFun() {
+				this.getProductInfoByMerid(this.mer_id);
+				this.isShowAuth = false;
+			},
+
+			// 提交订单
+			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);
+					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,
+							success: (res) => {
+								res.eventChannel.emit('datas', res1.data.platformConsumption);
+							}
+						})
+					}).catch(err => {
+						Toast(err.message || err)
+					});
+				}).catch((err) => {
+					this.$util.Tips({
+						title: err.message || err.msg || err
+					})
+				})
+			},
+
+			getProductInfoByMerid(merid) {
+				let that = this;
+				getProductInfo({
+					mer_id: merid,
+					money: 444
+				}).then(res => {
+					console.log(res);
+					this.merchantInfo = res.data.list;
+				}).catch((err) => {
+					this.tips = err.message || err.smg || err;
+					this.$util.Tips({
+						title: err.message || err.msg || err
+					})
+					// #ifdef APP
+					setTimeout(() => {
+						uni.navigateBack({
+							delta: 1
+						})
+					}, 1500)
+					// #endif
+
+					// #ifndef APP
+					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
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	page {
+		background-color: #FCDFAD;
+	}
+
+	.empty {
+		margin: 0;
+		text-align: center;
+
+		image,
+		uni-image {
+			display: inline-block;
+			width: 414rpx;
+			height: 305rpx;
+		}
+
+		text {
+			display: block;
+			color: #666;
+			font-size: 26rpx;
+		}
+	}
+
+	.container {
+		position: relative;
+		height: 100vh;
+		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);
+
+		.v-desc {
+			position: absolute;
+			top: 196rpx;
+			z-index: 10;
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			width: 100%;
+			padding: 0 20rpx;
+			background: transparent;
+
+			.v-desc-main {
+				margin-bottom: 30rpx;
+				font-weight: 600;
+				font-size: 42rpx;
+				color: #FFFFFF;
+			}
+
+			.v-desc-sub {
+				font-weight: 500;
+				font-size: 24rpx;
+				color: #FFFFFF;
+			}
+		}
+
+		.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;
+
+			.v-con-text {
+				margin-bottom: 60rpx;
+				font-weight: 400;
+				font-size: 32rpx;
+				color: #2E2E2E;
+				line-height: 16rpx;
+			}
+
+			.v-con-input {
+				display: flex;
+				align-items: center;
+				margin-bottom: 83rpx;
+				padding: 0 0 40rpx 12rpx;
+				border-bottom: 1rpx solid #D6D6D6;
+			}
+
+			.v-wrap {
+				display: flex;
+				align-items: center;
+				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;
+					align-items: center;
+					color: #FF5E0C;
+					margin-right: 30rpx;
+
+					.icon {
+						font-size: 34rpx;
+					}
+
+					.num {
+						font-size: 46rpx;
+						display: inline-block;
+						overflow: auto;
+						width: 180rpx;
+					}
+				}
+
+				.v-wrap-desc {
+					.v-wrap-desc-main {
+						margin-bottom: 16rpx;
+						font-weight: 600;
+						font-size: 32rpx;
+						color: #2E2E2E;
+					}
+
+					.v-wrap-desc-sub {
+						font-weight: 400;
+						font-size: 24rpx;
+						color: #2E2E2E;
+					}
+				}
+			}
+		}
+
+		.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;
+
+				&:active {
+					opacity: .8;
+				}
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/payment/settlement.vue b/pages/payment/settlement.vue
index 3577856..97f6681 100644
--- a/pages/payment/settlement.vue
+++ b/pages/payment/settlement.vue
@@ -1,967 +1,976 @@
 <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>
-              </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='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>
+		</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,
-  } 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";
 
-  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-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: "",
+	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-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: ''
+				},
+				checkForm: {
+					address_id: '',
+					cart_id: [],
+					consumption_id: '',
+					product_type: 0,
+					source: 999,
+					takes: [],
+					use_coupon: {},
+					use_integral: false
+				},
+				productData: []
+			};
+		},
+		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.total_coupon = data.money;
 
-      // 获取个人信息
-      getUserInfo() {
-        getUserInfo().then(res => {
-          this.userInfo = res.data
-        })
-      },
 
-      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
-        }
-      },
+			// #ifdef H5
+			this.from = this.$wechat.isWeixin() ? 'weixin' : 'h5'
+			// #endif
+			// #ifdef MP
+			this.from = 'routine'
+			// #endif
+			// #ifdef APP-PLUS
+			this.from = 'weixin'
+			// #endif
 
-      payment: function(data) {
-        let that = this;
-        createOrder(data).then(res => {
+			if (!this.isLogin) {
+				this.isAuto = true;
+				this.isShowAuth = true
+			}
+		},
+		/**
+		 * 生命周期函数--监听页面显示
+		 */
+		onShow: function() {
+			this.getUserInfo()
+		},
 
-          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;
+		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;
+			},
 
-          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;
+			// 获取个人信息
+			getUserInfo() {
+				getUserInfo().then(res => {
+					this.userInfo = res.data
+				})
+			},
 
-                  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
+			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: '取消支付'
-              }, {
-                tab: 5,
-                url: pages + '&status=0'
-              });
-          }
-        }).catch(err => {
-          return that.$util.Tips({
-            title: err
-          });
-          uni.hideLoading();
-        });
-      },
+			payment: function(data) {
+				let that = this;
+				createOrder(data).then(res => {
 
-      SubOrder: function() {
-        let that = this,
-          data = {};
-        if (!that.payType) return that.$util.Tips({
-          title: '请选择支付方式'
-        });
+					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;
 
-        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
-        });
+					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;
 
-        // #ifdef MP
-        openPaySubscribe().then(() => {
-          that.payment(this.payForm);
-        });
-        // #endif
+									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
 
-        // #ifndef MP
-        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();
+				});
+			},
+
+			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;
+				uni.showLoading({
+					title: '订单支付中',
+					mask: true
+				});
+
+				// #ifdef MP
+				openPaySubscribe().then(() => {
+					that.payment(this.payForm);
+				});
+				// #endif
+
+				// #ifndef MP
+				that.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/order_list/index.vue b/pages/users/order_list/index.vue
index 0d79374..a48bc7c 100644
--- a/pages/users/order_list/index.vue
+++ b/pages/users/order_list/index.vue
@@ -173,9 +173,11 @@
 														<view>￥{{goods.cart_info.productAttr.price}}</view>
 														<view>x{{goods.product_num}}</view>
 													</view>
-                          <text style="font-size: 22rpx;background-color: #ecfaed;color: #40ae36;border-radius: 40rpx;padding: 5rpx 10rpx;">{{item.merchant.cloud_warehouse}}</text>
+
+													<!-- <text
+														style="font-size: 22rpx;background-color: #ecfaed;color: #40ae36;border-radius: 40rpx;padding: 5rpx 10rpx;">{{(item.merchant && item.merchant.cloud_warehouse) || ''}}</text> -->
 												</view>
-                        
+
 											</view>
 										</block>
 									</view>
@@ -203,8 +205,8 @@
 									<view class="acea-row row-middle left-wrapper" @click.stop="goMall(item)">
 										<text class="iconfont icon-shangjiadingdan"></text>
 										<view class="store-name">
-                      <view>{{item.merchant.mer_name}}</view>
-                    </view>
+											<view>{{item.merchant.mer_name}}</view>
+										</view>
 										<text class="iconfont icon-xiangyou"></text>
 									</view>
 									<view v-if="item.status == 0" class='t-color'>
diff --git a/static/mono-keyboard/backspace.png b/static/mono-keyboard/backspace.png
new file mode 100644
index 0000000000000000000000000000000000000000..a814fab21e10e52ea087d87876bf664856db2f8a
GIT binary patch
literal 2688
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
G9r+&z<l}q*

literal 0
HcmV?d00001

diff --git a/static/mono-keyboard/backspace_dark.png b/static/mono-keyboard/backspace_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..e42b9de4cd2d543d5b2ea78d750e77d504a47bde
GIT binary patch
literal 2431
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
M#ltyc--)Py1F{B-f&c&j

literal 0
HcmV?d00001

diff --git a/static/shop_logo.webp b/static/shop_logo.webp
new file mode 100644
index 0000000000000000000000000000000000000000..0f535eebfda93449621944ff72488d6e493a8121
GIT binary patch
literal 1424
zcmWIYbaU%qWnc(*bqWXzu!!JdU|=u+Vp|3VQw9c4XXk(uj6f~};|UPS0+h<lD=7+c
zcT$Lmj8b5Kz`zKEV33$xTmWHVC4s8GU4y8-tcz6zenHNZ)Z%2Ik`F+vQUtUd=q3>$
zTO=LA)&Q}SAZ!~DyS${J1gIte#4ZX6at5+ffNYI)Bz6)KJGr0;q`n8J#wItX6l50&
zfPBZ3nim=jq&a|ChM|}th{2t~3FLnu9|-anF)&zsWnf^QfDlWX$-uC^m4QLx7D7yA
z0Rsbn3j@Qp^9V6Sm=q)yC4!A(0g_B<X$%aXmNPK$Mlvu6UtnP1iU!L82^?-y07}UK
z-IWi7=?pmxsSFAXo(y>m$qafxmJu*g4H?XUG3+yonSnvy)`3?bomF#F?$vX*o`2?H
zUC^wrpe1Czaz=`TvGLth<{}l(E|v3fKR#BsM*h8e@UYj8UKPtpi>75QpKtzrzx9`s
zZ$u7n%RRizWqGuNgVh1Mw~5pF-oFu$n`<|3TglI#yMF!Lyzuqy4GV6+PyAy1@ZRJ1
z`yZB8{M~!z<?q+^@7re^{;m7}{_}q$yPWq=pWk_q|E9h?$7TNO|7}<PeY@)OzdGLc
z@764{H~$X>Zaq=zSN~?>>r21hFWda=U-Y?MIjf9|*L=<Ydi7P*>BwomS4)<4yJ}~a
zuGwmOMd$nWu9KoWt=3%pHzR$TYoNW&q@`}ZwDsqBaL-t<_s9mD=q2qkXGLc+ed>zh
zjhl3niSwcJrn!w$T`8H%<P2G=t~fPG^ezcrqUNvCwTVGU@iwc9OO#RyhhmPalI#Y-
z2|;pNte&kRMlO*~N<xk;Ijszw9=mg2-<bCG7Ki$6i<{ftR&CCmn{#{H>pv%7)va4y
zc>iax%YVroxl1&5AD^=LoIFFrI_vwpc4GnZvm<yIES)!Zzk8Q?j;G(?%;mJwmV+xd
z+c=#)IHkRRZ|9e=ZvGiFv4FMmGuUBi13SI3R5la`*jk;MkWq2}Zm@lYTZ3f$rUwNL
z!t+?y-+Im?d#^&RHnvFP#*3RD7N|IOi%Wj2^l0LY|9);o{2HdL^*htA?q;yHwGLy-
zHhL229cBNO=Xb=iifIu?C;I%n^1SxQ<I`_vTwm;O*gxH{_hq@V)OqvcTg>+NW$f86
za#?Dt>7v3Kk2e!}_K1JHvC~9swXB<q%`?+_iE9?|TND;uUH|#<hGWwnRqbw;QlD+~
zB-!KfU5i)qxwGEtrU(9bSl)h3oJp$ux6{8(4*xf>yr?%X@&D?ut<oX;%=i79FRuH3
z(pc{8lpoRQ&nxcDns(tu*^6MKHnXe0*9Go<<az0n&-ytLuQomWG<WrHrm0I0t_e2J
zpEEad?rX!0^HZazU*C56YDQ4`$7^5zItwSxo9vU?`Y`9b_D?a(#I={2Hn`Pge(b-}
zyy(oU6Aim|e!f0eV(z5m+19sTKhv2bX)<$41>@u3MY*4Ze|INr>c9XczXUJ!ZvMZC
e<&qV17;9#YRjpgw;YG*$++UuXJ9pN63o!u3(<7z;

literal 0
HcmV?d00001