11 mesiacov pred · 754d205f18
--- a/mallh5/pages/pay/index.vue
+++ b/mallh5/pages/pay/index.vue
@@ -1,5 +1,22 @@
 
				 <template>
			
 
				 	<view class="pay-container">
			
 
				+
			
 
				+		<!-- 商家信息区域 -->
			
 
				+		<view class="merchant-section">
			
 
				+			<view class="merchant-card">
			
 
				+				<view class="merchant-logo">
			
 
				+					<image 
			
 
				+						:src="shopInfo.smallAvatar" 
			
 
				+						class="logo-image"
			
 
				+						mode="aspectFill"
			
 
				+					/>
			
 
				+				</view>
			
 
				+				<view class="merchant-details">
			
 
				+					<text class="merchant-name">{{ shopInfo.showName || '未命名' }}</text>
			
 
				+				</view>
			
 
				+			</view>
			
 
				+		</view>
			
 
				+		
			
 
				 		<!-- 支付金额区域 -->
			
 
				 		<view class="amount-section">
			
 
				 			<view class="amount-label">支付金额</view>
			
@@ -101,6 +118,12 @@ export default {
 
				 		return {
			
 
				 			currentAmount: '0',
			
 
				 			displayAmount: '0',
			
 
				+			// 商家信息
			
 
				+			merchantInfo: {
			
 
				+				logo: '',
			
 
				+				name: '',
			
 
				+				description: ''
			
 
				+			},
			
 
				 			// 优化：使用静态数据，避免重复创建
			
 
				 			keyboardKeys: [
			
 
				 				[
			
@@ -131,7 +154,8 @@ export default {
 
				 			// 弹框状态
			
 
				 			showConfirm: false,
			
 
				 			account:0,
			
 
				-			payWay:1
			
 
				+			payWay:1,
			
 
				+			shopInfo:[]
			
 
				 		}
			
 
				 	},
			
 
				 	computed: {
			
@@ -148,8 +172,8 @@ export default {
 
				 		}
			
 
				 		if (this.account) {
			
 
				 			orderRelate({account:this.account}).then(res => {
			
 
				-				if (res.data && res.data.ghs){
			
 
				-
			
 
				+				if (res.data && res.data.shop){
			
 
				+					this.shopInfo = res.data.shop?res.data.shop:[]
			
 
				 				}
			
 
				 			})
			
 
				 		}
			
@@ -354,6 +378,53 @@ export default {
 
				 	position: relative;
			
 
				 }
			
 
				 
			
 
				+.merchant-section {
			
 
				+	padding: 40upx 30upx 20upx;
			
 
				+	
			
 
				+	.merchant-card {
			
 
				+		background: rgba(255, 255, 255, 0.95);
			
 
				+		backdrop-filter: blur(20px);
			
 
				+		border-radius: 20upx;
			
 
				+		padding: 30upx;
			
 
				+		display: flex;
			
 
				+		align-items: center;
			
 
				+		box-shadow: 0 8upx 30upx rgba(0, 0, 0, 0.1);
			
 
				+		border: 1upx solid rgba(255, 255, 255, 0.2);
			
 
				+		
			
 
				+		.merchant-logo {
			
 
				+			width: 100upx;
			
 
				+			height: 100upx;
			
 
				+			border-radius: 20upx;
			
 
				+			overflow: hidden;
			
 
				+			margin-right: 25upx;
			
 
				+			background: linear-gradient(135deg, #f8f9fa 0%, #e9ecef 100%);
			
 
				+			display: flex;
			
 
				+			align-items: center;
			
 
				+			justify-content: center;
			
 
				+			box-shadow: 0 4upx 15upx rgba(0, 0, 0, 0.1);
			
 
				+			
			
 
				+			.logo-image {
			
 
				+				width: 100%;
			
 
				+				height: 100%;
			
 
				+				border-radius: 20upx;
			
 
				+			}
			
 
				+		}
			
 
				+		
			
 
				+		.merchant-details {
			
 
				+			flex: 1;
			
 
				+			display: flex;
			
 
				+			align-items: center;
			
 
				+			
			
 
				+			.merchant-name {
			
 
				+				font-size: 36upx;
			
 
				+				font-weight: 600;
			
 
				+				color: #333;
			
 
				+				line-height: 1.2;
			
 
				+			}
			
 
				+		}
			
 
				+	}
			
 
				+}
			
 
				+
			
 
				 .nav-bar {
			
 
				 	display: flex;
			
 
				 	align-items: center;
			
--- a/mallh5/unpackage/dist/build/web/assets/admin-ghs-pay.BQTHaKT_.js
+++ b/mallh5/unpackage/dist/build/web/assets/admin-ghs-pay.BQTHaKT_.js
--- a/mallh5/unpackage/dist/build/web/assets/admin-ghs-success.DbWJW-br.js
+++ b/mallh5/unpackage/dist/build/web/assets/admin-ghs-success.DbWJW-br.js
--- a/mallh5/unpackage/dist/build/web/assets/index-CV_PFQyV.css
+++ b/mallh5/unpackage/dist/build/web/assets/index-CV_PFQyV.css
--- a/mallh5/unpackage/dist/build/web/assets/index-Dn8DUGme.js
+++ b/mallh5/unpackage/dist/build/web/assets/index-Dn8DUGme.js
--- a/mallh5/unpackage/dist/build/web/assets/index-Nhp7_n4W.js
+++ b/mallh5/unpackage/dist/build/web/assets/index-Nhp7_n4W.js
--- a/mallh5/unpackage/dist/build/web/assets/admin-ghs-index.CcvX6Jms.js
+++ b/mallh5/unpackage/dist/build/web/assets/admin-ghs-index.CcvX6Jms.js
@@ -1 +1 @@
 
				-import{c as e,w as a,i as o,o as t,a as n}from"./index-Dn8DUGme.js";import{_ as s}from"./_plugin-vue_export-helper.BCo6x5W8.js";const r=s({name:"index",data:()=>({}),computed:{},onLoad(e){},methods:{}},[["render",function(s,r,d,u,i,m){const p=o;return t(),e(p,null,{default:a((()=>[n(" 您好 ")])),_:1})}]]);export{r as default};
			
 
				+import{c as e,w as a,i as o,o as t,a as n}from"./index-Nhp7_n4W.js";import{_ as s}from"./_plugin-vue_export-helper.BCo6x5W8.js";const r=s({name:"index",data:()=>({}),computed:{},onLoad(e){},methods:{}},[["render",function(s,r,d,u,i,m){const p=o;return t(),e(p,null,{default:a((()=>[n(" 您好 ")])),_:1})}]]);export{r as default};
			
--- a/mallh5/unpackage/dist/build/web/assets/pages-pay-index.NSxwno0a.js
+++ b/mallh5/unpackage/dist/build/web/assets/pages-pay-index.NSxwno0a.js
--- a/mallh5/unpackage/dist/build/web/assets/pages-pay-success.C-uVyInm.js
+++ b/mallh5/unpackage/dist/build/web/assets/pages-pay-success.C-uVyInm.js
--- a/mallh5/unpackage/dist/build/web/assets/pay-f9kJHxVx.css
+++ b/mallh5/unpackage/dist/build/web/assets/pay-f9kJHxVx.css
--- a/mallh5/unpackage/dist/build/web/assets/success-C8uHclsI.css
+++ b/mallh5/unpackage/dist/build/web/assets/success-C8uHclsI.css
--- a/mallh5/unpackage/dist/build/web/assets/success-DxPNQDHS.css
+++ b/mallh5/unpackage/dist/build/web/assets/success-DxPNQDHS.css
--- a/mallh5/unpackage/dist/build/web/assets/uni.a38dd567.css
+++ b/mallh5/unpackage/dist/build/web/assets/uni.a38dd567.css
--- a/mallh5/unpackage/dist/build/web/index.html
+++ b/mallh5/unpackage/dist/build/web/index.html
@@ -1,7 +1,7 @@
 
				 <!DOCTYPE html>

			
 
				 <html lang="zh-CN">

			
 
				   <head>
			
 
				-    <link rel="stylesheet" href="/assets/uni.a1c77e84.css">
			
 
				+    <link rel="stylesheet" href="/assets/uni.a38dd567.css">
			
 
				 

			
 
				     <meta charset="UTF-8" />

			
 
				     <script>

			
@@ -16,7 +16,7 @@
 
				 	<script src="/static/web/quill-1.3.7.min.js"></script>

			
 
				     <!--preload-links-->

			
 
				     <!--app-context-->

			
 
				-    <script type="module" crossorigin src="/assets/index-Dn8DUGme.js"></script>
			
 
				+    <script type="module" crossorigin src="/assets/index-Nhp7_n4W.js"></script>
			
 
				     <link rel="stylesheet" crossorigin href="/assets/index-Dzn8UyOo.css">
			
 
				   </head>

			
 
				   <body>