Skip to content

M
mallapp
Commit 9ad054b8 authored by Mac's avatar Mac
Browse files
Options

1

parent 051082a5
Show whitespace changes
Inline Side-by-side
Showing with 143 additions and 136 deletions
components/miaiactivityCustom/style5.vue
View file @ 9ad054b8
......@@ -14,7 +14,7 @@
</view>
<view class="good-info" v-if="item.name && item.name!=''">
<view class="good-name">{{ item.name }}</view>
<view style="width: 130px;">
<view style="width: 150px;">
<view class="style_five_label"
:style="{background:mainColor}" v-for="(subItem,subIndex) in item.lableNameList" :key="subIndex">
{{subItem}}
......@@ -85,22 +85,23 @@
margin-bottom:0!important;
}
.good-five-stydy .img-box {
width: 110px;
height: 70px;
width: 360rpx;
height: 100px;
border-radius: 4px;
overflow: hidden;
box-shadow: 0 4px 10px 1px #D2D2D2;
}
.good-five-stydy .img-box2 {
width: 278rpx;
height: 144rpx;
width: 360rpx;
height: 100px;
border-radius: 4px;
overflow: hidden;
box-shadow: 0 4px 10px 1px #D2D2D2;
margin-right: 12px;
}
.good-five-stydy .good-info {
height: 70px;
height: 100px;
padding: 0 12px ;
flex: 1;
border: 10rpx;
......@@ -121,7 +122,7 @@
-webkit-line-clamp: 2;
line-clamp: 2;
-webkit-box-orient: vertical;
width:130px;
width:300rpx;
}
.good-five-stydy .good-info .good-price-info {
......
pages/blindDate/persondetails.vue
View file @ 9ad054b8
......@@ -231,6 +231,55 @@
此用户还未实名认证
</view>
<view v-if="dataList.IsAttestation==1">
<view class="pd-title">相册</view>
<view class="pd-img" style="margin-top: 15px;" >
<view v-if="dataList.AlbumList.length==0" style="width: 100%;height: 50px;line-height: 50px;text-align: center;color: #666666;">
暂无照片墙
</view>
<view v-if="dataList.AlbumList.length==1" style="width: 100%;height: 690rpx;border-radius: 15px;" @click="previewImage(0,dataList.AlbumList)">
<image :src="dataList.AlbumList[0]" style="width: 100%;height: 100%;border-radius: 15px;" mode="aspectFill"></image>
</view>
<view v-if="dataList.AlbumList.length==2" style="width: 100%;display: flex;flex-direction: row;align-items: center;justify-content: space-between;">
<view v-for='(x,y) in dataList.AlbumList' :key='y' style="width: calc(50vw - 20px);height: 335rpx;border-radius: 15px;" @click="previewImage(y,dataList.AlbumList)">
<image :src="x" style="width: 100%;height: 100%;border-radius: 15px;" mode="aspectFill"></image>
</view>
</view>
<view v-if="dataList.AlbumList.length==3" style="width: 100%;display: flex;flex-direction: row;align-items: center;justify-content: space-between;">
<view style="width: 448rpx;height: 448rpx;border-radius: 15px;" @click="previewImage(0,dataList.AlbumList)">
<image :src="dataList.AlbumList[0]" style="width: 100%;height: 100%;border-radius: 15px;" mode="aspectFill"></image>
</view>
<view style="margin-left: 20rpx;">
<view style="width: 220rpx;height: 214rpx;border-radius: 15px;" @click="previewImage(1,dataList.AlbumList)">
<image :src="dataList.AlbumList[1]" style="width: 100%;height: 100%;border-radius: 15px;" mode="aspectFill"></image>
</view>
<view style="width: 220rpx;height: 214rpx;border-radius: 15px;margin-top: 20rpx;" @click="previewImage(2,dataList.AlbumList)">
<image :src="dataList.AlbumList[2]" style="width: 100%;height: 100%;border-radius: 15px;" mode="aspectFill"></image>
</view>
</view>
</view>
<view v-if="dataList.AlbumList.length>3" style="display: flex;flex-direction: row;align-items: center;">
<view >
<view style="width: 448rpx;height: 448rpx;border-radius: 15px;" @click="previewImage(0,dataList.AlbumList)">
<image :src="dataList.AlbumList[0]" style="width: 100%;height: 100%;border-radius: 15px;" mode="aspectFill"></image>
</view>
<view style="width: 448rpx;height: 260rpx;border-radius: 15px;margin-top: 20rpx;" @click="previewImage(2,dataList.AlbumList)">
<image :src="dataList.AlbumList[2]" style="width: 100%;height: 100%;border-radius: 15px;" mode="aspectFill"></image>
</view>
</view>
<view style="margin-left: 20rpx;">
<view style="width: 220rpx;height: 260rpx;border-radius: 15px;position: relative;" @click="previewImage(1,dataList.AlbumList)">
<image :src="dataList.AlbumList[1]" style="width: 100%;height: 100%;border-radius: 15px;" mode="aspectFill"></image>
<view class="zhezao" v-if="dataList.AlbumList.length>4">+{{dataList.AlbumList.length}}</view>
</view>
<view style="width: 220rpx;height: 448rpx;border-radius: 15px;margin-top: 20rpx;" @click="previewImage(3,dataList.AlbumList)">
<image :src="dataList.AlbumList[3]" style="width: 100%;height: 100%;border-radius: 15px;" mode="aspectFill"></image>
</view>
</view>
</view>
</view>
<!-- 基础资料 -->
<view class="pd-title">基础资料</view>
<view class="pd-bubble">
......@@ -338,55 +387,7 @@
<view class="pd-abouthim">
{{dataList.IdealLove?dataList.IdealLove:'暂无'}}
</view> -->
<view class="pd-title">相册</view>
<view class="pd-img" style="margin-top: 15px;" >
<view v-if="dataList.AlbumList.length==0" style="width: 100%;height: 50px;line-height: 50px;text-align: center;color: #666666;">
暂无照片墙
</view>
<view v-if="dataList.AlbumList.length==1" style="width: 100%;height: 690rpx;border-radius: 15px;" @click="previewImage(0,dataList.AlbumList)">
<image :src="dataList.AlbumList[0]" style="width: 100%;height: 100%;border-radius: 15px;" mode="aspectFill"></image>
</view>
<view v-if="dataList.AlbumList.length==2" style="width: 100%;display: flex;flex-direction: row;align-items: center;justify-content: space-between;">
<view v-for='(x,y) in dataList.AlbumList' :key='y' style="width: calc(50vw - 20px);height: 335rpx;border-radius: 15px;" @click="previewImage(y,dataList.AlbumList)">
<image :src="x" style="width: 100%;height: 100%;border-radius: 15px;" mode="aspectFill"></image>
</view>
</view>
<view v-if="dataList.AlbumList.length==3" style="width: 100%;display: flex;flex-direction: row;align-items: center;justify-content: space-between;">
<view style="width: 448rpx;height: 448rpx;border-radius: 15px;" @click="previewImage(0,dataList.AlbumList)">
<image :src="dataList.AlbumList[0]" style="width: 100%;height: 100%;border-radius: 15px;" mode="aspectFill"></image>
</view>
<view style="margin-left: 20rpx;">
<view style="width: 220rpx;height: 214rpx;border-radius: 15px;" @click="previewImage(1,dataList.AlbumList)">
<image :src="dataList.AlbumList[1]" style="width: 100%;height: 100%;border-radius: 15px;" mode="aspectFill"></image>
</view>
<view style="width: 220rpx;height: 214rpx;border-radius: 15px;margin-top: 20rpx;" @click="previewImage(2,dataList.AlbumList)">
<image :src="dataList.AlbumList[2]" style="width: 100%;height: 100%;border-radius: 15px;" mode="aspectFill"></image>
</view>
</view>
</view>
<view v-if="dataList.AlbumList.length>3" style="display: flex;flex-direction: row;align-items: center;">
<view >
<view style="width: 448rpx;height: 448rpx;border-radius: 15px;" @click="previewImage(0,dataList.AlbumList)">
<image :src="dataList.AlbumList[0]" style="width: 100%;height: 100%;border-radius: 15px;" mode="aspectFill"></image>
</view>
<view style="width: 448rpx;height: 260rpx;border-radius: 15px;margin-top: 20rpx;" @click="previewImage(2,dataList.AlbumList)">
<image :src="dataList.AlbumList[2]" style="width: 100%;height: 100%;border-radius: 15px;" mode="aspectFill"></image>
</view>
</view>
<view style="margin-left: 20rpx;">
<view style="width: 220rpx;height: 260rpx;border-radius: 15px;position: relative;" @click="previewImage(1,dataList.AlbumList)">
<image :src="dataList.AlbumList[1]" style="width: 100%;height: 100%;border-radius: 15px;" mode="aspectFill"></image>
<view class="zhezao" v-if="dataList.AlbumList.length>4">+{{dataList.AlbumList.length}}</view>
</view>
<view style="width: 220rpx;height: 458rpx;border-radius: 15px;margin-top: 20rpx;" @click="previewImage(3,dataList.AlbumList)">
<image :src="dataList.AlbumList[3]" style="width: 100%;height: 100%;border-radius: 15px;" mode="aspectFill"></image>
</view>
</view>
</view>
</view>
</view>
<template v-if="isShowBtn">
<view class="edit" v-if="dataList.IsAttestation==1" :style="{background:mainColor}" @click="goedit()">
......@@ -473,7 +474,6 @@
},
res => {
if(res.resultCode==1){
console.log(res,'数据');
this.dataList = res.data;
}
}
......
pages/blindDate/postPublishing.vue
View file @ 9ad054b8
......@@ -133,15 +133,22 @@
<input type="text" v-model="addMsg.ActivityTitle" :min='0' placeholder="活动标题" style="font-size: 12px;text-align: right;">
</view>
</view>
<view class="box-item" style="justify-content: space-between;" >
<view class="box-item" style="justify-content: space-between;height: 70px;" >
<text style="font-size:12px;color: #666666;">标签</text>
<view class="flex-row">
<input type="text" v-model="addMsg.Label" :min='0' :maxlength="6" placeholder="活动标签" style="font-size: 12px;text-align: right;margin-right: 5px;">
<div>
<view class="flex-row" style="justify-content: flex-end;margin-bottom: 5px;">
<u-tag :text="x" mode="dark" :bg-color="mainColor" size='mini' style='margin-left: 5px;' v-for="(x, i) in addMsg.Label" :key="i" closeable @close="tagClick(i)"/>
</view>
<view class="flex-row" style="justify-content: flex-end;">
<input type="text" v-model="labeldemo" :min='0' :maxlength="5" placeholder="活动标签" style="font-size: 12px;text-align: right;margin-right: 5px;">
<text style="color: #999999;font-size: 10px;">
{{addMsg.Label.length}}/6
{{labeldemo.length}}/5
</text>
<u-button @click="addlable" size='mini' style='margin-left: 5px;'>添加</u-button>
</view>
</div>
</view>
<view class="box-item" style="justify-content: space-between;" >
<text style="font-size:12px;color: #666666;">是否开启报名</text>
......@@ -284,7 +291,7 @@ export default {
Content:'',
ImageList:[],
Deadline:'',
Label:'',
Label:[],
IsOpenEnroll:1,//1 是开启 2 是不开启
StartTime:'',
EndTime:'',
......@@ -293,6 +300,7 @@ export default {
LonLat:'',
LocationName:'',
},
labeldemo:'',
params: {
year: true,
month: true,
......@@ -346,7 +354,23 @@ export default {
},
methods: {
addlable(){
console.log(this.addMsg.Label.length)
if(this.addMsg.Label.length>2){
uni.showToast({
title: '标签最多3个',
icon: 'none',
duration: 2500
})
}else{
this.addMsg.Label.push(this.labeldemo)
this.labeldemo = '';
}
},
tagClick(i){
this.addMsg.Label.splice(i,1)
},
GetForumList(){
this.request2(
{
......
pages/blindDate/postbar.vue
View file @ 9ad054b8
......@@ -13,57 +13,23 @@
style="height: 100%;">
<view class="details">
<view class="item" v-for="(x, i) in g" :key="i">
<!-- 小图模式 -->
<view class="item-minbox" v-if="showtype==1" @click="gopostdetails(x)">
<view class="minbox-l">
<text class="minbox-l-t">{{x.ActivityTitle}}</text>
<view style="display: flex;align-items: center;margin-top: 20px;">
<view style="width: 30px;height: 30px;border-radius: 15px;position: relative;">
<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>
</view>
<view
style="margin-left: 5px;display: flex;flex-direction: column;height: 30px;justify-content: space-between;">
<text
style="width: calc(100vw - 75px - 310rpx);overflow: hidden;white-space: nowrap;text-overflow: ellipsis;font-size: 12px;color: #111111;">
{{x.UserName}}
</text>
<view style="display: flex;align-items: center;font-size: 10px;color: #858687;">
<text>报名{{x.EnrollNum}}人</text>
<text style="margin-left: 5px;">{{x.ReplyNum}}留言</text>
</view>
</view>
</view>
</view>
<view class="minbox-r">
<view class="maxbox" @click="gopostdetails(x)">
<image :src="x.ImageList[0]" mode="aspectFill"
style="width: 100%;height: 100%;border-radius: 15px;"></image>
</view>
style="width: 100%;height: 100%;border-top-left-radius:30rpx;border-top-right-radius:30rpx"></image>
</view>
<!-- 大图模式 -->
<view v-if="showtype==2" class="maxbox" @click="gopostdetails(x)">
<image :src="x.ImageList[0]" mode="aspectFill"
style="width: 100%;height: 410rpx;border-radius: 15px;"></image>
<view
style="width: 100%;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;font-size: 32rpx;color: #111111;padding-top: 10px;">
<view style="width: 100%;padding: 13px 10px;">
<view style="width: 100%;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;font-size: 32rpx;color: #111111;">
{{x.ActivityTitle}}
</view>
<view class="max-b">
<!-- <text v-if="x.Label!=null && x.Label!=''" :style="{color:mainColor}">【{{x.Label}}】</text> -->
<view class="tagBox">
<u-tag :text="x.Label" mode="dark" :bg-color="mainColor"
<u-tag :text="x.Label" mode="dark" :bg-color="mainColor" size='mini'
v-if="x.Label!=null && x.Label!=''" />
</view>
<view class="infoBox">
<!-- 头像 -->
<view style="width: 35px;height: 35px;border-radius: 15px;position: relative;"
<view style="width: 30px;height: 30px;border-radius: 15px;position: relative;"
@click.native.stop="goUserinfo(x)">
<image :src="x.Photo" style="width: 100%;height: 100%;border-radius: 15px;">
</image>
......@@ -83,20 +49,6 @@
style="font-size: 22rpx;font-weight: 500;color: #858687;">报名人数：{{x.EnrollNum}}</text>
</view>
</view>
<!-- <view style="margin-left: 10px;display: flex;flex-direction: column;height: 35px;justify-content: space-between;">
<text style="width: calc(100vw - 75px);overflow: hidden;white-space: nowrap;text-overflow: ellipsis;font-size: 14px;color: #111111;">
{{x.UserName}}
</text>
<view style="display: flex;align-items: center;justify-content: space-between;font-size: 11px;color: #858687;">
<view style="display: flex;align-items: center;">
<text v-if="x.IsOpenEnroll==1" style="margin-right: 5px;">报名{{x.EnrollNum}}人</text>
<text >{{x.ReplyNum}}留言</text>
</view>
<text v-if="x.IsOpenEnroll==1">{{x.Deadline}}截止</text>
<text v-if="x.IsOpenEnroll==2">创建时间:{{x.CreateDate}}</text>
</view>
</view> -->
</view>
</view>
</view>
......@@ -163,7 +115,7 @@
nomore: "没有更多了",
},
forumList: [],
showtype: 2, //好像这里没配置了 直接显示的大图模式
isAttestation:0,
};
},
created() {
......@@ -183,6 +135,8 @@
uni.setNavigationBarTitle({
title: this.pageTitle,
});
let basedata = wx.getStorageSync("basedata")
this.isAttestation = basedata.user_info.isAttestation?basedata.user_info.isAttestation:0
},
onLoad: function(option) {
this.u = uni.getStorageSync("mall_UserInfo");
......@@ -277,9 +231,18 @@
};
this.showAuth = true;
} else {
if(this.isAttestation == 1){//判断是否认证了
uni.navigateTo({
url: '/pages/blindDate/postPublishing?ForumId=' + this.msg.ForumId
})
}else{
uni.showToast({
title: '您还未实名认证,暂不能发布状态',
icon: 'none',
duration: 2500
})
}
}
},
......@@ -312,7 +275,7 @@
.postbar {
width: 100%;
height: 100%;
background: #FFF;
background: #F5F5F5;
position: relative;
font-family: aa;
}
......@@ -339,6 +302,12 @@
display: flex;
flex-direction: column;
}
.postbar .details .item{
border-radius: 30rpx;
background: #FFF;
margin-top: 20px;
}
.postbar .release {
......@@ -398,7 +367,7 @@
.postbar .maxbox {
width: 100%;
margin-top: 20px;
height: 300rpx;
}
.postbar .max-b {
......@@ -408,7 +377,7 @@
justify-content: space-between;
align-items: center; */
position: relative;
margin-top: 10px;
margin-top: 5px;
}
/* 活动标签 */
......
pages/user-center/components/blinddate-user.vue
View file @ 9ad054b8
......@@ -39,9 +39,13 @@
</view>
</view>
<view style="display: flex;">
<u-tag text="单身名片" mode="dark" :bg-color="mainColor" size='mini' style='margin-right: 2px;'/>
<u-icon name="arrow" color="#A5A4AC" size="40" style='margin-right: 10px;'></u-icon>
</view>
</view>
<view style="display: flex;flex-direction: column;align-items: center;margin-top: 23px;margin-bottom: 5px;" v-if="meueData.user_center.top_style == 2">
<u-avatar :src="user_info.avatar" size="120"></u-avatar>
<Text style="color: #000000;font-size: 40rpx;" @click="login(user_info)">{{ user_info.nickname ? user_info.nickname : '立即登录' }}</Text>
......@@ -148,11 +152,20 @@
},
goperson(){
let mall_UserInfo = uni.getStorageSync("mall_UserInfo")?uni.getStorageSync("mall_UserInfo"):null;
if(this.user_info.isAttestation == 0){
if(mall_UserInfo!=null){
uni.navigateTo({
url: '/pages/blindDate/editData?UserId='+ mall_UserInfo.UserId
});
}
}else{
if(mall_UserInfo!=null){
uni.navigateTo({
url: '/pages/blindDate/persondetails?UserId='+ mall_UserInfo.UserId
});
}
}
},
gopointBalance(){//跳转点数余额
uni.navigateTo({
......
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