Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

public/react/public/index.html

@@ -23,7 +23,6 @@
     <title>EduCoder</title>
     <script type="text/javascript">
       window.__isR = true;
-      
       // 不支持ie9 ie10
       if (
           ( navigator.userAgent.indexOf('MSIE 9') != -1 
@@ -32,8 +31,11 @@
           location.pathname.indexOf("/compatibility") == -1) {
 
         // location.href = './compatibility'
-        location.href = '/compatibility.html'
+        location.href = '/compatibility.html'  
-        
+      }
+      const isMobile = (/android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(navigator.userAgent.toLowerCase()));
+      if (isMobile) {
+        document.write('<script type="text/javascript" src="/javascripts/wx/jweixin-1.3.0.js"><\/script>');
       }
     </script>
 

public/react/src/App.js

@@ -281,7 +281,58 @@ class App extends Component {
 			mydisplay:true,
 		})
 	};
+	initWXShare = () => {
+		if (window.wx) {
+			const wx = window.wx
+			const url = '/wechats/js_sdk_signature.json'
+			axios.post(url, {
+				url: 'http://pre-newweb.educoder.net',
+			}).then((response) => {
+				const data = response.data;
+				wx.config({
+					debug: false,
+					appId: data.appid,
+					timestamp: data.timestamp,
+					nonceStr: data.nonceStr,
+					signature: data.signature,
+					jsApiList: [
+						'onMenuShareTimeline',//
+						'onMenuShareAppMessage',
+						'onMenuShareQQ',
+						'onMenuShareWeibo',
+						'onMenuShareQZone'
+	
+					]
+				});
+				wx.ready(function () {
+					var shareData = {
+						title: '这是是分享标题',
+						desc: '这是是摘要',
+						link: 'http://pre-newweb.educoder.net',
+						imgUrl: 'http://pre-newweb.educoder.net/images/educoder/index/subject/subject15.jpg'
+					};
+			
+					wx.onMenuShareAppMessage(shareData);//分享给好友
+					wx.onMenuShareTimeline(shareData);//分享到朋友圈
+					wx.onMenuShareQQ(shareData);//分享给手机QQ
+					wx.onMenuShareWeibo(shareData);//分享腾讯微博
+					wx.onMenuShareQZone(shareData);//分享到QQ空间
+			
+			
+			
+				});
+				wx.error(function (res) {
+					//alert(res.errMsg);//错误提示
+			
+				});
+			}).catch((error) => {
+				console.log(error)
+			})
+		}
+	}
 	componentDidMount() {
+		
+
 		// force an update if the URL changes
 		history.listen(() => {
 			this.forceUpdate()
@@ -291,7 +342,7 @@ class App extends Component {
 		});
 
 		initAxiosInterceptors(this.props)
-
+		this.initWXShare()
 		//
 		// axios.interceptors.response.use((response) => {
 		// 	// console.log("response"+response);