Merge pull request 'zmr' (#9) from zmr into master

Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/9

main.js

@@ -19,15 +19,4 @@ Vue.use(httpInterceptor, app)
 import httpApi from '@/common/http.api.js'
 Vue.use(httpApi, app)
 
-app.$mount()
+app.$mount() 
-
-
-
-// http拦截器，将此部分放在new Vue()和app.$mount()之间，才能App.vue中正常使用
-import httpInterceptor from '@/common/http.interceptor.js'
-Vue.use(httpInterceptor, app)
-
-// http接口API集中管理引入部分
-import httpApi from '@/common/http.api.js'
-Vue.use(httpApi, app)
-app.$mount()

package-lock.json

@@ -6,8 +6,13 @@
   "dependencies": {
     "uview-ui": {
       "version": "1.5.2",
+<<<<<<< HEAD
+      "resolved": "https://registry.npmjs.org/uview-ui/-/uview-ui-1.5.2.tgz",
+      "integrity": "sha512-FV9G+gZTAZKEE2m85ahIbIRiC/fdzTl+eNXDIMBoyc9b+fQWQhEtmAfu6huu7AtKuTI6gfqaYn6WGcmqYvr76w=="
+=======
       "resolved": "https://registry.npm.taobao.org/uview-ui/download/uview-ui-1.5.2.tgz?cache=0&sync_timestamp=1594781920423&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fuview-ui%2Fdownload%2Fuview-ui-1.5.2.tgz",
       "integrity": "sha1-4jDud0TIBjMJe74GU+IyvJSyAwk="
+>>>>>>> fa383397b331ec0091096becf886f978cc1277fc
     }
   }
 }

pages.json

@@ -26,6 +26,18 @@
 				}
 			}
 		},
+		{
+			"path": "pages/messages/messagesList",
+			"style": {
+				"navigationBarTitleText": "消息",
+				"app-plus": {
+		            "titleNView": {
+						"backgroundColor": "#FFFFFF",
+		                "titleColor": "#333333"
+					}
+				}
+			}
+		},
 		{
 			"path": "pages/index/index",
 			"style": {

pages/messages/messagesList.vue

@@ -0,0 +1,111 @@
+<template>
+	<!-- login页面 -->
+	<view>
+		<view class="border_serach">
+			<view class="u-search">
+				<u-search :show-action="false" input-align="left" shape="round" placeholder="搜索" v-model="keyword"></u-search>
+			</view>
+		</view>
+		<!-- 消息列表 -->
+		<view class="massage_list" v-for="(item,index) in list" :key="index">
+			<view class="images">
+				<image :src="item.url" ></image>
+			</view>
+			<view class="names">{{item.name}}</view>
+			<view class="content">{{item.content}}</view>
+			<view class="times">{{item.time}}</view>
+		</view>
+	</view>
+</template>
+<script>
+	export default {
+		data() {
+			return {
+				keyword: '搜索',
+				list: [{
+						name: '瘦瘦',
+						content: "木糖少女小紫薯西装领连衣裙夏季新款女装装领连衣裙夏季装领连衣裙夏季装领连衣裙夏季夏收腰格子格纹裙子",
+						url: '../../static/image/tosign/tosigin(5).png',
+						id : '1',
+						time : '10：15'
+					},
+					{
+						name: '瘦瘦',
+						content: "木糖少女小紫薯西装领连衣裙夏季新款女装装领连衣裙夏季装领连衣裙夏季装领连衣裙夏季夏收腰格子格纹裙子",
+						url: '../../static/image/tosign/tosigin(5).png',
+						id : '1',
+						time : '10：15'
+					},
+					{
+						name: '瘦瘦',
+						content: "木糖少女小紫薯西装领连衣裙夏季新款女装装领连衣裙夏季装领连衣裙夏季装领连衣裙夏季夏收腰格子格纹裙子",
+						url: '../../static/image/tosign/tosigin(5).png',
+						id : '1',
+						time : '10：15'
+					},
+				],
+			};
+		},
+		methods: {
+			
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	.u-search{
+		width: 690rpx;
+		margin: 0 auto;
+		padding: 14rpx;
+	}
+	.border_serach{
+		border-top: 1px solid #EDEDED;
+	}
+	.massage_list{
+		padding: 25rpx 18rpx 25rpx 31rpx;
+		position: relative;
+		border-bottom: 1px #ECECEC solid;
+		overflow: hidden;
+		zoom: 1;
+		.images{
+			width: 84rpx;
+			height: 84rpx;
+			margin-right: 28rpx;
+		}
+	}
+	.massage_list image{
+		width: 84rpx;
+		height: 84rpx;
+		.names{
+			font-size: 30rpx;
+			color: #333;
+		}
+		
+		.content{
+			margin-bottom: 19rpx;
+		}
+	}
+	.content , .names{
+		width: 480rpx;
+	}
+	.content{
+		margin-top: 19rpx;
+		font-size: 26rpx;
+		color: #666666;
+		height: 30rpx;
+		height: 30rpx;
+		overflow:hidden; //超出的文本隐藏
+		text-overflow:ellipsis; //用省略号显示
+		white-space:nowrap; //不换行
+	}
+	.times{
+		position: absolute;
+		right: 29rpx;
+		top: 29rpx;
+		font-size: 22rpx;
+		color: #999999;
+	}
+	.massage_list > view{
+		float: left;
+	}
+</style>