From 1305931e3b9b1f62bfa597e68e751b13d83eeb40 Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Fri, 28 Aug 2020 14:51:35 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E7=9F=A5=E5=92=8C=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/http.api.js              | 11 +++++-
 pages.json                      | 12 ++++--
 pages/messages/info.vue         | 70 +++++++++++++++++++++++++++++++++
 pages/messages/list.vue         | 27 ++++++++++---
 pages/messages/messagesList.vue | 15 +++++--
 pages/release/index.vue         |  8 +++-
 pages/release/video.vue         |  8 +++-
 7 files changed, 134 insertions(+), 17 deletions(-)
 create mode 100644 pages/messages/info.vue

diff --git a/common/http.api.js b/common/http.api.js
index 4618888..c257473 100644
--- a/common/http.api.js
+++ b/common/http.api.js
@@ -132,9 +132,18 @@ const install = (Vue, vm) => {
 		// 试穿
 		agreetest({goods_try_id,type,takeawayer_id}){
 			return vm.$u.post("/order/goodsTryAgree",{goods_try_id,type,takeawayer_id})
+		},
+
+		messageList({page = 1}){
+			return vm.$u.post("/message/messageList",{page})
+		},
+		isread(){
+			return vm.$u.post("/message/isread")
+		},
+		messageInfo(){
+			return vm.$u.post("/message/messageInfo")
 		}
 		
-		
     }
 	// 将各个定义的接口名称，统一放进对象挂载到vm.$u.api(因为vm就是this，也即this.$u.api)下
 	vm.$u.api = api;
diff --git a/pages.json b/pages.json
index fea89ea..9986ce6 100644
--- a/pages.json
+++ b/pages.json
@@ -262,10 +262,14 @@
 			"style": {
 				"navigationBarTitleText": "活动列表",
 				"app-plus": {
-					"titleNView": {
-						"backgroundColor": "#2D2D2D",
-						"titleColor": "#FFFFFF"
-					}
+				}
+			}
+		},
+		{
+			"path": "pages/messages/info",
+			"style": {
+				"navigationBarTitleText": "活动详情",
+				"app-plus": {
 				}
 			}
 		}
diff --git a/pages/messages/info.vue b/pages/messages/info.vue
new file mode 100644
index 0000000..07fd8f7
--- /dev/null
+++ b/pages/messages/info.vue
@@ -0,0 +1,70 @@
+<template>
+	<view>
+		<image :src="list.picture" class="picture" mode=""></image>
+        <view class="box">
+            <view class="info">
+                <text class="title u-line-2">{{ list.title }}</text>
+                <u-divider class="time">{{ list.addtime }}</u-divider>
+                <!-- <text class="time"></text> -->
+            </view>
+            <view class="content">{{ list.content }}</view>
+        </view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				id: 0,
+                list: [],
+			};
+		},
+        onLoad(option) {
+            // console.log(option);
+            this.id = option.id;
+            // 获取数据
+            this.informationList();
+        },
+        methods: {
+            informationList(){
+                console.log(this.id)
+            	this.$u.api.messageInfo({id:this.id}).then((res)=>{
+                    
+                    console.log(res);
+
+            	})
+            }
+        }
+	}
+</script>
+
+<style lang="scss">
+page {
+}
+.picture {
+    width: 100%;
+}
+.box {
+    width: 100%;
+    padding: 20rpx;
+    .info {
+        .title {
+            font-size: 38rpx;
+            color: rgba(0,0,0,.84);
+            line-height: 1.2;
+        }
+        .time {
+            padding: 40rpx 0;
+        }
+    }
+    .content {
+        padding: 0 6rpx;
+        font-size: 34rpx;
+        color: rgba(0,0,0,.6);
+        line-height: 1.4;
+        letter-spacing: 1rpx;
+        text-indent: 2rem;
+    }
+}
+</style>
diff --git a/pages/messages/list.vue b/pages/messages/list.vue
index e0857a3..a50deea 100644
--- a/pages/messages/list.vue
+++ b/pages/messages/list.vue
@@ -1,10 +1,10 @@
 <template>
     <view class="box">
-        <view class="item">
-            <view class="time">2020-05-14 20:22</view>
+        <view class="item" v-for="(item,index) in list" :key="index" @click="navto(item.id)">
+            <view class="time">{{item.addtime}}</view>
             <view class="info">
-                <image class="img"></image>
-                <view class="title u-line-2">潮牌1折秒杀！杨幂同款小白鞋今日43元送10000元大红包还有明星限量签名潮牌1折秒杀！杨幂同款小白鞋今日43元送10000元大红包还有明星限量签名潮牌1折秒杀！杨幂同款小白鞋今日43元送10000元大红包还有明星限量签名潮牌1折秒杀！杨幂同款小白鞋今日43元送10000元大红包还有明星限量签名潮牌1折秒杀！杨幂同款小白鞋今日43元送10000元大红包还有明星限量签名潮牌1折秒杀！杨幂同款小白鞋今日43元送10000元大红包还有明星限量签名潮牌1折秒杀！杨幂同款小白鞋今日43元送10000元大红包还有明星限量签名照</view>
+                <image class="img" :src="item.picture"></image>
+                <view class="title u-line-2">{{item.title}}</view>
                 <view class="next">
                     <text>查看详情</text>
                     <image class="right" src="@/static/image/user/1.png"></image>
@@ -68,7 +68,24 @@
 export default {
     data(){
         return {
-
+            list:[]
+        }
+    },
+    onLoad(){
+        this.$u.api.messageList({page:1}).then((res)=>{
+            console.log(res)
+            this.list = res.data
+        })
+    },
+    methods:{
+        navto(id){
+            console.log(id)
+            this.$u.route({
+                url:"/pages/messages/info",
+                params:{
+                    id
+                }
+            })
         }
     }
 }
diff --git a/pages/messages/messagesList.vue b/pages/messages/messagesList.vue
index 4c83289..e3e0b50 100644
--- a/pages/messages/messagesList.vue
+++ b/pages/messages/messagesList.vue
@@ -12,9 +12,9 @@
 				<image src="" ></image>
 			</view>
 			<view class="names">活动消息</view>
-			<view class="content u-line-1">12121212</view>
-			<view class="times">12121</view>
-			<view class="tishi" v-if="true"></view>
+			<view class="content u-line-1">{{huodong.data.title}}</view>
+			<view class="times">{{huodong.data.addtime}}</view>
+			<view class="tishi" v-if="huodong.count != 0"></view>
 		</view>
 		<!-- <u-empty text="并没有什么消息" mode="message" v-if="Object.keys(list).length == 0" style="margin: auto"></u-empty> -->
 		<view class="massage_list" v-for="(item,index) in list" :key="index"  @click="gochat(item)">
@@ -37,6 +37,11 @@
 				list: [
 					
 				],
+				huodong:{
+					data:{
+						
+					}
+				}
 			};
 		},
 		methods: {
@@ -73,6 +78,10 @@
 			const res = uni.getSystemInfoSync();
 			this.swiperHeight = res.windowHeight;
 			this.list = this.imService.friends;
+			this.$u.api.isread().then((res)=>{
+				console.log(res)
+				this.huodong = res.data
+			})
 		}
 	};
 </script>
diff --git a/pages/release/index.vue b/pages/release/index.vue
index cfe70df..e938b70 100644
--- a/pages/release/index.vue
+++ b/pages/release/index.vue
@@ -3,7 +3,7 @@
 		<u-form :model="form" ref="uForm">
 			<u-form-item label="标题" label-position="right"><u-input v-model="form.name" placeholder="请输入标题" /></u-form-item>
 			<!-- form-data -->
-			<view class="titles">封面</view>
+			<view class="titles">封面<text>（建议图片尺寸为334*334）</text></view>
 			<u-upload
 				:form-data="coverformdata"
 				:max-count="1"
@@ -16,7 +16,7 @@
 				:file-list="fileListA"
 				@on-success="uploadcover"
 			></u-upload>
-			<view class="titles">图片</view>
+			<view class="titles">图片<text>（最多选择5张图片，建议图片尺寸为750*700）</text></view>
 			<u-upload
 				:form-data="imgformdata"
 				name="article_image"
@@ -405,6 +405,10 @@ export default {
 		font-weight: 400;
 		color: rgba(51, 51, 51, 1);
 		margin: 30rpx 0;
+		>text{
+			font-size: 20rpx;
+			color: #999;
+		}
 	}
 
 	textarea {
diff --git a/pages/release/video.vue b/pages/release/video.vue
index 33b3c4a..dae1bdb 100644
--- a/pages/release/video.vue
+++ b/pages/release/video.vue
@@ -2,7 +2,7 @@
 	<view id="release" >
 		<u-form :model="form" ref="uForm">
 			<u-form-item label="标题" label-position="right"><u-input v-model="form.name" placeholder="请输入标题" /></u-form-item>
-			<view class="titles">封面</view>
+			<view class="titles">封面<text>（建议图片尺寸为334*334）</text></view>
 			<u-upload
 				:form-data="coverformdata"
 				:max-count="1"
@@ -15,7 +15,7 @@
 				:file-list="fileListA"
 				@on-success="uploadcover"
 			></u-upload>
-			<view class="titles">视频</view>
+			<view class="titles">视频<text>（建议视频时长在5分钟内，视频大小不超过100M）</text></view>
 			<view class="videobox video-flex" v-if="videostate == false" @click="uploadvideo">
 				<u-icon name="plus" class="u-add-btn" size="40"></u-icon>
 				<view class="videotext">选择视频</view>
@@ -581,6 +581,10 @@ export default {
 		font-weight: 400;
 		color: rgba(51, 51, 51, 1);
 		margin: 30rpx 0;
+		>text{
+			font-size: 20rpx;
+			color: #999;
+		}
 	}
     .video-flex {
         flex-direction: column;