From ee04a8cb089288a88f4fb17e009222e6d82d8dc0 Mon Sep 17 00:00:00 2001
From: Gdpao <1341331954@qq.com>
Date: Tue, 18 Aug 2020 15:24:06 +0800
Subject: [PATCH] gdpaoup

---
 components/index/video-item/index.vue | 30 ++++++++++++++++++++-------
 pageA/login/login.vue                 |  8 +++----
 pageE/mine/ArticleDetails.vue         | 29 +++++++++++++++++++++-----
 pages.json                            | 11 +++++++++-
 4 files changed, 60 insertions(+), 18 deletions(-)

diff --git a/components/index/video-item/index.vue b/components/index/video-item/index.vue
index 27b5dbf..35fbdad 100644
--- a/components/index/video-item/index.vue
+++ b/components/index/video-item/index.vue
@@ -1,9 +1,12 @@
 <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>
-		<view class="header_fist"  v-else>
-			<view class="backes"></view>
-			<image class="head" :src="item.article_pic" ></image>
+		<view class="header_fist" v-else>
+			<view class="backes">
+                <u-icon name="play-circle-fill" color="#ffffff" size="20"></u-icon>
+                <text>视频</text>
+            </view>
+			<image class="head" :src="item.article_pic"></image>
 		</view>
         <view class="title" v-if="">{{ item.article_title }}</view>
         <view class="jianjie">{{ item.article_content }}</view>
@@ -172,11 +175,22 @@
 	.header_fist{
 		position: relative;
 		.backes{
+            z-index: 99;
 			position: absolute;
-			top: 0;
-			width: 100%;
-			height: 100%;
-			color: #fff;
+            display: flex;
+            align-items: center;
+            justify-content: space-around;
+			top: 10rpx;
+            left: 10rpx;
+			width: 80rpx;
+			height: 30rpx;
+            padding: 0 10rpx;
+            border-radius: 30rpx;
+			background-color: rgba(0,0,0,0.5);
+            & > text {
+                color: #fff;
+                font-size: 18rpx;
+            }
 		}
 		
 	}
@@ -197,7 +211,7 @@ export default {
 	},
     watch: {
         item(newVal, old) {
-            // console.log(newVal);
+            console.log(newVal);
             this.item = newVal;
         },
         deep: true
diff --git a/pageA/login/login.vue b/pageA/login/login.vue
index 834699b..0f63ca7 100644
--- a/pageA/login/login.vue
+++ b/pageA/login/login.vue
@@ -233,11 +233,11 @@
                                                     console.log(res.data.member.member_mobilebind);
 													if(res.data.member.member_mobilebind) {
 														uni.switchTab({
-																url: "/pages/index/index"
+															url: "/pages/index/index"
 														});
 													} else {
 														uni.navigateTo({
-															 url: '/pageA/bindinges/bindinges'
+															url: '/pageA/bindinges/bindinges'
 														});
 													}
 												}
@@ -271,11 +271,11 @@
                                                     console.log(res.data.member.member_mobilebind);
 													if(res.data.member.member_mobilebind) {
 														uni.switchTab({
-																url: "/pages/index/index"
+															url: "/pages/index/index"
 														});
 													} else {
 														uni.navigateTo({
-															 url: '/pageA/bindinges/bindinges'
+															url: '/pageA/bindinges/bindinges'
 														});
 													}
 												}
diff --git a/pageE/mine/ArticleDetails.vue b/pageE/mine/ArticleDetails.vue
index b93c53b..9732be0 100644
--- a/pageE/mine/ArticleDetails.vue
+++ b/pageE/mine/ArticleDetails.vue
@@ -16,8 +16,10 @@
 				<text class="tips">已是最新版本</text>
 			</view>
 		</view>
-        <u-popup v-model="show" v-if="type == 2">
-            <view>出淤泥而不染，濯清涟而不妖</view>
+        <u-popup v-model="show" v-if="type == 2" mode="left" width="100%">
+            <view class="u-content">
+                <rich-text :nodes="nodes"></rich-text>
+            </view>
         </u-popup>
 	</view>
 </template>
@@ -26,11 +28,11 @@ import common from '@/static/js/common.js'
 export default {
 	data() {
 		return {
-			version: "",
-			phone_type: "",
 			type: 1,
 			nodes: "",
-            show: false,
+			version: "",
+			show: false,
+			phone_type: "",
 		}
 	},
 	onLoad(option) {
@@ -43,6 +45,17 @@ export default {
 		this.getVersion();
 		this.phone_type = this.$u.os();
 	},
+	onBackPress() {
+		if (this.show) {
+				this.show = !this.show;
+		} else {
+				return false;
+		}
+		return true;
+	},
+	onNavigationBarButtonTap(e) {
+		console.log(e);
+	},
 	methods: {
 		setTitle(title){
 			uni.setNavigationBarTitle({
@@ -129,4 +142,10 @@ page {
 		font-size: 22rpx;
 	}
 }
+.u-content {
+    padding: 20rpx;
+    font-size: 30rpx;
+    text-indent: 1rem;
+    line-height: 1.2;
+}
 </style>
\ No newline at end of file
diff --git a/pages.json b/pages.json
index 51da0ec..8c36d72 100644
--- a/pages.json
+++ b/pages.json
@@ -610,7 +610,16 @@
 							"titleSize": "36px",
 							"titleNView": {
 								"titleColor": "#333333",
-								"backgroundColor": "#FFFFFF"
+								"backgroundColor": "#FFFFFF",
+                                "buttons": [
+                                	{
+                                        "width": "0",
+                                		"type":"none",
+                                		"text":"关闭",
+                                		"float":"right",
+                                		"fontSize":"14"
+                                	}
+                                ]
 							}
 						}
 					}
-- 
2.45.2