From 20b9d18b687db9e9697f2c7a68d4c6c4d3d1d02b Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Wed, 15 Oct 2025 13:55:23 +0800
Subject: [PATCH] =?UTF-8?q?H5=E9=80=82=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                               |  12 +
 components/addressAdd.vue             |   2 +-
 pages.json                            |  10 +
 static/css/base.css                   |   9 +-
 subPackages/activity/greenOrganic.vue |   2 +-
 subPackages/food/order.vue            |   9 +
 subPackages/homestay/order.vue        |  10 +-
 subPackages/line/orders.vue           |   9 +-
 subPackages/order/cartOrder.vue       |   9 +-
 subPackages/order/orderDetail.vue     |  37 ++-
 subPackages/order/orderPay.vue        | 421 ++++++++++++++++++++++++++
 subPackages/order/trades.vue          |  10 +-
 subPackages/pointsMall/index.vue      |   4 +-
 subPackages/pointsMall/order.vue      |   8 +
 subPackages/techan/cartOrder.vue      |   2 +-
 subPackages/techan/index.vue          |   8 +-
 subPackages/techan/order.vue          |  19 +-
 subPackages/ticket/order.vue          |   8 +
 18 files changed, 557 insertions(+), 32 deletions(-)
 create mode 100644 subPackages/order/orderPay.vue

diff --git a/App.vue b/App.vue
index 3e2ed1e..bdf113c 100644
--- a/App.vue
+++ b/App.vue
@@ -39,6 +39,18 @@
 	}
 
 	/* #endif */
+	
+	/* #ifdef H5 */
+	.uni-body{
+		line-height: normal;
+	}
+	body{
+		line-height: normal !important;
+	}
+	/* #endif */
+	
+
+	
 	.example-info {
 		font-size: 14px;
 		color: #333;
diff --git a/components/addressAdd.vue b/components/addressAdd.vue
index cf09a51..3e503b8 100644
--- a/components/addressAdd.vue
+++ b/components/addressAdd.vue
@@ -324,7 +324,7 @@
 	}
 </script>
 
-<style scoped>
+<style scoped lang="scss">
 	.addressadd-bg {
 		width: 100%;
 		height: 100%;
diff --git a/pages.json b/pages.json
index f85a46b..67d2aeb 100644
--- a/pages.json
+++ b/pages.json
@@ -58,6 +58,16 @@
 					"navigationBarTitleText": "uni-app"
 				}
 			},
+			// #ifdef H5 
+			{
+				"path": "order/orderPay",
+				"style": {
+					"navigationBarTitleText": "支付",
+					"navigationStyle": "custom"
+				}
+			},
+			// #endif
+			
 			{
 				"path" : "search/index",
 				"style" : {
diff --git a/static/css/base.css b/static/css/base.css
index 5b307fe..d758ad4 100644
--- a/static/css/base.css
+++ b/static/css/base.css
@@ -123,4 +123,11 @@ view {
 	text-align: center;
 	line-height: 33rpx;
 
-}
\ No newline at end of file
+}
+
+
+/* #ifdef H5 */
+.flex-row-scroll-view .uni-scroll-view-content{
+	display: flex;
+}
+/* #endif */
diff --git a/subPackages/activity/greenOrganic.vue b/subPackages/activity/greenOrganic.vue
index b6ff051..b7c474d 100644
--- a/subPackages/activity/greenOrganic.vue
+++ b/subPackages/activity/greenOrganic.vue
@@ -13,7 +13,7 @@
 					<image v-show="typeIndex!=i" mode="aspectFill" :src="item.img"></image>
 				</view>
 			</view> -->
-			<scroll-view class="type-container type-scroll" scroll-x="true" scroll-with-animation="true" enable-flex 
+			<scroll-view class="type-container type-scroll flex-row-scroll-view" scroll-x="true" scroll-with-animation="true" enable-flex 
 			    :scroll-into-view="scrollIntoView" :show-scrollbar="false">
 				<view :id="`item-${i}`" :class="['type-item']" @click="changeTypeIndex(i)"
 				v-for="(item,i) in typeList" :key="i">
diff --git a/subPackages/food/order.vue b/subPackages/food/order.vue
index 2a14eb8..61a35e5 100644
--- a/subPackages/food/order.vue
+++ b/subPackages/food/order.vue
@@ -259,6 +259,7 @@
 						console.log(res.data.order_id);
 						let order_id = res.data.order_id
 						this.$store.commit("choseCoupon", "");
+						// #ifdef MP-WEIXIN
 						this.Post({
 							order_id: order_id,
 							pay_method: 'WEIXIN',
@@ -282,6 +283,14 @@
 								})
 							}
 						})
+						// #endif
+						
+						
+						// #ifdef H5
+						uni.navigateTo({
+							url: "/subPackages/order/orderPay?orderId=" +order_id
+						})
+						// #endif
 					}
 				})
 			},
diff --git a/subPackages/homestay/order.vue b/subPackages/homestay/order.vue
index 08bf896..6642a33 100644
--- a/subPackages/homestay/order.vue
+++ b/subPackages/homestay/order.vue
@@ -333,6 +333,7 @@ export default {
                 console.log('成功');
                 if (res.code == 1) {
                     uni.removeStorageSync('hotelOrderInfo');
+					// #ifdef MP-WEIXIN
                     this.Post({
                         order_id: res.data.order_id,
                         pay_platform: "MINI",
@@ -351,8 +352,15 @@ export default {
                                     });
                                 }
                             });
-                        }
+						}
                     });
+					// #endif
+					
+					// #ifdef H5
+					uni.navigateTo({
+						url: "/subPackages/order/orderPay?orderId=" +res.data.order_id
+					})
+					// #endif
                 }
             });
         },
diff --git a/subPackages/line/orders.vue b/subPackages/line/orders.vue
index 3aade19..fa404b5 100644
--- a/subPackages/line/orders.vue
+++ b/subPackages/line/orders.vue
@@ -258,7 +258,7 @@
 							let order_id = res.data.order_id
 							this.$store.commit("changeLineInfo", null);
 							this.$store.commit("choseCoupon", "");
-							
+							// #ifdef MP-WEIXIN
 							this.Post({
 								order_id: order_id,
 								pay_platform: "MINI",
@@ -282,6 +282,13 @@
 									})
 								}
 							})
+							// #endif
+							
+							// #ifdef H5
+							uni.navigateTo({
+								url: "/subPackages/order/orderPay?orderId=" +order_id
+							})
+							// #endif
 						}
 					})
 				}
diff --git a/subPackages/order/cartOrder.vue b/subPackages/order/cartOrder.vue
index cffc963..9c37470 100644
--- a/subPackages/order/cartOrder.vue
+++ b/subPackages/order/cartOrder.vue
@@ -457,6 +457,7 @@ export default {
 					this.$store.commit("changeTicketOrderList", []);
 					this.$store.commit("changeFoodOrderList", []);
 					this.$store.commit("changeHotelOrderList", []);
+					// #ifdef MP-WEIXIN
 					this.Post({
 						order_id: res.data.order_id,
 						pay_platform: "MINI",
@@ -477,7 +478,13 @@ export default {
 							});
 						}
 					});
-					
+					// #endif
+													
+					// #ifdef H5
+					uni.navigateTo({
+						url: "/subPackages/order/orderPay?orderId=" +res.data.order_id
+					})
+					// #endif
 				}
 			})
 			
diff --git a/subPackages/order/orderDetail.vue b/subPackages/order/orderDetail.vue
index b796d65..c1ee56e 100644
--- a/subPackages/order/orderDetail.vue
+++ b/subPackages/order/orderDetail.vue
@@ -726,25 +726,33 @@
 			},
 			// 支付
 			setOrderId(id) {
+				// #ifdef MP-WEIXIN
 			    this.Post({
 			        order_id: this.info.order_id,
 			        pay_platform: "MINI",
 			        pay_method: 'WEIXIN',
 			    }, '/api/order/pay')
-			       .then(res => {
-			            if (res.code == 1) {
-			                uni.requestPayment({
-			                    nonceStr: res.data.nonceStr,
-			                    package: res.data.package,
-			                    paySign: res.data.paySign,
-			                    signType: res.data.signType,
-			                    timeStamp: res.data.timeStamp,
-			                    success: () => {
-			                        this.getDetail();
-			                    }
-			                });
-			            }
-			        });
+			   .then(res => {
+					if (res.code == 1) {
+						uni.requestPayment({
+							nonceStr: res.data.nonceStr,
+							package: res.data.package,
+							paySign: res.data.paySign,
+							signType: res.data.signType,
+							timeStamp: res.data.timeStamp,
+							success: () => {
+								this.getDetail();
+							}
+						});
+					}
+				});
+				// #endif
+												
+				// #ifdef H5
+				uni.navigateTo({
+					url: "/subPackages/order/orderPay?orderId=" +this.info.order_id
+				})
+				// #endif
 			},
 			// 快递查询
 			openMask(item) {
@@ -1220,6 +1228,7 @@
 		background-color: #fff;
 		border-top: 10rpx solid #F7F7F7;
 		padding: 0 26rpx;
+		box-sizing: border-box;
 	
 		.bottom-price {
 			font-weight: 500;
diff --git a/subPackages/order/orderPay.vue b/subPackages/order/orderPay.vue
new file mode 100644
index 0000000..5583f78
--- /dev/null
+++ b/subPackages/order/orderPay.vue
@@ -0,0 +1,421 @@
+<template>
+	<view class="bg">
+		<uni-page-head uni-page-head-type="default">
+			<div class="uni-page-head" style="background-color: rgb(248, 248, 248); color: rgb(0, 0, 0);">
+				<div class="uni-page-head-hd">
+					<div class="uni-page-head-btn" @click="clickBack()">
+						<uni-icons type="left" size="27"></uni-icons>
+					</div>
+					<div class="uni-page-head-ft"></div>
+				</div>
+				<div class="uni-page-head-bd">
+					<div class="uni-page-head__title" style="font-size: 16px; opacity: 1;">
+						 支付
+					</div>
+				</div>
+				<div class="uni-page-head-ft"></div>
+			</div>
+			<div class="uni-placeholder"></div>
+		</uni-page-head>
+		
+		<view class="title">支付剩余时间</view>
+		<view class="time-box">
+			<uni-countdown :font-size="40" :show-day="false" :hour="times.hours" :minute="times.minutes"
+				:second="times.seconds" @timeup="timeup"></uni-countdown>
+		</view>
+		<view class="money-box" style="padding-bottom: 30rpx;">
+			<view>应付金额</view>
+			<view style="color: red;">￥{{detail.paid_money / 100}}</view>
+		</view>
+		<view class="money-box" style="border-bottom: none;">
+			<view>支付方式:</view>
+		</view>
+		
+		<!-- 优惠券 -->
+		<view v-if="coupon_activity">
+			<view class="pay-box" @click="payType = 1" v-if="pay_type.includes('WEIXIN')">
+				<view style="display: flex; align-items: center;">
+					<image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/wxPay.png" mode="widthFix"></image>
+					微信支付
+				</view>
+			
+				<view class="select-box">
+					<view class="select" v-if="payType == 1"></view>
+				</view>
+			</view>
+			
+			<view v-if="walletList.length > 0 &&  pay_type.includes('SUBWALLET')">
+				<view class="pay-box">
+					<view style="display: flex; align-items: center;">
+						<image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/numLogo.png" mode="widthFix">
+						</image>
+						数字人民币子钱包支付
+					</view>
+			
+					<image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/selectB.png" class="select-img"
+						mode="widthFix" :style="{'transform': showMore ? 'rotate(180deg)' : ''}"
+						@click="showMore = !showMore"></image>
+				</view>
+			
+				<view v-show="showMore" style="padding-left: 40rpx;">
+					<view class="pay-box" v-for="(item,index) in walletList" :key="index" @click="payType = 2;walletIndex = index">
+						<view style="display: flex; align-items: center;">
+							<image :src="item.bank_logo" mode="widthFix"></image>
+							{{item.bank_name}}
+						</view>
+			
+						<view class="select-box">
+							<view class="select" v-if="payType == 2 && walletIndex === index"></view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		
+		<view class="" v-else>
+			<view class="pay-box" @click="payType = 1">
+				<view style="display: flex; align-items: center;">
+					<image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/wxPay.png" mode="widthFix"></image>
+					微信支付
+				</view>
+			
+				<view class="select-box">
+					<view class="select" v-if="payType == 1"></view>
+				</view>
+			</view>
+			
+			<view v-if="walletList.length > 0">
+				<view class="pay-box">
+					<view style="display: flex; align-items: center;">
+						<image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/numLogo.png" mode="widthFix">
+						</image>
+						数字人民币子钱包支付
+					</view>
+			
+					<image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/selectB.png" class="select-img"
+						mode="widthFix" :style="{'transform': showMore ? 'rotate(180deg)' : ''}"
+						@click="showMore = !showMore"></image>
+				</view>
+			
+				<view v-show="showMore" style="padding-left: 40rpx;">
+					<view class="pay-box" v-for="(item,index) in walletList" :key="index" @click="payType = 2;walletIndex = index">
+						<view style="display: flex; align-items: center;">
+							<image :src="item.bank_logo" mode="widthFix"></image>
+							{{item.bank_name}}
+						</view>
+			
+						<view class="select-box">
+							<view class="select" v-if="payType == 2 && walletIndex === index"></view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="btn" @click="pay">
+			立即付款
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				id: '',
+				token: {},
+				detail: {},
+				closeTime: 1000 * 60 * 30,
+				times: {},
+				showMore: true,
+				walletList: [],
+				walletIndex: 0,
+				payType: null,
+				coupon_activity: false,
+				pay_type: "",
+				JDSZAPIURL: 'https://api.cloud.sz-trip.com'
+			}
+		},
+		onReady() {
+
+		},
+		onLoad(option) {
+			this.id = option.orderId
+			// this.Post({}, '/api/subwallet.ermb/wallet').then(res => {
+			// 	this.walletList = res.data
+			// })
+			this.Post({order_id: option.orderId}, "/api/order/query").then(res => {
+				// 选择优惠券需要判断优惠券支付方式
+				if(res.data.coupon_activity && res.data.coupon_activity.pay_type) {
+					this.coupon_activity = true
+					this.pay_type = res.data.coupon_activity.pay_type
+				}
+				
+				if(res.data.paid_money == 0) {
+					uni.redirectTo({
+						url: '/subPackages/order/trades'
+					})
+					return;
+				}
+				this.detail = res.data
+				let createTime = new Date((this.detail.create_time + "").replace(/-/g, "/")).getTime();
+				createTime += this.detail.auto_close_time * 1000;
+				this.closeTime = createTime - new Date().getTime();
+				const hours = parseInt((this.closeTime % (1000 * 60 * 60 * 24)) / (1000 * 60 * 60));
+				const minutes = parseInt((this.closeTime % (1000 * 60 * 60)) / (1000 * 60));
+				const seconds = (this.closeTime % (1000 * 60)) / 1000;
+				this.times = {
+					hours: hours,
+					minutes: minutes,
+					seconds: seconds
+				}
+			})
+		},
+		onShow() {
+
+		},
+		onBackPress() {
+			return true; // 返回 true 表示阻止默认返回行为
+		},
+		methods: {
+			// 返回
+			clickBack () {
+				let pages = getCurrentPages()
+				let prePage = null
+				// 看上个页面
+				if (pages.length>=2) {
+					prePage = pages[pages.length - 2];
+				} else {
+					uni.redirectTo({
+						url: "/subPackages/order/trades"
+					})
+					return
+				}
+				// 有问题
+				if (prePage.$page.fullPath.indexOf('trades')>=0 || prePage.$page.fullPath.indexOf('orderDetail')>=0) {
+					uni.navigateBack()
+				} else {
+					uni.redirectTo({
+						url: "/subPackages/order/trades"
+					})
+				}
+			},
+			
+			// 倒计时时间到触发事件
+			timeup() {
+				let flag = false
+				setTimeout(() => {
+					flag = true
+				}, 2000)
+				if (flag) {
+					console.log('倒计时结束')
+				}
+			},
+			// 支付
+			pay() {
+				if(this.payType == null) {
+					uni.showToast({
+						title: '请选择支付方式',
+						icon: 'none'
+					})
+					return;
+				}
+				uni.showLoading({
+					title: '加载中'
+				})
+				if(this.payType == 1) {
+					// 微信支付
+					uni.request({
+						method: 'POST',
+						url: this.JDSZAPIURL + '/api/order/pay',
+						header: {
+							'content-type': 'application/json',
+							'token': this.token
+						},
+						data: {
+							order_id: this.id,
+							pay_method: "WEIXIN",
+							pay_platform: "MINI",
+							app_name: "WxXcxConfig"
+						},
+						success: res => {
+							uni.hideLoading()
+							if (res.data.code == 1) {
+								let data = JSON.parse(res.data.data)
+								uni.requestPayment({
+									nonceStr: data.nonceStr || data.noncestr,
+									package: data.package,
+									paySign: data.paySign || data.sign,
+									signType: data.signType,
+									timeStamp: "" + (data.timeStamp || data.timestamp),
+									complete: function(res) {
+										// setTimeout(() => {
+										// 	uni.redirectTo({
+										// 		url: '/subPackages/order/trades'
+										// 	})
+										// }, 1000)
+									}
+								});
+							} else {
+								uni.showToast({
+									title:res.data.msg,
+									icon:'none'
+								})
+							}
+						},
+					})
+				}else if(this.payType == 2) {
+					// 数币支付
+					uni.request({
+						method: 'POST',
+						url: this.JDSZAPIURL + '/api/subwallet.ermb/wallet',
+						header: {
+							'content-type': 'application/json',
+							'token': this.token
+						},
+						data: {
+							order_id: this.id,
+							pay_method: "SUBWALLET",
+							pay_platform: "MWEB",
+							ins_no: this.walletList[this.walletIndex].ins_no,
+							return_url: "https://m.cloud.sz-trip.com/OrderWaiting",
+						},
+						success: res => {
+							uni.request({
+								method: 'POST',
+								url: this.JDSZAPIURL + '/api/order/pay',
+								header: {
+									'content-type': 'application/json',
+									'token': this.token
+								},
+								data: {
+									order_id: this.id,
+									pay_method: "SUBWALLET",
+									pay_platform: "MWEB",
+									ins_no: this.walletList[this.walletIndex].ins_no,
+									return_url: "https://https://m.cloud.sz-trip.com/OrderWaiting",
+								},
+								success: res => {
+									let data = JSON.parse(res.data.data);
+									if(data && data.RESULT && data.RESULT=='Y'){
+										uni.request({
+											method: 'POST',
+											url: this.JDSZAPIURL + '/api/order/query',
+											header: {
+												'content-type': 'application/json',
+												'token': this.token
+											},
+											data: {
+												order_id: this.id,
+											},
+											success: res => {
+												uni.hideLoading()
+												if (res.data.data.state != "UNPAID") {
+													uni.redirectTo({
+														url: '/subPackages/order/trades'
+													})
+												} else {
+													uni.showToast({
+														title: '未查询到支付结果！',
+														icon: 'none'
+													})
+												}
+											},
+											complete: (res) => {uni.hideLoading()}
+										})
+									} else {
+										uni.hideLoading()
+										if (res.data.code!=1 && res.data.msg) {
+											uni.showToast({
+												title: res.data.msg,
+												icon: 'none'
+											})
+										}
+									}
+								},
+							})
+						},
+					})
+				}
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.bg {
+		box-sizing: border-box;
+	}
+
+	.title {
+		text-align: center;
+		font-size: 35rpx;
+		line-height: 60rpx;
+		padding-top: 100rpx;
+	}
+
+	.time-box {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		margin-bottom: 100rpx;
+	}
+
+	.money-box {
+		width: 670rpx;
+		margin: 30rpx auto 0;
+		font-size: 35rpx;
+		display: flex;
+		justify-content: space-between;
+		border-bottom: 1rpx solid #000;
+		height: 60rpx;
+		align-items: center;
+	}
+
+	.pay-box {
+		padding: 0 40rpx;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		font-size: 35rpx;
+		margin-top: 40rpx;
+
+		image {
+			width: 70rpx;
+			margin-right: 20rpx;
+		}
+
+		.select-box {
+			width: 35rpx;
+			height: 35rpx;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			border: 1rpx solid #000;
+			border-radius: 50%;
+
+			.select {
+				width: 15rpx;
+				height: 15rpx;
+				background: #000;
+				border-radius: 50%;
+			}
+		}
+
+		.select-img {
+			width: 50rpx;
+			height: 50rpx;
+			margin-right: 0rpx;
+		}
+	}
+
+	.btn {
+		margin: 80rpx auto 0;
+		width: 670rpx;
+		line-height: 80rpx;
+		text-align: center;
+		font-size: 40rpx;
+		background: #d62828;
+		color: #fff;
+		border-radius: 40rpx;
+	}
+</style>
\ No newline at end of file
diff --git a/subPackages/order/trades.vue b/subPackages/order/trades.vue
index 7689764..f36b535 100644
--- a/subPackages/order/trades.vue
+++ b/subPackages/order/trades.vue
@@ -185,6 +185,7 @@ export default {
         // 设置订单ID并发起支付
         setOrderId(id) {
             this.orderId = id;
+			// #ifdef MP-WEIXIN
             this.Post({
                 order_id: id,
                 pay_platform: "MINI",
@@ -205,7 +206,14 @@ export default {
                         });
                     }
                 });
-        },
+			// #endif
+        
+			// #ifdef H5
+			uni.navigateTo({
+				url: "/subPackages/order/orderPay?orderId=" +id
+			})
+			// #endif
+		},
         // 确认收货
         confirmpost(id, index) {
             uni.showModal({
diff --git a/subPackages/pointsMall/index.vue b/subPackages/pointsMall/index.vue
index 9164b10..6ea0e02 100644
--- a/subPackages/pointsMall/index.vue
+++ b/subPackages/pointsMall/index.vue
@@ -40,7 +40,7 @@
 				<view></view>
 			</view>
 			
-			<scroll-view class="jx-box no-scrollbar" style="height: 500rpx;"
+			<scroll-view class="jx-box no-scrollbar flex-row-scroll-view" style="height: 500rpx;"
 			enable-flex scroll-x scroll-with-animation :show-scrollbar="false"
 			@scrolltolower="getJXList">
 				<view class="jx-item" v-for="(item,i) in JXList" :key="i" @click="gotoDetail(item)">
@@ -59,7 +59,7 @@
 			</scroll-view>
 		
 			<view class="flex" style="height: 80rpx;">
-				<scroll-view class="type-box no-scrollbar" :scroll-into-view="scrollView"
+				<scroll-view class="type-box no-scrollbar flex-row-scroll-view" :scroll-into-view="scrollView"
 				enable-flex scroll-x scroll-with-animation :show-scrollbar="false"
 				>
 					<view :id="`scroll${i}`" :class="['type-item',typeIndex==i?'active':'']" v-for="(type,i) in typeList" 
diff --git a/subPackages/pointsMall/order.vue b/subPackages/pointsMall/order.vue
index 964de9a..c0db73b 100644
--- a/subPackages/pointsMall/order.vue
+++ b/subPackages/pointsMall/order.vue
@@ -795,6 +795,7 @@ export default {
 				'/api/order/create'
 			).then(res => {
 				if (res.code == 1) {
+					// #ifdef MP-WEIXIN
 					this.Post(
 						{
 							order_id: res.data.order_id,
@@ -818,6 +819,13 @@ export default {
 							});
 						}
 					});
+					// #endif
+													
+					// #ifdef H5
+					uni.navigateTo({
+						url: "/subPackages/order/orderPay?orderId=" +res.data.order_id
+					})
+					// #endif
 				}
 			});
 		},
diff --git a/subPackages/techan/cartOrder.vue b/subPackages/techan/cartOrder.vue
index eeb342a..69cdc77 100644
--- a/subPackages/techan/cartOrder.vue
+++ b/subPackages/techan/cartOrder.vue
@@ -132,7 +132,7 @@
 				</view>
 				<!-- #endif -->
 				<view class="popup-list" v-if="addressList.length > 0">
-					<view :class="['popup-item',selectInfo.contacts.id==item.id?'active':'']" v-for="(item, index) in addressList" :key="index" @click="seldThisAddress(item)">
+					<view :class="['popup-item',selectInfo&&selectInfo.contacts.id==item.id?'active':'']" v-for="(item, index) in addressList" :key="index" @click="seldThisAddress(item)">
 						<view class="item-top flex-between">
 							<view style="padding-right: 71rpx;">
 								<view class="name flex-start">
diff --git a/subPackages/techan/index.vue b/subPackages/techan/index.vue
index f02f86f..ed2f383 100644
--- a/subPackages/techan/index.vue
+++ b/subPackages/techan/index.vue
@@ -14,7 +14,7 @@
 		<!-- 正常产品 -->
 		<template>
 			<view style="width: 100%;position: relative;" :class="[methodPopShow?'methodShow':'']">
-				<scroll-view  class="type-container scroll-view" scroll-x="true" scroll-with-animation="true" enable-flex
+				<scroll-view  class="type-container scroll-view flex-row-scroll-view" scroll-x="true" scroll-with-animation="true" enable-flex
 				      :scroll-into-view="scrollIntoView">
 					<view :id="`item-${i}`" :class="['type-item',typeIndex==i?'active':'']" v-for="(item,i) in typeParam" :key="i" @click="changeType(item,i)">
 						<view class="img-container" >
@@ -755,11 +755,7 @@
 			}
 		}
 	
-		// #ifdef H5
-		::v-deep .uni-scroll-view-content{
-			display: flex;
-		}
-		// #endif
+
 	}
 	.more-btn{
 		position: absolute;
diff --git a/subPackages/techan/order.vue b/subPackages/techan/order.vue
index 3fb8bd8..38cc9e8 100644
--- a/subPackages/techan/order.vue
+++ b/subPackages/techan/order.vue
@@ -106,7 +106,7 @@
 			
 			<template v-if="info.user_select_type!=3||(info.user_select_type==3&&isInDeliveryTime)">
 				<view class="new-box" >
-					<view v-if="info.user_select_type==3" class="text-overflow" style="font-weight: bold;font-size: 31rpx;padding: 20rpx 20rpx 0;">{{shop.shop_name}}</view>
+					<view v-if="info.user_select_type==3" class="text-overflow" style="font-weight: bold;font-size: 31rpx;padding: 20rpx 20rpx 0;">{{info.pInfo.supplier_shop_name}}</view>
 					<view class="commodity box">
 						<image class="img" :src="showImg(info.sInfo.headimg)" mode="aspectFill"></image>
 						<view class="sku-content">
@@ -138,7 +138,9 @@
 							运费
 						</view>
 						<view style="font-weight: 500;" >
-							{{!info.post?'免邮':info.post/100}}
+							<text style="color: #a1a1a1;text-decoration: line-through;padding-right: 10rpx;" 
+							v-if="info.postDiscount>0">{{info.postPrice/100}}</text>
+							<text>{{!info.post?'免邮':info.post/100}}</text>
 						</view>
 					</view>
 					<view class="post top-line flex-between" v-show="info.user_select_type==3">
@@ -441,6 +443,9 @@ export default {
 			item.user_select_type = value
 			this.getPost()
 			this.getDeliveryPost()
+			// #ifdef H5
+			this.$forceUpdate()
+			// #endif
 		},
 		
 		goOrderCoupon () {
@@ -820,6 +825,7 @@ export default {
 				'/api/order/create'
 			).then(res => {
 				if (res.code == 1) {
+					// #ifdef MP-WEIXIN
 					this.Post(
 						{
 							order_id: res.data.order_id,
@@ -843,6 +849,14 @@ export default {
 							});
 						}
 					});
+					// #endif
+					
+					// #ifdef H5
+					uni.navigateTo({
+						url: "/subPackages/order/orderPay?orderId=" +res.data.order_id
+					})
+					// #endif
+					
 				}
 			});
 		},
@@ -898,6 +912,7 @@ export default {
 	background: #f2f4f7;
 	padding-bottom: 200rpx;
 }
+
 view {
 	box-sizing: border-box;
 }
diff --git a/subPackages/ticket/order.vue b/subPackages/ticket/order.vue
index f41dc47..6122428 100644
--- a/subPackages/ticket/order.vue
+++ b/subPackages/ticket/order.vue
@@ -469,6 +469,7 @@
 						console.log(res.data.order_id);
 						let order_id = res.data.order_id
 						this.$store.commit("choseCoupon", "");
+						// #ifdef MP-WEIXIN
 						this.Post({
 							order_id: order_id,
 							pay_platform: "MINI",
@@ -487,6 +488,13 @@
 								})
 							}
 						})
+						// #endif
+					
+						// #ifdef H5
+						uni.navigateTo({
+							url: "/subPackages/order/orderPay?orderId=" +order_id
+						})
+						// #endif
 					}
 				})
 			},