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

components/index/video-item/index.vue

@@ -113,6 +113,7 @@
 			box-shadow: 0rpx 0rpx 6rpx 0rpx rgba(35,24,21,0.12);
 			.bubble {
 				position: relative;
+                border-radius: 20rpx;
 				background-color: #fff;
 				&::after {
 					position: absolute;
@@ -130,8 +131,7 @@
 				> view {
 					display: flex;
 					align-items: center;
-                    height: 52rpx;
-					padding: 10rpx 20rpx;
+					padding: 20rpx 30rpx;
 					&:not(:last-child) {
 						border-bottom: 2rpx #ECECEC solid;
 					}
@@ -142,17 +142,17 @@
 					}
 					> image {
 						&:first-child {
-							@include image-class($width: 21rpx, $height: 22rpx, $right: 12rpx);
+							@include image-class($width: 30rpx, $height: 30rpx, $right: 12rpx);
 						}
 						&:nth-child(2) {
-							@include image-class($width: 22rpx, $height: 22rpx, $right: 12rpx);
+							@include image-class($width: 30rpx, $height: 30rpx, $right: 12rpx);
 						}
 						&:last-child {
-							@include image-class($width: 24rpx, $height: 20rpx, $right: 9rpx);
+							@include image-class($width: 30rpx, $height: 30rpx, $right: 9rpx);
 						}
 					}
 					> text {
-						font-size: 20rpx;
+						font-size: 24rpx;
 						color: rgba(51,51,51,1);
 					}
 				}
@@ -205,19 +205,18 @@ export default {
 			}).then(res => {
 				console.log(res)
 				if(res.errCode == 0) {
+                    this.$u.toast(res.message);
 					this.$emit("getArticlelist");
-                    // this.$u.toast(res.message);
-				} else {
-                    // this.$u.toast(res.message);
-                }
+				}
 			})
 		},
 		articleCollect() {
 			this.$u.api.articleCollect({
 				article_id: this.item.article_id,
 			}).then(res => {
-				console.log(res)
+				console.log(res);
 				if(res.errCode == 0) {
+                    this.$u.toast(res.message);
 					this.$emit("getArticlelist");
 				}
 			})
@@ -229,6 +228,7 @@ export default {
 			}).then(res => {
 				// console.log(res)
 				if(res.errCode == 0) {
+                    this.$u.toast(res.message);
 					this.$emit("getArticlelist");
 				}
 			})

components/remaining/remaining.vue

@@ -4,9 +4,8 @@
 		<view v-if="type" id="video_mp4">
 			<view class="page-body">
 				<view class="page-section">
-					<video id="myVideo" :src=" 'https://' + vide0_url" autoplay controls="false" @error="videoErrorCallback"
+					<video id="myVideo" enable-progress-gesture="false" :src=" 'https://' + vide0_url" autoplay controls="false" @error="videoErrorCallback"
 					 enable-danmu danmu-btn></video>
-                     <cover-view class="time">abc</cover-view>
 				</view>
 			</view>
 		</view>
@@ -22,8 +21,8 @@
 								<swiper-item v-for="(item,index) in list" :key="index">
 									<view class="swiper-item uni-bg-red">
 										<image :src=" 'https://' + item.launch_path"></image>
-                                        <view v-if="index == 3">立即体验</view>
 									</view>
+                                    <view class="btn-init" v-if="parseInt(index) == 2" @click="goNext">立即体验</view>
 								</swiper-item> 
 							</swiper>
 						</view>
@@ -72,7 +71,8 @@
 				background: ['color1', 'color2', 'color3'],
 				indicatorDots: true,
 				interval: 2000,
-				duration: 500
+				duration: 500,
+                swiper_index: "",
 			};
 		},
 		onReady: function(res) {
@@ -133,6 +133,11 @@
 					}
 				});
 			},
+            // 立即体验
+            goNext() {
+                this.protocol = true;
+                this.banner = false;
+            },
 			// 我同意
 			to_agree() {
 				uni.setStorage({
@@ -203,8 +208,21 @@
 	.uni-padding-wrap{
 		// height: 400rpx;
 	}
+    .btn-init {
+        z-index: 1000;
+        position: absolute;
+        bottom: 100rpx;
+        right: 30%;
+        width: 300rpx;
+        height: 80rpx;
+        line-height: 80rpx;
+        text-align: center;
+        color: #fff;
+        border-radius: 40rpx;
+        background-color: #007AFF;
+    }
 	.welcome_jumpes {
-		z-index: 10000;
+		z-index: 100;
 		position: absolute;
 		top: 80rpx;
 		right: 60rpx;
@@ -220,15 +238,6 @@
 
 	#myVideo {
         width: 100%;
-        .time {
-            position: absolute;
-            top: 0;
-            left: 0;
-            width: 10rpx;
-            height: 10rpx;
-            color: #fff;
-            font-size: 30rpx;
-        }
 	}
 
 	uni-video {

components/shop/list/item.vue

@@ -1,6 +1,6 @@
 <template>
     <view class="item" @click="toDetailsPage">
-        <image :src="info.goods_image" class="img"></image>
+        <image :src="info.goods_image" mode="aspectFill" class="img"></image>
         <view class="info">
             <text class="title u-line-2">{{ info.goods_name }}</text>
             <text class="jianjie u-line-1">{{ info.goods_advword }}</text>
@@ -44,13 +44,12 @@ export default {
 <style lang="scss" scoped>
 .item{
     width: 330rpx;
-	height: 460rpx;
     margin-bottom: 26rpx;
     background-color: #f8f8f8;
     border-radius: 10rpx 10rpx 0rpx 0rpx;
     .img{
 		width: 330rpx;
-		height: 272rpx;
+		height: 300rpx;
 		background: rgba(245,245,245,1);
 		border-radius: 10rpx 10rpx 0rpx 0rpx;
 		margin-bottom: 24rpx;

components/shop/shop-item/index.vue

@@ -1,7 +1,7 @@
 <template>
     <view class="shop-item" @click="toClassifyPage">
         <image :src="info.goodscn_pic"></image>
-        <text class="u-line-1">{{ info.gc_name }}</text>
+        <text class="">{{ info.gc_name }}</text>
     </view>    
 </template>
 <script>
@@ -23,21 +23,20 @@ export default {
 <style lang="scss" scoped>
 .shop-item{
     display: flex;
-    flex-direction: column;
     align-items: center;
-	justify-content: center;
-	width: 100rpx;
+    flex-direction: column;
+    width: 20%;
+    margin-bottom: 20rpx;
     >image{
         width: 80rpx;
         height: 80rpx;
         border-radius: 50%;
     }
     >text{
-		width: 100%;
+		width: 100rpx;
+        margin-top: 14rpx;
         font-size: 24rpx;
         color: #333;
-        margin-top: 14rpx;
-		text-align: center;
     }
 }
 </style>