Merge branch 'master' of http://150.158.33.144:3000/lalalashen/MeetMateApp

pages/w3/ucenter.vue

@@ -12,7 +12,7 @@
 			<view class="bg">
 				<view class="left">
 					<view class="user">
-						<image class="avator" mode="widthFix" :src="myinfo.avator"></image>
+						<image class="avator" mode="aspectFill" :src="myinfo.avator"></image>
 						<text class="nickname">{{myinfo.nickname}}</text>
 						<image class="iconV" mode="widthFix" :src="'http://c.yujianmate.com/images/v1/w3/w3_icon_'+(myinfo.level+1)+'.png'">
 						</image>

uni_modules/next-swipe-action/components/next-swipe-action/next-swipe-action.vue

@@ -73,7 +73,7 @@
 				operation: 0,
 				height: 0,
 				screenWidth: 0,
-				isActive:false,
+				isActive:false,     
 			};
 		},
 		watch:{