1

pages/blindDate/editData.vue

@@ -76,6 +76,7 @@
 								 	<picker :mode ="item1.mode" class="subpicker" :range="item1.array" @change="changPicker($event,item1.field,item1.mode,item1.array)">
 								 	       <input class="subInput" disabled type="text" :placeholder="item1.placehloder" v-model="data[item1.field]" />
 								 	</picker>
+									 <u-icon style="flex-grow: 4;" name="arrow-right"></u-icon>
 								 </view>
 								 
 							</view>
@@ -118,7 +119,7 @@
 						showType:"text"
 					},{
 						name:"性别",
-						field:"Sex",
+						field:"SexStr",
 						placehloder:"请选择性别",
 						subType:2,
 						array:['男','女'],
@@ -146,7 +147,7 @@
 						showType:"number"
 					},{
 						name:"学历",
-						field:"EducationType",
+						field:"EducationTypeStr",
 						placehloder:"请选择学历",
 						subType:2,
 						array:['高中及以下','大专','本科','硕士及以上'],
@@ -159,7 +160,7 @@
 						showType:"text"
 					},{
 						name:"婚姻",
-						field:"Marriage",
+						field:"MarriageStr",
 						placehloder:"请选择婚姻状况",
 						subType:2,
 						array:['未婚','离异','丧偶'],
@@ -279,12 +280,15 @@
 				data:{
 					Name:"",
 					Sex:"",
+					SexStr:"",
 					Birthday:"",
 					Height:"",
 					Weight:"",
 					EducationType:"",
+					EducationTypeStr:"",
 					SchoolInfo:"",
 					Marriage:"",
+					MarriageStr:"",
 					Job:"",
 					WorkUnit:"",
 					YearMoney:"",
@@ -408,27 +412,27 @@
 				delete msg.nativePlace
 				delete msg.addCode
 			
-				if(this.data.Sex=="男"){
+				if(this.data.SexStr=="男"){
 					msg.Sex=1
 				}else{
 					msg.Sex=2
 				}
 				
-				if(this.data.EducationType=="高中及以下"){
+				if(this.data.EducationTypeStr=="高中及以下"){
 					msg.EducationType=1
-				}else if(this.data.EducationType=="大专"){
+				}else if(this.data.EducationTypeStr=="大专"){
 					msg.EducationType=2
-				}else if(this.data.EducationType=="本科"){
+				}else if(this.data.EducationTypeStr=="本科"){
 					msg.EducationType=2
-				}else if(this.data.EducationType=="硕士及以上"){
+				}else if(this.data.EducationTypeStr=="硕士及以上"){
 					msg.EducationType=4
 				}
 				
-				if(this.data.Marriage=="未婚"){
+				if(this.data.MarriageStr=="未婚"){
 					msg.Marriage=1
-				}else if(this.data.Marriage=="离异"){
+				}else if(this.data.MarriageStr=="离异"){
 					msg.Marriage=2
-				}else if(this.data.Marriage=="丧偶"){
+				}else if(this.data.MarriageStr=="丧偶"){
 					msg.Marriage=3
 				}
 				
@@ -472,22 +476,26 @@
 					});
 					return
 				}
-				if(this.data.nativePlace==""){
-					uni.showToast({
-					    title: '请选择籍贯',
-					    duration: 2000,
-						icon:"none"
-					});
-					return
-				}
-				console.log(this.data)
+				// if(this.data.nativePlace==""){
+				// 	uni.showToast({
+				// 	    title: '请选择籍贯',
+				// 	    duration: 2000,
+				// 		icon:"none"
+				// 	});
+				// 	return
+				// }
+
 				this.request2({
 						url: '/api/AppletMiai/GetSetMiAiBaseInfo',
 						data: msg
 					},
 					res => {
 						if (res.resultCode == 1) {
-							console.log(res)
+							uni.showToast({
+							    title: res.message,
+							    duration: 2000,
+								icon:"success"
+							});
 						}
 					}
 				);

pages/blindDate/persondetails.vue

@@ -241,7 +241,7 @@
 							<view class="bubble" v-if="dataList.ConoldBaseInfostellation">{{dataList.ConoldBaseInfostellation}}</view>
 							<view class="bubble" v-if="dataList.Height">{{dataList.Height}}cm</view>
 							<view class="bubble" v-if="dataList.Weight">{{dataList.Weight}}kg</view>
-							<view class="bubble" v-if="dataList.Marriage">{{dataList.Marriage}}</view>
+							<view class="bubble" v-if="dataList.Marriage">{{dataList.MarriageStr}}</view>
 							<view class="bubble" v-if="dataList.YearMoney">年收入(税后)：{{dataList.YearMoney}}万元</view>
 							
 						</view>
@@ -250,14 +250,10 @@
 							<view class="bubble" v-if="dataList.HuKou">户口:{{dataList.HuKou}}</view>
 							<view class="bubble" v-if="dataList.PName&&dataList.CName&&dataList.DName">籍贯:{{dataList.PName,dataList.CName,dataList.DName}}</view>
 							<view class="bubble" v-if="dataList.SchoolInfo">学校:{{dataList.SchoolInfo}}</view>
-							<view class="bubble" v-if="dataList.EducationType">学历:{{dataList.EducationType}}</view>
-							<view class="bubble" v-if="dataList.HouseInfo">{{dataList.HouseInfo}}</view>
-							<view class="bubble" v-if="dataList.MajorInfo">{{dataList.MajorInfo}}</view>
-							<view class="bubble" v-if="dataList.MotherInfo">母亲:{{dataList.MotherInfo}}</view>
-							<view class="bubble" v-if="dataList.FatherInfo">父亲:{{dataList.FatherInfo}}</view>
-							<view class="bubble" v-if="dataList.CarInfo">车:{{dataList.CarInfo}}</view>
+							<view class="bubble" v-if="dataList.EducationType">学历:{{dataList.EducationTypeStr}}</view>
 							<view class="bubble" v-if="dataList.Job">职位:{{dataList.Job}}</view>
 							<view class="bubble" v-if="dataList.WorkUnit">工作单位:{{dataList.WorkUnit}}</view>
+							<view class="bubble" v-if="dataList.HouseInfo">资产:{{dataList.HouseInfo}}</view>
 							
 						</view>
 						<view class="pd-title">家庭背景</view>

pages/blindDate/visitor.vue

@@ -27,7 +27,7 @@
 				</view>
 				<view class="visit">
 					<view class="num">
-						{{todayVisit}}
+						{{PeopleNum}}
 					</view>
 					<view class="name">
 						今日浏览量
@@ -48,7 +48,8 @@
 							<view class="subItemBox">
 								<view class="avaBox">
 									<image class="avatar" :src="subItem.Photo"></image>
-									<image class="sex" :src="sex[subItem.Sex]"></image>
+									<image class="sex" v-if="subItem.Sex==1" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/basic-nan.png"></image>
+									<image class="sex" v-if="subItem.Sex==2" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/basic-nv.png"></image>
 								</view>
 
 								<view class="rightBox">
@@ -57,7 +58,7 @@
 											{{subItem.RealName||subItem.UserName}}
 										</view>
 										<view class="time">
-											{{subItem.CreateDate.slice(-5)}}&nbsp;&nbsp;访问了你的自画像
+											{{subItem.CreateDate.slice(-5)}}<text style="margin-left: 5rpx;" v-if="msg.VsisitorType==1">&nbsp;&nbsp;访问了你</text><text style="margin-left: 5rpx;" v-if="msg.VsisitorType==2">&nbsp;&nbsp;访问了ta</text>
 										</view>
 									</view>
 									<!-- <view class="icon"> </view> -->
@@ -83,10 +84,6 @@
 		data() {
 			return {
 				pageTitle: "访客",
-				sex: {
-					1: "https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/basic-nan.png",
-					2: "https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/basic-nv.png",
-				},
 				msg: {
 					pageIndex: 1,
 					pageSize: 10,
@@ -104,7 +101,8 @@
 				}],
 				activeNav: 0,
 				allVisit: 100, //总浏览量
-				todayVisit: 1, //今日访客,今日浏览量
+				todayVisit: 1, //今日总浏览量
+				PeopleNum:0,//今日浏览量人数
 				visitorData: [],
 				loading: false,
 				status: "loadmore",
@@ -123,7 +121,7 @@
 				this.visitorData=[]
 				this.getMiaiMessageVisitorPageList();
 			},
-			//获取访问量
+			//获取今日访问量
 			getMiaiMessageVisitorStatistics() {
 				this.request2({
 						url: '/api/AppletMiai/GetMiaiMessageVisitorStatistics',
@@ -131,8 +129,8 @@
 					},
 					res => {
 						if (res.resultCode == 1) {
-							this.allVisit = res.data.TCount
-							this.todayVisit = res.data.PeopleNum
+							this.todayVisit = res.data.TCount
+							this.PeopleNum = res.data.PeopleNum
 						}
 					}
 				);
@@ -145,6 +143,7 @@
 					},
 					res => {
 						if (res.resultCode == 1) {
+							this.allVisit = res.data.count
 							this.loading = false;
 							let data = this.handleDate(res.data.pageData, "CreateDate")
 							this.visitorData = this.visitorData.concat(data);
@@ -190,7 +189,7 @@
 				this.request2({
 						url: '/api/AppletMiai/DelMiaiMessageInfoBatch',
 						data: {
-							TypeIds: "7"
+							TypeIds: "7,10"
 						},
 					},
 					res => {