Merge branch 'master' of http://gitlib.occloud.net/suwenbiao/h5-watch

App.vue

 <script>
 	export default {
 		onLaunch() {
-			let status = navigator.userAgent.toLowerCase();
-			if (status.match(/MicroMessenger/i) == "micromessenger") {
-				//微信浏览器
-				uni.setStorageSync('browser_type', '1')
-			} else {
-				//其他浏览器
-				uni.setStorageSync('browser_type', '0')
+			if(window.location.href.slice( window.location.href.indexOf('/',10)+1,9999).length > 5 && window.location.href.indexOf("&code=" == -1)){
+				uni.setStorageSync('room_id', window.location.href.slice( window.location.href.indexOf('/',10)+1,9999))
+				window.location.href = window.location.href.slice(0, window.location.href.indexOf('/',10));
 			}
 		},
 		onShow() {
@@ -21,18 +17,7 @@
 
 <style>
 	/*每个页面公共css */
-	.contents {
+	.contents{
 		overflow-x: hidden;
 	}
-
-	uni-scroll-view .uni-scroll-view::-webkit-scrollbar {
-		/* 隐藏滚动条，但依旧具备可以滚动的功能 */
-		display: none;
-		width: 0 !important;
-		height: 0 !important;
-		-webkit-appearance: none;
-		background: transparent;
-		color: transparent;
-	}
-	
 </style>

api/index.js

@@ -246,7 +246,19 @@ function delwatchtype() {
     return request('/LiveRoomWatchType/delWatchType', "POST", {
     })
 }
+//获取appid
+function getappid() {
+    return request('/ocLogin/getAppid', "GET", {
+    })
+}
+//wx登录
+function loginbywx(code) {
+    return request('/ocLogin/loginByWx', "GET", {
+		code
+    })
+}
 export default {
+	loginbywx,
     sendsms,
     getverification,
     loginforphone,
@@ -287,5 +299,6 @@ export default {
     livechatinfo,
     livechecktoken,
     livewatchurl,
-    delwatchtype
+    delwatchtype,
+	getappid
 }
\ No newline at end of file