Skip to content

M
mallapp
Commit 300c6e36 authored by Mac's avatar Mac
Browse files
Options

1

parent ed2c911f
Hide whitespace changes
Inline Side-by-side
Showing with 165 additions and 98 deletions
pages/friendcircle/friendcircle.vue
View file @ 300c6e36
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
position: relative; position: relative;
margin-top: 3px; margin-top: 5px;
} }
.friendcircle .r-sj-d{ .friendcircle .r-sj-d{
width: 26px; width: 26px;
......
pages/friendcircle/medynamic.vue
View file @ 300c6e36
...@@ -5,105 +5,113 @@ ...@@ -5,105 +5,113 @@
background: #FFF; background: #FFF;
} }
.mynews .ftBox { .mynews .ftBox {
width: 100%; width: 100%;
padding: 0 15px; padding: 0 15px;
margin-top: 20px; margin-top: 20px;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: flex-start; align-items: flex-start;
justify-content: space-between; justify-content: space-between;
} }
.mynews .ftBox-left{
margin-right: 15px; .mynews .ftBox-left {
} margin-right: 15px;
.mynews .ftBox-center{ }
width: 1;
flex: 1; .mynews .ftBox-center {
margin-right: 5px; width: 1;
} flex: 1;
.mynews .ftBox-right{ margin-right: 5px;
width: 80px; }
height: 80px;
border-radius: 5px; .mynews .ftBox-right {
overflow: hidden; width: 80px;
} height: 80px;
.mynews .ftBox-right-text{ border-radius: 5px;
width: 100%; overflow: hidden;
height: 100%; }
border-radius: 5px;
font-size: 14px; .mynews .ftBox-right-text {
color: #333333; width: 100%;
background: #F5F5F5; height: 100%;
border-radius: 5px;
font-size: 14px;
} color: #333333;
.mynews .text{ background: #F5F5F5;
font-size: 14px;
color: #A68237;
} }
.mynews .text {
font-size: 14px;
color: #A68237;
}
</style> </style>
<template> <template>
<div class='mynews'> <div class='mynews'>
<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 v-if="g.length > 0" style=" <view v-if="g.length > 0" style="
height: 100vh ;width: calc(100vw) height: 100vh ;width: calc(100vw)
overflow: hidden; overflow: hidden;
"> ">
<scroll-view :scroll-y="true" :enable-back-to-top="true" :enable-flex="true" @scrolltolower="lower" :style="{ height: '100%' }"> <scroll-view :scroll-y="true" :enable-back-to-top="true" :enable-flex="true" @scrolltolower="lower" :style="{ height: '100%' }">
<view class="ftBox" v-for="(x, i) in g" :key="i" @click="godetails(x)"> <view class="ftBox" v-for="(x, i) in g" :key="i" @click="godetails(x)">
<view class="ftBox-left"> <view class="ftBox-left">
<u-avatar :src="x.crearteEmPhoto" size='80' mode="square"></u-avatar> <u-avatar :src="x.crearteEmPhoto" size='80' mode="square"></u-avatar>
</view> </view>
<view class="ftBox-center"> <view class="ftBox-center">
<view class="text"> <view class="text">
{{x.createEmName}} {{x.createEmName}}
</view> </view>
<view v-if="x.realtionType==1"> <view v-if="x.realtionType==1">
<view>{{x.replyName==''?'回复了':'评论了'}} <text class="text" style="margin-left: 3px;">{{x.replyName}}</text></view> <view>{{x.replyName==''?'回复了':'评论了'}} <text class="text" style="margin-left: 3px;">{{x.replyName}}</text></view>
<view> <view style="overflow: hidden;
{{x.commentContent}} text-overflow: ellipsis;
</view> display: -webkit-box;
</view> -webkit-line-clamp: 4;
<view v-if="x.realtionType==2"> -webkit-box-orient: vertical;">
<u-icon name="like-o" :size="30" color="#000000"></u-icon> {{x.commentContent}}
</view> </view>
<view style="font-size: 11px;color: #B0B0B0;">{{x.createTime}}</view> </view>
</view> <view v-if="x.realtionType==2">
<view class="ftBox-right" > <u-icon name="like-o" :size="30" color="#000000"></u-icon>
<view class="ftBox-right-text" style="padding: 6px;" v-if="x.fileType==0"> </view>
{{x.content}} <view style="font-size: 11px;color: #B0B0B0;">{{x.createTime}}</view>
</view>
<view class="ftBox-right-text" v-if="x.fileType==1">
<image :src="x.coverPhoto" mode='aspectFill' style="width: 100%;height: 100%;border-radius: 5px;"></image>
</view>
<view class="ftBox-right-text" v-if="x.fileType==2" style="position: relative;">
<video id="myVideo" :src="x.coverPhoto" style="width: 100%;height: 100%;border-radius: 5px;" :controls='false'
:show-center-play-btn='false'></video>
<view style="width: 100%;height: 100%;position: absolute;left: 0;top: 0;display: flex;align-items: center;justify-content: center;"
>
<u-icon name="play-circle-o" :size="50" color="#FFF"></u-icon>
</view>
</view>
<view class="ftBox-right-text" v-if="x.fileType==3" style="display: flex;align-items: center;justify-content: center;background: #BBA16B;">
<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/mic.png" mode='aspectFill' style="width: 27px;height: 40px;border-radius: 5px;"></image>
</view>
</view> </view>
<view class="ftBox-right">
<view class="ftBox-right-text" style="padding: 6px;" v-if="x.fileType==0">
{{x.content}}
</view>
<view class="ftBox-right-text" v-if="x.fileType==1">
<image :src="x.coverPhoto" mode='aspectFill' style="width: 100%;height: 100%;border-radius: 5px;"></image>
</view>
<view class="ftBox-right-text" v-if="x.fileType==2" style="position: relative;">
<video id="myVideo" :src="x.coverPhoto" style="width: 100%;height: 100%;border-radius: 5px;" :controls='false'
:show-center-play-btn='false'></video>
<view style="width: 100%;height: 100%;position: absolute;left: 0;top: 0;display: flex;align-items: center;justify-content: center;">
<u-icon name="play-circle-o" :size="50" color="#FFF"></u-icon>
</view>
</view>
<view class="ftBox-right-text" v-if="x.fileType==3" style="display: flex;align-items: center;justify-content: center;background: #BBA16B;">
<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/mic.png" mode='aspectFill' style="width: 27px;height: 40px;border-radius: 5px;"></image>
</view>
</view>
</view> </view>
<u-loadmore :status="status" :load-text="loadText" :font-size="24" :margin-top="20" :margin-bottom="20" bg-color="#FFF" /> <u-loadmore :status="status" :load-text="loadText" :font-size="24" :margin-top="20" :margin-bottom="20" bg-color="#FFF" />
</scroll-view> </scroll-view>
</view> </view>
</view> </view>
</div> </div>
...@@ -135,11 +143,11 @@ ...@@ -135,11 +143,11 @@
nomore: "没有更多了", nomore: "没有更多了",
}, },
windowWidth: 0, windowWidth: 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;
this.secondary = this.$uiConfig.secondary; this.secondary = this.$uiConfig.secondary;
...@@ -158,12 +166,12 @@ ...@@ -158,12 +166,12 @@
}); });
uni.setNavigationBarTitle({ uni.setNavigationBarTitle({
title: this.pageTitle, title: this.pageTitle,
}); });
this.init() this.init()
}, },
onLoad() { onLoad() {
}, },
methods: { methods: {
init() { init() {
...@@ -186,8 +194,8 @@ ...@@ -186,8 +194,8 @@
); );
}, },
lower(e) { lower(e) {
console.log(2) console.log(2)
if (this.msg.pageIndex < this.page_count) { if (this.msg.pageIndex < this.page_count) {
this.msg.pageIndex++; this.msg.pageIndex++;
...@@ -196,13 +204,22 @@ ...@@ -196,13 +204,22 @@
} else { } else {
this.status = "nomore"; this.status = "nomore";
} }
}, },
godetails(x){ godetails(x) {
uni.navigateTo({ uni.navigateTo({
url: '/pages/friendcircle/mydetails?ID=' + x.id url: '/pages/friendcircle/mydetails?ID=' + x.id + '&index=-1'
}) })
},
getsplice(id) {
let data = []
this.g.forEach((x, i) => {
if (id != x.id) {
data.push(x)
}
})
this.g = data
} }
} }
} }
</script> </script>
pages/friendcircle/my-news.vue
View file @ 300c6e36
...@@ -142,7 +142,7 @@ ...@@ -142,7 +142,7 @@
<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 v-if="g.length > 0" :style="{'width':'100vw','overflow':'hidden','margin-top':Messagecount>0?'60px':'0','height':Messagecount>0?calc('100vh-60px'):'100vh'}"> <view v-if="g.length > 0" :style="{'width':'100vw','overflow':'hidden','margin-top':Messagecount>0?'60px':'0','height':Messagecount>0?calc('100vh-60px'):'100vh'}">
<scroll-view :scroll-y="true" :enable-back-to-top="true" :enable-flex="true" @scrolltolower="lower" :style="{ height: '100%' }"> <scroll-view :scroll-y="true" :enable-back-to-top="true" :enable-flex="true" @scrolltolower="lower" :style="{ height: '100%' }">
<view class="ftBox" v-for="(x, i) in g" :key="i" @click="godetails(x)"> <view class="ftBox" v-for="(x, i) in g" :key="i" @click="godetails(x,i)">
<view class="jiazu" v-if="x.YearTime!=''">{{x.YearTime}}年</view> <view class="jiazu" v-if="x.YearTime!=''">{{x.YearTime}}年</view>
<view class="interDList"> <view class="interDList">
<view class="interDList-left"> <view class="interDList-left">
...@@ -457,6 +457,9 @@ ...@@ -457,6 +457,9 @@
this.msg.pageIndex = 1; this.msg.pageIndex = 1;
this.g = []; this.g = [];
this.init(); this.init();
},
getsplice(i){
this.g.splice(i,1)
}, },
lower(e) { lower(e) {
...@@ -477,9 +480,9 @@ ...@@ -477,9 +480,9 @@
gbAuth() { gbAuth() {
uni.navigateBack() uni.navigateBack()
}, },
godetails(x){//跳入详情 godetails(x,i){//跳入详情
uni.navigateTo({ uni.navigateTo({
url: '/pages/friendcircle/mydetails?ID=' + x.id url: '/pages/friendcircle/mydetails?ID=' + x.id+'&index='+i
}) })
innerAudioContext.stop(); innerAudioContext.stop();
}, },
......
pages/friendcircle/mydetails.vue
View file @ 300c6e36
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
position: relative; position: relative;
margin-top: 3px; margin-top: 5px;
} }
.mydetails .r-sj-d{ .mydetails .r-sj-d{
width: 26px; width: 26px;
...@@ -240,7 +240,11 @@ ...@@ -240,7 +240,11 @@
{{detial.address}} {{detial.address}}
</view> </view>
<view class="r-sj"> <view class="r-sj">
<text>{{detial.createTime}}</text> <view style="display: flex;flex-direction: row;align-items: center;">
<text style="margin-right: 5px;">{{detial.createTime}}</text>
<text v-if='isdelete == true' :style="{'color': mainColor}" @click="showdelete=true">删除</text>
</view>
<view class="r-sj-d" @click.stop="getdian(detial)"> <view class="r-sj-d" @click.stop="getdian(detial)">
<view class="dian"></view> <view class="dian"></view>
<view class="dian"></view> <view class="dian"></view>
...@@ -312,6 +316,7 @@ ...@@ -312,6 +316,7 @@
</view> </view>
</u-popup> </u-popup>
<u-modal v-model="showdelete" content="删除该朋友圈？" :show-cancel-button='true' @cancel='showdelete=false' @confirm='deletepyq()'></u-modal>
</view> </view>
</template> </template>
...@@ -340,6 +345,9 @@ ...@@ -340,6 +345,9 @@
user:'',//点击用户保存的数据 user:'',//点击用户保存的数据
UserId:0, UserId:0,
controls:false,//显示默认控件 controls:false,//显示默认控件
isdelete:false,//是否出现删除键
showdelete:false,//提示删除的弹框
index:0,//上个页面的索引
} }
}, },
onLoad(options) { onLoad(options) {
...@@ -348,6 +356,9 @@ ...@@ -348,6 +356,9 @@
this.commentMsg.ArticleId = options.ID this.commentMsg.ArticleId = options.ID
this.init(1) this.init(1)
} }
if(options && options.index){
this.index = options.index;
}
uni.setNavigationBarTitle({ uni.setNavigationBarTitle({
title: '详情', title: '详情',
}); });
...@@ -375,6 +386,9 @@ ...@@ -375,6 +386,9 @@
if (res.resultCode == 1) { if (res.resultCode == 1) {
this.detial = res.data; this.detial = res.data;
this.detial.dianshow = false; this.detial.dianshow = false;
if(this.detial.createEmpId==this.UserId){//是当前账户 可以进行删除
this.isdelete = true
}
} }
} }
); );
...@@ -516,6 +530,39 @@ ...@@ -516,6 +530,39 @@
data: this.user.item.content, data: this.user.item.content,
}); });
}, },
deletepyq(){//删除朋友圈
this.request2({
url: '/api/AppletEducation/DeleteDynamic',
data: {articleId:this.articleId}
},
res => {
if (res.resultCode == 1) {
uni.showToast({
title: res.message,
icon: 'none',
duration: 2000
});
let that = this
let pages = getCurrentPages(); // 当前页面
let beforePage = pages[pages.length - 2]; // 前一个页面
setTimeout(() => {
uni.navigateBack({
success: function() {
if(that.index==-1){
beforePage.$vm.getsplice(that.articleId); // 执行前一个页面的created方法
}else{
beforePage.$vm.getsplice(that.index); // 执行前一个页面的created方法
}
}
});
}, 500)
}
}
);
},
enlarge(file) { enlarge(file) {
// 全屏 // 全屏
innerAudioContext.stop(); innerAudioContext.stop();
......
pages/friendcircle/release.vue
View file @ 300c6e36
...@@ -175,7 +175,7 @@ ...@@ -175,7 +175,7 @@
<view style="width: 150px; height: 200px;position: relative;margin-right: 20px;"> <view style="width: 150px; height: 200px;position: relative;margin-right: 20px;">
<video id="myVideo" :src="addMsg.FileList[0]" <video id="myVideo" :src="addMsg.FileList[0]"
controls='controls' :controls='controls'
:show-center-play-btn='false' :show-center-play-btn='false'
:show-fullscreen-btn='false' :show-fullscreen-btn='false'
@fullscreenchange='videoControl' ></video> @fullscreenchange='videoControl' ></video>
......
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