From 1bb582d51aaea184486dc66fcbb621ce8e88cb4d Mon Sep 17 00:00:00 2001
From: tangxinyue <524779910@qq.com>
Date: Tue, 19 May 2026 16:34:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=85=B3=E4=BA=8E=E6=9C=AC?=
 =?UTF-8?q?=E6=9C=BA=E9=A1=B5=E9=9D=A2=E4=B8=8A=E6=BB=91=E6=AF=9B=E7=8E=BB?=
 =?UTF-8?q?=E7=92=83=E6=95=88=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main.js                                       |   2 +-
 .../about-this-iphone/about-this-iphone.vue   | 112 +++++++++++++++---
 .../shangou-order-detail.vue                  |   2 +-
 3 files changed, 96 insertions(+), 20 deletions(-)

diff --git a/main.js b/main.js
index 4bbde0e..90b19b2 100644
--- a/main.js
+++ b/main.js
@@ -29,7 +29,7 @@ export function createApp() {
 	app.config.globalProperties.$system = plus.os.name;
 	// #endif
 	app.config.globalProperties.$systemInfo = systemInfo
-	uni.setStorageSync('version', '1.0.5.sp1')
+	uni.setStorageSync('version', '1.0.5.sp3')
 	app.config.globalProperties.$version = uni.getStorageSync('version')
 	app.use(globalMethods);
 	return {
diff --git a/pages/other/about-this-iphone/about-this-iphone.vue b/pages/other/about-this-iphone/about-this-iphone.vue
index 9286911..a80c1b1 100644
--- a/pages/other/about-this-iphone/about-this-iphone.vue
+++ b/pages/other/about-this-iphone/about-this-iphone.vue
@@ -1,12 +1,19 @@
 <template>
 	<view>
-		<nav-bar title="关于本机" bgColor="#F2F1F6">
-			<template v-slot:left>
-				<image class="back-icon" src="/static/image/common/iphone-back.png" style="width: 86rpx;height: 86rpx;"
-					@click="back">
-				</image>
-			</template>
-		</nav-bar>
+		<!-- Custom Nav Bar -->
+		<view class="custom-nav-bar">
+			<view class="status-bar" :style="{ height: statusBarHeight + 'px' }"></view>
+			<view class="nav-content">
+				<view class="left-icon" @click="back">
+					<image class="back-icon" src="/static/image/common/iphone-back.png" />
+				</view>
+				<view class="title">关于本机</view>
+				<view class="right-placeholder"></view>
+			</view>
+		</view>
+
+		<!-- Placeholder to push content down -->
+		<view class="nav-placeholder" :style="{ height: statusBarHeight + 'px' }"></view>
 
 		<view class="info-container">
 			<block v-for="(group, groupIndex) in listData" :key="groupIndex">
@@ -50,14 +57,26 @@
 			</view>
 		</view>
 	</view>
+	<!-- 水印 -->
+	<view v-if="$isVip()">
+		<watermark dark="light" source="uni_alipay_shopping_about_iphone" />
+		<liu-drag-button :canDocking="false"
+			@clickBtn="$goRechargePage('watermark', 'uni_alipay_shopping_about_iphone')">
+			<c-lottie ref="cLottieRef" :src='$watermark()' width="94px" height='74px' :loop="true"></c-lottie>
+		</liu-drag-button>
+	</view>
 </template>
 
 <script setup>
-import { ref, onMounted } from 'vue';
+import { ref, onMounted, getCurrentInstance } from 'vue';
 import { util } from '@/utils/common.js'
+import { onShow, onLoad, onPageScroll } from '@dcloudio/uni-app'
+const { proxy } = getCurrentInstance();
 
 const CACHE_KEY = 'about_iphone_data';
 
+// Removed scroll logic, styling is now fully CSS-driven
+
 const defaultData = [
 	{
 		groupTitle: '',
@@ -123,8 +142,30 @@ const defaultData = [
 ];
 
 const listData = ref([]);
+const statusBarHeight = ref(0);
+onShow(() => {
+	// #ifdef APP-PLUS
+	util.setAndroidSystemBarColor('#F2F1F6')
+	setTimeout(() => {
+		plus.navigator.setStatusBarStyle("dark");
+	}, 500);
+	// #endif
+
+})
+
+onLoad(() => {
+	proxy.$apiUserEvent('all', {
+		type: 'event',
+		key: 'ios-about-phone',
+		prefix: '.uni.other.',
+		value: '设置-关于本机'
+	})
+})
 
 onMounted(() => {
+	const systemInfo = uni.getSystemInfoSync();
+	statusBarHeight.value = systemInfo.statusBarHeight || 0;
+
 	const cached = uni.getStorageSync(CACHE_KEY);
 	if (cached) {
 		try {
@@ -173,28 +214,61 @@ const confirmModal = () => {
 </script>
 
 <style lang="less" scoped>
-::v-deep .nav-box {
-	height: auto !important;
+.custom-nav-bar {
+	opacity: .97;
+	position: fixed;
+	top: 0;
+	left: 0;
+	right: 0;
+	z-index: 999;
+	background: linear-gradient(180deg, rgba(242, 242, 246, 0.5) 0%, rgba(242, 242, 246, 0) 100%);
+	backdrop-filter: saturate(220%) blur(14px);
+	-webkit-backdrop-filter: saturate(220%) blur(14px);
+	-webkit-mask-image: linear-gradient(180deg, rgba(242, 242, 246, 0.5) 0%, rgba(242, 242, 246, 0) 100%);
+	mask-image: linear-gradient(to bottom, rgba(0, 0, 0, 1) calc(100% - 50rpx), rgba(0, 0, 0, 0) 100%);
+
+	.nav-content {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		padding: 10rpx 26rpx 50rpx;
+	}
+
+	.left-icon,
+	.right-placeholder {
+		width: 86rpx;
+		display: flex;
+		align-items: center;
+	}
+
+	.title {
+		flex: 1;
+		text-align: center;
+		font-size: 32rpx;
+		font-weight: 500;
+		color: #1A1A1A;
+	}
 }
 
-::v-deep .nav-bar-title {
-	font-size: 32rpx !important;
+.nav-placeholder {
+	width: 100%;
+	padding-top: 146rpx;
 }
 
-::v-deep .uni-navbar__header {
-	height: auto !important;
-	padding: 10rpx 26rpx;
-}
+/* .blur-nav removed */
 
 .back-icon {
 	box-shadow: 0rpx 0rpx 20rpx 0rpx #E1E1E6;
 	border: 2rpx solid #FFFFFF;
 	border-radius: 50%;
+	width: 86rpx;
+	height: 86rpx;
 }
 
 .info-container {
 	padding: 30rpx;
 	padding-bottom: 60rpx;
+	margin-top: 60rpx;
 }
 
 .info-group {
@@ -245,8 +319,10 @@ const confirmModal = () => {
 }
 
 .header-text {
-	font-size: 28rpx;
-	color: #8A8A8D;
+	font-size: 32rpx;
+	line-height: 32rpx;
+	margin-bottom: 16rpx;
+	color: #85858A;
 }
 
 .custom-modal-mask {
diff --git a/pages/shopping/taobao/shangou-order-detail/shangou-order-detail.vue b/pages/shopping/taobao/shangou-order-detail/shangou-order-detail.vue
index d36b049..baccc22 100644
--- a/pages/shopping/taobao/shangou-order-detail/shangou-order-detail.vue
+++ b/pages/shopping/taobao/shangou-order-detail/shangou-order-detail.vue
@@ -25,7 +25,7 @@
 				</view>
 			</template>
 		</nav-bar>
-		<view class="map-box">
+		<view v-if="order.statusType == 'wait_recv'" class="map-box">
 			<image style="width: 100%;opacity: 0;" src="/static/image/shopping/taobao/waimai/map1.png" mode="widthFix">
 			</image>
 			<view class="qishou flex-align-center flex-column">