Skip to content

M
mallapp
Commit 60675fc1 authored by 罗超's avatar 罗超
Browse files
Options

1

parent 00516ff3
Show whitespace changes
Inline Side-by-side
Showing with 422 additions and 366 deletions
pages/blindDate/editData.vue
View file @ 60675fc1
...@@ -458,25 +458,25 @@ ...@@ -458,25 +458,25 @@
}); });
return return
} }
if(this.data.EducationType==""){ if(this.data. Marriage==""){
uni.showToast({ uni.showToast({
title: '请选择学历', title: '请选择婚姻状况',
duration: 2000, duration: 2000,
icon:"none" icon:"none"
}); });
return return
} }
console.log(this.data) console.log(this.data)
// this.request2({ this.request2({
// url: '/api/AppletMiai/GetSetMiAiBaseInfo', url: '/api/AppletMiai/GetSetMiAiBaseInfo',
// data: msg data: msg
// }, },
// res => { res => {
// if (res.resultCode == 1) { if (res.resultCode == 1) {
// console.log(res) console.log(res)
// } }
// } }
// ); );
}, },
getEnumList(){ getEnumList(){
this.request2( this.request2(
...@@ -533,6 +533,11 @@ ...@@ -533,6 +533,11 @@
success: (res) =>{ success: (res) =>{
let data= res.data.user_info let data= res.data.user_info
this.data.nickname=data.nickname this.data.nickname=data.nickname
if(data.Sex==1){
this.data.Sex="男"
}else if(data.Sex==2){
this.data.Sex="女"
}
}, },
fail:(err)=> { fail:(err)=> {
// console.log(err); // console.log(err);
......
pages/blindDate/postDetails.vue
View file @ 60675fc1
<style> <style scoped>
/deep/.u-size-mini{
vertical-align: middle;
}
.postDetails{ .postDetails{
width: 100%; width: 100%;
height: 100vh; height: 100vh;
...@@ -320,7 +323,9 @@ ...@@ -320,7 +323,9 @@
<image style="width: 100%;height: 100%;" :src="details.ImageList[0]" mode="aspectFill"></image> <image style="width: 100%;height: 100%;" :src="details.ImageList[0]" mode="aspectFill"></image>
</view> </view>
<view class="details"> <view class="details">
<view class="details-title"><text v-if="details.Label!=null&& details.Label!='' " :style="{color:mainColor}">【{{details.Label}}】</text>{{details.ActivityTitle}}</view> <view class="details-title"><u-tag :text="details.Label" mode="dark" :bg-color="mainColor" size="mini" v-if="details.Label!=null&& details.Label!=''"/>
{{details.ActivityTitle}}</view>
<view @click="fxshow=true">分享</view> <view @click="fxshow=true">分享</view>
<view class="details-info"> <view class="details-info">
<view class="details-info-l"> <view class="details-info-l">
......
pages/blindDate/postbar.vue
View file @ 60675fc1
<template> <template>
<view class="postbar" :style="{ height: contentHeight }"> <view class="postbar" :style="{ height: contentHeight }">
<u-tabs <u-tabs :list="list" :is-scroll="true" :current="current" @change="change" :active-color="mainColor"></u-tabs>
:list="list"
:is-scroll="true"
:current="current"
@change="change"
:active-color="mainColor"
></u-tabs>
<u-empty v-if="g.length == 0" text="暂无内容" mode="list"></u-empty> <u-empty v-if="g.length == 0" text="暂无内容" mode="list"></u-empty>
<view <view v-if="g.length > 0" style="
v-if="g.length > 0"
style="
height: calc(100vh - 50px); height: calc(100vh - 50px);
width: calc(100vw); width: calc(100vw);
overflow: hidden; overflow: hidden;
padding-bottom: 50px; padding-bottom: 50px;
" ">
> <scroll-view :scroll-y="true" :enable-back-to-top="true" :enable-flex="true" @scrolltolower="lower"
<scroll-view style="height: 100%;">
:scroll-y="true"
:enable-back-to-top="true"
:enable-flex="true"
@scrolltolower="lower"
style="height: 100%;"
>
<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-minbox" v-if="showtype==1" @click="gopostdetails(x)"> <view class="item-minbox" v-if="showtype==1" @click="gopostdetails(x)">
<view class="minbox-l"> <view class="minbox-l">
<text class="minbox-l-t">{{x.ActivityTitle}}</text> <text class="minbox-l-t">{{x.ActivityTitle}}</text>
<view style="display: flex;align-items: center;margin-top: 20px;"> <view style="display: flex;align-items: center;margin-top: 20px;">
<view style="width: 30px;height: 30px;border-radius: 15px;position: relative;"> <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 :src="x.Photo" style="width: 100%;height: 100%;border-radius: 15px;">
<image class="gstyle" v-if="x.Sex==1" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/basic-nan-b.png" ></image> </image>
<image class="gstyle" v-if="x.Sex==2" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/basic-nv-b.png" ></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>
<view style="margin-left: 5px;display: flex;flex-direction: column;height: 30px;justify-content: space-between;"> <view
<text style="width: calc(100vw - 75px - 310rpx);overflow: hidden;white-space: nowrap;text-overflow: ellipsis;font-size: 12px;color: #111111;"> 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}} {{x.UserName}}
</text> </text>
<view style="display: flex;align-items: center;font-size: 10px;color: #858687;"> <view style="display: flex;align-items: center;font-size: 10px;color: #858687;">
...@@ -49,24 +42,50 @@ ...@@ -49,24 +42,50 @@
</view> </view>
</view> </view>
<view class="minbox-r"> <view class="minbox-r">
<image :src="x.ImageList[0]" mode="aspectFill" style="width: 100%;height: 100%;border-radius: 15px;"></image> <image :src="x.ImageList[0]" mode="aspectFill"
style="width: 100%;height: 100%;border-radius: 15px;"></image>
</view> </view>
</view> </view>
<!-- 大图模式 --> <!-- 大图模式 -->
<view v-if="showtype==2" class="maxbox" @click="gopostdetails(x)"> <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> <image :src="x.ImageList[0]" mode="aspectFill"
<view style="width: 100%;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;font-size: 16px;color: #111111;padding-top: 10px;"> style="width: 100%;height: 410rpx;border-radius: 15px;"></image>
<text v-if="x.Label!=null && x.Label!=''" :style="{color:mainColor}">【{{x.Label}}】</text> <view
{{x.ActivityTitle}}</view> style="width: 100%;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;font-size: 32rpx;color: #111111;padding-top: 10px;">
{{x.ActivityTitle}}
</view>
<view class="max-b"> <view class="max-b">
<view style="width: 35px;height: 35px;border-radius: 15px;position: relative;" @click.native.stop="goUserinfo(x)"> <!-- <text v-if="x.Label!=null && x.Label!=''" :style="{color:mainColor}">【{{x.Label}}】</text> -->
<image :src="x.Photo" style="width: 100%;height: 100%;border-radius: 15px;"></image> <view class="tagBox">
<image class="gstyle" v-if="x.Sex==1" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/basic-nan-b.png" ></image> <u-tag :text="x.Label" mode="dark" :bg-color="mainColor"
<image class="gstyle" v-if="x.Sex==2" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/basic-nv-b.png" ></image> v-if="x.Label!=null && x.Label!=''" />
</view>
<view class="infoBox">
<!-- 头像 -->
<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>
</view>
<view style="width: 170rpx; margin-left: 20rpx;">
<view
style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis;font-size: 24rpx;color: #111111;font-weight: 800;">
{{x.UserName}}
</view>
<text v-if="x.IsOpenEnroll==1"
style="font-size: 22rpx;font-weight: 500;color: #858687;">报名人数：{{x.EnrollNum}}</text>
</view>
</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;">
<!-- <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}} {{x.UserName}}
</text> </text>
<view style="display: flex;align-items: center;justify-content: space-between;font-size: 11px;color: #858687;"> <view style="display: flex;align-items: center;justify-content: space-between;font-size: 11px;color: #858687;">
...@@ -77,21 +96,15 @@ ...@@ -77,21 +96,15 @@
<text v-if="x.IsOpenEnroll==1">{{x.Deadline}}截止</text> <text v-if="x.IsOpenEnroll==1">{{x.Deadline}}截止</text>
<text v-if="x.IsOpenEnroll==2">创建时间:{{x.CreateDate}}</text> <text v-if="x.IsOpenEnroll==2">创建时间:{{x.CreateDate}}</text>
</view> </view>
</view> </view> -->
</view> </view>
</view> </view>
</view> </view>
</view> </view>
<u-loadmore <u-loadmore :status="status" :load-text="loadText" :font-size="24" :margin-top="20" :margin-bottom="20"
:status="status" bg-color="#FFF" />
:load-text="loadText"
:font-size="24"
:margin-top="20"
:margin-bottom="20"
bg-color="#FFF"
/>
<view style="width: 100%;height: 50px;"></view> <view style="width: 100%;height: 50px;"></view>
</scroll-view> </scroll-view>
...@@ -100,7 +113,8 @@ ...@@ -100,7 +113,8 @@
<!-- <image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/pp-fabu.png" style="width: 100%;height: 100%;"></image> --> <!-- <image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/pp-fabu.png" style="width: 100%;height: 100%;"></image> -->
<!-- 发布动态按钮 --> <!-- 发布动态按钮 -->
<view class="fbanniu"> <view class="fbanniu">
<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/fabupyq.png" style="height: 26rpx;" mode="aspectFit"></image> <image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/fabupyq.png"
style="height: 26rpx;" mode="aspectFit"></image>
<text style="font-size: 10px;color: #FFF;">发布</text> <text style="font-size: 10px;color: #FFF;">发布</text>
</view> </view>
</view> </view>
...@@ -111,15 +125,15 @@ ...@@ -111,15 +125,15 @@
</view> </view>
<!-- 取消提示 --> <!-- 取消提示 -->
<u-toast ref="uToast" /> <u-toast ref="uToast" />
<tabbar ></tabbar> <tabbar></tabbar>
<auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth= 'gbAuth'></auth> <auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth='gbAuth'></auth>
</view> </view>
</template> </template>
<script> <script>
import auth from "@/components/auth/index.vue"; import auth from "@/components/auth/index.vue";
import tabbar from "@/components/tabbar/index"; import tabbar from "@/components/tabbar/index";
export default { export default {
components: { components: {
auth, auth,
tabbar tabbar
...@@ -127,17 +141,17 @@ export default { ...@@ -127,17 +141,17 @@ export default {
data() { data() {
return { return {
pageTitle: "贴吧", pageTitle: "贴吧",
showAuth:false, showAuth: false,
u:{}, u: {},
list: [], list: [],
mainColor: "", mainColor: "",
contentHeight: 0, contentHeight: 0,
current:0, current: 0,
msg:{ msg: {
pageIndex: 1, pageIndex: 1,
pageSize:10, pageSize: 10,
ForumId:0, ForumId: 0,
ActivityTitle:'', ActivityTitle: '',
}, },
page_count: 1, page_count: 1,
g: [], g: [],
...@@ -148,8 +162,8 @@ export default { ...@@ -148,8 +162,8 @@ export default {
loading: "努力加载中", loading: "努力加载中",
nomore: "没有更多了", nomore: "没有更多了",
}, },
forumList:[], forumList: [],
showtype:2,//好像这里没配置了 直接显示的大图模式 showtype: 2, //好像这里没配置了 直接显示的大图模式
}; };
}, },
created() { created() {
...@@ -159,9 +173,8 @@ export default { ...@@ -159,9 +173,8 @@ export default {
mounted() { mounted() {
let currentPages = getCurrentPages(); let currentPages = getCurrentPages();
let u = "/" + currentPages[currentPages.length - 1].route; let u = "/" + currentPages[currentPages.length - 1].route;
let pages = wx.getStorageSync("basedata") let pages = wx.getStorageSync("basedata") ?
? wx.getStorageSync("basedata").bar_title wx.getStorageSync("basedata").bar_title : [];
: [];
pages.forEach((x) => { pages.forEach((x) => {
if (x.value == u) { if (x.value == u) {
this.pageTitle = x.new_name ? x.new_name : x.name; this.pageTitle = x.new_name ? x.new_name : x.name;
...@@ -171,7 +184,7 @@ export default { ...@@ -171,7 +184,7 @@ export default {
title: this.pageTitle, title: this.pageTitle,
}); });
}, },
onLoad: function (option) { onLoad: function(option) {
this.u = uni.getStorageSync("mall_UserInfo"); this.u = uni.getStorageSync("mall_UserInfo");
if (!this.u) { if (!this.u) {
this.u = { this.u = {
...@@ -179,7 +192,7 @@ export default { ...@@ -179,7 +192,7 @@ export default {
avatarUrl: "" avatarUrl: ""
}; };
// this.showAuth = true; // this.showAuth = true;
} else{ } else {
} }
this.GetForumList() this.GetForumList()
...@@ -194,10 +207,10 @@ export default { ...@@ -194,10 +207,10 @@ export default {
this.loading = true; this.loading = true;
this.init(); this.init();
}, },
Children(Id){//发布成功了返回刷新列表 Children(Id) { //发布成功了返回刷新列表
this.msg.ForumId = Id this.msg.ForumId = Id
this.forumList.forEach((x,y)=>{ this.forumList.forEach((x, y) => {
if(x.Id == Id){ if (x.Id == Id) {
this.current = y this.current = y
} }
}) })
...@@ -206,18 +219,19 @@ export default { ...@@ -206,18 +219,19 @@ export default {
this.loading = true; this.loading = true;
this.init(); this.init();
}, },
GetForumList(){ GetForumList() {
this.request2( this.request2({
{
url: '/api/AppletMiai/GetForumList', url: '/api/AppletMiai/GetForumList',
data: {} data: {}
}, },
res => { res => {
if(res.resultCode==1){ if (res.resultCode == 1) {
this.forumList = res.data this.forumList = res.data
this.list =[] this.list = []
res.data.forEach(x=>{ res.data.forEach(x => {
let obj ={name:x.Name} let obj = {
name: x.Name
}
this.list.push(obj) this.list.push(obj)
}) })
this.msg.ForumId = this.forumList[0].Id; this.msg.ForumId = this.forumList[0].Id;
...@@ -228,14 +242,13 @@ export default { ...@@ -228,14 +242,13 @@ export default {
}, },
init() { init() {
this.request2( this.request2({
{
url: '/api/AppletMiai/GetActivityPageList', url: '/api/AppletMiai/GetActivityPageList',
data: this.msg data: this.msg
}, },
res => { res => {
this.loading = false; this.loading = false;
if(res.resultCode==1){ if (res.resultCode == 1) {
this.g = this.g.concat(res.data.pageData); this.g = this.g.concat(res.data.pageData);
this.page_count = res.data.pageCount; this.page_count = res.data.pageCount;
if (this.page_count == 1) { if (this.page_count == 1) {
...@@ -255,7 +268,7 @@ export default { ...@@ -255,7 +268,7 @@ export default {
this.status = "nomore"; this.status = "nomore";
} }
}, },
gopublishing(){//发帖 gopublishing() { //发帖
this.u = uni.getStorageSync("mall_UserInfo"); this.u = uni.getStorageSync("mall_UserInfo");
if (!this.u) { if (!this.u) {
this.u = { this.u = {
...@@ -263,9 +276,9 @@ export default { ...@@ -263,9 +276,9 @@ export default {
avatarUrl: "" avatarUrl: ""
}; };
this.showAuth = true; this.showAuth = true;
} else{ } else {
uni.navigateTo({ uni.navigateTo({
url: '/pages/blindDate/postPublishing?ForumId='+this.msg.ForumId url: '/pages/blindDate/postPublishing?ForumId=' + this.msg.ForumId
}) })
} }
...@@ -276,35 +289,35 @@ export default { ...@@ -276,35 +289,35 @@ export default {
this.GetForumList(); this.GetForumList();
}, },
//关闭登录窗口 //关闭登录窗口
gbAuth(){ gbAuth() {
this.showAuth = false; this.showAuth = false;
}, },
gopostdetails(x){//招募贴的 gopostdetails(x) { //招募贴的
uni.navigateTo({ uni.navigateTo({
url: '/pages/blindDate/postDetails?Id='+x.Id url: '/pages/blindDate/postDetails?Id=' + x.Id
}) })
}, },
goUserinfo(x){//用户信息 goUserinfo(x) { //用户信息
uni.navigateTo({ uni.navigateTo({
url: '/pages/blindDate/persondetails?UserId='+ x.UserId url: '/pages/blindDate/persondetails?UserId=' + x.UserId
}); });
innerAudioContext.stop(); innerAudioContext.stop();
} }
}, },
}; };
</script> </script>
<style> <style>
.postbar { .postbar {
width: 100%; width: 100%;
height: 100%; height: 100%;
background: #FFF; background: #FFF;
position: relative; position: relative;
font-family: aa; font-family: aa;
} }
.postbar .loading { .postbar .loading {
width: 180rpx; width: 180rpx;
height: 180rpx; height: 180rpx;
background: #000000; background: #000000;
...@@ -319,14 +332,16 @@ export default { ...@@ -319,14 +332,16 @@ export default {
top: 30%; top: 30%;
margin-left: -100rpx; margin-left: -100rpx;
z-index: 999; z-index: 999;
} }
.postbar .details{
padding:0 15px; .postbar .details {
padding: 0 15px;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
} }
.postbar .release{
.postbar .release {
width: 120rpx; width: 120rpx;
height: 120rpx; height: 120rpx;
...@@ -334,8 +349,9 @@ export default { ...@@ -334,8 +349,9 @@ export default {
right: 15px; right: 15px;
bottom: 120px; bottom: 120px;
} }
.item-minbox{
.item-minbox {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
...@@ -344,16 +360,18 @@ export default { ...@@ -344,16 +360,18 @@ export default {
height: 94px; height: 94px;
margin: 15px 0; margin: 15px 0;
} }
.item-minbox .minbox-l{
.item-minbox .minbox-l {
width: calc(100vw - 40px - 310rpx); width: calc(100vw - 40px - 310rpx);
height: 94px; height: 94px;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
} }
.item-minbox .minbox-l-t{
.item-minbox .minbox-l-t {
font-size: 15px; font-size: 15px;
color: #111111; color: #111111;
width: 100%; width: 100%;
...@@ -362,29 +380,57 @@ export default { ...@@ -362,29 +380,57 @@ export default {
display: -webkit-box; display: -webkit-box;
-webkit-line-clamp: 2; -webkit-line-clamp: 2;
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
} }
.postbar .gstyle{
position: absolute;right: 0;bottom: 0; .postbar .gstyle {
position: absolute;
right: 0;
bottom: 0;
width: 13px; width: 13px;
height: 13px; height: 13px;
} }
.postbar .minbox-r{
.postbar .minbox-r {
width: 310rpx; width: 310rpx;
height: 94px; height: 94px;
border-radius: 15px; border-radius: 15px;
} }
.postbar .maxbox{
.postbar .maxbox {
width: 100%; width: 100%;
margin-top: 20px; margin-top: 20px;
} }
.postbar .max-b{
.postbar .max-b {
width: 100%; width: 100%;
height: 35px; height: 35px;
/* display: flex;
justify-content: space-between;
align-items: center; */
position: relative;
margin-top: 10px;
}
/* 活动标签 */
.tagBox {
position: absolute;
top: 50%;
transform: translateY(-50%);
left: 0;
}
/* 活动信息 */
.infoBox {
display: flex; display: flex;
justify-content: space-between;
align-items: center; align-items: center;
margin-top: 10px; position: absolute;
} top: 50%;
.fbanniu{ transform: translateY(-50%);
right: 0;
}
.fbanniu {
width: 42px; width: 42px;
height: 42px; height: 42px;
border-radius: 21px; border-radius: 21px;
......
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