Merge branch 'dev-4.9.3' of http://192.168.32.253:3000/Software/android-cloud-H5 into dev-4.9.3

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

@@ -5,7 +5,7 @@
 var base_url = baseUrl; //测试服务器
 //http://test.androidscloud.com
 // var base_url = 'https://per.cs.se.androidscloud.com/';
-//var base_url = 'http://test.androidscloud.com'
+//var base_url = 'https://per.cs.se.androidscloud.com/'
 //https://www.nn-jtjt.com/app
 // var base_url = 'http://kmpark.cdwatertek.com/appwechatpay'; //测试服务器
 // var base_url = 'http://192.168.100.83:3001'; //测试服务器

microserviceUserH5/vcloud/share.html

@@ -149,6 +149,7 @@
 		}
 
 		.prompt img {
+			width: 200px;
 			position: absolute;
 			right: 15px;
 			top: 6px;
@@ -192,7 +193,7 @@
 				isshow: false,
 				id: GetRequest().id ? GetRequest().id : 404,
 				topic: {},
-				showD: false,
+				showD: true,
 
 			},
 			created() {
@@ -212,7 +213,7 @@
 					var isIOS = !!u.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/); //ios终端
 					if (isAndroid) {
 						this.getBrowser()
-					
+
 					} else if (isIOS) {
 						window.location.href = 'https://www.pgyer.com/gemini6';
 					} else {
@@ -220,35 +221,15 @@
 					}
 				},
 				getBrowser() {
-					var browser = {
-						versions: function () {
-							var u = navigator.userAgent,
-								app = navigator.appVersion;
-							return {
-								trident: u.indexOf('Trident') > -1, //IE内核
-								presto: u.indexOf('Presto') > -1, //opera内核
-								webKit: u.indexOf('AppleWebKit') > -1, //苹果、谷歌内核
-								gecko: u.indexOf('Gecko') > -1 && u.indexOf('KHTML') == -1, //火狐内核
-								mobile: !!u.match(/AppleWebKit.*Mobile.*/), //是否为移动终端
-								ios: !!u.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/), //ios终端
-								android: u.indexOf('Android') > -1 || u.indexOf('Adr') > -1, //android终端
-								iPhone: u.indexOf('iPhone') > -1, //是否为iPhone或者QQHD浏览器
-								iPad: u.indexOf('iPad') > -1, //是否iPad
-								webApp: u.indexOf('Safari') == -1, //是否web应该程序，没有头部与底部
-								weixin: u.indexOf('MicroMessenger') > -1, //是否微信 （2015-01-22新增）
-								qq: u.match(/QQ/i) == "qq" //是否QQ
-							};
-						}(),
-						language: (navigator.browserLanguage || navigator.language).toLowerCase()
-					}
-					if (browser.versions.weixin || navigator.userAgent.toLowerCase().toString().indexOf('qqbrowser') >-1) { //qq 微信
+					var ua = navigator.userAgent.toLowerCase();
+					if (ua.match(/MicroMessenger/i) == "micromessenger" || ua.match(/QQ\/[0-9]/i)) {
 						this.showD = true;
 						return;
-					}else{
-						window.location.href =
-							'http://www.androidscloud.com/admin/attachment/download/2117e9b7f3734b16b81b9d7bb1c5a601';
+					} else {
+						window.location.href ='http://www.androidscloud.com/admin/attachment/download/2117e9b7f3734b16b81b9d7bb1c5a601';
 
 					}
+
 				},
 				getList() {
 					this.$toast.loading({