Merge branch 'release/v5.4.0' of Software/android-cloud-H5 into test

static/microserviceUserH5/static/js/vender/config.js

@@ -5,17 +5,6 @@ var baseUrl = 'http://14.18.190.141:1280'
 // var baseUrl = 'http://prese.phone.androidscloud.com'
 // var baseUrl = 'http://vclusters.imwork.net:2221'
 
-const fileCenterApi = 'https://file.phone.androidscloud.com:8121';
-let uploadKey = ''
-if (window.location.origin.includes('client.phone.androidscloud.com')) {
-  uploadKey = 'edv834e74a9c43eaac02'
-} else if (window.location.origin.includes('prese.phone.androidscloud')) {
-  uploadKey = '347905r86eb745a1sc38'
-} else {
-  uploadKey = '13d0arghebcc4cm49cf04'
-}
-
-
 function GetRequest() {
   var url = location.search; // 获取url中"?"符后的字串
   var obj= new Object();

static/microserviceUserH5/vcloud/awardActivity.html

@@ -193,6 +193,15 @@
 	<script type="text/javascript" src="https://js.cdn.aliyun.dcloud.net.cn/dev/uni-app/uni.webview.1.5.2.js"></script>
 	<script type="text/javascript">
         // var baseUrl = 'http://gntest.phone.androidscloud.com:1280'
+		const fileCenterApi = 'https://file.phone.androidscloud.com:8121';
+		let uploadKey = ''
+		if (window.location.origin.includes('client.phone.androidscloud.com')) {
+			uploadKey = 'edv834e74a9c43eaac02'
+		} else if (window.location.origin.includes('prese.phone.androidscloud')) {
+			uploadKey = '347905r86eb745a1sc38'
+		} else {
+			uploadKey = '13d0arghebcc4cm49cf04'
+		}
 	    let timer,flag = true;
 		var url = window.location.href;
 		url = url.split('/')