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

# Conflicts:
#	main.js

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.6.sp4')
+	uni.setStorageSync('version', '1.0.6.sp5')
 	app.config.globalProperties.$version = uni.getStorageSync('version')
 	app.use(globalMethods);
 	return {

pages/call-log/detail/callDetail.vue

@@ -12,11 +12,11 @@
 				
 			</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="{background:(data.info.avatar&&data.headerHeight!='206'?`rgba(0,0,0,0)`:'linear-gradient(180deg, #bdbec3 0%, #a0a2af 100%)')
 				, 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:data.headerHeight+'rpx'}"></image>
+				<image v-if="data.info.avatar&&data.headerHeight!='206'" :src="data.info.avatar" mode="aspectFill" 
+					style="width:100%;position: absolute;bottom: 0;left: 0;z-index:0;" :style="{height:data.headerHeight+'px'}"></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',
@@ -27,7 +27,7 @@
 						{{data.info.name.substring(0,1)}}
 					</view>
 					<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.avatarY}px)`}" />
+						:style="{opacity:data.info.avatar?(data.headerHeight=='206'?1: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" :style="{transform: `scale(${data.textScale}) translateY(${data.text2Y}px)`}">{{data.info.name||formatString(data.info.phone)}} </text>
@@ -583,8 +583,6 @@
 	import {
 		ref,
 		reactive,
-		watch,
-		nextTick,
 		getCurrentInstance
 	} from "vue";
 	import {
@@ -595,16 +593,8 @@
 		onReachBottom
 	} from "@dcloudio/uni-app";
 	const {
-		appContext,
 		proxy
 	} = getCurrentInstance();
-	import {
-		useStore
-	} from '@/store/index.js'
-	const {
-		getCallDetail,
-		setCallDetail
-	} = useStore()
 	let recordPopup = ref()
 	let timePickerPopup = ref()
 	let editTimePopup = ref()
@@ -768,6 +758,7 @@
 		data.index = Number(option.index)
 		let listArr = uni.getStorageSync('callLog')
 		data.info = listArr[data.index]
+		// data.info.avatar='/static/logo.png'
 		data.list = data.info.list || data.list
 		console.log(data.info)
 		data.headerHeight=data.info.avatar?519:325
@@ -778,24 +769,24 @@
 	onShow(() => {
 
 	})
-	onPageScroll((e) => { 
-		if(data.type=='ios'){
+	onPageScroll((e) => {
+		if (data.type == 'ios') {
 			const y = e.scrollTop;
-			const max = 200; 
+			const max = 200;
 			let p = Math.min(y / max, 1);
-			data.contentY = -p * 90; 
+			data.contentY = -p * (data.info.avatar ? 65 : 90);
 			data.avatarY = -p * 0;
-			data.text2Y = -p * 130; 
+			data.text2Y = -p * (data.info.avatar ? 75 : 130);
 			data.avatarScale = 1 - p * 0.55; // 1 → 0.6 textScale
-			data.textScale = 1 - p * 0.5; // 1 → 0.6 
+			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);
-		}else{ 
-			
-		} 
-	 })
+			data.scale = 1 - p * 1; // 1 → 0.6
+			data.headerHeight = Math.max(206, (data.info.avatar ? 519 : 325) - y);
+			console.log(data.headerHeight)
+		} else {
+			// 其他类型的处理
+		}
+	})
 	onReachBottom(() => {
 
 	})

pages/other/bank/gsyh.vue

@@ -9,7 +9,7 @@
 		<view class="group_45764" v-if="!selectedImage" :style="{'padding-top':$systemInfo.statusBarHeight+'px'}">
 			<view class="rectangle_23284">
 				<view class="flexcontainer">
-					<view class="group_8">
+					<view class="group_8"  @click="back">
 						<image class="frame" src="/static/image/other/bank/gsyh/back.png" />
 					</view>
 					<view class="group_7">
@@ -40,7 +40,8 @@
 						<text class="text_2">{{data.form.cardType}}</text>
 						<view class="text_3">
 							{{maskCardNumber(data.form.cardNumber)}}
-							<text style="color:#3E82BD;margin-left: 52rpx;" @click="data.isShow=true">查看</text>
+							<view 
+							style="color:#3E82BD;margin-left: 52rpx;text-align: center;font-size: 22rpx; width: 52rpx;height: 32rpx;background: #F3F6FB;border-radius: 2px 2px 2px 2px;" @click="data.isShow=true">查看</view>
 						</view>
 					</view>
 				</view>
@@ -381,7 +382,9 @@ onMounted(() => {
 	}
 	// #endif
 });
-
+function back(){
+	uni.navigateBack()
+}
 function loadCache() {
 	const cache = uni.getStorageSync(CACHE_KEY);
 	if (cache) {
@@ -758,6 +761,7 @@ function onNumberInput(field, value) {
 		display: flex;
 		flex-direction: column;
 		margin-left: 22rpx;
+		width: calc(100% - 130rpx);
 	}
 
 	.text_2 {
@@ -768,6 +772,8 @@ function onNumberInput(field, value) {
 	.text_3 {
 		font-size: 26rpx;
 		color: #333333;
+		display: flex;
+		flex-direction: row;
 	}
 
 	.group_48162 {

pages/other/bank/zsyh.vue

@@ -23,7 +23,7 @@
 								<image class="group_13980" src="/static/image/other/bank/zsyh/kf.png" mode="aspectFit" />
 								<view class="flexcontainer_4">
 									<view class="group_48144">
-										<text class="text_6">20</text>
+										20
 									</view>
 									<image class="group_13979" src="/static/image/other/bank/zsyh/more.png" mode="aspectFit" />
 								</view>
@@ -1091,7 +1091,7 @@
 			width: 60rpx;
 			height: 52rpx;
 			margin-left: 44rpx;
-			margin-top: 32rpx;
+			margin-top: 28rpx;
 		}
 
 		.group_48144 {
@@ -1100,14 +1100,20 @@
 			margin-left: 12rpx;
 			border-radius: 100rpx;
 			background: #ff5d5f;
+			margin-bottom: -2px;
+			margin-top: 4px;
+			text-align: center;
+			font-size: 24rpx;
+			line-height: 36rpx;
+			color: #ffffff;
+			display: flex;
+			align-items: center;
+			justify-content: center;
 		}
 
 		.text_6 {
 			display: block;
-			text-align: center;
-			font-size: 24rpx;
-			line-height: 30rpx;
-			color: #ffffff;
+			
 		}
 
 		.group_13979 {
@@ -1148,7 +1154,7 @@
 		.group_48142 {
 			width: 20rpx;
 			height: 20rpx;
-			margin-top: 8rpx;
+			margin-top: 6rpx;
 		}
 
 		.path {
@@ -1195,6 +1201,7 @@
 			font-size: 30rpx;
 			line-height: 42rpx;
 			color: #1a1a1a;
+			font-weight: bold;
 		}
 
 		.text_10 {