From 1643bf51b219546e1233430fed4c37cac2f054c9 Mon Sep 17 00:00:00 2001
From: Gdpao <1341331954@qq.com>
Date: Thu, 20 Aug 2020 15:16:29 +0800
Subject: [PATCH] gdppao

---
 components/index/video-item/index.vue |  2 +-
 pageB/components/userinfo/index.vue   |  3 +--
 pageB/photo/index.vue                 | 36 +++++++++++++++++++++------
 pageB/video/video.nvue                | 12 ++++++---
 4 files changed, 38 insertions(+), 15 deletions(-)

diff --git a/components/index/video-item/index.vue b/components/index/video-item/index.vue
index dd983a0..eb56e81 100644
--- a/components/index/video-item/index.vue
+++ b/components/index/video-item/index.vue
@@ -1,6 +1,6 @@
 <template>
     <view class="video-item" v-if="item" @click="toDetailsPage(item.article_id,item.video_path)">
-        <image class="head" :src="item.article_pic" v-if="item.type == 1" ></image>
+        <image class="head" :src="item.article_pic" v-if="item.type == 1"></image>
 		<view class="header_fist" v-else>
 			<view class="backes">
                 <u-icon name="play-circle-fill" color="#ffffff" size="20"></u-icon>
diff --git a/pageB/components/userinfo/index.vue b/pageB/components/userinfo/index.vue
index 0b24e31..55707c0 100644
--- a/pageB/components/userinfo/index.vue
+++ b/pageB/components/userinfo/index.vue
@@ -64,7 +64,7 @@
         z-index: 100;
         position: absolute;
         top: 80rpx;
-        left: 30rpx;
+        left: 34rpx;
         width: 50rpx;
         height: 50rpx;
     }
@@ -82,7 +82,6 @@
         margin-top: 10rpx;
         font-size: 28rpx;
         color: #fff;
-        text-shadow: 0px 0px 4rpx #999999;
     }
 
     .operat-img {
diff --git a/pageB/photo/index.vue b/pageB/photo/index.vue
index f8cf8de..824179e 100644
--- a/pageB/photo/index.vue
+++ b/pageB/photo/index.vue
@@ -24,12 +24,12 @@
 		<!-- 用户操作 -->
         <userinfo class="userinfo" :list="list" :cart="cart_type" :comment="is_comment" :num="comment_num" @openCart="openPopup"></userinfo>
 		<!-- 评论 -->
-		<u-popup v-model="is_comment" class="pl" mode="bottom" border-radius="10" height="700rpx">
-			<view class="top">
+		<u-popup v-model="is_comment" class="pl" mode="bottom" border-radius="10" @touchmove.stop.prevent="moveHandle">
+			<view class="comment-top">
 				<text>评论</text>
 				<u-icon name="close" color="#333" size="28" @click="is_comment=false"></u-icon>
 			</view>
-			<scroll-view class="scroll-box" scroll-y="true" lower-threshold="50" @scrolltolower="scrollBottom">
+			<scroll-view class="scroll-box" scroll-y="true" lower-threshold="50" @scroll="changeComment" @scrolltolower="scrollBottom">
 				<block v-for="(item,index) in commentList" :key="index">
 					<view class="box">
 						<image :src="item.member_avatar" mode="aspectFill"></image>
@@ -80,7 +80,8 @@
 		        <view v-for="(item,index) in list.goods" :key="index" class="item" @click="gotoInfo(item.goods_id)">
 					<image :src="item.goods_image" mode="aspectFill"></image>
 					<view>
-						<text class="title">{{ item.goods_advword }}</text>
+						<text class="cart-title u-line-1">{{ item.goods_advword }}</text>
+						<text class="cart-info u-line-2">{{ item.goods_name }}</text>
 						<text class="price">{{ item.goods_promotion_price }}</text>
 					</view>
 				</view>
@@ -176,10 +177,11 @@
         transform: translateY(-285rpx);
     }
 	.pl {
-		.top {
+		.comment-top {
 			z-index: 1000;
 			position: fixed;
 			top: 0;
+            left: 0;
             display: flex;
             align-items: center;
             justify-content: space-between;
@@ -197,7 +199,7 @@
 		.scroll-box {
 			z-index: 99;
 			margin: 88rpx 0 100rpx 0;
-			height: 100%;
+			height: 600rpx;
 			.box {
 				display: flex;
 				align-items: center;
@@ -217,6 +219,7 @@
 					height: 60rpx;
 					font-size: 26rpx;
 					color: #333;
+                    pointer-events: none;
 					.time {
 						font-size: 22rpx;
 						color: #999;
@@ -229,10 +232,13 @@
 			}
 			.content {
 				padding: 0 20rpx 10rpx 90rpx;
+                pointer-events: none;
 			}
             .child-content {
                 margin: 6rpx 90rpx 6rpx;
+                // pointer-events: none;
                 .child-box {
+                    pointer-events: none;
                     .info {
                         display: flex;
                         align-items: center;
@@ -333,11 +339,16 @@
 					display: flex;
 					flex-direction: column;
 					justify-content: space-around;
-					color: #333;
+					color: #343434;
 					font-size: 28rpx;
-					.title {
+					.cart-title {
+                        width: 400rpx;
 						line-height: 40rpx;
+                        font-size: 29rpx;
 					}
+                    .cart-info {
+                        font-size: 24rpx;
+                    }
 					.name {
 						width: 500rpx;
 						height: 80rpx;
@@ -606,7 +617,11 @@ export default {
 		},
         // 评论滚动到底部
         scrollBottom(e) {
+            console.log(1);
             this.getComment();
+        },
+        changeComment(e) {
+            console.log(e);
         },
 		// 跳转到商品
 		gotoInfo(id) {
@@ -615,6 +630,11 @@ export default {
 				url: "/pageB/sdetails/index?id=" + id + "&type=" + 1,
 			})
 		},
+        // 禁止滚动
+        moveHandle(e) {
+            console.log(e);
+            return;
+        },
 		goBack() {
 			uni.navigateBack({
 				delta: 1
diff --git a/pageB/video/video.nvue b/pageB/video/video.nvue
index 7095b60..51e58c8 100644
--- a/pageB/video/video.nvue
+++ b/pageB/video/video.nvue
@@ -178,7 +178,11 @@
             this.videoBox = uni.createVideoContext("videoId", this);
         },
         onHide() {
-            this.videoBox.pause();
+            if (uni.getSystemInfoSync().platform == "ios") {
+                console.log("ios");
+            } else if (uni.getSystemInfoSync().platform == "android") {
+                this.videoBox.pause();
+            }
         },
         onBackPress() {
             if (this.cart_type) {
@@ -313,7 +317,6 @@
                     title: "loading..."
                 })
                 if (!this.page_[id] === 0) {}
-                console.log(id);
                 uni.request({
                     url: temp_url + "article/articleReplyList",
                     method: "POST",
@@ -326,15 +329,15 @@
                     },
                     success: (res) => {
                         uni.hideLoading();
+                        console.log(this.page_);
                         if (res.data.errCode == 0) {
                             if (res.data.data.length < 10) {
                                 this.is_more = false;
                             }
                             this.page_[id]++;
+                            console.log(this.page_);
                             this.allList[id] = res.data.data;
                             this.$forceUpdate();
-                            // console.log(this.page_[id]);
-                            // console.log(this.allList);
                         }
                     }
                 })
@@ -724,6 +727,7 @@
     }
 
     .btn-send {
+        padding: 0 20rpx;
         font-size: 28rpx;
         color: #666;
     }
-- 
2.45.2