11 months ago · e712e0efd5
--- a/mallApp/dist/build/h5/index.html
+++ b/mallApp/dist/build/h5/index.html
@@ -1,3 +1,3 @@
 
				 <!doctype html><html lang="zh-CN"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1,minimum-scale=1"><title>商城</title><script>document.addEventListener('DOMContentLoaded', function() {
			
 
				 				document.documentElement.style.fontSize = document.documentElement.clientWidth / 20 + 'px'
			
 
				-			})</script><link rel="stylesheet" href="/static/index.css"/><script defer="defer" src="/static/js/chunk-vendors.dd919b35.js"></script><script defer="defer" src="/static/js/index.a4040b96.js"></script></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id="app"></div><script>/*BAIDU_STAT*/</script></body></html>
			
 
				+			})</script><link rel="stylesheet" href="/static/index.css"/><script defer="defer" src="/static/js/chunk-vendors.1dccc2e3.js"></script><script defer="defer" src="/static/js/index.3bab629e.js"></script></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id="app"></div><script>/*BAIDU_STAT*/</script></body></html>
			
--- a/mallApp/dist/build/h5/static/js/1335.4e7ed939.js
+++ b/mallApp/dist/build/h5/static/js/1335.4e7ed939.js
--- a/mallApp/dist/build/h5/static/js/1507.f891617b.js
+++ b/mallApp/dist/build/h5/static/js/1507.f891617b.js
--- a/mallApp/dist/build/h5/static/js/2603.27a11418.js
+++ b/mallApp/dist/build/h5/static/js/2603.27a11418.js
--- a/mallApp/dist/build/h5/static/js/4782.7a5dc8d9.js
+++ b/mallApp/dist/build/h5/static/js/4782.7a5dc8d9.js
--- a/mallApp/dist/build/h5/static/js/8252.974d2f9d.js
+++ b/mallApp/dist/build/h5/static/js/8252.974d2f9d.js
--- a/mallApp/dist/build/h5/static/js/9057.90d9018e.js
+++ b/mallApp/dist/build/h5/static/js/9057.90d9018e.js
--- a/mallApp/dist/build/h5/static/js/chunk-vendors.1dccc2e3.js
+++ b/mallApp/dist/build/h5/static/js/chunk-vendors.1dccc2e3.js
--- a/mallApp/dist/build/h5/static/js/index.3bab629e.js
+++ b/mallApp/dist/build/h5/static/js/index.3bab629e.js
--- a/mallApp/dist/build/h5/static/js/pages-balance-changeList.17c2e8fc.js
+++ b/mallApp/dist/build/h5/static/js/pages-balance-changeList.17c2e8fc.js
--- a/mallApp/dist/build/h5/static/js/pages-billing-affirmGhs.3b380d3b.js
+++ b/mallApp/dist/build/h5/static/js/pages-billing-affirmGhs.3b380d3b.js
--- a/mallApp/dist/build/h5/static/js/pages-callback-index.6193b200.js
+++ b/mallApp/dist/build/h5/static/js/pages-callback-index.6193b200.js
--- a/mallApp/dist/build/h5/static/js/pages-callback-pay.c3ce3e72.js
+++ b/mallApp/dist/build/h5/static/js/pages-callback-pay.c3ce3e72.js
--- a/mallApp/dist/build/h5/static/js/pages-chat-index.5e5e72b6.js
+++ b/mallApp/dist/build/h5/static/js/pages-chat-index.5e5e72b6.js
--- a/mallApp/dist/build/h5/static/js/pages-coupon-list.e834b0f7.js
+++ b/mallApp/dist/build/h5/static/js/pages-coupon-list.e834b0f7.js
--- a/mallApp/dist/build/h5/static/js/pages-custom-levelChange.1f1293c7.js
+++ b/mallApp/dist/build/h5/static/js/pages-custom-levelChange.1f1293c7.js
--- a/mallApp/dist/build/h5/static/js/pages-goods-detail.e1333b5d.js
+++ b/mallApp/dist/build/h5/static/js/pages-goods-detail.e1333b5d.js
--- a/mallApp/dist/build/h5/static/js/pages-home-category.c8e029eb.js
+++ b/mallApp/dist/build/h5/static/js/pages-home-category.c8e029eb.js
--- a/mallApp/dist/build/h5/static/js/pages-home-course.2faf4ef3.js
+++ b/mallApp/dist/build/h5/static/js/pages-home-course.2faf4ef3.js
--- a/mallApp/dist/build/h5/static/js/pages-home-index.049a2f5d.js
+++ b/mallApp/dist/build/h5/static/js/pages-home-index.049a2f5d.js
--- a/mallApp/dist/build/h5/static/js/pages-home-recent.7f18a681.js
+++ b/mallApp/dist/build/h5/static/js/pages-home-recent.7f18a681.js
--- a/mallApp/dist/build/h5/static/js/pages-home-user.ce161c0d.js
+++ b/mallApp/dist/build/h5/static/js/pages-home-user.ce161c0d.js
--- a/mallApp/dist/build/h5/static/js/pages-interest-invite.ef899d1c.js
+++ b/mallApp/dist/build/h5/static/js/pages-interest-invite.ef899d1c.js
--- a/mallApp/dist/build/h5/static/js/pages-item-detail.61f52f5a.js
+++ b/mallApp/dist/build/h5/static/js/pages-item-detail.61f52f5a.js
--- a/mallApp/dist/build/h5/static/js/pages-item-item.c7212535.js
+++ b/mallApp/dist/build/h5/static/js/pages-item-item.c7212535.js
--- a/mallApp/dist/build/h5/static/js/pages-login-account.e8c82565.js
+++ b/mallApp/dist/build/h5/static/js/pages-login-account.e8c82565.js
--- a/mallApp/dist/build/h5/static/js/pages-login-index.14d0d97b.js
+++ b/mallApp/dist/build/h5/static/js/pages-login-index.14d0d97b.js
--- a/mallApp/dist/build/h5/static/js/pages-member-recharge.249f9372.js
+++ b/mallApp/dist/build/h5/static/js/pages-member-recharge.249f9372.js
--- a/mallApp/dist/build/h5/static/js/pages-order-buy.34890973.js
+++ b/mallApp/dist/build/h5/static/js/pages-order-buy.34890973.js
--- a/mallApp/dist/build/h5/static/js/pages-order-comment.0fe437de.js
+++ b/mallApp/dist/build/h5/static/js/pages-order-comment.0fe437de.js
--- a/mallApp/dist/build/h5/static/js/pages-order-detail.0484a030.js
+++ b/mallApp/dist/build/h5/static/js/pages-order-detail.0484a030.js
--- a/mallApp/dist/build/h5/static/js/pages-order-list.aa4bfa84.js
+++ b/mallApp/dist/build/h5/static/js/pages-order-list.aa4bfa84.js
--- a/mallApp/dist/build/h5/static/js/pages-pay-index.0bf1c6a4.js
+++ b/mallApp/dist/build/h5/static/js/pages-pay-index.0bf1c6a4.js
--- a/mallApp/dist/build/h5/static/js/pages-pay-index.376882c3.js
+++ b/mallApp/dist/build/h5/static/js/pages-pay-index.376882c3.js
--- a/mallApp/dist/build/h5/static/js/pages-recharge-list.95886b44.js
+++ b/mallApp/dist/build/h5/static/js/pages-recharge-list.95886b44.js
--- a/mallApp/dist/build/h5/static/js/pages-settle-debt.82845d58.js
+++ b/mallApp/dist/build/h5/static/js/pages-settle-debt.82845d58.js
--- a/mallApp/dist/build/h5/static/js/pages-settle-detail.5367552a.js
+++ b/mallApp/dist/build/h5/static/js/pages-settle-detail.5367552a.js
--- a/mallApp/dist/build/h5/static/js/pages-settle-list.1c0162ce.js
+++ b/mallApp/dist/build/h5/static/js/pages-settle-list.1c0162ce.js
--- a/mallApp/dist/build/h5/static/js/pages-settle-pay.22c910d6.js
+++ b/mallApp/dist/build/h5/static/js/pages-settle-pay.22c910d6.js
--- a/mallApp/dist/build/h5/static/js/pages-user-modify.aec65b92.js
+++ b/mallApp/dist/build/h5/static/js/pages-user-modify.aec65b92.js
--- a/mallApp/dist/build/h5/static/js/pages-user-password.5bc7c76b.js
+++ b/mallApp/dist/build/h5/static/js/pages-user-password.5bc7c76b.js
--- a/mallApp/src/pages/pay/index.vue
+++ b/mallApp/src/pages/pay/index.vue
@@ -1,9 +1,5 @@
 
				 <template>
			
 
				 	<div class="app-content pay-wrap">
			
 
				-		<!-- 加载状态 -->
			
 
				-		<div class="loading-wrap" v-if="$util.isEmpty(orderShop)">
			
 
				-			<div class="loading-text">正在加载...</div>
			
 
				-		</div>
			
 
				 
			
 
				 		<div class="delivery-wrap" v-if="!$util.isEmpty(orderShop)">
			
 
				 			<div class="shop-logo-wrap" v-if="!$util.isEmpty(orderShop)">
			
@@ -126,19 +122,9 @@
 
				 		onLoad(option) {
			
 
				             // #ifdef H5
			
 
				 			this.specialInit()
			
 
				-            // #endif
			
 
				-            // #ifndef H5
			
 
				-            this.specialInit()
			
 
				-            // #endif
			
 
				-		},
			
 
				-		mounted() {
			
 
				-            // H5环境下确保数据加载完成
			
 
				-            // #ifdef H5
			
 
				-            if (this.$util.isEmpty(this.orderShop)) {
			
 
				-                this.specialInit()
			
 
				-            }
			
 
				             // #endif
			
 
				 		},
			
 
				+		mounted() {},
			
 
				 		methods: {
			
 
				 			fillGetMan(){
			
 
				 				this.tabIndex = this.tabIndex == 0 ? 1 : 0
			
@@ -155,36 +141,24 @@
 
				 					this.tabIndex = parseInt(this.option.pageType)
			
 
				 				}
			
 
				 				getOrderShop(true).then(res => {
			
 
				-					if (res) {
			
 
				-						this.inpFocus = true
			
 
				-						uni.setNavigationBarTitle({
			
 
				-							title: `向【${res.shop.showName}】付款`
			
 
				-						})
			
 
				-						this.$refs.couponSel._getUserDiscount().then(status => {
			
 
				-							this.discountArr = status
			
 
				-						})
			
 
				-						// 设置分享
			
 
				-						let shareParams = {
			
 
				-							title: `点我付款`, // 分享标题
			
 
				-							desc: '享随机优惠，最高20元', // 分享内容
			
 
				-							imgUrl: '',
			
 
				-							pagePath: `/pages/pay/index?account=${res.shop.id}&store=0&fromType=3`
			
 
				-						}
			
 
				-                        // #ifdef MP-WEIXIN
			
 
				-						this.jweixinFn(shareParams)
			
 
				-                        // #endif
			
 
				-						console.log(`/pages/pay/index?account=${res.shop.id}&store=0&fromType=3`)
			
 
				-					} else {
			
 
				-						// H5环境下数据获取失败的处理
			
 
				-						// #ifdef H5
			
 
				-						this.$msg('数据加载失败，请刷新页面重试')
			
 
				-						// #endif
			
 
				+					this.inpFocus = true
			
 
				+					uni.setNavigationBarTitle({
			
 
				+						title: `向【${res.shop.showName}】付款`
			
 
				+					})
			
 
				+					this.$refs.couponSel._getUserDiscount().then(status => {
			
 
				+						this.discountArr = status
			
 
				+					})
			
 
				+					// 设置分享
			
 
				+					let shareParams = {
			
 
				+						title: `点我付款`, // 分享标题
			
 
				+						desc: '享随机优惠，最高20元', // 分享内容
			
 
				+						imgUrl: '',
			
 
				+						pagePath: `/pages/pay/index?account=${res.shop.id}&store=0&fromType=3`
			
 
				 					}
			
 
				-				}).catch(err => {
			
 
				-					console.error('获取订单商店信息失败:', err)
			
 
				-					// #ifdef H5
			
 
				-					this.$msg('网络异常，请检查网络连接')
			
 
				-					// #endif
			
 
				+                    // #ifdef MP-WEIXIN
			
 
				+					this.jweixinFn(shareParams)
			
 
				+                    // #endif
			
 
				+					console.log(`/pages/pay/index?account=${res.shop.id}&store=0&fromType=3`)
			
 
				 				})
			
 
				 			},
			
 
				 			_pay() {
			
@@ -312,19 +286,6 @@
 
				 		min-height: calc(100vh - 20upx);
			
 
				 		padding-top: 20upx;
			
 
				 	}
			
 
				-	
			
 
				-	// 加载状态样式
			
 
				-	.loading-wrap {
			
 
				-		display: flex;
			
 
				-		justify-content: center;
			
 
				-		align-items: center;
			
 
				-		height: 400upx;
			
 
				-		.loading-text {
			
 
				-			font-size: 28upx;
			
 
				-			color: #999;
			
 
				-		}
			
 
				-	}
			
 
				-	
			
 
				 	.tabs-wrap {
			
 
				 		position: fixed;
			
 
				 		top: 0;