Merge branch 'master' of https://git.flyfish.group/gaowk/saas-page-web

# Conflicts:
#	index.html

index.html

@@ -32,13 +32,14 @@
 			</div>
 		</div>
 		<script>
-			// var host = 'http://192.168.26.198:10089';
+			// var ctx = 'http://192.168.26.198:3000';
 			var ctx = '/epi-project'
 			var app = new Vue({
 				el: '#app',
 				data: {
 					tenantList: [],
-					selectedTenant: null
+					selectedTenant: null,
+					isMiniProgram: false
 				},
 				methods: {
 					selChange(tenant) {
@@ -48,23 +49,28 @@
 							opacity: 'toggle'
 						})
 						localStorage.setItem('tenant', tenant.identifier);
-						wx.miniProgram.getEnv(function(res) {
-							if (res.miniprogram) {
-								wx.miniProgram.postMessage({
-									data: {
-										tenant: tenant.identifier
-									}
-								})
-							}
-						});
-						// 跳转业务系统
-						location.href = '/'
+						if (this.isMiniProgram) {
+							wx.miniProgram.postMessage({
+								data: {
+									tenant: tenant.identifier
+								}
+							})
+						} else {
+							// 跳转业务系统
+							location.href = '/'
+						}
 					}
 				},
 				created() {
 					fetch(ctx + '/tenants').then(r => r.json()).then(res => {
 						this.tenantList = res.data;
 					})
+					if (!window.WeixinJSBridge || !WeixinJSBridge.invoke) {
+						document.addEventListener('WeixinJSBridgeReady', () => {
+							this.isMiniProgram = window.__wxjs_environment === 'miniprogram'
+						}, false)
+					}
+					this.isMiniProgram = window.__wxjs_environment === 'miniprogram'
 				}
 			})