Merge branch 'Branch_1' of https://git.u8t.cn/tangxinyue/alipay-emulator into Branch_1

App.vue

@@ -13,7 +13,6 @@
 			console.log('启动参数:', JSON.stringify(options))
 			console.log('环境:', process.env.NODE_ENV)
 
-
 			uni.setStorageSync('onNativeEventReceive', "no")
 			// 清除上次遗留的跳转指令，防止正常启动时自动跳转
 			uni.removeStorageSync('jumpTarget_url');

pages.json

@@ -404,6 +404,22 @@
 						"navigationBarTitleText" : "工商银行",
 						"navigationStyle": "custom"
 					}
+				},
+				{
+					"path" : "bank/nyyh",
+					"style" : 
+					{
+						"navigationBarTitleText" : "农业银行",
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path" : "bank/jsyh",
+					"style" : 
+					{
+						"navigationBarTitleText" : "建设银行",
+						"navigationStyle": "custom"
+					}
 				}
 			]
 		},

pages/call-log/detail/callDetail.vue

@@ -8,36 +8,31 @@
 			</liu-drag-button>
 		</view>
 		<view class="ios" v-if="data.type=='ios'">
-<!-- 			<view  :style="{height:(data.info.avatar?519:325)+'px' }">
+			<view  :style="{height:(data.info.avatar?519:325)+'px' }">
 				
-			</view> -->
-			<view class="rectangle_22292"  
+			</view>
+			<view class="rectangle_22292"   style="position: fixed;left:0;top:0;overflow: hidden;"
 				:style="{background:(data.info.avatar?`rgba(0,0,0,0)`:'linear-gradient(180deg, #bdbec3 0%, #a0a2af 100%)')
-				}">
-				<!-- style="position: fixed;left:0;top:0;overflow: hidden;" -->
-				<!-- , height:data.headerHeight+'px' -->	
+				, height:data.headerHeight+'px'}">
 				<view v-if="data.info.avatar" style="height:400rpx;"></view>
 				<image v-if="data.info.avatar" :src="data.info.avatar" mode="aspectFill" 
-					style="width:100%;position: absolute;bottom: 0;left: 0;z-index:0;" :style="{height:1400+'rpx'}"></image>
-					<!-- :style="{height:data.headerHeight+'px'}" -->
+					style="width:100%;position: absolute;bottom: 0;left: 0;z-index:0;" :style="{height:data.headerHeight+'rpx'}"></image>
 				<view class="status" :style="{height:$systemInfo.statusBarHeight+'px'}"> </view>
 				<view class="flexcontainer"  @click="openEditModalDetail()">
 					<image @click.stop="back()" class="group_48089" src="/static/image/call/detail/iosBack.png" :style="{position: 'fixed',
 					'top': $systemInfo.statusBarHeight*2+22+'rpx', left: '26rpx'}" />
+					<view class="ios-edit" :style="{position: 'fixed', 'top': $systemInfo.statusBarHeight*2+22+'rpx', right: '26rpx',opacity:1-data.scale}">编辑</view>
 					<view class="text-avatar" v-if="data.info.name && data.info.avatarType === 'text'"
-						:style="{opacity:data.info.avatar?0:1}">
+						:style="{opacity:data.info.avatar?0:1,transform: `scale(${data.avatarScale}) translateY(${data.avatarY}px)`}">
 						{{data.info.name.substring(0,1)}}
 					</view>
-					<!-- ,transform: `scale(${data.avatarScale}) translateY(${data.contentY}px)` -->
 					<image v-else class="group_47577" :src="data.info.avatar||'/static/image/call/iosAvatar.png'"
-						:style="{opacity:data.info.avatar?0:1}" />
-						<!-- ,transform: `scale(${data.avatarScale}) translateY(${data.contentY}px)` -->
+						:style="{opacity:data.info.avatar?0:1,transform: `scale(${data.avatarScale}) translateY(${data.avatarY}px)`}" />
 				</view>
 				<text class="text_1" v-if="!data.info.avatar"  :style="{opacity:data.scale}"> {{data.info.address}} </text>
-				<text class="text_2" >{{data.info.name||formatString(data.info.phone)}} </text>
-				<!-- :style="{transform: `scale(${data.avatarScale}) translateY(${data.contentY}px)`}" -->
-				<view class="flexcontainer_1" >
-					<!-- :style="{transform: `translateY(${data.contentY}px)`}" -->
+				<text class="text_2" :style="{transform: `scale(${data.textScale}) translateY(${data.text2Y}px)`}">{{data.info.name||formatString(data.info.phone)}} </text>
+
+				<view class="flexcontainer_1" :style="{transform: `translateY(${data.contentY}px)`}">
 					<view class="group_48123" :style="{'background-color': `rgba(128,131,146,${data.info.avatar?0.5:1})`}">
 						<image class="group_13792" src="/static/image/call/detail/iosIcon1.png" />
 						<text class="text_3"> 信息 </text>
@@ -721,7 +716,10 @@
 	const data = reactive({
 		scale:1,
 		avatarScale:1,
+		textScale:1,
 		contentY:0,
+		avatarY:0,
+		text2Y:0,
 		headerHeight:0,
 		type: 'ios',
 		index: 0,
@@ -785,8 +783,12 @@
 			const y = e.scrollTop;
 			const max = 200; 
 			let p = Math.min(y / max, 1);
-			data.contentY = -p * 100; 
-			data.avatarScale = 1 - p * 0.5; // 1 → 0.6 
+			data.contentY = -p * 90; 
+			data.avatarY = -p * 0;
+			data.text2Y = -p * 130; 
+			data.avatarScale = 1 - p * 0.55; // 1 → 0.6 textScale
+			data.textScale = 1 - p * 0.5; // 1 → 0.6 
+			
 			data.scale = 1 - p * 1; // 1 → 0.6 
 			console.log(data.avatarScale ) 
 			data.headerHeight=Math.max(206,(data.info.avatar?519:325) - y);
@@ -1458,9 +1460,9 @@
 					width: 60rpx;
 					height: 60rpx;
 					z-index: 1;
-					position: relative;
-					margin-left: 0;
-					margin-top: 0;
+					position: fixed;
+					left: 0;
+					top: 0;
 				}
 
 				.group_47577 {
@@ -3524,4 +3526,15 @@
 			}
 		}
 	}
+	.ios-edit{
+		width: 50px;
+		height: 30px;
+		text-align: center;
+		line-height: 30px;
+		background: rgba(0,0,0,0.1);
+		border-radius: 15px 15px 15px 15px;	
+		font-weight: 400;
+font-size: 16px;
+color: #FFFFFF;
+	}
 </style>

pages/call-log/detail/test.vue

@@ -65,7 +65,6 @@ export default {
   computed: {
     headerHeight() {
       const y = this.scrollY;
-
       // 🔥 折叠高度（关键）
       return Math.max(this.headerMin, this.headerMax - y);
     }

pages/other/bank/index.vue

@@ -54,7 +54,7 @@
 				buttonColor: '#FB6767',
 			},
 			icon: 'gsyh',
-			callUrl: ""
+			callUrl: "/pages/other/bank/gsyh"
 		},
 		{
 			name: '农业',
@@ -64,7 +64,7 @@
 				buttonColor: '#FFA64D',
 			},
 			icon: 'nyyh',
-			callUrl: ""
+			callUrl: "/pages/other/bank/nyyh"
 		},
 		{
 			name: '建设',
@@ -74,7 +74,7 @@
 				buttonColor: '#5DCD49',
 			},
 			icon: 'jsyh',
-			callUrl: ""
+			callUrl: "/pages/other/bank/jsyh"
 		}
 	])
 

pages/other/bank/zsyh.vue

@@ -1339,7 +1339,7 @@
 	.popup-footer {
 		display: flex;
 		justify-content: space-between;
-		padding: 20rpx;
+		padding-top: 20rpx;
 		border-top: 1rpx solid #eee;
 	}