Quellcode durchsuchen

Merge branch 'dev-4.9.6.3'

heyang vor 3 Jahren
Ursprung
Commit
5798dd7af1
26 geänderte Dateien mit 1181 neuen und 7 gelöschten Zeilen
  1. BIN
      microserviceUserH5/static/img/exchangePhoneActivityNew/back.png
  2. BIN
      microserviceUserH5/static/img/exchangePhoneActivityNew/banner.png
  3. BIN
      microserviceUserH5/static/img/exchangePhoneActivityNew/btn.png
  4. BIN
      microserviceUserH5/static/img/exchangePhoneActivityNew/code.png
  5. BIN
      microserviceUserH5/static/img/exchangePhoneActivityNew/custer.png
  6. BIN
      microserviceUserH5/static/img/exchangePhoneActivityNew/down_icon.png
  7. BIN
      microserviceUserH5/static/img/exchangePhoneActivityNew/logo.png
  8. BIN
      microserviceUserH5/static/img/exchangePhoneActivityNew/mask-btn.png
  9. BIN
      microserviceUserH5/static/img/exchangePhoneActivityNew/mask-btn2.png
  10. BIN
      microserviceUserH5/static/img/exchangePhoneActivityNew/new.png
  11. BIN
      microserviceUserH5/static/img/exchangePhoneActivityNew/no-selected.png
  12. BIN
      microserviceUserH5/static/img/exchangePhoneActivityNew/phone.png
  13. BIN
      microserviceUserH5/static/img/exchangePhoneActivityNew/procedure.png
  14. BIN
      microserviceUserH5/static/img/exchangePhoneActivityNew/right_icon.png
  15. BIN
      microserviceUserH5/static/img/exchangePhoneActivityNew/rule-close.png
  16. BIN
      microserviceUserH5/static/img/exchangePhoneActivityNew/rule.png
  17. BIN
      microserviceUserH5/static/img/exchangePhoneActivityNew/selected.png
  18. BIN
      microserviceUserH5/static/img/exchangePhoneActivityNew/success.png
  19. BIN
      microserviceUserH5/static/img/exchangePhoneActivityNew/time_line_left.png
  20. BIN
      microserviceUserH5/static/img/exchangePhoneActivityNew/time_line_right.png
  21. BIN
      microserviceUserH5/static/img/exchangePhoneActivityNew/tips.png
  22. BIN
      microserviceUserH5/static/img/exchangePhoneActivityNew/title.png
  23. 586 0
      microserviceUserH5/vcloud/baiduExchangePhoneActivity.html
  24. 3 6
      microserviceUserH5/vcloud/exchangePhoneActivity.html
  25. 8 1
      microserviceUserH5/vcloud/exchangePhoneDownApp.html
  26. 584 0
      microserviceUserH5/vcloud/weChatExchangePhoneActivity.html

BIN
microserviceUserH5/static/img/exchangePhoneActivityNew/back.png


BIN
microserviceUserH5/static/img/exchangePhoneActivityNew/banner.png


BIN
microserviceUserH5/static/img/exchangePhoneActivityNew/btn.png


BIN
microserviceUserH5/static/img/exchangePhoneActivityNew/code.png


BIN
microserviceUserH5/static/img/exchangePhoneActivityNew/custer.png


BIN
microserviceUserH5/static/img/exchangePhoneActivityNew/down_icon.png


BIN
microserviceUserH5/static/img/exchangePhoneActivityNew/logo.png


BIN
microserviceUserH5/static/img/exchangePhoneActivityNew/mask-btn.png


BIN
microserviceUserH5/static/img/exchangePhoneActivityNew/mask-btn2.png


BIN
microserviceUserH5/static/img/exchangePhoneActivityNew/new.png


BIN
microserviceUserH5/static/img/exchangePhoneActivityNew/no-selected.png


BIN
microserviceUserH5/static/img/exchangePhoneActivityNew/phone.png


BIN
microserviceUserH5/static/img/exchangePhoneActivityNew/procedure.png


BIN
microserviceUserH5/static/img/exchangePhoneActivityNew/right_icon.png


BIN
microserviceUserH5/static/img/exchangePhoneActivityNew/rule-close.png


BIN
microserviceUserH5/static/img/exchangePhoneActivityNew/rule.png


BIN
microserviceUserH5/static/img/exchangePhoneActivityNew/selected.png


BIN
microserviceUserH5/static/img/exchangePhoneActivityNew/success.png


BIN
microserviceUserH5/static/img/exchangePhoneActivityNew/time_line_left.png


BIN
microserviceUserH5/static/img/exchangePhoneActivityNew/time_line_right.png


BIN
microserviceUserH5/static/img/exchangePhoneActivityNew/tips.png


BIN
microserviceUserH5/static/img/exchangePhoneActivityNew/title.png


Datei-Diff unterdrückt, da er zu groß ist
+ 586 - 0
microserviceUserH5/vcloud/baiduExchangePhoneActivity.html


+ 3 - 6
microserviceUserH5/vcloud/exchangePhoneActivity.html

@@ -377,11 +377,7 @@
 		},false);
         function download() {
             if (isAndroid) {
-				if(baseUrl == 'https://per.cs.se.androidscloud.com'){
-					location.href = `./exchangePhoneDownApp.html?code=h8v320gxzb2W&platform=1`;
-				}else{
-					location.href = `./exchangePhoneDownApp.html?code=nEk3HnNl61C3&platform=1`;
-				}
+				location.href = `./exchangePhoneDownApp.html?code=nEk3HnNl61C3&platform=1`;
             } else if (isIOS) {
                 location.href = 'https://www.pgyer.com/gemini6?timestamp=' + Math.random();
             } else {
@@ -419,7 +415,8 @@
 				url: baseUrl + '/api/public/v1/systemBuriedPoint/stat',
 				type: 'post',
 				data: JSON.stringify({
-					pointName: pointName
+					pointName: pointName,
+					channel: 'nEk3HnNl61C3'
 				}),
 				contentType: "application/json",
 				dataType: 'json',

+ 8 - 1
microserviceUserH5/vcloud/exchangePhoneDownApp.html

@@ -17,6 +17,13 @@
 	<script>
 		toastr.options.positionClass = 'toast-center-center';
 	</script>
+	<style>
+		@media (max-width: 800px) {
+			.free-code-con {
+				width: 100%;
+			}
+		}
+	</style>
 </head>
 <div class="top free-code-con" style="position:relative;background: #169af2;">
 	<div class="bottom-img">
@@ -79,7 +86,7 @@
 			cache: false,
 			success: function (res) {
 				if (res.status === 0) {
-					if(baseUrl == 'https://per.cs.se.androidscloud.com'){
+					if(baseUrl.includes('per.cs.se.androidscloud.com')){
 						window.location.href = `https://per.cs.se.androidscloud.com/file-center/fileOperate/downloadFile?id=${downloadId}`;
 					}else{
 						window.location.href = `https://wjzx.androidscloud.com:9091/file-center/fileOperate/downloadFile?id=${downloadId}`;

Datei-Diff unterdrückt, da er zu groß ist
+ 584 - 0
microserviceUserH5/vcloud/weChatExchangePhoneActivity.html