From 3620bba75a3429abc3b451473087889964648b9f Mon Sep 17 00:00:00 2001
From: "3075067877@qq.com" <3075067877@qq.com>
Date: Wed, 31 Jan 2024 11:24:38 +0800
Subject: [PATCH] update

---
 .../src/components/index/page_standby.vue          | 206 +++++++++++----------
 .../src/components/index/view_footer.nvue          |   5 +-
 .../src/components/index/view_header.nvue          |  10 +-
 uniapp_project_code/src/components/pay/paying.vue  |  10 +-
 uniapp_project_code/src/components/pay/success.vue |   2 +
 uniapp_project_code/src/pages/index/index.nvue     |   2 +-
 uniapp_project_code/src/pages/pay/index.vue        |  10 +-
 7 files changed, 130 insertions(+), 115 deletions(-)

diff --git a/uniapp_project_code/src/components/index/page_standby.vue b/uniapp_project_code/src/components/index/page_standby.vue
index 80be747..854ff16 100644
--- a/uniapp_project_code/src/components/index/page_standby.vue
+++ b/uniapp_project_code/src/components/index/page_standby.vue
@@ -1,114 +1,118 @@
 <template>
-  <view class="content">
-    <view class="content_title">
-		<text class="txt">欧轩智能场馆丛云店</text>
-	</view>
-    <view class="content_info">
-		<text class="txt">欢迎使用自助收银</text>
-	</view>
-    <image class="content_tip" src="/static/index_tips.png" mode="scaleToFill" />
-    <image class="content_img" src="/static/index_person.png" mode="scaleToFill" />
-    <!-- <main-click-btn > -->
-      <view class="content_btn" @click="clickToUse">
-        <image class="icon_saoma" src="/static/images/saoma.png" mode="scaleToFill" />
-        <view>
+	<view class="content">
+		<view class="content_title">
+			<text class="txt">欧轩智能场馆丛云店</text>
+		</view>
+		<view class="content_info">
+			<text class="txt">欢迎使用自助收银</text>
+		</view>
+		<image class="content_tip" src="/static/index_tips.png" mode="scaleToFill" />
+		<image class="content_img" src="/static/index_person.png" mode="scaleToFill" />
+		<!-- <main-click-btn > -->
+		<view class="content_btn" @click="clickToUse">
+			<image class="icon_saoma" src="/static/images/saoma.png" mode="scaleToFill" />
 			<text class="txt">请扫描商品条形码</text>
 		</view>
-      </view>
-    <!-- </main-click-btn> -->
-    <view class="content_logo">
-		<text class="txt">欧轩智能场馆提供技术支持</text>
+		<!-- </main-click-btn> -->
+		<view class="content_logo">
+			<text class="txt">欧轩智能场馆提供技术支持</text>
+		</view>
 	</view>
-  </view>
 </template>
 
 <script setup>
-import mainClickBtn from '@/components/index/button_green_square.vue';
-import util from "@/utils/util.js"
+	import mainClickBtn from '@/components/index/button_green_square.vue';
+	import util from "@/utils/util.js"
 
-function clickToUse() {
-  util.routeTo(`/pages/login/success`, 'nT');
-}
+	function clickToUse() {
+		util.routeTo(`/pages/login/success`, 'nT');
+	}
 </script>
 
 <style lang="scss" scoped>
-.content {
-  width: 750rpx;
-
-  // background-color: #fff;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-
-  .content_title {
-    // align-self: flex-start;
-	width: 750rpx;
-    margin-left: 47rpx;
-    margin-top: 50rpx;
-	.txt{
-		font-weight: 800;
-		font-size: 25rpx;
-		color: #1A1A1A;
-	}
-  }
-
-  .content_info {
-    margin-top: 49rpx;
-	// margin-top: 19rpx;
-	.txt{
-		font-weight: 800;
-		font-size: 58.33rpx;
-		color: #1A1A1A;
-	}
-  }
-
-  .content_tip {
-    width: 470.83rpx;
-    height: 120.83rpx;
-    // margin-top: 68rpx;
-	margin-top: 28rpx;
-  }
-
-  .content_img {
-    width: 617rpx;
-    height: 625rpx;
-    margin-top: 31rpx;
-    margin-bottom: 30rpx;
-  }
-
-  .content_logo {
-
-    margin-top: 38rpx;
-    margin-bottom: 40rpx;
-	.txt{
-		font-weight: 400;
-		font-size: 19.44rpx;
-		color: #999999;
-	}
-  }
-// background-image: linear-gradient(180deg, #00C9AC 0%, #009874 100%);
-  .content_btn {
-    width: 632.64rpx;
-    height: 100%;
-	background-color: #009874;
-    @include ctf(center);
-    flex-direction: row;
-    // background: #000;
-    .icon_saoma {
-      width: 41.67rpx;
-      height: 41.67rpx;
-      margin-right: 10rpx;
-      // display: inline;
-    }
-
-	.txt{
-		font-weight: 500;
-		font-size: 33.33rpx;
-		color: #FFFFFF;
-	}
+	.content {
+		width: 750rpx;
+
+		// background-color: #fff;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+
+		.content_title {
+			// align-self: flex-start;
+			width: 750rpx;
+			margin-left: 47rpx;
+			margin-top: 50rpx;
 
-  }
+			.txt {
+				font-weight: 800;
+				font-size: 25rpx;
+				color: #1A1A1A;
+			}
+		}
 
-}
-</style>
+		.content_info {
+			margin-top: 49rpx;
+
+			// margin-top: 19rpx;
+			.txt {
+				font-weight: 800;
+				font-size: 58.33rpx;
+				color: #1A1A1A;
+			}
+		}
+
+		.content_tip {
+			width: 470.83rpx;
+			height: 120.83rpx;
+			// margin-top: 68rpx;
+			margin-top: 28rpx;
+		}
+
+		.content_img {
+			width: 617rpx;
+			height: 625rpx;
+			margin-top: 31rpx;
+			margin-bottom: 30rpx;
+		}
+
+		.content_logo {
+
+			margin-top: 38rpx;
+			margin-bottom: 40rpx;
+
+			.txt {
+				font-weight: 400;
+				font-size: 19.44rpx;
+				color: #999999;
+			}
+		}
+
+		// background-image: linear-gradient(180deg, #00C9AC 0%, #009874 100%);
+		.content_btn {
+			width: 632.64rpx;
+			// height: 100%;
+			height: 81.94rpx;
+			background-color: #009874;
+			@include ctf(center);
+			flex-direction: row;
+
+			// background: #000;
+			.icon_saoma {
+				width: 41.67rpx;
+				height: 41.67rpx;
+				margin-right: 10rpx;
+				// display: inline;
+			}
+
+			.txt {
+				font-weight: 500;
+				font-size: 33.33rpx;
+				color: #FFFFFF;
+			}
+
+		}
+
+	}
+</style>
\ No newline at end of file
diff --git a/uniapp_project_code/src/components/index/view_footer.nvue b/uniapp_project_code/src/components/index/view_footer.nvue
index a4fe3d7..5089c6d 100644
--- a/uniapp_project_code/src/components/index/view_footer.nvue
+++ b/uniapp_project_code/src/components/index/view_footer.nvue
@@ -45,7 +45,7 @@
             </view>
         </view>
 
-        <view class="btn-style">
+        <view class="btn-style" @click="clickToPay">
 			<text class="txt">去付款</text>
 		</view>
         <!-- <button-square class="btn-style">
@@ -82,6 +82,9 @@ import util from "@/utils/util.js"
 	let handle_clickVIP = ()=>{
 		emits("clickVIP","")
 	}
+    let clickToPay = ()=>{
+        util.routeTo(`/pages/pay/index`, 'nT');
+    }
 
 	onMounted(async (res) => {
 		console.log(res + `    the keyboard_box component is now mounted.  ` + props.maskHeight)
diff --git a/uniapp_project_code/src/components/index/view_header.nvue b/uniapp_project_code/src/components/index/view_header.nvue
index c1d766c..9258f07 100644
--- a/uniapp_project_code/src/components/index/view_header.nvue
+++ b/uniapp_project_code/src/components/index/view_header.nvue
@@ -4,7 +4,7 @@
 			<image class="v-image" src="/static/index/camera_icon.png" mode="widthFix" />
 			<text class="v-text">您已进入视频覆盖区{{ props.backgroundCustom }}</text>
 		</view>
-		<view class="cancel-button" @click="handle_closeStandby">
+		<view class="cancel-button" @click="handle_closeUse">
 			<text class="v-text"> 取消交易</text>
 		</view>
 	</view>
@@ -12,8 +12,9 @@
 
 <script setup>
 //触发自定义事件
+import util from "@/utils/util.js"
 import { defineEmits, defineProps, computed } from 'vue'
-const emits = defineEmits(['closeStandby'])
+const emits = defineEmits(['closeUse'])
 const props = defineProps({
 	backgroundCustom: {
 		type: String,
@@ -33,8 +34,9 @@ const getBorderStyle = computed(() => {
 	}
 })
 
-const handle_closeStandby = () => {
-	emits("closeStandby", "false")
+const handle_closeUse = () => {
+	util.routeTo(`/pages/index/index`, 'rL');
+	// emits("closeUse", "false")
 }
 </script>
 
diff --git a/uniapp_project_code/src/components/pay/paying.vue b/uniapp_project_code/src/components/pay/paying.vue
index 9647500..bc33957 100644
--- a/uniapp_project_code/src/components/pay/paying.vue
+++ b/uniapp_project_code/src/components/pay/paying.vue
@@ -57,7 +57,7 @@
 		flex-direction: column;
 
 		.p-text {
-			margin-top: 161rpx;
+			margin-top: 80rpx;
 			font-weight: 600;
 			font-size: 22.22rpx;
 			color: #1A1A1A;
@@ -72,7 +72,7 @@
 		}
 		
 		.p-zhichi{
-			margin-top: 132.67rpx;
+			margin-top: 90rpx;
 			@include ctf(center);
 			flex-direction: row;
 			.p-line{
@@ -117,7 +117,7 @@
 		}
 
 		.p-btn {
-			margin-top: 107rpx;
+			margin-top: 80rpx;
 			@include ctf(center);
 			flex-direction: row;
 			width: 240.97rpx;
@@ -140,10 +140,10 @@
 		}
 
 		.p-user {
-			margin-top: 92rpx;
+			margin-top: 80rpx;
 			margin-left: 67rpx;
 			margin-bottom: 92rpx;
-			width: 750rpx;
+			align-self: flex-start;
 			.p-txt {
 				font-weight: 400;
 				font-size: 22.22rpx;
diff --git a/uniapp_project_code/src/components/pay/success.vue b/uniapp_project_code/src/components/pay/success.vue
index 8ab8ddd..cc31dad 100644
--- a/uniapp_project_code/src/components/pay/success.vue
+++ b/uniapp_project_code/src/components/pay/success.vue
@@ -39,6 +39,7 @@
 
 <script setup>
 //触发自定义事件
+import util from "@/utils/util.js"
 const emits = defineEmits(['clickToIndex'])
 const props = defineProps({
 	paySuccessInfo: {
@@ -49,6 +50,7 @@ const props = defineProps({
 
 const handle_clickToIndex = () => {
 	emits("clickToIndex", "")
+	util.routeTo(`/pages/index/index`, 'rL');
 }
 </script>
 
diff --git a/uniapp_project_code/src/pages/index/index.nvue b/uniapp_project_code/src/pages/index/index.nvue
index a0a738c..f3c3763 100644
--- a/uniapp_project_code/src/pages/index/index.nvue
+++ b/uniapp_project_code/src/pages/index/index.nvue
@@ -75,7 +75,7 @@
 		},
 		async onLoad(res) {
 			console.log("onload:",res)
-
+			this.showPageStandby = true
 		},
 		async onReady() {
 			this.screenHeight = await util.getPageHeight()
diff --git a/uniapp_project_code/src/pages/pay/index.vue b/uniapp_project_code/src/pages/pay/index.vue
index 5333547..28efc1f 100644
--- a/uniapp_project_code/src/pages/pay/index.vue
+++ b/uniapp_project_code/src/pages/pay/index.vue
@@ -1,7 +1,8 @@
 <template>
 	<view class="pay-page">
 		<view v-if="!paySuccess">
-			<view-header class="mheader" :backgroundCustom="('none')" :needBorder="('false')" @closeStandby="handle_closeStandby"></view-header>
+			<view-header class="mheader" :backgroundCustom="('none')" :needBorder="('false')" 
+			@closeUse="handle_closeUse"></view-header>
 			<paying v-if="true" @clickVipCard="handle_clickVipCard"></paying>
 		</view>
 		<pay-success v-else></pay-success>
@@ -60,7 +61,8 @@
 
 			handle_clickVipCard() {
 				util.showNone("储值卡支付未接入")
-				this.handle_clickVIP()
+				this.paySuccess = true
+				// this.handle_clickVIP()
 				// util.routeTo(`/pages/pay/success`, 'nT');
 			},
 
@@ -85,6 +87,8 @@
 <style lang="scss" scoped>
 	.pay-page {
 		width: 750rpx;
-
+		.mheader{
+			width: 750rpx;
+		}
 	}
 </style>
\ No newline at end of file