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

pages/blindDate/message.vue

 <template>
 	<view class="page">
 		<view v-for="(item,index) in listData" :key="index">
-			<view class="itemBox" @click="jumpPage(index)">
+			<view class="itemBox" @click="jumpPage(item.key)">
 				<view class="avatarBox">
 					<image class="imgicon" :src="item.imgurl" mode="widthFix"></image>
 					<u-badge size="mini" class="badge" :absolute="false"  :count="item.Num"></u-badge>
@@ -16,9 +16,12 @@
 							{{item.Time}}
 						</view>
 					</view>
-					<view class="infoTipMsg">
+					<view class="infoTipMsg" v-if="item.Description">
 						{{item.Description}}
 					</view>
+					<view class="infoTipMsg" v-if="!item.Description">
+						暂无新消息
+					</view>
 				</view>
 			</view>
 		</view>
@@ -41,15 +44,15 @@
 			}
 		},
 		methods: {
-			jumpPage(index){
+			jumpPage(key){
 				let url="";
-				if(index==0){
+				if(key=="CircleModel"){
 					url="/pages/blindDate/circleNews?pageType=1"
-				}else if(index==1){
+				}else if(key=="SystemModel"){
 					url="/pages/blindDate/systemMsg"
-				}else if(index==2){
+				}else if(key=="PPPlusModel"){
 					url="/pages/blindDate/circleNews?pageType=2"
-				}else if(index==3){
+				}else if(key=="VisitorModel"){
 					url="/pages/blindDate/visitor"
 				}
 				uni.navigateTo({
@@ -68,15 +71,20 @@
 							for(let key in res.data ){
 								if(key=="CircleModel"){
 									res.data.CircleModel.imgurl="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/Blind-quan.png"
+									res.data.CircleModel.key="CircleModel"
 								}else if(key=="PPPlusModel"){
 									res.data.PPPlusModel.imgurl="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/Blind-xitong.png"
+									res.data.PPPlusModel.key="PPPlusModel"
 								}else if(key=="SystemModel"){
 									res.data.SystemModel.imgurl="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/Blind-ppplus.png"
+									res.data.SystemModel.key="SystemModel"
 								}else if(key=="VisitorModel"){
 									res.data.VisitorModel.imgurl="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/Blind-fangke.png"
+									res.data.VisitorModel.key="VisitorModel"
 								}
 								this.listData.push(res.data[key])
 							}
+							console.log(this.listData)
 						}
 				  	}
 				  );