Merge remote-tracking branch 'origin/master'

@@ -12,7 +12,7 @@ Component({
 	},
 	},
 	attached(){
 	attached(){
 		let peoplelist=[]
 		let peoplelist=[]
-		for(let i=0;i<=Math.ceil((30-4)/5);i++){
+		for(let i=0;i<Math.ceil((30-4)/5);i++){
 			peoplelist.push({
 			peoplelist.push({
 				list:[]
 				list:[]
 			})
 			})
@@ -28,6 +28,7 @@ Component({
 		this.setData({
 		this.setData({
 			peoplelist:peoplelist
 			peoplelist:peoplelist
 		})
 		})
+		console.log(peoplelist)
 	},
 	},
 	ready(){
 	ready(){
 		this.editpeoplelist(this.data.count);
 		this.editpeoplelist(this.data.count);

-<swiper class="people-list" display-multiple-items="1" next-margin="46rpx" circular="{{true}}">
+<swiper class="people-list" display-multiple-items="1" next-margin="46rpx">
 	<block wx:for="{{peoplelist}}" wx:key="{{index}}" wx:for-item="itemlist">
 	<block wx:for="{{peoplelist}}" wx:key="{{index}}" wx:for-item="itemlist">
 		<swiper-item>
 		<swiper-item>
 			<view class="flex-ll">
 			<view class="flex-ll">