From 20b4316e520c83f0919b08778bfe091f895f2bf6 Mon Sep 17 00:00:00 2001
From: yangrz <yangrz@vip.qq.com>
Date: Sun, 28 Apr 2024 17:55:12 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=8E=92=E9=98=9F=E4=B8=AD?=
 =?UTF-8?q?=E9=87=91=E9=A2=9D=E6=98=BE=E7=A4=BA=EF=BC=8C=E6=B4=BB=E5=8A=A8?=
 =?UTF-8?q?=E8=A7=84=E5=88=99=E6=9F=A5=E7=9C=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 agentApp/pages/allpages/index.vue             |  7 +++--
 agentApp/pages/payment/payment.vue            | 30 +++++++++++++++++--
 .../queuing-information.vue                   |  2 +-
 agentApp/pages/user-orders/user-orders.vue    |  6 +++-
 4 files changed, 38 insertions(+), 7 deletions(-)

diff --git a/agentApp/pages/allpages/index.vue b/agentApp/pages/allpages/index.vue
index 9c87842..d26783c 100644
--- a/agentApp/pages/allpages/index.vue
+++ b/agentApp/pages/allpages/index.vue
@@ -1,5 +1,5 @@
 <template>
-	<view class="page">
+	<view class="page" v-if="is_debug">
 		<text>商户相关</text>
 		<button @click="goPage(4)">商户登录</button>
 		<button @click="goPage(5)">商户主页</button>
@@ -18,13 +18,16 @@
 		<button @click="goPage(12)">代理商提现详情</button>
 		<button @click="goPage(13)">代理商提现历史</button>
 	</view>
+	<view class="page" v-else>
+		<button @click="goPage(20)">用户主页</button>
+	</view>
 </template>
 
 <script>
 	export default {
 		data() {
 			return {
-
+				is_debug: process.env.NODE_ENV !== 'production'
 			};
 		},
 		methods: {
diff --git a/agentApp/pages/payment/payment.vue b/agentApp/pages/payment/payment.vue
index f017fe9..316aec8 100644
--- a/agentApp/pages/payment/payment.vue
+++ b/agentApp/pages/payment/payment.vue
@@ -55,6 +55,11 @@
 					查看活动规则
 				</view>
 			</view>
+			<u-overlay :show="showRule" :opacity="0.8" @click="showRule=false">
+				<view class="warp">
+					<image class="rect" :src="sysConfig.activity_rule_img" mode="aspectFit"></image>
+				</view>
+			</u-overlay>
 			<!-- 			<u-keyboard confirmText="1" mode="number" :closeOnClickOverlay="true" @close="close" :show="show" @confirm="confirm" @cancel="cancel"></u-keyboard> -->
 			<cu-keyboard ref="cukeyboard" @change="change" @confirm="confirm" @hide="hide" :safeHeight="safeHeight"></cu-keyboard>
 		</view>
@@ -64,7 +69,8 @@
 <script>
 	import {
 		userGetMerchantInfo,
-		userCreateOrder
+		userCreateOrder,
+		publicSysConfig
 	} from '../../common/api.js'
 
 	export default {
@@ -78,7 +84,9 @@
 					address: '',
 					logo: ''
 				},
-				safeHeight:0
+				safeHeight:0,
+				sysConfig: {},
+				showRule: false
 			}
 		},
 		onReady() {
@@ -96,9 +104,12 @@
 				this.safeHeight = 20;
 			}
 			
-			
+			this.getSysConfig();
 		},
 		methods: {
+			getSysConfig() {
+				publicSysConfig().then(data => this.sysConfig = data)
+			},
 			getMerchantInfo() {
 				userGetMerchantInfo({
 					payment_code: this.payment_code
@@ -192,6 +203,7 @@
 			},
 			showDetail() {
 				console.log("showDetail")
+				this.showRule = true
 			}
 
 		}
@@ -203,6 +215,18 @@
 	.uni-page-body {
 		background: #ededed;
 	}
+	
+	.warp {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		height: 100vh;
+	}
+
+	.rect {
+		width: 90vw !important;
+		height: 90vh !important;
+	}
 
 	.pam-content {
 		padding-top: 50rpx;
diff --git a/agentApp/pages/queuing-information/queuing-information.vue b/agentApp/pages/queuing-information/queuing-information.vue
index 27a48de..1aedeaa 100644
--- a/agentApp/pages/queuing-information/queuing-information.vue
+++ b/agentApp/pages/queuing-information/queuing-information.vue
@@ -39,7 +39,7 @@
 				tabList: [{
 					name: '按时间排序'
 				}, {
-					name: '待最快排序'
+					name: '按最快排序'
 				}],
 				currentTab: 0,
 				queueList: [],
diff --git a/agentApp/pages/user-orders/user-orders.vue b/agentApp/pages/user-orders/user-orders.vue
index 28e812c..b1a6e26 100644
--- a/agentApp/pages/user-orders/user-orders.vue
+++ b/agentApp/pages/user-orders/user-orders.vue
@@ -16,7 +16,11 @@
 				<image class="withdrawal-line"
 					src="https://common-1257637852.cos.ap-guangzhou.myqcloud.com/paidui-pay/withdrawal-line.png" />
 			</view>
-			<view class="to-be-credited">待入账：￥{{accountInfo.waiting_amount}}</view>
+			<view class="to-be-credited">
+				待入账￥{{accountInfo.waiting_amount}}
+				&emsp;
+				排队中金额￥{{accountInfo.wait_rebate_amount}}
+			</view>
 			<view class="divider-style"></view>
 
 			<view class="information-id-content">