6.1

common/config.js

@@ -1,4 +1,4 @@
 module.exports = {
-    baseUrl: 'https://xiangqin.zhousi.hdlkeji.com'//正式
-    // baseUrl: 'http://ceshixq.zhousi.hdlkeji.com'//测试
+    // baseUrl: 'https://xiangqin.zhousi.hdlkeji.com'//正式
+    baseUrl: 'http://ceshixq.zhousi.hdlkeji.com'//测试
 }

components/lingdang-AddressPicker/AddressPicker.vue

@@ -28,9 +28,15 @@
 		},
 		methods:{
 			getAllAddress(){
+				uni.showLoading({
+					title:'加载中'
+				})
 				uni.$u.http.post('/api/Publics/area').then(res => {
+					uni.hideLoading()
 				this.AllAddress=res.data
 				this.init()
+				}).catch(err=>{
+					uni.hideLoading()
 				})
 			},
 			// 初始化地址选项

pages/activity/activity.vue

@@ -103,13 +103,13 @@
 					})
 					return
 				}
-				var is_info=uni.getStorageSync('is_info')
-				if (is_info != 2) {
-					uni.navigateTo({
-						url: '/pages/index/base'
-					})
-					return
-				}
+				// var is_info=uni.getStorageSync('is_info')
+				// if (is_info != 2) {
+				// 	uni.navigateTo({
+				// 		url: '/pages/index/base'
+				// 	})
+				// 	return
+				// }
 				uni.navigateTo({
 					url:'./activityInfo?id='+item.id
 				})

pages/activity/activityInfo.vue

@@ -369,11 +369,18 @@ border-image: linear-gradient(270deg, rgba(178, 148, 246, 1), rgba(248, 172, 182
 				})
 			},
 			baoming() {
-				if(this.userInfo.vip_level==0){
-					// this.$u.toast('您暂未认证')
-					// return
-					// this.showtoast=true
-				}
+				// var is_info=uni.getStorageSync('is_info')
+				// if (is_info != 2) {
+				// 	uni.navigateTo({
+				// 		url: '/pages/index/base'
+				// 	})
+				// 	return
+				// }
+				// if(this.userInfo.vip_level==0){
+				// 	// this.$u.toast('您暂未认证')
+				// 	// return
+				// 	// this.showtoast=true
+				// }
 				if(this.userInfo.vip_level==2){
 					this.$u.toast('经用户反馈，您账户存在违规行为，暂不支持使用该功能')
 					return

pages/index/base.vue

@@ -15,10 +15,10 @@
 					<text class="itemText" style="white-space: nowrap;">昵称</text>
 					<input type="text" v-model="nickname" placeholder="请输入您的昵称">
 				</view>
-				<!-- <view class="item u-flex u-row-between">
+				<view class="item u-flex u-row-between">
 					<text class="itemText" style="white-space: nowrap;">单位名称</text>
 					<input type="text" v-model="unit" placeholder="请输入您的单位名称">
-				</view> -->
+				</view>
 				<view class="item u-flex u-row-between">
 					<text class="itemText" style="white-space: nowrap;">姓名</text>
 					<input type="text" v-model="name" placeholder="请输入姓名">
@@ -80,7 +80,7 @@
 					<text class="itemText" style="white-space: nowrap;">验证码</text>
 					<view class="u-flex" >
 						<input v-model="code" type="text" placeholder=" ">
-						<text style="color: #2A63F3;background: linear-gradient(270deg, #A890FE 0%, #FFAEAE 100%);-webkit-background-clip: text;-webkit-text-fill-color: transparent;" @click="getCode">{{count}}</text>
+						<text style="color: #2A63F3;background: linear-gradient(270deg, #A890FE 0%, #FFAEAE 100%);-webkit-background-clip: text;-webkit-text-fill-color: transparent;white-space: nowrap;" @click="getCode">{{count}}</text>
 					</view>
 				</view>
 				<view class="item1  u-col-center">
@@ -150,6 +150,7 @@
 				}, 1000);
 			},
 		onLoad() {
+			this.getAddress()
 				this.getInfo()
 		},
 		onShow() {
@@ -190,7 +191,6 @@
 				current: null,
 				name:'',
 				phone:'',
-				unit:'',
 				workImg:'',
 				type:'',
 				reason:'',
@@ -204,6 +204,11 @@
 			}
 		},
 		methods: {
+			getAddress() {
+				uni.$u.http.post('/api/index/linyi').then(res => {
+					this.addresscolumns[1] = res.data
+				})
+			},
 			// 删除图片
 						deletePic(event) {
 							console.log(event)
@@ -392,7 +397,7 @@
 				let data={
 					type:1,
 					nickname:this.nickname,
-					// working:this.unit,
+					workshow:this.unit,
 					username:this.name,
 					sex:this.radiovalue1,
 					ID_car:this.idcard,

pages/index/index.vue

@@ -121,52 +121,61 @@
 						img: '/static/index/5@2x.png',
 						name: '会员列表',
 						path: '/pages/index/renzhengVip',
-						isWhite: true
+						isWhite: true,
+						isLogin:true
 					},
 					{
 						img: '/static/index/yugao.png',
 						name: '活动预告',
 						path: '/pages/activity/activity',
-						isWhite: false,
-						tabbar:true
+						isWhite: true,
+						tabbar:true,
+						isLogin:false
 					},
 					{
 						img: '/static/index/6@2x.png',
 						name: '精准配对',
 						path: '/pages/index/pipei',
-						isWhite: false
+						isWhite: true,
+						isLogin:true
 					},
 					{
 						img: '/static/index/11@2x.png',
 						name: '情感咨询',
 						path: '/pages/index/zixun',
-						isWhite: true
+						isWhite: true,
+						isLogin:true
 					},
 					{
 						img: '/static/index/9@2x.png',
 						name: '消息中心',
 						path: '/pages/index/message',
-						isWhite: false
+						isWhite: false,
+						isLogin:true
 					},
 					{
 						img: '/static/index/16@2x.png',
 						name: '喜上加喜',
 						path: '/pages/index/twoHappy',
-						isWhite: false
+						isWhite: true,
+						isLogin:false,
 					},
 					
 					{
 						img: '/static/index/10@2x.png',
 						name: '入会攻略',
 						path: '/pages/index/gonglue',
-						isWhite: true
+						isWhite: true,
+						isLogin:false
 					},
 
 					{
 						img: '/static/index/111@2x.png',
 						name: '联系我们',
 						path: '/pages/index/contactour',
-						isWhite: true
+						isWhite: true,
+						isLogin:false
+						
 					}
 				]
 			}
@@ -305,14 +314,14 @@
 				})
 			},
 			toinfo(item) {
-				if (!this.is_login) {
-					this.toLogin()
-					return
-				}
-				if (this.is_info != 2) {
-					this.tozhuce()
-					return
-				}
+				// if (!this.is_login) {
+				// 	this.toLogin()
+				// 	return
+				// }
+				// if (this.is_info != 2) {
+				// 	this.tozhuce()
+				// 	return
+				// }
 				if (item.type == 1) {
 					uni.navigateTo({
 						url: './talkInfo?id=' + item.id
@@ -325,14 +334,14 @@
 
 			},
 			tomore() {
-				if (!this.is_login) {
-					this.toLogin()
-					return
-				}
-				if (this.is_info != 2) {
-					this.tozhuce()
-					return
-				}
+				// if (!this.is_login) {
+				// 	this.toLogin()
+				// 	return
+				// }
+				// if (this.is_info != 2) {
+				// 	this.tozhuce()
+				// 	return
+				// }
 				uni.navigateTo({
 					url: './talkLove'
 				})
@@ -343,15 +352,21 @@
 				})
 			},
 			toitem(item) {
-				if (!this.is_login) {
+				if (item.isLogin&&!this.is_login) {
 					this.toLogin()
 					return
 				}
-				if (this.is_info != 2) {
+				if (this.is_info != 2&&item.isLogin&&!item.tabbar) {
 					this.tozhuce()
 					return
 				}
-				if((item.isWhite || this.info.vip_level == 1)&&item.tabbar){
+				// if((item.isWhite || this.info.vip_level == 1)&&item.tabbar){
+				// 	uni.setStorageSync('type',1)
+				// 	uni.switchTab({
+				// 		url:item.path
+				// 	})
+				// }
+				if(item.tabbar){
 					uni.setStorageSync('type',1)
 					uni.switchTab({
 						url:item.path
@@ -361,6 +376,7 @@
 					uni.navigateTo({
 						url: item.path
 					})
+					return
 				} else {
 					if (this.info.vip_level == 0) {
 						// this.$u.toast('您暂未认证')

pages/index/pipei.vue

@@ -51,7 +51,7 @@
 			background: #F1F1F1;
 			border-radius: 28rpx;margin: 24rpx 0;box-sizing: border-box;padding: 0 32rpx;" @click="showmoney=true">
 				<input type="text" :disabled="true" placeholder="你期望ta的月收入" style="flex: 1;"
-					v-model="money.length==0?'':money[0]+'-'+money[1]">
+					v-model="money">
 				<u-icon name="arrow-down"></u-icon>
 			</view>
 			<view class="" style="font-size: 32rpx;">
@@ -71,22 +71,22 @@
 				开始匹配
 			</view>
 		</view>
-		<u-picker :show="showage" @cancel='showage=false' title="年龄" ref="uPicker" :columns="columns" @confirm="confirm"
+		<u-picker :immediateChange='true' :show="showage" @cancel='showage=false' title="年龄" ref="uPicker" :columns="columns" @confirm="confirm"
 			@change="changeHandler">
 		</u-picker>
-		<u-picker :show="showheight" @cancel='showheight=false' title="身高" ref="uPicker" :columns="heightcolumns"
+		<u-picker :immediateChange='true' :show="showheight" @cancel='showheight=false' title="身高" ref="uPicker" :columns="heightcolumns"
 			@confirm="heightconfirm">
 		</u-picker>
-		<u-picker :show="showmoney" @cancel='showmoney=false' title="月收入" ref="uPicker" :columns="moneycolumns"
+		<u-picker :immediateChange='true' :show="showmoney" @cancel='showmoney=false' title="月收入" ref="uPicker" :columns="moneycolumns"
 			@confirm="moneyconfirm">
 		</u-picker>
-		<u-picker :show="showaddress" @cancel='showaddress=false' keyName="name" title="居住地" ref="uPicker"
+		<u-picker :immediateChange='true' :show="showaddress" @cancel='showaddress=false' keyName="name" title="居住地" ref="uPicker"
 			:columns="addresscolumns" @confirm="addressconfirm">
 		</u-picker>
-		<u-picker :show="showEducation" @cancel='showEducation=false' title="学历" ref="uPicker" :columns="columns2"
+		<u-picker :immediateChange='true' :show="showEducation" @cancel='showEducation=false' title="学历" ref="uPicker" :columns="columns2"
 			@confirm="confirmEducation">
 		</u-picker>
-		<u-picker :show="showwork" @cancel='showwork=false' title="工作性质" @confirm='confirmWork' keyName="name"
+		<u-picker :immediateChange='true' :show="showwork" @cancel='showwork=false' title="工作性质" @confirm='confirmWork' keyName="name"
 			:columns="columns1"></u-picker>
 	</view>
 </template>
@@ -104,7 +104,7 @@
 					list1.push(list1[0] + i)
 				}
 			}
-			for (let i = 159; i < 200; i++) {
+			for (let i = 150; i < 200; i++) {
 				this.heightcolumns[0].push(i + 'cm')
 				this.heightcolumns[1].push(i + 'cm')
 			}
@@ -119,6 +119,7 @@
 				work: {},
 				address: [],
 				age: [],
+				moneyIndex:'',
 				money: [],
 				height: [],
 				showEducation: false,
@@ -141,11 +142,11 @@
 					[{"id":1480,"name":"兰山区"},{"id":1481,"name":"罗庄区"},{"id":1482,"name":"河东区"},{"id":1483,"name":"沂南县"},{"id":1484,"name":"郯城县"},{"id":1485,"name":"沂水县"},{"id":1486,"name":"兰陵县"},{"id":1487,"name":"费县"},{"id":1488,"name":"平邑县"},{"id":1489,"name":"莒南县"},{"id":1490,"name":"蒙阴县"},{"id":1491,"name":"临沭县"}]
 				],
 				moneycolumns: [
-					['不限', '3000元', '5000元', '7000元', '9000元', '11000元', '13000元', '15000元', '17000元', '20000元'],
-					['不限', '3000元', '5000元', '7000元', '9000元', '11000元', '13000元', '15000元', '17000元', '20000元'],
+					
+					['3000-6000','6000-10000','1万以上','不限'],
 				],
 				columns2: [
-					['高中', '大专', '本科', '硕士', '博士']
+					['高中', '大专', '本科', '硕士', '博士','不限']
 				]
 
 			}
@@ -162,11 +163,13 @@
 			getWork() {
 				uni.$u.http.post('/api/index/WorkNature').then(res => {
 					this.columns1 = [res.data]
+					this.columns1[0].push({id:7,name:'不限'})
 				})
 			},
 			getAddress() {
 				uni.$u.http.post('/api/index/linyi').then(res => {
 					this.addresscolumns[1] = res.data
+					this.addresscolumns[1].unshift({id:3750,name:'不限'})
 				})
 			},
 			start() {
@@ -197,13 +200,12 @@
 				var data = {
 					age_min: this.age[0],
 					age_max: this.age[1],
-					nature: this.work.id,
+					nature: this.work.id==7?'不限':this.work.id,
 					education: this.education,
 					height_min:this.height[0],
 					height_max:this.height[1],
-					income_min:this.money[0],
-					income_max:this.money[1],
-					area_id:this.address[1].id,
+					income:this.moneyIndex,
+					area_id:this.address[1].id==3750?'不限':this.address[1].id,
 				}
 				uni.navigateTo({
 					url: './pipeizhong?info=' + JSON.stringify(data)
@@ -243,6 +245,7 @@
 				this.showheight = false
 			},
 			moneyconfirm(e) {
+				this.moneyIndex=e.indexs[0]+1
 				this.money = e.value
 				this.showmoney = false
 			},

pages/index/pipeizhong.vue

@@ -15,7 +15,7 @@
 			<view class="list u-flex u-row-between" v-if="!isSearch">
 				<view class="item" v-for="(item,index) in list" :key="index" @click="torecommendinfo(item)">
 					<view class="">
-						<image :src="item.headimg" mode=""></image>
+						<image :src="item.headimg" mode="aspectFill"></image>
 					</view>
 					<view class="" style="font-size: 32rpx;padding: 16rpx 0 8rpx 20rpx;">
 						{{item.nickname}} <image src="../../static/index/2@2x.png" mode="" style="width: 32rpx;height: 32rpx;margin:0 20rpx;vertical-align: middle;" v-show="itm.sex==1"></image> <image src="../../static/index/1@2x.png" mode="" style="width: 32rpx;height: 32rpx;margin:0 20rpx;vertical-align: middle;"  v-show="itm.sex==2"></image> 

pages/index/renzhengVip.vue

@@ -19,7 +19,7 @@
 		<view class="u-flex u-row-between" style="flex-wrap: wrap;padding: 0 30rpx;">
 		<view class="" style="background-color: #fff;width: 336rpx;margin: 0 0 20rpx;border-radius: 20rpx;position: relative;height: 600rpx;box-sizing: border-box;" v-for="(item,index) in list" :key="index" @click="toinfo(item)">
 			<view class="" style="position: relative;">
-				<image :src="item.headimg" mode="" style="width: 336rpx;
+				<image :src="item.headimg" mode="aspectFill" style="width: 336rpx;
 				height: 336rpx;
 				border-radius: 20rpx;"></image>
 				<image src="../../static/index/notice.png" mode="" style="width: 48rpx;height: 48rpx;vertical-align: middle;position: absolute;bottom: 16rpx;right: 20rpx;" @click.stop="tomessage(item)"></image>
@@ -315,10 +315,10 @@ border-radius: 14rpx;position: absolute;left: 16rpx;bottom: 16rpx;text-align: ce
 				})
 			},
 			toinfo(item){
-				if(this.info.vip_level==0){
-					this.showtoast=true
-					return
-				}
+				// if(this.info.vip_level==0){
+				// 	this.showtoast=true
+				// 	return
+				// }
 				if(this.info.vip_level==2){
 					this.$u.toast('经用户反馈，您账户存在违规行为，暂不支持使用该功能')
 					return

pages/index/talkInfo.vue

@@ -4,29 +4,355 @@
 			{{info.title}}
 		</view>
 		<rich-text :nodes="info.content"></rich-text>
+		<view class="comment">
+			<view class="title u-flex u-row-between">
+				<text>评论（{{total}}）</text>
+				<text @click="towrite">写留言</text>
+			</view>
+			<view class="" style="text-align: center;font-size: 32rpx;color: #bbb;" v-if="commentList.length==0">
+				暂无评论
+			</view>
+			<view class="commentItem" v-for="(item,index) in commentList" :key="index">
+				<view class="user">
+					<image :src="item.headimg" mode="" class="avatar"></image><text class="name">{{item.nickname}}</text>
+				</view>
+				<view class="content">
+					<view class="word">
+						{{item.content}}
+					</view>
+					<view class="contentBottom u-flex u-row-between">
+						<text class="date">{{item.create_time}}</text>
+						<text class="reply" @click="openpopup(item)">回复</text>
+					</view>
+					<!-- <view class="commentItem" v-for="(item,index) in 4" v-show="index<2">
+						<view class="user">
+							<image src="../../static/auth/2@2x.png" mode="" class="avatar"></image><text class="name">养乐多03y</text>
+						</view>
+						<view class="content">
+							<view class="word">
+								知识学多了就明白自己的利益是多么重要了知识学多了就明白自己的利益是多么重要了
+							</view>
+							<view class="contentBottom u-flex u-row-between">
+								<text class="date">2023-03-21</text>
+								<text class="reply">回复</text>
+							</view>
+						</view>
+					</view> -->
+					<view class="more u-flex u-row-center" v-if="item.count>0">
+						<text @click="openpopup(item)">查看全部{{item.count}}条回复</text><u-icon name="arrow-right" color="#444444" size="14"></u-icon>
+					</view>
+				</view>
+			</view>
+			
+		</view>
+		<view class="submit u-flex u-row-between" v-show="isWrite">
+			<input type="text" v-model="comment">
+			<text @click="public(1)">发布</text>
+		</view>
+		<u-popup :show="show" mode="bottom" :round="10" @close="show=false">
+			<view class="popup">
+				<view class="popupTitle">
+					评论回复
+				</view>
+				<view class="commentItem commentItem1" >
+					<view class="user">
+						<image :src="item.headimg" mode="" class="avatar"></image><text class="name">{{item.nickname}}</text>
+					</view>
+					<view class="content">
+						<view class="word">
+							{{item.content}}
+						</view>
+						<view class="contentBottom u-flex u-row-between">
+							<text class="date">{{item.create_time}}</text>
+							<!-- <text class="reply" @click="openpopup">回复</text> -->
+						</view>
+					</view>
+				</view>
+				<view class="evenyComment">
+					<view class="evenyTitle">
+						全部回复
+					</view>
+					<view class="commentItem " v-for="(item,index) in secondCommentList" :key="index">
+						<view class="user">
+							<image :src="item.headimg" mode="" class="avatar"></image><text class="name">{{item.nickname}}</text>
+						</view>
+						<view class="content">
+							<view class="word">
+								{{item.content}}
+							</view>
+							<view class="contentBottom u-flex u-row-between">
+								<text class="date">{{item.create_time}}</text>
+								<!-- <text class="reply" @click="openpopup">回复</text> -->
+							</view>
+							
+						</view>
+					</view>
+				</view>
+				<view class="submit u-flex u-row-between" >
+					<input type="text" v-model="comment">
+					<text @click="public(2)">发布</text>
+				</view>
+			</view>
+				
+			</u-popup>
 	</view>
 </template>
 
 <script>
 	export default {
+		onReachBottom() {
+				if(this.commentList.length<this.total){
+					this.page++
+					this.getComment()
+				}
+				
+		},
 		onLoad(option) {
 			this.getinfo(option.id)
+			if (!uni.getStorageSync('token')) {
+				this.is_login=false
+			}else{
+				this.is_login=true
+			}
+			if (uni.getStorageSync('userInfo')) {
+				this.userinfo=JSON.parse(uni.getStorageSync('userInfo'))
+			}
 		},
 		data() {
 			return {
-				info:{}
+				userinfo:{},
+				is_login:false,
+				info:{},
+				isWrite:false,
+				comment:'',
+				show:false,
+				page:1,
+				commentList:[],
+				secondCommentList:[],
+				total:0,
+				item:{}
 			}
 		},
 		methods: {
+			toLogin(){
+					uni.navigateTo({
+						url:'/pages/profile/login'
+					})
+			},
+			towrite(){
+				if(!this.is_login){
+					this.toLogin()
+					return
+				}
+				if (this.userinfo.is_info == 0) {
+					uni.navigateTo({
+						url: '/pages/index/base'
+					})
+					return
+				}
+				this.isWrite=!this.isWrite
+			},
+			openpopup(item){
+				this.item={}
+				this.item=item
+				this.secondCommentList=[]
+				let data={
+					id:this.info.id,
+					page_num:100,
+					page:1,
+					type:2,
+					belong_id:item.id
+				}
+				uni.$u.http.post('/api/Index/comment_list',data).then(res => {
+					if(res.code==1){
+						this.secondCommentList=res.data.data
+					}
+				})
+				this.show=true
+			},
+			public(type){
+				if(!this.is_login){
+					this.toLogin()
+					return
+				}
+				if (this.userinfo.is_info == 0) {
+					uni.navigateTo({
+						url: '/pages/index/base'
+					})
+					return
+				}
+					if(!this.comment){
+						this.$u.toast('请输入评论内容')
+						return
+					}else{
+						let data={
+							type:type,
+							articleid:this.info.id,
+							content:this.comment,
+							belong_id:type==2?this.item.id:''
+						}
+						uni.$u.http.post('/api/Index/comment',data).then(res => {
+							console.log(121,res)
+								
+							if(res.code==1){
+								this.$u.toast('发布成功，正在审核中')
+								this.isWrite=false
+								this.comment=''
+								this.show=false
+							}
+						
+						})
+						
+					}
+			},
 			getinfo(id){
 				uni.$u.http.post('/api/index/articlederail',{id:id}).then(res => {
 				this.info=res.data
+				this.getComment()
+				})
+			},
+			getComment(){
+				let data={
+					id:this.info.id,
+					page_num:10,
+					page:this.page,
+					type:1
+				}
+				uni.$u.http.post('/api/Index/comment_list',data).then(res => {
+					if(res.code==1){
+						this.total=res.data.total
+						if(this.page==1){
+							this.commentList=res.data.data
+						}else{
+							this.commentList=[...this.commentList,...res.data.data]
+						}
+						
+						
+					}
 				})
 			}
 		}
 	}
 </script>
 
-<style>
-
+<style lang="scss">
+	
+	.submit{
+		align-items: flex-start;
+		box-sizing: border-box;
+		padding: 18rpx 30rpx 0;
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		right: 0;
+		width: 750rpx;
+		height: 166rpx;
+		background: #FFFFFF;
+		box-shadow: 0rpx 0rpx 0rpx 0rpx rgba(0,0,0,0.5);
+		input{
+			box-sizing: border-box;
+			padding: 0 20rpx;
+			width: 598rpx;
+			height: 72rpx;
+			line-height: 72rpx;
+			background: #F1F1F1;
+			border-radius: 36rpx;
+		}
+		text{
+			line-height: 72rpx;
+			font-size: 36rpx;
+			font-weight: bold;
+			color: #222222;
+			background: linear-gradient(180deg, #FFBAE7 0%, #9956FF 100%);
+			-webkit-background-clip: text;
+			-webkit-text-fill-color: transparent;
+		}
+	}
+.comment{
+	margin-top: 22rpx;
+	position: relative;
+	padding-bottom:166rpx;
+	
+	.title{
+		font-size: 34rpx;
+		color: #131415;
+		font-weight: bold;
+		margin-bottom: 36rpx;
+	}
+	
+}
+.commentItem{
+		margin-top: 30rpx;
+		.user{
+			.avatar{
+				width: 64rpx;
+				height: 64rpx;
+				border-radius: 50%;
+				vertical-align: middle;
+				margin-right: 20rpx;
+			}
+			.name{
+				font-size: 32rpx;
+				font-weight: bold;
+			}
+		}
+		.content{
+			margin-left: 84rpx;
+			.word{
+				
+				font-size: 32rpx;
+				margin-bottom: 20rpx;
+			}
+			.contentBottom{
+				.date{
+					font-size: 24rpx;
+					color: #89898A;
+				}
+				.reply{
+					margin-right: 20rpx;
+					font-size: 24rpx;
+				}
+			}
+			.more{
+				// padding-left: 10rpx;
+				text-align: center;
+				font-size: 20rpx;
+				color: #444444;
+				margin-top: 20rpx;
+				// margin-left: 92rpx;
+				width: 228rpx;
+				height: 40rpx;
+				line-height: 40rpx;
+				background: #F1F1F1;
+				border-radius: 20rpx;
+				text{
+					margin-right: 8rpx;
+				}
+			}
+		}
+	}
+	
+	.popup{
+		height: 800rpx;
+		overflow: scroll;
+		padding: 36rpx 30rpx 166rpx;
+		.popupTitle{
+			text-align: center;
+			margin-bottom: 40rpx;
+			font-size: 36rpx;
+			font-weight: bold;
+		}
+		.commentItem1 {
+			border-bottom: 2rpx solid #EAEAEA;
+			padding-bottom: 44rpx
+		}
+		.evenyComment{
+			margin-top: 28rpx;
+			.evenyTitle{
+				font-size: 28rpx;
+				font-weight: bold;
+				margin-bottom: 32rpx;
+			}
+		}
+	}
 </style>

pages/profile/fankuiList.vue

@@ -11,7 +11,7 @@
 					{{item.content}}
 				</view>
 				<view class="content_img" v-if="item.show_images.length!=0">
-					<image :src="item" mode="" class="item_img" v-for="(item,index) in item.show_images" :key="index"></image>
+					<image :src="it" mode="" class="item_img" v-for="(it,index) in item.show_images" :key="index"></image>
 					
 				</view>
 				

pages/profile/myPage.vue

@@ -78,7 +78,7 @@
 					<view class="group_50 flex-row  justify-between">
 						<text class="text_49">学历</text>
 						<view class="flex-row">
-							<text class="text_50">{{info.graduation_school||''}}</text>
+							<text class="text_50">{{info.education||''}}</text>
 						</view>
 					</view>
 

pages/profile/otherPage.vue

@@ -15,7 +15,7 @@
             <view class="image-text_45 flex-row u-flex u-row-between">
              <view class="u-flex">
              	<text class="text_4">{{info.nickname}}</text>
-				<text style="font-size: 24rpx;" v-if="info.username">（真实姓名·{{info.username}}）</text>
+				<!-- <text style="font-size: 24rpx;" v-if="info.username">（真实姓名·{{info.username}}）</text> -->
              	<view class="image-text_46 flex-row justify-between">
              	 <!-- <view class="box_21 flex-col"></view>
              	  <text class="text-group_20">已认证</text> -->
@@ -39,6 +39,7 @@
             class="image_1"
             referrerpolicy="no-referrer"
             :src="info.headimg"
+			mode="aspectFill"
           />
         </view>
       </view>
@@ -107,18 +108,18 @@
       				
       				</view>
 	  <view class="" v-show="current==1">
-	  	<view class="group_50 flex-row  justify-between">
+	  <!-- 	<view class="group_50 flex-row  justify-between">
 	  		<text class="text_49">姓名</text>
 	  		<view class="flex-row">
 	  			<text class="text_50">{{info.username}}</text>
 	  		</view>
-	  	</view>
-	  	<view class="group_50 flex-row  justify-between">
+	  	</view> -->
+	  	<!-- <view class="group_50 flex-row  justify-between">
 	  		<text class="text_49">工作单位</text>
 	  		<view class="flex-row">
 	  			<text class="text_50">{{info.danwei||''}}</text>
 	  		</view>
-	  	</view>
+	  	</view> -->
 	  	<view class="group_50 flex-row  justify-between">
 	  		<text class="text_49">工作性质</text>
 	  		<view class="flex-row">
@@ -182,23 +183,23 @@
 				<text>{{info.is_car==1?'是':info.is_car==2?'否':''}}</text>
 			</view>
 		</view>
-		<view class="group_50 flex-row  justify-between" v-if="info.is_car==1">
+		<!-- <view class="group_50 flex-row  justify-between" v-if="info.is_car==1">
 			<text class="text_49">车辆型号</text>
 			<view class="flex-row">
 				<text>{{info.car_model||''}}</text>
 			</view>
-		</view>
+		</view> -->
 		<view class="group_50 flex-row  justify-between">
 			<text class="text_49">父亲工作</text>
 			<view class="flex-row">
-				<input type="text" placeholder="请输入父亲工作职位" v-model='info.fa_work'
+				<input type="text" :disabled="true" v-model='info.fa_work'
 					style="text-align: right;">
 			</view>
 		</view>
 		<view class="group_50 flex-row  justify-between">
 			<text class="text_49">母亲工作</text>
 			<view class="flex-row">
-				<input type="text" placeholder="请输入母亲工作职位" v-model='info.ma_work'
+				<input type="text" :disabled="true" v-model='info.ma_work'
 					style="text-align: right;">
 			</view>
 		</view>
@@ -238,12 +239,18 @@
 		</view>
       </view>
     </view>
+	<Showtoast @canceltoast='canceltoast' :showtoast='showtoast' />
   </view>
 </template>
 <script>
-export default {
+import Showtoast from'../../components/Showtoast.vue'
+	export default {
+		components:{
+			Showtoast
+		},
   data() {
     return {
+		showtoast:false,
       list: ['个人档案','工作职业','家庭情况','相册'],
 	  current:0,
 	  value:false,
@@ -263,9 +270,12 @@ export default {
   	this.getlifePhoto()
   },
   methods: {
+	  canceltoast(){
+	  		this.showtoast=false
+	  },
 	  tomessage(){
 		  if(this.userInfo.vip_level==0){
-		  	this.$u.toast('您暂未认证')
+		  	this.showtoast=true
 		  	return
 		  }
 		  if(this.userInfo.vip_level==2){
@@ -313,10 +323,10 @@ export default {
 	  		  }
 	  },
 	  tojubao(){
-		  if(this.userInfo.vip_level==0){
-		  	this.$u.toast('您暂未认证')
-		  	return
-		  }
+		  // if(this.userInfo.vip_level==0){
+		  // 	this.showtoast=true
+		  // 	return
+		  // }
 		  if(this.userInfo.vip_level==2){
 		  	this.$u.toast('经用户反馈，您账户存在违规行为，暂不支持使用该功能')
 		  	return

pages/profile/profile.vue

@@ -325,10 +325,10 @@
 					})
 					return
 				}
-				if(this.info.vip_level==0){
-					this.showtoast=true
-					return
-				}
+				// if(this.info.vip_level==0){
+				// 	this.showtoast=true
+				// 	return
+				// }
 				if(this.info.vip_level==2){
 					this.$u.toast('经用户反馈，您账户存在违规行为，暂不支持使用该功能')
 					return
@@ -433,12 +433,12 @@
 					this.toLogin()
 					return
 				}
-				if (this.is_info != 2) {
-					uni.navigateTo({
-						url: '/pages/index/base'
-					})
-					return
-				}
+				// if (this.is_info != 2) {
+				// 	uni.navigateTo({
+				// 		url: '/pages/index/base'
+				// 	})
+				// 	return
+				// }
 				uni.navigateTo({
 					url:'./set'
 				})

pages/profile/suqiu.vue

@@ -9,33 +9,35 @@
 				{{info.age_min?info.age_min+'-':'请选择年龄'}}{{info.age_max?info.age_max:''}}<u-icon name="arrow-right"></u-icon>
 			</view>
 		</view>
-		<view class="item-box u-flex u-col-center u-row-between">
+		<view class="item-box u-flex u-col-center u-row-between" @click="showheight=true">
 			<text class="text1" style="flex: 1;">身高</text>
 			<view class=" u-flex">
-				<input type="text" v-model='info.height' style="text-align: right;">
-				<text class="text_50">cm</text>
-				<!-- {{info.height}}cm<u-icon name="arrow-right"></u-icon> -->
+				<input type="text" :disabled="true" placeholder="" v-model="getheight" style="text-align: right;">
+				<!-- <text class="text_50">cm</text> -->
+				<!-- {{info.height}}cm -->
+				<u-icon name="arrow-right"></u-icon>
 			</view>
 		</view>
-		<view class="item-box u-flex u-col-center u-row-between">
+	<!-- 	<view class="item-box u-flex u-col-center u-row-between">
 			<text class="text1" style="flex: 1;">体重</text>
 			<view class=" u-flex">
 				<input type="text" v-model='info.weight' style="text-align: right;">
 				<text class="text_50">kg</text>
 			</view>
-		</view>
-		<view class="item-box u-flex u-col-center u-row-between">
+		</view> -->
+		<view class="item-box u-flex u-col-center u-row-between" @click="showEducation=true">
 			<text class="text1" style="flex: 1;">学历</text>
-			<view class=" u-flex"  @click="showEducation=true">
+			<view class=" u-flex"  >
 				<text class="text_50">{{info.education}}</text>
 				<u-icon name="arrow-right"></u-icon>
 				</view>
 		</view>
-		<view class="item-box u-flex u-col-center u-row-between">
+		<view class="item-box u-flex u-col-center u-row-between" @click="showIncome=true">
 			<text class="text1" style="flex: 1;">月收入</text>
-			<view class=" u-flex">
-				<input type="text" v-model='info.income' style="text-align: right;">
-			</view>
+			<view class=" u-flex"  >
+				<text class="text_50">{{info.income}}</text>
+				<u-icon name="arrow-right"></u-icon>
+				</view>
 		</view>
 		<view class="item-box u-flex u-col-center u-row-between">
 			<text class="text1" style="flex: 1;">工作地区</text>
@@ -48,9 +50,14 @@
 		<view class="publish" @click="storage">
 			保存
 		</view>
-		<u-picker :show="showEducation" @cancel='showEducation=false' title="学历" ref="uPicker" :columns="educationcolumns" @confirm="confirmEducation">
+		<u-picker :show="showIncome" :immediateChange='true' @cancel='showIncome=false' title="收入" ref="uPicker" :columns="incomecolumns" @confirm="confirmIncome">
 		</u-picker>
-		<u-picker :show="showage" @cancel='showage=false' title="年龄" ref="uPicker" :columns="columns" @confirm="confirm" @change="changeHandler">
+		<u-picker :show="showEducation" :immediateChange='true' @cancel='showEducation=false' title="学历" ref="uPicker" :columns="educationcolumns" @confirm="confirmEducation">
+		</u-picker>
+		<u-picker :show="showage" :immediateChange='true' @cancel='showage=false' title="年龄" ref="uPicker" :columns="columns" @confirm="confirm" @change="changeHandler">
+		</u-picker>
+		<u-picker :immediateChange='true' :show="showheight" @cancel='showheight=false' title="身高" ref="uPicker" :columns="heightcolumns"
+			@confirm="heightconfirm">
 		</u-picker>
 	</view>
 </template>
@@ -71,13 +78,36 @@
 					list1.push(list1[0]+i)
 				}
 			}
+			for (let i = 150; i < 200; i++) {
+				this.heightcolumns[0].push(i + 'cm')
+				this.heightcolumns[1].push(i + 'cm')
+			}
+		},
+		computed:{
+				getheight(){
+					console.log(this.info)
+					if(this.info.height_min){
+						return (this.info.height_min+'-'+this.info.height_max)
+					}else{
+						return '请选择身高'
+					}
+				}
 		},
 		data() {
 			return {
+				heightcolumns: [
+					['不限'],
+					['不限']
+				],
+				showheight: false,
+				incomeIndex:'',
 				showage:false,
-				info:{},
+				info:{
+				},
 				showEducation:false,
-				educationcolumns:[['高中','大专','本科','硕士','博士']],
+				showIncome:false,
+				incomecolumns:[['3000-6000','6000-10000','1万以上','不限']],
+				educationcolumns:[['高中','大专','本科','硕士','博士','不限']],
 				columns: [
 					[18],
 					[18]
@@ -85,13 +115,21 @@
 			}
 		},
 		methods: {
+			heightconfirm(e) {
+				this.$set(this.info,'height_min',e.value[0])
+				this.$set(this.info,'height_max',e.value[1])
+				// this.info.height_min = e.value[0]
+				// this.info.height_max = e.value[1]
+				this.showheight = false
+			},
 			storage(){
 				var data={
 					age_min:this.info.age_min,
 					age_max:this.info.age_max,
-					height:this.info.height,
+					height_min:this.info.height_min,
+					height_max:this.info.height_max,
 					weight:this.info.weight,
-					income:this.info.income,
+					income:this.incomeIndex,
 					province_id:this.info.province_id,
 					city_id:this.info.city_id,
 					area_id:this.info.area_id,
@@ -147,10 +185,35 @@
 				this.info.education=e.value[0]
 				this.showEducation=false
 			},
+			confirmIncome(e){
+				console.log(121,e)
+				this.info.income=e.value[0]
+				this.incomeIndex=e.indexs[0]+1
+				this.showIncome=false
+			},
 			getInfo(){
 				uni.$u.http.post('/api/user/show_appeals').then(res => {
 					if(res.code==1){
 						this.info=res.data
+						if(this.info.income){
+							if(this.info.income[0]=='3000'){
+								this.info.income='3000-6000'
+								this.incomeIndex=1
+							}
+							if(this.info.income[0]=='6000'){
+								this.info.income='6000-10000'
+								this.incomeIndex=2
+							}
+							if(this.info.income[0]=='10000'){
+								this.info.income='1万以上'
+								this.incomeIndex=3
+							}
+							if(this.info.income[0]=='不限'){
+								this.info.income='不限'
+								this.incomeIndex=4
+							}
+						}
+						
 					}
 				})
 			}