From b40921054625e39aca23e964f0df1f76a98d6769 Mon Sep 17 00:00:00 2001
From: tk <szdot@live.com>
Date: Wed, 5 Jun 2024 19:15:26 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=B1=BB=09=E5=9E=8B=E3=80=91?=
 =?UTF-8?q?=EF=BC=9Atest=20=E3=80=90=E4=B8=BB=09=E9=A2=98=E3=80=91?=
 =?UTF-8?q?=EF=BC=9A=E8=B0=83=E6=95=B4=E4=B8=80=E4=B8=8B=E6=94=AF=E4=BB=98?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=9A=84ui=20=E3=80=90=E6=8F=8F=09=E8=BF=B0?=
 =?UTF-8?q?=E3=80=91=EF=BC=9A=20=09[=E5=8E=9F=E5=9B=A0]=EF=BC=9A=20=09[?=
 =?UTF-8?q?=E8=BF=87=E7=A8=8B]=EF=BC=9A=20=09[=E5=BD=B1=E5=93=8D]=EF=BC=9A?=
 =?UTF-8?q?=20=E3=80=90=E7=BB=93=09=E6=9D=9F=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# 类型 包含:
# feat：新功能（feature）
# fix：修补bug
# docs：文档（documentation）
# style： 格式（不影响代码运行的变动）
# refactor：重构（即不是新增功能，也不是修改bug的代码变动）
# test：增加测试
# chore：构建过程或辅助工具的变动
---
 pages.json         | 7 +++----
 pages/shop/pay.vue | 8 +++++++-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/pages.json b/pages.json
index 323c2e3..4990f47 100644
--- a/pages.json
+++ b/pages.json
@@ -42,7 +42,7 @@
 		{
 			"path": "pages/shop/pay",
 			"style": {
-				"navigationBarTitleText": "收银台"
+				"navigationStyle": "custom"
 			}
 		},
 		{
@@ -53,9 +53,8 @@
 		},
 		{
 			"path" : "pages/main/login",
-			"style" : 
-			{
-				"navigationBarTitleText" : ""
+			"style": {
+				"navigationStyle": "custom"
 			}
 		},
 		{
diff --git a/pages/shop/pay.vue b/pages/shop/pay.vue
index 4930a32..235626b 100644
--- a/pages/shop/pay.vue
+++ b/pages/shop/pay.vue
@@ -1,6 +1,12 @@
 <template>
 	<view>
-		<button @click="pay">确认支付</button>
+		<!-- topbar -->
+		<u-navbar title="收银台" bgColor="#d43030" :titleStyle="{ color: '#FFF'}" :autoBack="true" placeholder>
+			<view class="u-nav-slot" slot="left">
+				<u-icon name="arrow-left" color="#fff" size="19"></u-icon>
+			</view>
+		</u-navbar>
+		<button @click="pay" type="primary" style="margin-top:200rpx;">确认支付</button>
 	</view>
 </template>