Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into zhy

components/index/zhibo-item/index.vue

@@ -76,11 +76,12 @@ export default {
             this.$u.route({
                 url:"/pageB/zhibo/index",
                params:{
-                   url:this.url
+                   url:this.url,
+                   id:this.zid
                } 
             })
         }
     },
-    props:['name','image','url']
+    props:['name','image','url','zid']
 }
 </script>

components/remaining/remaining.vue

@@ -48,7 +48,7 @@
 	export default {
 		data() {
 			return {
-				remaining: 4,
+				remaining: 11,
 				type: true,
 				banner: false,
 				protocol: false,
@@ -142,12 +142,19 @@
 				uni.getSystemInfo({
 					success: function(res) {
 						that.heightOut = res.windowHeight;
-						console.log('666666666666666' + that.heightOut)
+						console.log(that.heightOut)
 					}
 				});
 			},
 			// 我同意
 			to_agree() {
+				uni.setStorage({
+					key: 'launchFlag',
+					data: true,
+					success: function() {
+						console.log('error时存储launchFlag');
+					}
+				});
 				uni.navigateTo({
 					url: '/pageA/login/login'
 				});
@@ -174,8 +181,7 @@
 				})
 			},
 			videoErrorCallback: function(e) {
-				console.log('视频错误信息:')
-				console.log(e.target.errMsg)
+				console.log('视频错误信息:',e);
 			},
 			getRandomColor: function() {
 				const rgb = []
@@ -222,19 +228,18 @@
 		// height: 400rpx;
 	}
 	.welcome_jumpes {
-		width: 94rpx;
-		height: 36rpx;
-		opacity: 0.5;
-		border-radius: 18rpx;
+		z-index: 10;
 		position: absolute;
-		right: 37rpx;
-		top: 66rpx;
+		top: 80rpx;
+		right: 60rpx;
+		width: 100rpx;
+		height: 40rpx;
+		border-radius: 20rpx;
 		font-size: 22rpx;
 		text-align: center;
-		line-height: 35rpx;
+		line-height: 40rpx;
 		color: #fff;
-		background: #C4CAC6;
-		z-index: 10;
+		background-color: rgba(0,0,0,0.5);
 	}
 
 	#myVideo {
@@ -257,8 +262,8 @@
 
 	.welcome_images {
 		width: 100%;
+		height: 100vh;
 		position: fixed;
-		height: 100%
 	}
 
 	uni-swiper,
@@ -266,7 +271,7 @@
 	uni-image {
 		width: 100%;
 		// position: fixed;
-		height: 100%
+		height: 100vh;
 	}
 
 	uni-image {