Skip to content

C
cust-app
Commit e2eaf85a authored by liwei's avatar liwei
Browse files
Options

删除了没用的图片和页面，修改了活动详情页面位置

parent 60f662bf
Expand all Show whitespace changes
Inline Side-by-side
Showing with 38 additions and 2129 deletions
pages.json
View file @ e2eaf85a
......@@ -89,7 +89,7 @@
"root": "pagesActivity",
"pages": [
{
"path": "components/activityDetail",
"path": "activityDetail",
"style": {
"navigationBarTitleText": "活动详情"
}
......@@ -104,6 +104,14 @@
"style": {
"navigationBarTitleText": "动态详情"
}
},
{
"path": "publishArticle",
"style": {
"navigationBarTitleText" : "发布动态",
"enablePullDownRefresh" : false,
"navigationBarBackgroundColor":"#fff"
}
}
]
},
......@@ -289,32 +297,6 @@
"backgroundColorTop": "#ffffff",
"backgroundColorBottom": "#ffffff"
}
},
{
"path": "school/selectSchool",
"style": {
"navigationBarTitleText": "选择学校",
"enablePullDownRefresh": true,
"onReachBottomDistance": 50,
"backgroundColor": "#ffffff",
"backgroundColorTop": "#ffffff",
"navigationBarBackgroundColor": "#ffffff"
}
}
]
},
{
"root": "pagescommunity",
"pages": [
{
"path" : "newsRelease/newsRelease",
"style" :
{
"navigationBarTitleText" : "发布动态",
"enablePullDownRefresh" : false,
"navigationBarBackgroundColor":"#fff"
}
}
]
}
......
pages/tab/activity.vue
View file @ e2eaf85a
......@@ -142,7 +142,7 @@ export default {
// 页面跳转
gotopage(item) {
uni.navigateTo({
url: '/pagesActivity/components/activityDetail?id='+item.businessId
url: '/pagesActivity/activityDetail?id='+item.businessId
})
},
},
......
pages/tab/article.vue
View file @ e2eaf85a
......@@ -3,7 +3,7 @@
<z-paging-swiper>
<!-- 发表动态按钮-->
<view :class="['add',isOpen ? 'add2':'']">
<image @click='goPage("/pagescommunity/newsRelease/newsRelease")' src="../../static/images/102.png" mode=""/>
<image @click='goPage("/pagesArticle/publishArticle")' src="../../static/images/102.png" mode=""/>
</view>
<!-- 需要固定在顶部不滚动的view放在slot="top"的view中 -->
<!-- 注意！此处的z-tabs为独立的组件，可替换为第三方的tabs，若需要使用z-tabs，请在插件市场搜索z-tabs并引入，否则会报插件找不到的错误 -->
......
pages2/explain/explain.vue
View file @ e2eaf85a
......@@ -8,7 +8,6 @@
</u-navbar>
<view class="top">
关注服务号及时接收消息通知
</view>
<view class="toptext">
<view class="toptexts">
......
pages2/school/selectSchool.vue deleted 100644 → 0
View file @ 60f662bf
<template>
<view class="container" @touchmove.stop.prevent="() => {}">
<view class="select-c">
<view class="select-c-div">
<input type="text" placeholder="请输入内容" focus="" class="u-input-item" v-model="searchValue"
@input="searchChange" @confirm="confirm">
<image src="/static/images/close.png" class="img" @click="close" mode="aspectFill"></image>
</view>
<view class="search-res-c" v-if="isShowSearchList">
<view class="search-res-item" v-for="(item,index) in searchResList" @click="() => selectSearch(item)"
:key="item.index">
<text>{{item.name}}</text>
</view>
</view>
</view>
<view class="to-btn" @click="stepToNext">
确定
</view>
<ELM ref="elm" :msg="tipMsg" :isConfirm="isConfirm" @confirm="confirm"></ELM>
</view>
</template>
<script>
// import MySelect from './components/dateSelect.vue'
import ELM from '@/components/elm-toast/index.vue';
export default {
components: {
ELM
},
data() {
return {
bgColor: 'rgba(0, 31, 63, 0)',
searchValue: '',
searchResList: [],
img: this.$BASE_URL,
isShowSearchList: false,
obj: {},
img: this.$BASE_URL,
id: "",
tipMsg: '',
isConfirm: false
};
},
onLoad(options) {
if(options.obj){
this.obj = JSON.parse(options.obj)
console.log(this.obj)
}
if(options.val){
this.searchValue = options.val
}
},
methods: {
confirm() {
this.nameSelect()
},
close() {
this.searchValue = ''
this.isShowSearchList = false
this.searchResList = []
this.id = ''
},
async nameSelect() {
const res = await this.$myRequest({
url: 'nostalgia/university/nameSelect',
data: {
name: this.searchValue
},
method: 'GET',
});
console.log(res, 'delshoucang');
if (res.data.code == 200) {
this.searchResList = res.data.data
if (res.data.data.length > 0) {
this.isShowSearchList = true
} else {
this.isShowSearchList = false
}
} else {
this.tipMsg = res.data.msg;
this.$refs.elm.showDialog();
}
},
left() {
uni.navigateBack()
},
searchChange(val) {
if (val.detail.value == '') {
this.id = ''
this.close()
}else{
this.nameSelect()
}
console.log(val.detail.value)
},
stepToNext() {
if (this.searchValue == '') {
this.tipMsg = "请选择就读/毕业学校";
this.$refs.elm.showDialog();
return
}
console.log(this.searchValue);
this.obj.school = this.searchValue
var pages = getCurrentPages();
var prevPage = pages[pages.length - 2]; //上一个页面
prevPage.$vm.BackPage(this.searchValue); //重点$vm
uni.navigateBack({
delta: 1
})
},
selectSearch(item) {
this.searchValue = item.name
this.id = item.id
this.isShowSearchList = false
}
}
}
</script>
<style lang="scss" >
.container{
position: relative;
width: 100vw;
height: 100%;
}
page {
width: 100%;
height: 100%;
}
/deep/ .indicator-class {
background: #EEF5FE;
z-index: -1;
}
.to-btn {
width: 686rpx;
height: 84rpx;
background: linear-gradient(86deg, #C2D2F9 0%, #C5C2F3 100%);
border-radius: 42rpx 42rpx 42rpx 42rpx;
text-align: center;
line-height: 84rpx;
margin: auto;
font-family: 'PingFang SC-Bold, PingFang SC';
position: fixed;
bottom: 6vh;
left: 32rpx;
color: rgba(65, 92, 158, 0.9);
font-weight: 400;
font-size: 28rpx;
}
.tips {
margin: auto;
text-align: center;
margin-top: 30rpx;
font-size: 24rpx;
font-weight: 400;
color: #B7B7B7;
}
.select-c {
width: 686rpx;
margin: auto;
height: 708rpx;
// width: 536rpx;
// height: 508rpx;
.search-res-c {
width: 600rpx;
margin: auto;
max-height: 618rpx;
font-size: 28rpx;
overflow-y: auto;
padding: 0 22rpx;
box-sizing: border-box;
background: rgba(255, 255, 255, 0.78);
// box-shadow: 0px 10px 12px 2px rgba(134, 166, 243, 0.19);
.search-res-item {
height: 70rpx;
font-family: 'PingFang SC-Regular, PingFang SC';
line-height: 70rpx;
color: rgba(45, 49, 50, 0.9);
}
}
}
.select-c-div {
width: 686rpx;
height: 90rpx;
background: #F8F8F8;
display: flex;
align-items: center;
justify-content: space-between;
border-radius: 46rpx 46rpx 46rpx 46rpx;
// border: 2rpx solid #5B83E8;
.u-input-item {
width: 86%;
margin-left: 32rpx;
font-size: 28rpx;
font-family: 'PingFang SC-Regular, PingFang SC';
font-weight: 400;
color: rgba(45, 49, 50, 0.9);
line-height: 90rpx;
}
.img {
width: 32rpx;
height: 32rpx;
margin-right: 32rpx
}
}
</style>
pagesActivity/components/activityDetail.vue → pagesActivity/activityDetail.vue
View file @ e2eaf85a
......@@ -19,16 +19,16 @@
<view class="popup-title">报名</view>
<view class="pop-body">
<view>
<image class="popbody-image" src="../../static/images/home/gonggao.png"/>
<image class="popbody-image" src="../static/images/home/gonggao.png"/>
</view>
<view>
<view class="popbod-title">{{activityDetail.title}}</view>
<view class="pop-time">
<image class="poptime-img" src="../../static/images/activity/date.png"/>
<image class="poptime-img" src="../static/images/activity/date.png"/>
<view class="poptime-text">{{activityDetail.startTime}}</view>
</view>
<view class="pop-price">
<image class="popprice-img" src="../../static/images/activity/unitPrice.png"/>
<image class="popprice-img" src="../static/images/activity/unitPrice.png"/>
<view class="popprice-text">单价:<text>￥{{activityDetail.applicationFee}}次/人</text></view>
</view>
......@@ -50,7 +50,7 @@
</template>
<script>
import {activityDetail,addApplication} from "../../api/activity/index.js"
import {activityDetail,addApplication} from "../api/activity/index.js"
export default {
data() {
return {
......
pagescommunity/newsRelease/newsRelease.vue → pagesArticle/publishArticle.vue
View file @ e2eaf85a
<template>
<view :class="['bigBox']">
<view class="box">
<textarea style="width: 100%;height: 260rpx;" v-model="form.content" :maxlength="-1" :auto-height="false"
:showConfirmBar="false" :adjust-position="false" @focus="focusFn" :focus="focus" @blur="blurFn"
......@@ -13,10 +12,7 @@
<view class="bot" :style="{'bottom':heightFn}">
<view class="btn">
<view class="l">
<!-- <image src="../../static/images/107.png" mode=""></image>
<image src="../../static/images/108.png" mode=""></image>
<u-checkbox label="匿名发布" name="匿名发布">
</u-checkbox> -->
</view>
<view class="r" @click="submit">
发布
......@@ -24,14 +20,12 @@
</view>
</view>
<ELM ref="elm" :msg="tipMsg" :isConfirm="isConfirm" @confirm="confirm"></ELM>
<login @change="getUserInfo" :isLoginPop="isLoginPop&&tabIndex!=1" class="my-select"></login>
</view>
</view>
</template>
<script>
import ELM from '@/components/elm-toast/index.vue';
import login from '../../components/login/login.vue';
export default {
components: {
ELM
......@@ -65,27 +59,26 @@
this.$refs.elm.showDialog();
return;
}
this.$myRequest({
url: 'nostalgia/article/add',
data: this.form,
withToken: true,
withLoading: true,
method: 'post',
}).then(res => {
if (res.data.code == "200") {
uni.setStorageSync("isRefresh", true)
uni.navigateBack({
delta: 1
})
} else if (res.data.code == "10006") {
this.isLoginPop=true
} else {
this.tipMsg = res.data.msg
this.$refs.elm.showDialog();
return;
}
})
// this.$myRequest({
// url: 'nostalgia/article/add',
// data: this.form,
// withToken: true,
// withLoading: true,
// method: 'post',
// }).then(res => {
// if (res.data.code == "200") {
// uni.setStorageSync("isRefresh", true)
// uni.navigateBack({
// delta: 1
// })
// } else if (res.data.code == "10006") {
// this.isLoginPop=true
// } else {
// this.tipMsg = res.data.msg
// this.$refs.elm.showDialog();
// return;
// }
// })
},
// 删除图片
deletePic(event) {
......
pagescommunity/components/Detail.vue deleted 100644 → 0
View file @ 60f662bf
This diff is collapsed.
pagescommunity/components/MessageItem.vue deleted 100644 → 0
View file @ 60f662bf
<template>
<view class="item">
<view class="one">
<view class="l">
<image @click="goPage2(info.senderId)" :src="info.senderHeadPortrait" mode="aspectFill"></image>
<view class="info">
<view class="name" @click="goPage2(info.senderId)">
{{info.senderNickName}}
</view>
<view class="m" v-if="info.category=='COMMENT'">
评论了您的动态
</view>
<view class="m" v-else-if="info.category=='LIKE_ARTICLE'">
点赞了您的动态
</view>
<view class="m" v-else-if="info.category=='LIKE_COMMENT'">
点赞了您的评论
</view>
<view class="m" v-else-if="info.category=='LIKE_REPLY'">
点赞了您的回复
</view>
<view class="time" v-else>
{{info.createTimeDesc}} {{info.senderIp}}
</view>
</view>
</view>
<view class="r">
<view class="time" v-if="isLike">
{{info.createTimeDesc}} {{info.senderIp}}
</view>
<view class="itemBen" @click="reply" v-if="!isLike">
回复
</view>
</view>
</view>
<view class="two">
<view class="m1" v-if="info.category=='REPLY'">
回复
<text @click="goPage2(info.articleUserId)">@{{info.replyNickName}}</text>
：{{info.content}}
</view>
<view class="m1" style="padding-left: 25rpx;" v-else-if="info.category!='LIKE_ARTICLE'">
{{info.content}}
</view>
<view class="coo" @click="goPage">
<view class="txt">
{{info.articleUserNickName}}：{{info.articleContent}}
</view>
<view :class="['imgs',info.img.length==2?'twoTemp':'']" v-if="info.img!==null&&info.img.length">
<image v-for="item in info.img.splice(0,3)" :src="item" mode="aspectFill"></image>
</view>
<text class="el-popper__arrow"></text>
</view>
</view>
</view>
</template>
<script>
export default {
props: {
isLike: {
type: Boolean
},
info: {
type: Object,
default: () => {}
}
},
methods: {
reply() {
this.$emit("reply")
},
goPage() {
uni.navigateTo({
url: "/pagescommunity/dynamicDetail/dynamicDetail?id=" + this.info.articleId
})
},
goPage2(id) {
uni.navigateTo({
url: '/pagesUser/userInfo?id=' + id
})
},
}
}
</script>
<style lang="scss" scoped>
.item {
margin-bottom: 48rpx;
.one {
display: flex;
justify-content: space-between;
align-items: center;
.l {
display: flex;
image {
width: 92rpx;
height: 92rpx;
border-radius: 50%;
margin-right: 28rpx;
}
.info {
display: flex;
flex-direction: column;
justify-content: space-between;
.name {
font-size: 32rpx;
color: #111827;
}
.time {
margin-top: 10rpx;
font-weight: 400;
font-size: 24rpx;
color: #8F97A4;
}
.m {
font-weight: 400;
font-size: 28rpx;
color: #434343;
}
}
}
.r {
display: flex;
flex-direction: column;
justify-content: space-between;
align-items: flex-end;
.time {
font-weight: 400;
font-size: 24rpx;
color: #8F97A4;
margin-bottom: 14rpx;
}
.itemBen {
width: 106rpx;
height: 52rpx;
background: rgba(255, 255, 255, 0.44);
border-radius: 34rpx 34rpx 34rpx 34rpx;
border: 2rpx solid #EFF5F5;
font-size: 24rpx;
color: #8F97A4;
text-align: center;
line-height: 52rpx;
}
}
}
.two {
.m1 {
font-weight: 400;
font-size: 28rpx;
color: #434343;
margin-top: 22rpx;
}
.coo {
background: #F9FAFB;
border-radius: 24rpx 24rpx 24rpx 24rpx;
padding: 36rpx 44rpx;
margin-top: 22rpx;
position: relative;
.txt {
font-weight: 400;
font-size: 28rpx;
color: #333333;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap
}
.twoTemp{
&:after{
width: calc(33% - 10rpx);
content: '';
}
image{
&:last-child{
margin-left: 10rpx;
}
}
}
.imgs {
display: flex;
justify-content: space-between;
margin-top: 24rpx;
image {
width: calc(33% - 10rpx);
height: 198rpx;
// border: 1rpx solid #707070;
border-radius: 12rpx;
// &:first-child{
// border-bottom-left-radius: 12rpx;
// border-top-left-radius:12rpx;
// }
// &:last-child{
// border-bottom-right-radius: 12rpx;
// border-top-right-radius:12rpx;
// }
}
}
.el-popper__arrow {
position: absolute;
left: 25rpx;
top: -8rpx;
width: 16rpx;
height: 16rpx;
z-index: -1;
&::before {
border-bottom-color: #F9FAFB ;
border-right-color: #F9FAFB ;
border-top-left-radius: 2rpx;
border: 2rpx solid #F9FAFB;
background: #F9FAFB;
right: 0;
position: absolute;
width: 16rpx;
height: 16rpx;
z-index: -1;
content: " ";
transform: rotate(45deg);
box-sizing: border-box;
}
}
}
}
}
</style>
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