From c81ee7e961fa5716e3898be44942635b1f1597e5 Mon Sep 17 00:00:00 2001
From: zmr900709 <1838875027@qq.com>
Date: Thu, 20 Aug 2020 14:23:21 +0800
Subject: [PATCH 1/2] 1

---
 components/index/video-item/index.vue     |  4 ++--
 components/informations/notice/notice.vue |  8 ++++++--
 components/shop/special-shop/index.vue    |  2 +-
 pageB/components/userinfo/index.vue       |  2 +-
 pageB/photo/index.vue                     | 15 +++++++++------
 pageB/video/video.nvue                    |  2 ++
 pageD/activity/activity.vue               |  2 +-
 pageD/notice/notice.vue                   | 13 +++++++++++--
 pageD/privateChat/privateChat.vue         |  8 +++++++-
 pages/mine/index.vue                      | 14 ++++++++++----
 10 files changed, 50 insertions(+), 20 deletions(-)

diff --git a/components/index/video-item/index.vue b/components/index/video-item/index.vue
index dd983a0..607f98a 100644
--- a/components/index/video-item/index.vue
+++ b/components/index/video-item/index.vue
@@ -6,7 +6,7 @@
                 <u-icon name="play-circle-fill" color="#ffffff" size="20"></u-icon>
                 <text>视频</text>
             </view>
-			<image class="head" :src="item.article_pic"></image>
+			<image class="head" :src="item.article_pic"  mode="aspectFill"></image>
 		</view>
         <view class="title" v-if="">{{ item.article_title }}</view>
         <view class="jianjie">{{ item.article_content }}</view>
@@ -103,7 +103,7 @@
             }
         }
         >image{
-            width: 37rpx;
+            width: 35rpx;
             height: 8rpx;
             padding: 20rpx;
         }
diff --git a/components/informations/notice/notice.vue b/components/informations/notice/notice.vue
index 712914a..cd812ac 100644
--- a/components/informations/notice/notice.vue
+++ b/components/informations/notice/notice.vue
@@ -1,5 +1,5 @@
 <template>
-	<view class="notice">
+	<view class="notice" :style="{height : height  + 'px'}">
 		<view v-for="(item,index) in notice" :key="index"  @click="gotoInfo(index)">
 			<view class="time_notice">{{ item.addtime }}</view>
 			<view class="notice_view">
@@ -36,6 +36,7 @@
 			margin: 0 auto;
 			text-align: left;
 			line-height: 40rpx;
+			letter-spacing: 2rpx;
 		}
 		.notice_view > view:nth-child(3){
 			height: 84rpx;
@@ -77,7 +78,8 @@
         props: ['list'],
 		data() {
 			return {
-				notice : []
+				notice : [],
+				height : ''
 			};
 		},
         watch: {
@@ -86,6 +88,8 @@
                 this.notice = newVal;
             }
         },
+		onLoad() {
+		},
         methods: {
             gotoInfo(index) {
                 console.log(index);
diff --git a/components/shop/special-shop/index.vue b/components/shop/special-shop/index.vue
index 0ae0014..7f5fb70 100644
--- a/components/shop/special-shop/index.vue
+++ b/components/shop/special-shop/index.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="special">
 		<view v-if="type == 'spike'" @click="spikeGoods">
-			<image :src="item.groupbuy_image1"></image>
+			<image :src="item.groupbuy_image1" mode="aspectFill"></image>
 			<view class="right">
 				<view class="name u-line-1">{{ item.goods_name }}</view>
 				<view class="price">
diff --git a/pageB/components/userinfo/index.vue b/pageB/components/userinfo/index.vue
index 0b24e31..ea0cf30 100644
--- a/pageB/components/userinfo/index.vue
+++ b/pageB/components/userinfo/index.vue
@@ -75,7 +75,7 @@
         /* #endif */
         align-items: center;
         flex-direction: column;
-        padding: 0 30rpx;
+        // padding: 0 30rpx;
     }
 
     .operat-span {
diff --git a/pageB/photo/index.vue b/pageB/photo/index.vue
index f8cf8de..ec9ad30 100644
--- a/pageB/photo/index.vue
+++ b/pageB/photo/index.vue
@@ -158,13 +158,16 @@
 			display: flex;
 			flex-wrap: wrap;
 			.label {
-				padding: 6rpx 10rpx;
-				margin: 0 10rpx 10rpx 0;
-				font-size: 24rpx;
+				height: 40rpx;
+				padding: 4rpx 14rpx;
+				margin-right: 10rpx;
+				margin-bottom: 10rpx;
+				font-size: 26rpx;
+				text-align: center;
+				line-height: 38rpx;
 				color: #fff;
-				border-radius: 6rpx;
-				background-color: #000000;
-				opacity: 0.5;
+				border-radius: 10rpx;
+				background-color: rgba(0, 0, 0, .6);
 			}
 		}
     }
diff --git a/pageB/video/video.nvue b/pageB/video/video.nvue
index 7095b60..645aaf9 100644
--- a/pageB/video/video.nvue
+++ b/pageB/video/video.nvue
@@ -631,6 +631,7 @@
         font-size: 28rpx;
         color: #333;
         lines: 2;
+		letter-spacing: 2rpx;	
     }
 
     .more-content-box {
@@ -859,6 +860,7 @@
         margin-bottom: 20rpx;
         lines: 1;
         text-overflow: ellipsis;
+		letter-spacing: 2rpx;
     }
 
     .centent {
diff --git a/pageD/activity/activity.vue b/pageD/activity/activity.vue
index 5283e70..0ad1ed7 100644
--- a/pageD/activity/activity.vue
+++ b/pageD/activity/activity.vue
@@ -81,7 +81,7 @@
 		padding: 39rpx 0 30rpx;
 	}
 	.content{
-		width:630rpx;
+		width:94%;
 		padding: 30rpx;
 		background:rgba(255,255,255,1);
 		border-radius:20rpx;
diff --git a/pageD/notice/notice.vue b/pageD/notice/notice.vue
index 18fef4d..4c7d154 100644
--- a/pageD/notice/notice.vue
+++ b/pageD/notice/notice.vue
@@ -1,5 +1,5 @@
 <template>
-	<view>
+	<view id="viewes" :style="{height : height  + 'px'}">
 		<!-- 公告咨询 -->
 		<notice :list="list"></notice>
 	</view>
@@ -15,6 +15,13 @@
 		},
 		onLoad() {
 			this.informationList();
+			var _that = this
+			uni.getSystemInfo({
+			    success: function (res) {
+			        console.log(res.windowHeight);
+					_that.height = res.windowHeight
+			    }
+			});
 		},
 		methods: {
 			titletext() {},
@@ -36,7 +43,9 @@
 	page {
 		background-color: #ECECEC;
 	}
-
+	#viewes{
+		background: #ECECEC;
+	}
 	.sousuo {
 		height: 113rpx;
 		border: 1px #f00 solid;
diff --git a/pageD/privateChat/privateChat.vue b/pageD/privateChat/privateChat.vue
index c638b31..a34f460 100644
--- a/pageD/privateChat/privateChat.vue
+++ b/pageD/privateChat/privateChat.vue
@@ -59,7 +59,7 @@
 				<div :class="[audio.visible ? 'record-icon record-open':'record-icon']" @click="switchAudioKeyboard"></div>
 				<div class="record-input" @longpress="onRecordStart" @touchend="onRecordEnd" v-if="audio.visible" >{{audio.recording ? '松开发送' : '按住录音'}}</div>
 				<div class="message-input" v-else>
-					<input type="text" placeholder="发送消息" v-model="content">
+					<input type="text" placeholder="发送消息" v-model="content" @click="bindtapInput">
 				</div>
 				<div class="file-icon img-video" @click="sendImage"></div>
 				<div class="file-icon" @click="sendVideo"></div>
@@ -84,6 +84,7 @@
 			return {
 				//聊天文本框
 				content: '',
+				bottom : '',
 				friend: null,
 				currentUser: null,
 				//已经接收到的消息
@@ -154,6 +155,11 @@
 			this.imService.resetFriendUnReadMessage(this.friend);
 		},
 		methods: {
+			bindtapInput(){
+				console.log("222")
+				var _that = this;
+				_that.bottom = 14
+			},
 			initialListeners () {
 				//传入监听器，收到一条私聊消息总是滚到到页面底部
 				this.imService.onNewPrivateMessageReceive =  (friendId, message)=> {
diff --git a/pages/mine/index.vue b/pages/mine/index.vue
index 6185c91..428e303 100644
--- a/pages/mine/index.vue
+++ b/pages/mine/index.vue
@@ -54,7 +54,9 @@
 					<view v-for="(item, index) in orderList" :key="index" @click="toOtherPage(item.link)">
 						<image :src="item.img"></image>
 						<view>{{ item.title }}</view>
-						<view class="order-num" v-if="item.number">{{ item.number }}</view>
+						<view class="order-num" v-if="item.number">
+							<text>{{ item.number }}</text>
+						</view>
 					</view>
 					<!-- <view @click="toOtherPage('/order/Index?current=1')">
 						<image src="/static/image/mine/6.png"></image>
@@ -410,11 +412,15 @@ export default {
 					align-items: center;
 					justify-content: space-between;
 					position: relative;
-					.order-num {
-						z-index: 9;
+					.order-num{
 						position: absolute;
 						top: -12rpx;
-						right: -16rpx;
+						right: -38rpx;
+						width: 50rpx;
+					}
+					.order-num > text {
+						z-index: 9;
+						float: left;
 						border: 1rpx solid #FF7807;
 						height: 24rpx;
 						border-radius: 12rpx;
-- 
2.45.2


From 78169d8cdeddccb25187b7adc1688f686f565da0 Mon Sep 17 00:00:00 2001
From: zmr900709 <1838875027@qq.com>
Date: Thu, 20 Aug 2020 14:24:17 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/shop/special-shop/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/shop/special-shop/index.vue b/components/shop/special-shop/index.vue
index 7f5fb70..7f4d59c 100644
--- a/components/shop/special-shop/index.vue
+++ b/components/shop/special-shop/index.vue
@@ -16,7 +16,7 @@
 		</view>
 		<view v-if="type == 'group'" @click="toDetailsPage">
 			<image :src="item.pintuan_image"></image>
-			<view class="right">
+			<view class="right"> 
 				<view class="name u-line-1">{{ item.pintuan_goods_name }}</view>
 				<view class="price group">
 					<view class="groupbuy-price">￥{{ item.pintuan_goods_price }}</view>
-- 
2.45.2