Merge pull request 'gdpao' (#325) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/325
This commit is contained in:
		
						commit
						379100a097
					
				@ -4,7 +4,9 @@
 | 
			
		||||
			<view class="time_notice">{{ item.addtime }}</view>
 | 
			
		||||
			<view class="notice_view">
 | 
			
		||||
				<image :src="item.picture" mode="aspectFill" ></image>
 | 
			
		||||
				<view class="text_view u-line-2">{{ item.content }}</view>
 | 
			
		||||
				<view class="text_view">
 | 
			
		||||
                    <view class="u-line-2">{{ item.content }}</view>
 | 
			
		||||
                </view>
 | 
			
		||||
				<view class="notice_list">
 | 
			
		||||
					<text>查看详情</text>
 | 
			
		||||
					<u-icon name="arrow-right" color="#666"></u-icon>
 | 
			
		||||
@ -28,21 +30,17 @@
 | 
			
		||||
			border-radius: 20rpx 20rpx 0px 0px;
 | 
			
		||||
		}
 | 
			
		||||
		.text_view{
 | 
			
		||||
			font-size:26rpx;
 | 
			
		||||
			font-weight:400;
 | 
			
		||||
			color: #343434;
 | 
			
		||||
			width: 643rpx;
 | 
			
		||||
            height: 110rpx;
 | 
			
		||||
			margin: 0 auto;
 | 
			
		||||
            padding: 20rpx 0;
 | 
			
		||||
			text-align: left;
 | 
			
		||||
			line-height: 40rpx;
 | 
			
		||||
            width: 690rpx;
 | 
			
		||||
            height: 120rpx;
 | 
			
		||||
			padding: 26rpx;
 | 
			
		||||
            color: #333;
 | 
			
		||||
            font-size: 26rpx;
 | 
			
		||||
            line-height: 38rpx;
 | 
			
		||||
		}
 | 
			
		||||
		.notice_view > view:nth-child(3){
 | 
			
		||||
			height: 80rpx;
 | 
			
		||||
			line-height: 80rpx;
 | 
			
		||||
			border-top: 1px #F5F5F5  solid;
 | 
			
		||||
			// margin-top: 30rpx;
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
	.time_notice{
 | 
			
		||||
@ -53,22 +51,11 @@
 | 
			
		||||
		padding: 26rpx 0 39rpx 0;
 | 
			
		||||
	}
 | 
			
		||||
	.notice_list{
 | 
			
		||||
		text-align: left;
 | 
			
		||||
		display: inline-block;
 | 
			
		||||
        display: flex;
 | 
			
		||||
        align-items: center;
 | 
			
		||||
        justify-content: space-between;
 | 
			
		||||
		width: 100%;
 | 
			
		||||
		position: relative;
 | 
			
		||||
		padding: 0 25rpx;
 | 
			
		||||
		margin: 0 auto;
 | 
			
		||||
		display: block;
 | 
			
		||||
	}
 | 
			
		||||
	.notice_list > view{
 | 
			
		||||
		text-align: right;
 | 
			
		||||
		position: absolute;
 | 
			
		||||
		right: 25rpx;
 | 
			
		||||
		top: 0;
 | 
			
		||||
		bottom: 0;
 | 
			
		||||
		margin: auto;
 | 
			
		||||
		
 | 
			
		||||
	}
 | 
			
		||||
	
 | 
			
		||||
</style>
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										12
									
								
								pages.json
									
									
									
									
									
								
							
							
						
						
									
										12
									
								
								pages.json
									
									
									
									
									
								
							@ -136,9 +136,9 @@
 | 
			
		||||
								"buttons": [
 | 
			
		||||
									{
 | 
			
		||||
										"type":"none",
 | 
			
		||||
										"text":"\ue503",
 | 
			
		||||
										"text":"\ue001",
 | 
			
		||||
										"float":"right",
 | 
			
		||||
										"fontSize":"20",
 | 
			
		||||
										"fontSize":"18",
 | 
			
		||||
										"fontSrc": "/static/fonts/cart.ttf"
 | 
			
		||||
									}
 | 
			
		||||
								]
 | 
			
		||||
@ -167,9 +167,9 @@
 | 
			
		||||
								"buttons": [
 | 
			
		||||
									{
 | 
			
		||||
										"type":"none",
 | 
			
		||||
										"text":"\ue503",
 | 
			
		||||
										"text":"\ue001",
 | 
			
		||||
										"float":"right",
 | 
			
		||||
										"fontSize":"20",
 | 
			
		||||
										"fontSize":"18",
 | 
			
		||||
										"fontSrc": "/static/fonts/cart.ttf"
 | 
			
		||||
									}
 | 
			
		||||
								]
 | 
			
		||||
@ -378,9 +378,9 @@
 | 
			
		||||
									// },
 | 
			
		||||
									{
 | 
			
		||||
										"type":"none",
 | 
			
		||||
										"text":"\ue503",
 | 
			
		||||
										"text":"\ue001",
 | 
			
		||||
										"float":"right",
 | 
			
		||||
										"fontSize":"22",
 | 
			
		||||
										"fontSize":"18",
 | 
			
		||||
										"fontSrc": "/static/fonts/cart.ttf",
 | 
			
		||||
										"color": "#FFFFFF"
 | 
			
		||||
                                        
 | 
			
		||||
 | 
			
		||||
										
											Binary file not shown.
										
									
								
							
										
											Binary file not shown.
										
									
								
							| 
		 Before Width: | Height: | Size: 2.7 MiB After Width: | Height: | Size: 1.0 MiB  | 
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user