提交

@@ -54,7 +54,7 @@
 		},
 		props:{
 			toUserId:{
-				type:String
+				type:Number
 			}
 		},
 		computed:{
@@ -147,7 +147,7 @@
 <style lang="scss" scoped>
 	/* 送礼物弹框 */
 	.sendGiftAlert{
-		position: fixed;top: 0;left: 0;right: 0;bottom: 0;background: rgba(0,0,0,0.5);
+		position: fixed;top: 0;left: 0;right: 0;bottom: 0;background: rgba(0,0,0,0.5);z-index: 21;
 		.sendGift{
 			width: 100%;
 			position: absolute;

@@ -29,16 +29,16 @@
 								</view>
 							</view>
 							<!-- 右-头像 -->
-							<view class="right">
-								<image :src="userInfo.img"></image>
+							<view class="right" @click="$href('/pages/my/my',2)">
+								<image :src="userInfo.img" mode="aspectFill"></image>
 							</view>
 						</view>
 						<!-- 别人发出的消息 -->
 						<view class="other" v-else>
 							<!-- 左-头像 -->
-							<view class="left">
-								<image :src="toUserInfo.avatar"></image>
-							</view>
+							<navigator class="left" hover-class="none" :url="'/pages/index/landHome?id='+toUserInfo.id">
+								<image :src="toUserInfo.avatar" mode="aspectFill"></image>
+							</navigator>
 							<!-- 右-用户名称-时间-消息 -->
 							<view class="right">
 								<view class="username">
@@ -56,9 +56,9 @@
 				</view>
 			</scroll-view>
 		</view>
-		<navigator class="giftWrap" hover-class="none" :url="'/pages/index/landHome?id='+toUserInfo.id" :style="{bottom: keyboardHeight + 150 +'rpx'}">
+		<view class="giftWrap" :style="{bottom: keyboardHeight + 150 +'rpx'}" @click="showSendGift = true">
 			<image src="../../static/image/roomGiftIcon.png" mode=""></image>
-		</navigator>
+		</view>
 		<!-- 抽屉栏 -->
 		<view class="popup-layer" :class="popupLayerClass" @touchmove.stop.prevent="discard">
 			<!-- 表情 -->
@@ -84,6 +84,8 @@
 				</view>
 			</view>
 		</view>
+		<!-- 送礼物弹框 -->
+		<send-gift v-if="showSendGift" :toUserId="toUserInfo.id" @closeSendGift="showSendGift = false"></send-gift>
 		<!-- 底部输入栏 -->
 		<view class="input-box" :style="{bottom: keyboardHeight+'rpx'}" :class="popupLayerClass" @touchmove.stop.prevent="discard">
 			<!-- H5下不能录音，输入栏布局改动一下 -->
@@ -151,10 +153,12 @@
 <script>
 	import userList from '../../commen/tim/user.js'
 	import {mapState} from "vuex";
+	import sendGift from '@/components/sendGift.vue'
 	
 	export default {
 		data() {
 			return {
+				showSendGift:false,//展示送礼物弹框
 				showRoom:false,
 				keyboardHeight:-2,
 				//TIM变量
@@ -218,6 +222,9 @@
 				}
 			};
 		},
+		components:{
+			sendGift
+		},
 		computed:{
 			...mapState({
 				userinfo: state => state.userinfo,

@@ -45,7 +45,7 @@
 				</view>
 			</view>
 			<view class="playTabList" v-if="tabIndex == 1">
-				<swiper class="classList" :autoplay="false" display-multiple-items="5" >
+				<swiper class="classList" :autoplay="false" display-multiple-items="5" :disable-touch="banner.length > 1 ? false : true">
 					<swiper-item>
 						<view class="playTabItem" :class="{active:playTabIndex == 0}" @click="changePlayTab(0)">
 							全部
@@ -309,7 +309,6 @@
 					success: (res) => {
 						this.last_page = res.data.data.last_page
 						this.current_page = res.data.data.current_page
-						
 						this.list = this.list.concat(res.data.data.data)
 						this.showWaterFalls = true
 						uni.hideLoading()

@@ -25,9 +25,9 @@
 		<view class="empTopH"></view>
 		<!-- @change="changeImg" -->
 		<!-- :style="{height:swiperHeight+'px'}" -->
-		<swiper class="imgSwiper" :indicator-dots="true" :indicator-active-color="'#35655f'" :indicator-color="'rgba(0,0,0,0.3)'" :circular="true">
+		<swiper class="imgSwiper" @change="changeImg" :indicator-dots="true" :indicator-active-color="'#35655f'" :indicator-color="'rgba(0,0,0,0.3)'" :circular="true">
 			<swiper-item v-for="(item,index) in articleInfo.images" :key="index" @click="closeAllAlert">
-				<view class="swiper-item">
+				<view class="swiper-item" :style="{'align-items':swiperHeight >= 480 ? 'flex-start' : 'center'}">
 					<image :src="item" mode="widthFix"></image>
 				</view>
 			</swiper-item>
@@ -37,7 +37,7 @@
 			<view class="userInfoWrap">
 				<view class="userInfoLeft">
 					<view class="userIcon" @click="goMainPage(articleInfo.user.id)">
-						<image :src="articleInfo.user.avatar" style="width: 93rpx;height: 93rpx;border-radius: 20rpx 0 20rpx 0;" mode=""></image>
+						<image :src="articleInfo.user.avatar" style="width: 93rpx;height: 93rpx;border-radius: 20rpx 0 20rpx 0;" mode="aspectFill"></image>
 					</view>
 					<view class="userNameAddress">
 						<view class="userName">
@@ -556,7 +556,6 @@
 			height: 1028rpx;
 			display: flex;
 			justify-content: center;
-			align-items: center;
 			image{width: 750rpx;}
 		}
 	}

@@ -30,7 +30,7 @@
 				<div class="userInfoWrap" :style="{bottom:expandStatus ? '400rpx' : '200rpx'}">
 					<div class="userInfoLeft">
 						<div class="userIcon" @click="goMainPage(articleInfo.user.id)">
-							<image :src="articleInfo.user.avatar" style="width: 93rpx;height: 93rpx;border-radius: 20rpx 0 20rpx 0;" mode=""></image>
+							<image :src="articleInfo.user.avatar" style="width: 93rpx;height: 93rpx;border-radius: 20rpx 0 20rpx 0;" mode="aspectFill"></image>
 						</div>
 						<div class="userNameAddress">
 							<div class="userName">

@@ -325,16 +325,6 @@
 		},
 		components:{touchSlide},
 		created() {
-			//获取状态栏高度
-			uni.getSystemInfo({
-				success: (res) => {
-					this.mapHeight = res.screenHeight - res.statusBarHeight
-					// #ifdef APP-NVUE || MP-WEIXIN
-					this.mapHeight = this.mapHeight - 45
-					// #endif
-					this.statusBarHeight = res.statusBarHeight*2
-				}
-			})
 			//获取成为地主图片
 			uni.request({
 				url:'http://app.zhaodizhu.cn/api/common/getConfig',
@@ -346,12 +336,18 @@
 			})
 		},
 		onShow() {
+			//获取状态栏高度
+			uni.getSystemInfo({
+				success: (res) => {
+					this.mapHeight = res.screenHeight - res.statusBarHeight - 45
+					this.statusBarHeight = res.statusBarHeight*2
+				}
+			})
 			let tempArr = []
 			let param = this.landParam
 			this.scale = 13
 			this.notReadNumber = 0
 			this.getSysNoReadNum()
-			this.landList = []
 			uni.getLocation({
 			    type: 'wgs84',
 				geocode: true,
@@ -471,18 +467,6 @@
 			if(this.userinfo.group_id == '1' && uni.getStorageSync('landAlertFlag') != this.userinfo.id){
 				this.showBecomeLand = true
 			}
-
-			//获取系统信息
-			uni.getSystemInfo({
-				success: (res) => {
-					//#ifdef APP-PLUS
-					this.mapHeight = res.windowHeight*2 + res.statusBarHeight*2
-					//#endif
-					//#ifdef H5
-					this.mapHeight = res.windowHeight*2
-					//#endif
-				}
-			})
 			
 			this.getAllData()
 		},
@@ -550,7 +534,6 @@
 			resetLandList(){
 				let coverArr = []
 				let tempArr = this.landList
-				this.landList = []
 				let index = 0
 				coverArr.push({
 					id:'me',
@@ -699,7 +682,6 @@
 					let _this = this
 					let landArr = []
 					_this.scale = 12.9
-					_this.landList = []
 					if(_this.allLandList.length > 0){
 						uni.showLoading({
 							title:'加载中...'
@@ -788,7 +770,6 @@
 				let landArr = this.landList
 				let coverArr = []
 				let index = 0
-				this.landList = []
 				coverArr.push(this.covers[0])
 				let changeLand
 				for(let i = 0; i < landArr.length; i ++){

@@ -30,12 +30,12 @@
 				<image @click="checkProt = false" v-if="checkProt" style="width: 23rpx;height: 23rpx;" src="../../static/image/Group_592@2x.png" mode=""></image>
 				请阅读并同意<text @click="goTo('../my/aboutUs?navTitle=用户协议')">《用户协议》</text>和<text @click="goTo('../my/aboutUs?navTitle=隐私政策')">《隐私政策》</text>
 			</view>
-			<view class="otherLoginTxt">
+			<view class="otherLoginTxt" v-if="switchTab == '1'">
 				<view class="line"></view>
 				第三方登录
 				<view class="line"></view>
 			</view>
-			<view class="otherLoginIcon" @click="weixinlogin">
+			<view class="otherLoginIcon" @click="weixinlogin" v-if="switchTab == '1'">
 				<image src="../../static/image/weixin-4_1@2x.png" mode=""></image>
 			</view>
 			
@@ -59,6 +59,7 @@
 				mobile:'',
 				event:'mobilelogin',//登录：mobilelogin。修改：changemobile
 				captcha:'',
+				switchTab:'1'
 				// backurl:''
 			}
 		},
@@ -67,6 +68,10 @@
 			if(uni.getStorageSync('token')){
 				this.$href('index',2)
 			}else{
+				this.$request('/common/getConfig',{type:'8'}).then((res)=>{
+					console.log('微信登录按钮开关',res)
+					this.switchTab = res.data.switch
+				})
 				this.showLogin = true
 			}
 		},

@@ -48,10 +48,10 @@
 				default: ''
 			},
 			// 图片裁剪模式
-			imgMode: {
+			/* imgMode: {
 				type: String,
 				default: 'widthFix'
-			},
+			}, */
 			// 占位图片路径
 			loadingImg: {
 				type: String,
@@ -92,11 +92,12 @@
 			// 图片高度，单位rpx
 			height: {
 				type: [Number, String],
-				default: '450'
+				default: '200'
 			}
 		},
 		data() {
 			return {
+				imgMode:'widthFix',
 				isShow: true,
 				opacity: 1,
 				time: this.duration,
@@ -194,6 +195,20 @@
 			//observer.disconnect();
 		},
 		mounted() {
+			let that = this
+			uni.getImageInfo({
+				src:this.image,
+				success: function(image) {
+					uni.getSystemInfo({
+						success: function (res) {
+							let imgH = res.windowWidth/image.width * image.height;
+							if(imgH < 120){
+								that.imgMode = 'aspectFill'
+							}
+						}
+					});
+				}
+			});
 			// 此uOnReachBottom事件由mixin.js发出，目的是让页面到底时，保证所有图片都进行加载，做到绝对稳定且可靠
 			this.$nextTick(() => {
 				uni.$once('uOnReachBottom', () => {