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

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

pages/call-log/detail/callDetail.vue

@@ -508,6 +508,19 @@
 		})
 	}
 	const saveChanges = () => {
+		let isChecked=false
+		tempList.value.forEach(item=>{
+			if(item.start_time==''||item.end_time==''){
+				isChecked=true
+			}
+		})
+		if(isChecked){
+			uni.showToast({
+				title: '请选择时间',
+				icon: 'none'
+			})
+			return
+		}
 		data.list = JSON.parse(JSON.stringify(tempList.value))
 		data.info.list = data.list
 		// setCallDetail(data.info)
@@ -1755,20 +1768,18 @@
 				position: absolute;
 				top: 8rpx;
 				left: 86rpx;
-				text-align: center;
+				// text-align: center;
 				font-size: 32rpx;
-				font-family: OPPOSans;
+				// font-family: OPPOSans;
 				font-weight: 700;
 				line-height: 48rpx;
-				color: var(--, #1a1a1a);
+				color: #1a1a1a;
 				white-space: pre;
 				height: 48rpx;
 				margin-top: -8rpx;
 				margin-bottom: -8rpx;
 				right: 0;
-				width: max-content;
+				// width: max-content;
-				margin-left: auto;
-				margin-right: auto;
 			}
 
 			/* flexContainer */
@@ -1947,7 +1958,7 @@
 			padding-top: 20rpx;
 			padding-left: 100rpx;
 			padding-bottom: 56rpx;
-			z-index: 9999;
+			z-index: 9;
 			margin-top: 18rpx;
 			background-color: #fff;