Skip to content

M
mallapp
Commit 9500c471 authored by 罗超's avatar 罗超
Browse files
Options

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

parents 732ef1e0 eba3c70b
Hide whitespace changes
Inline Side-by-side
Showing with 124 additions and 31 deletions
components/matchmaking/index.vue
View file @ 9500c471
......@@ -7,9 +7,9 @@
<image class="gstyle" v-if="item.SexStr=='女'" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/basic-nv-b.png" ></image>
<view class="boxt-center">
<view class="row">
<view class="boxtc-t-f" :style="{color:mainColor}">
<!-- <view class="boxtc-t-f" :style="{color:mainColor}">
{{item.Score}}分
</view>
</view> -->
<view class="box-name">{{item.name}}</view>
</view>
<view class="row">
......
pages/blindDate/baomingList.vue
View file @ 9500c471
......@@ -44,7 +44,7 @@
<view v-if="type==1" class="ftBox">
<view v-for="(x, i) in g" :key="i">
<view class="interDList" style="border-bottom: none;">
<view style="position: relative;">
<view style="position: relative;" @click="goUserinfo(x)">
<u-avatar :src="x.Photo" size="80"></u-avatar>
<image v-if="x.Sex==1" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/basic-nan.png" style="width: 32rpx;height: 32rpx;position: absolute;right: 0;bottom: 0;"></image>
<image v-if="x.Sex==2" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/basic-nv.png" style="width: 32rpx;height: 32rpx;position: absolute;right: 0;bottom: 0;"></image>
......@@ -253,6 +253,12 @@ export default {
gbAuth(){
uni.navigateBack()
},
goUserinfo(x){//用户信息
uni.navigateTo({
url: '/pages/blindDate/persondetails?UserId='+ x.UserId
});
innerAudioContext.stop();
}
},
};
......
pages/blindDate/personal/fanlist.vue
View file @ 9500c471
......@@ -18,7 +18,7 @@
>
<view class="ftBox">
<view class="interDList" v-for="(x, i) in g" :key="i">
<view style="position: relative;">
<view style="position: relative;" @click="goUserinfo(x)">
<u-avatar :src="x.Photo" size="80"></u-avatar>
<image v-if="x.Sex==1" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/basic-nan.png" style="width: 32rpx;height: 32rpx;position: absolute;right: 0;bottom: 0;"></image>
<image v-if="x.Sex==1" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/basic-nv.png" style="width: 32rpx;height: 32rpx;position: absolute;right: 0;bottom: 0;"></image>
......@@ -196,6 +196,12 @@ export default {
gbAuth(){
uni.navigateBack()
},
goUserinfo(x){//用户信息
uni.navigateTo({
url: '/pages/blindDate/persondetails?UserId='+ x.UserId
});
innerAudioContext.stop();
}
},
};
......
pages/blindDate/personal/followlist.vue
View file @ 9500c471
......@@ -18,7 +18,7 @@
>
<view class="ftBox">
<view class="interDList" v-for="(x, i) in g" :key="i">
<view style="position: relative;">
<view style="position: relative;" @click="goUserinfo(x)">
<u-avatar :src="x.Photo" size="80"></u-avatar>
<image v-if="x.Sex==1" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/basic-nan.png" style="width: 32rpx;height: 32rpx;position: absolute;right: 0;bottom: 0;"></image>
<image v-if="x.Sex==2" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/basic-nv.png" style="width: 32rpx;height: 32rpx;position: absolute;right: 0;bottom: 0;"></image>
......@@ -198,6 +198,12 @@ export default {
gbAuth(){
uni.navigateBack()
},
goUserinfo(x){//用户信息
uni.navigateTo({
url: '/pages/blindDate/persondetails?UserId='+ x.UserId
});
innerAudioContext.stop();
}
},
};
......
pages/blindDate/personal/mydate.vue
View file @ 9500c471
......@@ -42,19 +42,45 @@
border-radius: 6px;
margin-top: 10px;
}
.getsize{
width: 100%;
height: 100%;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
}
.getsize-kh{
width: 128rpx;
height: 128rpx;
position: fixed;
right: 16px;
bottom: 35px;
}
.contButton{
width: 100%;
height: 100%;
position: absolute;
left: 0;
top: 0;
opacity: 0;
}
</style>
<template>
<view class="mydate" :style="{ height: contentHeight }">
<u-tabs
:list="list"
:is-scroll="false"
:current="current"
@change="change"
:active-color="mainColor"
></u-tabs>
<u-empty v-if="g.length == 0" text="暂无约会记录" mode="list"></u-empty>
<view class="getsize" v-if="g.length == 0">
<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/mydate-bg.png" style="width: 400rpx;height: auto;margin-bottom: 30px;" mode="widthFix"></image>
<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/mydate-text.png" style="width: 466rpx;height: auto" mode="widthFix"></image>
<view class="getsize-kh">
<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/mydate-kh.png" style="width: 128rpx;height: 128rpx;" mode=""></image>
<button open-type="contact" class="contButton" ></button>
</view>
</view>
<view
v-if="g.length > 0"
......@@ -73,7 +99,7 @@
>
<view class="details">
<view class="item" v-for="(x, i) in g" :key="i" >
<view class="item-left">
<view class="item-left" @click="goUserinfo(x)">
<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>
......@@ -223,6 +249,19 @@ export default {
gbAuth(){
uni.navigateBack()
},
goUserinfo(x){//用户信息
let UserId = 0
if(this.UserId==x.ManId){
UserId = x.WoManId
}else{
UserId = x.ManId
}
uni.navigateTo({
url: '/pages/blindDate/persondetails?UserId='+ UserId
});
innerAudioContext.stop();
}
......@@ -232,7 +271,7 @@ export default {
<style>
.mydate {
width: 100%;
height: 100%;
height: 100vh;
background: #FFF;
position: relative;
}
......
pages/blindDate/postDetails.vue
View file @ 9500c471
......@@ -323,7 +323,7 @@
<view class="details-title"><text v-if="details.Label!=null&& details.Label!='' " :style="{color:mainColor}">【{{details.Label}}】</text>{{details.ActivityTitle}}</view>
<view class="details-info">
<view class="details-info-l">
<view style="width: 35px;height: 35px;border-radius: 50%;position: relative;">
<view style="width: 35px;height: 35px;border-radius: 50%;position: relative;" @click.native.stop="goUserinfo(details)">
<u-avatar :src="details.Photo" size="70"></u-avatar>
<image class="gstyle" v-if="details.Sex==1" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/basic-nan-b.png" ></image>
<image class="gstyle" v-if="details.Sex==2" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/basic-nv-b.png" ></image>
......@@ -360,11 +360,11 @@
</view>
<view class="activitytime-item" v-if='details.IsOpenEnroll==1'>
<view class="activitytime-item-l">
报名人数
活动人数
</view>
<text>男 {{details.ManNum}}人 <text style="margin-left: 10px;">女 {{details.WoManNum}}人 </text> </text>
</view>
<view class="activitytime-item" v-if="details.LocationName !=null && details.LocationName!=''">
<view class="activitytime-item" v-if="details.LocationName !=null && details.LocationName!=''" @click="goopenlocation(details)">
<view class="activitytime-item-l">
活动地址
</view>
......@@ -398,7 +398,7 @@
<view v-for="(x, i) in g" :key="i" style="width: 100%;">
<view class="pl-top" @click="replyone(x)" @longpress='longpress(x,i,1)'>
<view style="display: flex;align-items: center;">
<view style="width: 30px;height: 30px;border-radius: 50%;position: relative;">
<view style="width: 30px;height: 30px;border-radius: 50%;position: relative;" @click.native.stop="goUserinfo(x)">
<u-avatar :src="x.Photo" size="60"></u-avatar>
<image class="gstyle" v-if="x.Sex==1" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/basic-nan-b.png" ></image>
<image class="gstyle" v-if="x.Sex==2" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/basic-nv-b.png" ></image>
......@@ -495,7 +495,7 @@
<view style="padding:0 15px;">
<view class="pl-top">
<view style="display: flex;align-items: center;">
<view style="width: 30px;height: 30px;border-radius: 50%;position: relative;">
<view style="width: 30px;height: 30px;border-radius: 50%;position: relative;" @click.native.stop="goUserinfo(twodata)">
<u-avatar :src="twodata.Photo" size="60"></u-avatar>
<image class="gstyle" v-if="twodata.Sex==1" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/basic-nan-b.png" ></image>
<image class="gstyle" v-if="twodata.Sex==2" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/basic-nv-b.png" ></image>
......@@ -522,7 +522,7 @@
<view v-for="(x, i) in g2" :key="i">
<view class="pl-top" @click="replyone(x,2)" @longpress='longpress(x,i,2)'>
<view style="display: flex;align-items: center;">
<view style="width: 30px;height: 30px;border-radius: 50%;position: relative;">
<view style="width: 30px;height: 30px;border-radius: 50%;position: relative;" @click.native.stop="goUserinfo(x)">
<u-avatar :src="x.Photo" size="60"></u-avatar>
<image class="gstyle" v-if="x.Sex==1" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/basic-nan-b.png" ></image>
......@@ -1051,7 +1051,24 @@
gbAuth(){
this.showAuth = false;
},
goUserinfo(x){//用户信息
uni.navigateTo({
url: '/pages/blindDate/persondetails?UserId='+ x.UserId
});
innerAudioContext.stop();
},
goopenlocation(x){
uni.openLocation({
latitude: Number(x.LonLat.split(',')[1]) ,
longitude: Number(x.LonLat.split(',')[0]),
success: function () {
console.log('success');
},
fail:function(err){
console.log(err)
}
});
}
}
}
</script>
......
pages/blindDate/postPublishing.vue
View file @ 9500c471
......@@ -244,7 +244,7 @@
<view style="font-size: 13px;color: #999999;margin: 10px 0;">贴吧只能选择一个，发布前可更改</view>
</view>
<scroll-view scroll-y="true" style="max-height: calc(100vh * 0.7 - 65px);padding-bottom: 20px;">
<scroll-view scroll-y="true" style="max-height: calc(100vh * 0.7 - 65px);padding-bottom: 20px;min-height:calc(100vh * 0.4 - 65px) ;">
<view class="ht-box">
<view v-for="(x,y) in forumList" :key="y" class="foritem" @click="select(x)" :style="{color:x.Id == addMsg.ForumId?'#FFF':'#666666',background:x.Id == addMsg.ForumId?mainColor:'#F9F9F9'}">
{{x.Name}}
......@@ -330,6 +330,9 @@ export default {
this.action = this.host2 + '/api/File/UploadTencent?MallBaseId=' + MallBaseId
},
onLoad: function (option) {
if(option && option.ForumId){
this.addMsg.ForumId= option.ForumId
}
this.u = uni.getStorageSync("mall_UserInfo");
if (!this.u) {
this.u = {
......@@ -353,8 +356,11 @@ export default {
res => {
if(res.resultCode==1){
this.forumList = res.data
this.addMsg.ForumId = this.forumList[0].Id
this.ForumName =this.forumList[0].Name;
for(let i=0;i<this.forumList.length;i++){
if(this.forumList[i].Id == this.addMsg.ForumId){
this.ForumName =this.forumList[i].Name;
}
}
}
}
);
......
pages/blindDate/postbar.vue
View file @ 9500c471
......@@ -59,7 +59,7 @@
<text v-if="x.Label!=null && x.Label!=''" :style="{color:mainColor}">【{{x.Label}}】</text>
{{x.ActivityTitle}}</view>
<view class="max-b">
<view style="width: 35px;height: 35px;border-radius: 15px;position: relative;">
<view style="width: 35px;height: 35px;border-radius: 15px;position: relative;" @click.native.stop="goUserinfo(x)">
<image :src="x.Photo" style="width: 100%;height: 100%;border-radius: 15px;"></image>
<image class="gstyle" v-if="x.Sex==1" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/basic-nan-b.png" ></image>
<image class="gstyle" v-if="x.Sex==2" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/basic-nv-b.png" ></image>
......@@ -260,7 +260,7 @@ export default {
this.showAuth = true;
} else{
uni.navigateTo({
url: '/pages/blindDate/postPublishing'
url: '/pages/blindDate/postPublishing?ForumId='+this.msg.ForumId
})
}
......@@ -278,6 +278,12 @@ export default {
uni.navigateTo({
url: '/pages/blindDate/postDetails?Id='+x.Id
})
},
goUserinfo(x){//用户信息
uni.navigateTo({
url: '/pages/blindDate/persondetails?UserId='+ x.UserId
});
innerAudioContext.stop();
}
......
pages/friendcircle/friendcircle.vue
View file @ 9500c471
......@@ -259,12 +259,12 @@
<scroll-view :scroll-y="true" :enable-back-to-top="true" :enable-flex="true" @scroll='inputscroll' @scrolltolower="lower"
:style="{ height: '100%' }">
<view class="ftBox" v-for="(x, i) in g" :key="i" :style="{'margin-top':Messagecount>0 && i==0?'80px':'20px'}">
<view class="ftBox-left">
<view class="ftBox-left" @click="goUserinfo(x)">
<u-avatar :src="x.crearteEmPhoto" size='80' mode="square"></u-avatar>
</view>
<view class="ftBox-right">
<view class="text" :style="{'font-size': '14px','font-weight': 'bold','margin-bottom': '5px','color':mainColor}">{{x.createEmName}}</view>
<view class="text2" style="font-size: 14px;margin-bottom: 5px;"> <text @click="gohuati(x)" style="font-weight: 600;margin-right: 2px;" v-if="x.TalkContent!=null && x.TalkContent!=''">#{{x.TalkContent}}#</text> {{x.content}}</view>
<view class="text" :style="{'font-size': '14px','font-weight': 'bold','margin-bottom': '5px',color:'#010101'}">{{x.createEmName}}</view>
<view class="text2" style="font-size: 14px;margin-bottom: 5px;"> <text @click="gohuati(x)" :style="{'font-weight': '600','margin-right': '2px',color:mainColor}" v-if="x.TalkContent!=null && x.TalkContent!=''">#{{x.TalkContent}}#</text> {{x.content}}</view>
<!-- 图片模式 -->
<view class="imgmode" v-if="x.fileType==1">
<view v-if="x.files.length==1" style="width: 150px;height:200px;margin-bottom: 6px;" @click="previewImage(0,x.files)">
......@@ -880,6 +880,12 @@
url: '/pages/friendcircle/friendcircle?TalkId='+x.TalkId+'&TalkContent='+x.TalkContent+'&barshow=1'
})
innerAudioContext.stop();
},
goUserinfo(x){//用户信息
uni.navigateTo({
url: '/pages/blindDate/persondetails?UserId='+ x.createEmpId
});
innerAudioContext.stop();
}
}
}
......
pages/friendcircle/release.vue
View file @ 9500c471
......@@ -359,7 +359,7 @@
<view style="font-size: 13px;color: #999999;margin: 10px 0;">话题只能选择一个，发布前可更改</view>
</view>
<scroll-view scroll-y="true" style="max-height: calc(100vh * 0.7 - 65px);padding-bottom: 20px;">
<scroll-view scroll-y="true" style="max-height: calc(100vh * 0.7 - 65px);padding-bottom: 20px;min-height:calc(100vh * 0.4 - 65px)">
<view class="ht-box">
<view v-for="(x,y) in TalkList" :key="y" class="foritem" @click="select(x)" :style="{color:x.Id == addMsg.TalkId?'#FFF':'#666666',background:x.Id == addMsg.TalkId?mainColor:'#F9F9F9'}">
{{x.Content}}
......@@ -468,6 +468,7 @@
this.addMsg.TalkId =0;
this.TalkName = '';
}
this.show=false
},
GetEducationTalk(){//获取朋友圈话题
......
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