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

# Conflicts:
#	main.js

pages/call-log/call.vue

@@ -33,8 +33,6 @@
 	let callLogList = ref();
 	onLoad((option) => {
 		data.type=option.type
-
-	
 	})
 	onReady(() => {
 

pages/common/call-and-message-entry/call-and-message-entry.vue

@@ -30,7 +30,10 @@ import {
 		util
 	} from '@/utils/common.js';
 
-	const { appContext, proxy } = getCurrentInstance();
+	const {
+		appContext,
+		proxy
+	} = getCurrentInstance();
 	// 列表
 	const source = ref([{
 			name: '苹果',
@@ -100,17 +103,16 @@ onLoad((options) => {
 		if (options.type) {
 			data.type = options.type
 		}
-})
-
-function goPage(url) {
-
-	if (url) {
 		proxy.$apiUserEvent('all', {
 			type: 'event',
 			key: data.type == 'message' ? 'message' : 'call-log',
 			prefix: '.uni.other.',
 			value: data.type == 'message' ? '短信' : "通话"
 		})
+	})
+
+	function goPage(url) {
+		if (url) {
 			util.goPage(url)
 		} else {
 			uni.showToast({