Skip to content

M
mallapp
Commit 15c735d1 authored by Mac's avatar Mac
Browse files
Options

1

parent e7bd2bc1
Show whitespace changes
Inline Side-by-side
Showing with 90 additions and 11 deletions
pages/blindDate/personal/mydate.vue
View file @ 15c735d1
<style>
.details{
display: flex;
flex-direction: column;
padding: 0 15px;
}
.item{
width: 100%;
display: flex;
align-items: flex-start;
margin-top: 20px;
}
.item-left{
width: 80rpx;
height: 80rpx;
position: relative;
}
.item-right{
width: calc(100vw - 30px - 80rpx - 15px);
margin-left: 15px;
font-size: 11px;
color: #666666;
}
.item-r-text{
font-size: 15px;
color: #000000;
font-weight: 400;
}
.r-flex{
width: 100%;
display: flex;
align-items: flex-start;
margin-top: 8px;
}
.r-Remark{
width: 100%;
padding: 13px 12px;
background: #EDEDED;
color: #777777;
border-radius: 6px;
margin-top: 10px;
}
</style>
<template> <template>
<view class="mydate" :style="{ height: contentHeight }"> <view class="mydate" :style="{ height: contentHeight }">
<u-tabs <u-tabs
...@@ -26,7 +73,25 @@ ...@@ -26,7 +73,25 @@
> >
<view class="details"> <view class="details">
<view class="item" v-for="(x, i) in g" :key="i" > <view class="item" v-for="(x, i) in g" :key="i" >
<view class="item-left">
<u-avatar :src="x.WoManPhoto" v-if="UserId==x.ManId" size="80"></u-avatar>
<u-avatar :src="x.ManPhoto" v-else size="80"></u-avatar>
</view>
<view class="item-right">
<view v-if="UserId==x.ManId" class="item-r-text">{{x.WoManName}}</view>
<view v-else class="item-r-text">{{x.ManName}}</view>
<view class="r-flex">
<u-icon name="clock-o" size="24" ></u-icon>
<text style="margin-left: 5px;">{{x.Time}}</text>
</view>
<view class="r-flex">
<u-icon name="location" :color="mainColor" size="24" ></u-icon>
<text style="margin-left: 5px;">{{x.Address}}</text>
</view>
<view class="r-Remark" >
{{x.Remark!=null && x.Remark !=''?x.Remark:'无'}}
</view>
</view>
</view> </view>
</view> </view>
<u-loadmore <u-loadmore
...@@ -81,12 +146,15 @@ export default { ...@@ -81,12 +146,15 @@ export default {
loading: "努力加载中", loading: "努力加载中",
nomore: "没有更多了", nomore: "没有更多了",
}, },
UserId:0,
}; };
}, },
created() { created() {
this.contentHeight = this.$utils.calcContentHeight(-40) + "px"; this.contentHeight = this.$utils.calcContentHeight(-40) + "px";
this.mainColor = this.$uiConfig.mainColor; this.mainColor = this.$uiConfig.mainColor;
let UserId = uni.getStorageSync('mall_UserInfo')?uni.getStorageSync('mall_UserInfo').UserId : 0;
this.UserId = UserId
}, },
mounted() { mounted() {
let currentPages = getCurrentPages(); let currentPages = getCurrentPages();
......
pages/blindDate/postDetails.vue
View file @ 15c735d1
...@@ -335,7 +335,7 @@ ...@@ -335,7 +335,7 @@
</view> </view>
</view> </view>
</view> </view>
<view v-if='details.UserId!=sendMsg.ReplyUserId' class="details-info-r" :style="{background:mainColor}" @click="getfollow(details)"> <view v-if='details.UserId!=UserId' class="details-info-r" :style="{background:mainColor}" @click="getfollow(details)">
{{details.IsFocus==0?'关注':details.IsFocus==1?'已关注':'互相关注'}} {{details.IsFocus==0?'关注':details.IsFocus==1?'已关注':'互相关注'}}
</view> </view>
</view> </view>
...@@ -419,7 +419,7 @@ ...@@ -419,7 +419,7 @@
</view> </view>
<view class="pl-left twopl" v-if="x.ReplyList.length>0" @click="showtwo(x)"> <view class="pl-left twopl" v-if="x.ReplyList.length>0" @click="showtwo(x)">
<view style="font-size: 11px;color: #333333;margin: 5px 0;" v-for="(item, index) in x.ReplyList" :key="index"> <view style="font-size: 11px;color: #333333;margin: 5px 0;" v-for="(item, index) in x.ReplyList" :key="index">
<text :style="{color:mainColor}">{{item.ReplyUserName}}</text>：{{item.Content}} <text :style="{color:mainColor}">{{item.UserName}}</text>：{{item.Content}}
</view> </view>
<view v-if="x.ReplyList.length>3" style="font-size: 11px;color: #00C6C1;margin: 5px 0"> <view v-if="x.ReplyList.length>3" style="font-size: 11px;color: #00C6C1;margin: 5px 0">
查看全部 查看全部
...@@ -446,9 +446,12 @@ ...@@ -446,9 +446,12 @@
<view class="btn-l" @click="showreply=true"> <view class="btn-l" @click="showreply=true">
说点什么呗 说点什么呗
</view> </view>
<view class="btn-r" v-if="details.IsOpenEnroll==1" :style="{background:mainColor}" @click="gosigUp()"> <view class="btn-r" v-if="details.IsOpenEnroll==1 && gettime() == true " :style="{background:mainColor}" @click="gosigUp()">
立即报名 立即报名
</view> </view>
<view class="btn-r" v-if="details.IsOpenEnroll==1 && gettime() == false " >
活动结束
</view>
<view class="btn-r" v-if="details.IsOpenEnroll==2" > <view class="btn-r" v-if="details.IsOpenEnroll==2" >
暂无活动 暂无活动
</view> </view>
...@@ -619,6 +622,7 @@ ...@@ -619,6 +622,7 @@
ReplyUserId:0,//回复用户id ReplyUserId:0,//回复用户id
ImageList:[],//图片列表 ImageList:[],//图片列表
}, },
UserId:0,
show:false, show:false,
ParentName:'', ParentName:'',
twodata:{},//弹窗的数据 twodata:{},//弹窗的数据
...@@ -651,6 +655,7 @@ ...@@ -651,6 +655,7 @@
} }
let UserId = uni.getStorageSync('mall_UserInfo')?uni.getStorageSync('mall_UserInfo').UserId : 0; let UserId = uni.getStorageSync('mall_UserInfo')?uni.getStorageSync('mall_UserInfo').UserId : 0;
this.sendMsg.ReplyUserId = UserId this.sendMsg.ReplyUserId = UserId
this.UserId = UserId
}, },
methods:{ methods:{
...@@ -667,6 +672,7 @@ ...@@ -667,6 +672,7 @@
richtext = richtext.replace(regex, `<img width="100%"`); //图片超出的处理 richtext = richtext.replace(regex, `<img width="100%"`); //图片超出的处理
this.details.Content = richtext this.details.Content = richtext
this.init()//评论列表 this.init()//评论列表
if(this.details.IsOpenEnroll==1){ if(this.details.IsOpenEnroll==1){
this.GetActivityEnrollPageList()//获取招募贴报名列表 this.GetActivityEnrollPageList()//获取招募贴报名列表
} }
...@@ -722,11 +728,13 @@ ...@@ -722,11 +728,13 @@
} }
}, },
gettime(){//判断 活动是进行还是结束 gettime(){//判断 活动是进行还是结束
let text = '进行中';
let type = true
if((new Date()).getTime() >= (new Date(this.details.Deadline)).getTime()){ if((new Date()).getTime() >= (new Date(this.details.Deadline)).getTime()){
text = 已结束
type = false
} }
return text return type
}, },
//图片预览 //图片预览
previewImage(index, images) { previewImage(index, images) {
...@@ -824,6 +832,7 @@ ...@@ -824,6 +832,7 @@
this.sendMsg.Content =''; this.sendMsg.Content ='';
this.sendMsg.ParentId =0; this.sendMsg.ParentId =0;
this.sendMsg.ImageList =[]; this.sendMsg.ImageList =[];
this.sendMsg.ImageList =0;
this.ParentName=''; this.ParentName='';
this.showreply = false this.showreply = false
this.showreply2 = false this.showreply2 = false
...@@ -831,6 +840,8 @@ ...@@ -831,6 +840,8 @@
}, },
replyone(x,type=1){ replyone(x,type=1){
this.sendMsg.ParentId = x.Id; this.sendMsg.ParentId = x.Id;
this.sendMsg.ReplyUserId = x.UserId;
this.ParentName = x.UserName; this.ParentName = x.UserName;
if(type==1){ if(type==1){
...@@ -886,7 +897,7 @@ ...@@ -886,7 +897,7 @@
}, },
longpress(x,i,type){ longpress(x,i,type){
if(this.sendMsg.ReplyUserId == this.details.UserId || this.sendMsg.ReplyUserId == x.UserId ){ if(this.UserId == this.details.UserId || this.UserId == x.UserId ){
this.delete.DiscussId = x.Id this.delete.DiscussId = x.Id
this.delete.Copycontent = x.Content this.delete.Copycontent = x.Content
this.delete.index = i this.delete.index = i
...@@ -931,7 +942,7 @@ ...@@ -931,7 +942,7 @@
}, },
gobmlist(){//查看当前活动的报名列表 gobmlist(){//查看当前活动的报名列表
let type =0 let type =0
if(this.details.UserId==this.sendMsg.ReplyUserId){//如果是自己看自己的招募贴 if(this.details.UserId==this.UserId){//如果是自己看自己的招募贴
type =1 type =1
} }
uni.navigateTo({ uni.navigateTo({
......
pages/blindDate/stickSignUp.vue
View file @ 15c735d1
...@@ -79,11 +79,11 @@ ...@@ -79,11 +79,11 @@
<view class="box-c-l">联系电话</view> <view class="box-c-l">联系电话</view>
<input type="number" v-model="addMsg.Mobile" placeholder="请填写联系电话"> <input type="number" v-model="addMsg.Mobile" placeholder="请填写联系电话">
</view> </view>
<view class="box-c-i"> <!-- <view class="box-c-i">
<view class="box-c-l">报名人数</view> <view class="box-c-l">报名人数</view>
<u-number-box v-model="addMsg.PeopleNum" :min='1' @change="valChange"></u-number-box> <u-number-box v-model="addMsg.PeopleNum" :min='1' @change="valChange"></u-number-box>
</view> </view> -->
<view class="box-c-i"> <view class="box-c-i">
<view class="box-c-l">备注</view> <view class="box-c-l">备注</view>
<input type="text" v-model="addMsg.Remark" placeholder="请填写备注内容"> <input type="text" v-model="addMsg.Remark" placeholder="请填写备注内容">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment