提交

@@ -2,8 +2,8 @@
     "name" : "找地主",
     "appid" : "__UNI__AE869D6",
     "description" : "找地主",
-    "versionName" : "1.0.0",
-    "versionCode" : "100",
+    "versionName" : "1.1",
+    "versionCode" : 101,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

@@ -25,7 +25,7 @@
 		<view class="empTopH"></view>
 		<!-- @change="changeImg" -->
 		<!-- :style="{height:swiperHeight+'px'}" -->
-		<swiper class="imgSwiper" @change="changeImg" :indicator-dots="articleInfo.images.length > 1 ? true : false" :indicator-active-color="'#35655f'" :indicator-color="'rgba(0,0,0,0.3)'" :circular="true">
+		<swiper class="imgSwiper" @change="changeImg" :indicator-dots="articleInfo.images.length > 1 ? true : false" :indicator-active-color="'#35655f'" :indicator-color="'rgba(0,0,0,0.3)'" :circular="true" :duration="300">
 			<swiper-item v-for="(item,index) in articleInfo.images" :key="index" @click="closeAllAlert">
 				<view class="swiper-item" :style="{'align-items':swiperHeight >= 480 ? 'flex-start' : 'center'}">
 					<image :src="item" mode="widthFix"></image>
@@ -554,6 +554,7 @@
 		height: 1028rpx;
 		.swiper-item{
 			height: 1028rpx;
+			width: 750rpx;
 			display: flex;
 			justify-content: center;
 			image{width: 750rpx;}

@@ -293,7 +293,7 @@
 	
 	// var apiUrl = 'http://landlord.t.brotop.cn/api'
 	var apiUrl = 'http://app.zhaodizhu.cn/api'
-	var version = '1.0'//当前应用版本
+	var version = '1.1'//当前应用版本
 	export default {		
 		data() {
 			return {

@@ -158,6 +158,13 @@
 			},
 			// 微信登录
 			weixinlogin(){
+				if(!this.checkProt){
+					uni.showToast({
+						title:'请阅读并同意《用户协议》及《隐私政策》',
+						icon:'none'
+					})
+					return
+				}
 				let that = this
 				uni.login({
 				  provider: 'weixin',

@@ -315,6 +315,22 @@
 		onLoad(){
 			this.getData()
 		},
+		onShow(){
+			//获取成为地主图片
+			this.$request('/common/getConfig',{type:'1'}).then((res)=>{
+				this.becomeLandImg = res.data.landlord_index
+			})
+			//获取用户信息
+			this.$request('/user/info').then((res)=>{
+				this.userInfo = res.data
+				let starList = []
+				for(let i = 0; i < res.data.star; i ++){
+					starList.push(i)
+				}
+				this.startList = starList
+				this.showMy = true
+			})
+		},
 		onHide() {
 			this.showMoreService = false
 		},
@@ -328,16 +344,6 @@
 		},
 		methods:{
 			getData(){
-				//获取用户信息
-				this.$request('/user/info').then((res)=>{
-					this.userInfo = res.data
-					let starList = []
-					for(let i = 0; i < res.data.star; i ++){
-						starList.push(i)
-					}
-					this.startList = starList
-					this.showMy = true
-				})
 				if(this.otherTabIndex == 0){
 					this.$request('/article/userList',this.param).then((res)=>{
 						this.current_page = res.data.current_page
@@ -363,10 +369,6 @@
 						this.showList = true
 					})
 				}
-				//获取成为地主图片
-				this.$request('/common/getConfig',{type:'1'}).then((res)=>{
-					this.becomeLandImg = res.data.landlord_index
-				})
 			},
 			scrolltolower(){
 				console.log('滚动到底部了')

@@ -136,6 +136,10 @@
 				this.$request('/user_follow_log/follow',{to_user_id:to_user_id}).then((res)=>{
 					console.log('关注成功',res)
 					if(res.code == 1){
+						this.param.page = 1
+						this.last_page = 0
+						this.current_page = 1
+						this.followList = []
 						this.getData()
 						setTimeout(()=>{
 							uni.showToast({

@@ -202,7 +202,7 @@
 					uni.getSystemInfo({
 						success: function (res) {
 							let imgH = res.windowWidth/image.width * image.height;
-							if(imgH < 120){
+							if(imgH < 200){
 								that.imgMode = 'aspectFill'
 							}
 						}