Merge branch 'master' of http://gitlab.oytour.com/viitto/mallapp

pages/blindDate/circleNews.vue

@@ -159,6 +159,7 @@
 							this.loading = false;
 							this.count = res.data.count;
 							this.g = this.g.concat(res.data.pageData);
+							console.log(this.g)
 							this.page_count = res.data.pageCount;
 							if (this.page_count == 1) {
 								this.status = "nomore";
@@ -207,10 +208,16 @@
 			},
 			//设置全部消息为已看
 			setAllMsgSee() {
+				let ids=""
+				if(this.msg.SelectType==1){
+					ids="1,2"
+				}else if(this.msg.SelectType==2){
+					ids="3,4,5,6"
+				}
 				this.request2({
 						url: '/api/AppletMiai/DelMiaiMessageInfoBatch',
 						data: {
-							TypeIds: this.msg.SelectType
+							TypeIds: ids
 						},
 					},
 					res => {
@@ -222,9 +229,7 @@
 			}
 		},
 		onShow() {
-			if(this.g.length>0){
-				this.setAllMsgSee()
-			}
+			
 		},
 		created() {
 			this.mainColor = this.$uiConfig.mainColor;
@@ -233,6 +238,7 @@
 			this.windowWidth = this.$utils.SystemInfo().windowWidth;
 		},
 		mounted() {
+			
 			let currentPages = getCurrentPages();
 			// let u = "/" + currentPages[currentPages.length - 1].route;
 			// let pages = wx.getStorageSync("basedata") ?
@@ -246,6 +252,9 @@
 			uni.setNavigationBarTitle({
 				title: this.pageTitle,
 			});
+			if(this.g.length>0){
+				this.setAllMsgSee()
+			}
 
 		},
 		onLoad(options) {

pages/blindDate/editData.vue

@@ -68,13 +68,13 @@
 								 <view class="subName">
 									{{item1.name}}
 								 </view>
-								 <input type="text" :placeholder="item1.placehloder" v-model="data[item1.field]" class="subInput" v-if="item1.subType==1"/>
+								 <input type="text" :placeholder="item1.placehloder" v-model="data[item1.field]" :type="item1.showType" class="subInput" v-if="item1.subType==1"/>
 								 <view class="unit" v-if="item1.unit">
 								 	{{item1.unit}}
 								 </view>
 								 <view class="subpicker" v-if="item1.subType==2">
 								 	<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]" />
+								 	       <input class="subInput" disabled type="text" :placeholder="item1.placehloder" v-model="data[item1.field]" />{{data[item1.field]}}
 								 	</picker>
 								 </view>
 								 
@@ -114,7 +114,8 @@
 						name:"昵称",
 						field:"Name",
 						placehloder:"请填写昵称",
-						subType:1
+						subType:1,
+						showType:"text"
 					},{
 						name:"性别",
 						field:"Sex",
@@ -134,38 +135,28 @@
 						field:"Height",
 						placehloder:"请填写身高",
 						subType:1,
-						unit:"厘米"
+						unit:"厘米",
+						showType:"number"
 					},{
 						name:"体重",
 						field:"Weight",
 						placehloder:"请填写体重",
 						subType:1,
-						unit:"公斤"
+						unit:"公斤",
+						showType:"number"
 					},{
 						name:"学历",
 						field:"EducationType",
 						placehloder:"请选择学历",
 						subType:2,
 						array:['高中及以下','大专','本科','研究生及以上'],
-						// array:[{
-						// 	name:'高中及以下',
-						// 	id:1,
-						// },{
-						// 	name:'大专',
-						// 	id:2,
-						// },{
-						// 	name:'本科',
-						// 	id:3,
-						// },{
-						// 	name:'研究生及以上',
-						// 	id:4,
-						// }],
 						mode:"selector"
 					},{
 						name:"毕业院校",
 						field:"SchoolInfo",
 						placehloder:"请填写毕业院校",
 						subType:1,
+						showType:"text"
 					},{
 						name:"婚姻",
 						field:"Marriage",
@@ -177,18 +168,21 @@
 						name:"职位",
 						field:"Job",
 						placehloder:"请填写职位",
-						subType:1
+						subType:1,
+						showType:"text"
 					},{
 						name:"工作单位",
 						field:"WorkUnit",
 						placehloder:"请填写工作单位",
-						subType:1
+						subType:1,
+						showType:"text"
 					},{
 						name:"年收入",
 						field:"YearMoney",
 						placehloder:"请填写年收入",
 						subType:1,
-						unit:"万"
+						unit:"万",
+						showType:"number"
 					},{
 						name:"籍贯",
 						field:"nativePlace",
@@ -201,6 +195,7 @@
 						field:"HouseInfo",
 						placehloder:"请填写资产",
 						subType:1,
+						showType:"text"
 					}],
 					type:2
 				},{
@@ -276,6 +271,7 @@
 						field:"AppointmentAddress",
 						placehloder:"请填写方便的地点",
 						subType:1,
+						showType:"text"
 					},]
 				  },
 				],
@@ -339,8 +335,8 @@
 				}else if(mode=="date"){
 					this.data[e]=arg.detail.value
 				}else if(mode=="region"){
-					this.data.nativePlace=arg.detail.value
-					this.data.addCode=arg.detail.code
+					this.data.nativePlace=JSON.parse(JSON.stringify(arg.detail.value)) 
+					this.data.addCode=JSON.parse(JSON.stringify(arg.detail.code)) 
 					console.log(this.data.nativePlace)
 				}
 			},
@@ -518,9 +514,10 @@
 						if(res.resultCode==1){
 							this.data=res.data
 							if(res.data.PName&&res.data.DName&&res.data.CName){
-								this.data.nativePlace=[res.data.PName,res.data.DName,res.data.CName]
+								// this.data.nativePlace=[res.data.PName,res.data.DName,res.data.CName]
+								this.data.nativePlace=JSON.parse(JSON.stringify([res.data.PName,res.data.DName,res.data.CName])) 
 							}else{
-								this.data.nativePlace=[]
+								this.data.nativePlace="" 
 							}
 							
 							this.data.addCode=""
@@ -531,10 +528,12 @@
 							}else{
 								this.data.Sex=""
 							}
+							if(res.data.AlbumList){
+								res.data.AlbumList.map((item,index)=>{
+										this.AlbumListShow[`img${index+1}`]=true
+								})
+							}
 							
-							res.data.AlbumList.map((item,index)=>{
-									this.AlbumListShow[`img${index+1}`]=true
-							})
 							
 						}
 					}

pages/blindDate/visitor.vue

@@ -206,9 +206,7 @@
 			this.pricecolor = this.$uiConfig.pricecolor;
 		},
 		onShow(){
-			if(this.visitorData.length>0){
-				this.setAllMsgSee()
-			}
+			
 			this.getMiaiMessageVisitorPageList()
 			
 		},
@@ -217,6 +215,11 @@
 			uni.setNavigationBarTitle({
 				title: this.pageTitle,
 			});
+		},
+		updated() {
+			if(this.visitorData.length>0){
+				this.setAllMsgSee()
+			}
 		}
 	}
 </script>