Skip to content

C
cust-app
Commit 2d5732e0 authored by 罗林杰's avatar 罗林杰
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents 89f498fb 85bc2767
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 539 additions and 677 deletions
pages.json
View file @ 2d5732e0
...@@ -183,6 +183,15 @@ ...@@ -183,6 +183,15 @@
{ {
"root": "pagesme", "root": "pagesme",
"pages": [ "pages": [
{
"path": "goldCoin/consumeRecord",
"style": {
"navigationStyle": "custom",
"backgroundColor": "#F4F5F9",
"backgroundColorTop": "#F4F5F9",
"navigationBarBackgroundColor": "#F4F5F9"
}
},
{ {
"path": "goldCoin/recharge", "path": "goldCoin/recharge",
"style": { "style": {
......
pages/tab/activity.vue
View file @ 2d5732e0
This diff is collapsed.
pages/tab/my.vue
View file @ 2d5732e0
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
<text v-else>0</text> <text v-else>0</text>
</view> </view>
<view class="top-tabs"> <view class="top-tabs">
<view class="tab-1" @click="gotolike(1,info.meFollowCount)"> <view class="tab-1" @click="gotolike(1)">
<view class="tab-1-num"> <view class="tab-1-num">
<text v-if="info.meFollowCount">{{info.meFollowCount}}</text><text v-else>0</text> <text v-if="info.meFollowCount">{{info.meFollowCount}}</text><text v-else>0</text>
</view> </view>
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
我喜欢的 我喜欢的
</view> </view>
</view> </view>
<view class="tab-2" style="margin: 0 136rpx;" @click="gotolike(2,info.followMeCount)"> <view class="tab-2" style="margin: 0 136rpx;" @click="gotolike(2)">
<view class="tab-2-num"> <view class="tab-2-num">
<text v-if="info.followMeCount">{{info.followMeCount}}</text><text v-else>0</text> <text v-if="info.followMeCount">{{info.followMeCount}}</text><text v-else>0</text>
</view> </view>
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
喜欢我的 喜欢我的
</view> </view>
</view> </view>
<view class="tab-3" @click="gotolike(3,info.eachFollowCount)"> <view class="tab-3" @click="gotolike(3)">
<view class="tab-3-num"> <view class="tab-3-num">
<text v-if="info.eachFollowCount">{{info.eachFollowCount}}</text><text v-else>0</text> <text v-if="info.eachFollowCount">{{info.eachFollowCount}}</text><text v-else>0</text>
</view> </view>
...@@ -385,11 +385,13 @@ import {articleList, getOssUrl} from "../../api/article"; ...@@ -385,11 +385,13 @@ import {articleList, getOssUrl} from "../../api/article";
url: "/pagesme/me/doubleauth" url: "/pagesme/me/doubleauth"
}) })
}, },
gotolike(type,num) { //喜欢三个列表页面 //跳转我喜欢的 喜欢我的 互相喜欢的三个列表页面
gotolike(type,num) {
uni.navigateTo({ uni.navigateTo({
url: "/pagesme/me/likeList?type="+type+'&num='+num url: "/pagesme/me/likeList?type="+type
}) })
}, },
//操作项跳转
whether(i) { whether(i) {
if (i == 0) { if (i == 0) {
uni.navigateTo({ uni.navigateTo({
......
pagesUser/userList.vue
View file @ 2d5732e0
This diff is collapsed.
pagesme/goldCoin/consumeRecord.vue 0 → 100644
View file @ 2d5732e0
<template>
<view style="background-color: #F4F5F9;min-height: 100vh;">
<!-- 页头-->
<u-navbar @leftClick="backbar" bgColor="#F4F5F9" title="消费记录"></u-navbar>
<view class="recommendation" :style="{'top':navHeight+'px'}">
<view v-if="isdata" class="nodatacard">
<view class="text">暂无数据</view>
</view>
<view class="card">
<view class="recommendation-card" v-for="item in record" @click="gotoBusinessDetail(item)">
<view class="card-image"style="justify-content: left;display: flex">
<view style="margin-left: 20rpx;margin-top: 20rpx;">
<view style="font-weight: 400;font-size: 25rpx">
{{ item.title }}
</view>
<view class="message">
{{item.createDate}}
</view>
</view>
</view>
<view style="margin: 20rpx 20rpx 0 0;font-size: 26rpx;color: #8a8888;display: flex;align-items: center">
<text v-if="item.amount.includes('+')" style="color: rgb(55,156,72)">{{ item.amount }}</text>
<text v-else style="color: rgba(219,59,59,1)">{{ item.amount }}</text>
</view>
</view>
</view>
</view>
</view>
</template>
<script>
import {messageList} from "../../api/user";
import {getOssUrl} from "../../api/article";
export default {
data() {
return {
record:[
{
title:'余额充值',
createDate:'2025-02-05 09:19:13',
amount:'+10'
},
{
title:'余额消费',
createDate:'2025-02-05 09:19:13',
amount:'-10'
},
{
title:'余额充值',
createDate:'2025-02-05 09:19:13',
amount:'+20'
},
{
title:'余额消费',
createDate:'2025-02-05 09:19:13',
amount:'-30'
},
{
title:'余额充值',
createDate:'2025-02-05 09:19:13',
amount:'+40'
},
{
title:'余额消费',
createDate:'2025-02-05 09:19:13',
amount:'-50'
},
{
title:'余额充值',
createDate:'2025-02-05 09:19:13',
amount:'+60'
},
{
title:'余额消费',
createDate:'2025-02-05 09:19:13',
amount:'-70'
}
],
//是否有数据
isdata: false,
//距离表头
navHeight:'',
};
},
onShow() {
//获取当前页面的页头高度
this.menuButtonInfo = uni.getMenuButtonBoundingClientRect()
const {
top,
width,
height,
right
} = this.menuButtonInfo
uni.getSystemInfo({
success: (res) => {
const {
statusBarHeight
} = res;
const margin = top - statusBarHeight
this.navHeight = (height + statusBarHeight + (margin * 3)) //导航栏总高
}
})
},
methods: {
backbar() {
uni.navigateBack({
delta: 1, //返回层数，2则上上页
})
}
}
};
</script>
<style lang="scss" scoped>
.recommendation {
background-color: #F4F5F9;
position: relative;
padding: 0 34rpx;
.nodatacard{
height: 100vh;
display: flex;
justify-content: center;
align-items: center;
flex-direction: column;
.text{
text-align: center;
padding: 42rpx 0;
font-size: 13px;
font-family: Source Han Sans CN-Regular, Source Han Sans CN;
font-weight: 400;
color: #B9B9B9;
}
}
.recommendation-top {
display: flex;
justify-content: space-between;
margin: 56rpx 0;
.top-title {
font-size: 19px;
font-family: Source Han Sans CN-Bold, Source Han Sans CN;
font-weight: bold;
color: #222222;
}
.more {
display: flex;
.more-title {
font-size: 17px;
font-family: Source Han Sans CN-Regular, Source Han Sans CN;
font-weight: 400;
color: #848484;
margin-right: 14rpx;
}
.more-image {
display: flex;
align-items: center;
.rightimage {
width: 7px;
height: 12px;
}
}
}
}
.card {
display: grid;
grid-template-columns: 680rpx;
grid-column-gap: 22rpx;
.recommendation-card {
max-height: 180rpx;
justify-content: space-between;
display: flex;
width: 680rpx;
padding-bottom: 25rpx;
background-color: white;
.card-image {
.img {
margin: 15rpx 0 15rpx 15rpx;
width: 100rpx;
height: 100rpx;
}
}
}
}
}
.message{
max-width: 300rpx;
margin-top: 15rpx;
font-size: 24rpx;
color: #8a8888;
overflow:hidden;
text-overflow:ellipsis;
white-space:nowrap;
}
</style>
pagesme/goldCoin/recharge.vue
View file @ 2d5732e0
...@@ -185,7 +185,9 @@ export default { ...@@ -185,7 +185,9 @@ export default {
}, },
//消费记录 //消费记录
consumeRecord(){ consumeRecord(){
uni.navigateTo({
url: '/pagesme/goldCoin/consumeRecord'
});
} }
} }
} }
......
pagesme/me/likeList.vue
View file @ 2d5732e0
<template> <template>
<view style="background-color: #F4F5F9;min-height: 100vh;"> <view class="content">
<!-- 页头--> <z-paging ref="paging" empty-view-text="迈出第一步才有更多故事发生哦"
<u-navbar @leftClick="backbar" bgColor="#F4F5F9" :title="title"></u-navbar> :empty-view-title-style="{
<view class="recommendation" :style="{'top':navHeight+'px'}"> 'font-size': '32rpx',
<view v-if="isdata" class="nodatacard"> 'color': '#C9C9D0',
<view class="text">暂无数据</view> 'position': 'absolute',
</view> 'width': '100vw',
<view class="card"> }" :empty-view-img="baseUrl+'/common/empty.png'" :empty-view-img-style="{
<view class="recommendation-card" v-for="item in userList"> 'position': 'absolute',
<view class="card-image"> 'top': '210rpx',
<image @click="gotoDetail(item)" class="img" :src="item.avatarUrl"/> 'width': '447rpx',
</view> 'height': '375rpx'
<view class="card-bottom"> }" v-model="dataList" @query="queryList" :fixed="true" :auto-show-back-to-top="true" :back-to-top-with-animate="false">
<view class="bottom-left"> <!-- 页头-->
<view class="bottom-info"> <u-navbar bgColor="white" :placeholder="true" :title="title">
{{item.memNickName}} <view class="u-nav-slot" slot="left">
<image v-if="item.memSex === '0'" class="gender" :src="baseUrl+'/user/male.png'" mode=""/> <u-icon name="arrow-left" color="black" size="20" @click="backbar"/>
<image v-else class="gender" :src="baseUrl+'/user/famale.png'" mode=""/> <!-- <view @click="search" style="display: flex;align-items: center;justify-content: center"></view>-->
</view> </view>
<view class="bottom-info"> </u-navbar>
{{item.memAge}}岁 <view class="recommendation">
<text style="margin-left: 10rpx;margin-right: 10rpx;color: #BBB9B9FF;">|</text> <view class="card">
{{item.memHeight}}cm <view class="recommendation-card" v-for="item in userList">
<view class="card-image">
<image @click="gotoDetail(item)" class="img" :src="item.avatarUrl"/>
</view>
<view class="card-bottom">
<view class="bottom-left">
<view class="bottom-info">
{{item.memNickName}}
<image v-if="item.memSex === '0'" class="gender" :src="baseUrl+'/user/male.png'" mode=""/>
<image v-else class="gender" :src="baseUrl+'/user/famale.png'" mode=""/>
</view>
<view class="bottom-info">
{{item.memAge}}岁
<text style="margin-left: 10rpx;margin-right: 10rpx;color: #BBB9B9FF;">|</text>
{{item.memHeight}}cm
</view>
<view class="bottom-address">{{item.city}}</view>
</view> </view>
<view class="bottom-address">{{item.city}}</view> <image v-if="type == '1' || type == '3'" class="cnacleLike" :src="baseUrl+'/user/cancelLike.png'" @click="deleteLike(item.userId)"/>
</view> </view>
<image v-if="type == '1' || type == '3'" class="cnacleLike" :src="baseUrl+'/user/cancelLike.png'" @click="deleteLike(item.userId)"/>
</view> </view>
</view> </view>
</view> </view>
</view> </z-paging>
</view> </view>
</template> </template>
...@@ -42,6 +57,8 @@ import {calculateAge, parseDate} from "../../common"; ...@@ -42,6 +57,8 @@ import {calculateAge, parseDate} from "../../common";
export default { export default {
data() { data() {
return { return {
//分页插件存储数据的变量
dataList:[],
//图片路径 //图片路径
baseUrl: this.$IMG_URL, baseUrl: this.$IMG_URL,
//用户列表 //用户列表
...@@ -54,43 +71,23 @@ export default { ...@@ -54,43 +71,23 @@ export default {
type:'', type:'',
//页面数据的数量 //页面数据的数量
num:'', num:'',
//距离表头 //查询类型 1:我喜欢的 2：喜欢我的 3：互相喜欢的
navHeight:'', queryType:'',
share: false,
menuButtonInfo: '',
//分页查询参数
queryParam:{
page:1,
rows:10
}
}; };
}, },
onLoad(options) { onLoad(options) {
//设置页头 //设置页头
this.type = options.type; this.type = options.type;
this.num = options.num;
//获取当前页面的页头高度
this.menuButtonInfo = uni.getMenuButtonBoundingClientRect()
const {
top,
width,
height,
right
} = this.menuButtonInfo
uni.getSystemInfo({
success: (res) => {
const {
statusBarHeight
} = res;
const margin = top - statusBarHeight
this.navHeight = (height + statusBarHeight + (margin * 3)) //导航栏总高
}
})
this.getUserList() this.getUserList()
}, },
methods: { methods: {
getList(params){ //分页查询
//我喜欢的 queryList(pageNo, pageSize) {
const params = {
page: pageNo,
rows: pageSize,
queryType:this.queryType
}
likeList(params).then(res =>{ likeList(params).then(res =>{
this.userList = res.data.data this.userList = res.data.data
this.num = this.userList.length this.num = this.userList.length
...@@ -120,6 +117,7 @@ export default { ...@@ -120,6 +117,7 @@ export default {
item.city = getCity(item.memResidenceProvince,item.memResidenceCity) item.city = getCity(item.memResidenceProvince,item.memResidenceCity)
} }
}); });
this.$refs.paging.completeByTotal(this.userList,res.data.total);
}).catch(e => { }).catch(e => {
console.log(e) console.log(e)
}) })
...@@ -128,43 +126,29 @@ export default { ...@@ -128,43 +126,29 @@ export default {
getTitle(){ getTitle(){
if (this.type == '1'){ if (this.type == '1'){
//我喜欢的 //我喜欢的
this.title = '我喜欢的' + '('+ this.num +')'; this.title = '我喜欢的' + '('+this.num+')';
} else if (this.type == '2'){ } else if (this.type == '2'){
//喜欢我的 //喜欢我的
this.title = '喜欢我的' + '('+ this.num +')'; this.title = '喜欢我的'+ '('+this.num+')';
} else if (this.type == '3'){ } else if (this.type == '3'){
//互相喜欢 //互相喜欢
this.title = '互相喜欢' + '('+ this.num +')'; this.title = '互相喜欢'+ '('+this.num+')';
} }
}, },
//获取用户列表数据 //获取用户列表数据
getUserList(){ getUserList(){
if (this.type == '1'){ if (this.type == '1'){
//我喜欢的 //我喜欢的
const params = { this.queryType = '1'
page:this.queryParam.page,
rows:this.queryParam.rows,
queryType: '1'
}
this.getList(params)
} else if(this.type == '2') { } else if(this.type == '2') {
//喜欢我的 //喜欢我的
const params = { this.queryType = '2'
page:this.queryParam.page,
rows:this.queryParam.rows,
queryType: '2'
}
this.getList(params)
} else if(this.type == '3') { } else if(this.type == '3') {
//互相喜欢的 //互相喜欢的
const params = { this.queryType = '3'
page:this.queryParam.page,
rows:this.queryParam.rows,
queryType: '3'
}
this.getList(params)
} }
}, },
//取消关注
deleteLike(id){ deleteLike(id){
//是否确认 //是否确认
uni.showModal({ uni.showModal({
...@@ -193,6 +177,7 @@ export default { ...@@ -193,6 +177,7 @@ export default {
url: '/pagesUser/userInfo?memberId='+item.businessId url: '/pagesUser/userInfo?memberId='+item.businessId
}) })
}, },
//返回按钮
backbar() { backbar() {
uni.navigateBack({ uni.navigateBack({
delta: 1, //返回层数，2则上上页 delta: 1, //返回层数，2则上上页
...@@ -203,67 +188,88 @@ export default { ...@@ -203,67 +188,88 @@ export default {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.recommendation { .content {
min-height: 100vh;
background-color: #F4F5F9; background-color: #F4F5F9;
position: relative; .recommendation {
padding: 0 34rpx; background-color: #F4F5F9;
.nodatacard{ padding: 0 34rpx;
height: 100vh; .nodatacard{
display: flex; height: 100vh;
justify-content: center;
align-items: center;
flex-direction: column;
.text{
text-align: center;
padding: 42rpx 0;
font-size: 13px;
font-family: Source Han Sans CN-Regular, Source Han Sans CN;
font-weight: 400;
color: #B9B9B9;
}
}
.recommendation-top {
display: flex;
justify-content: space-between;
margin: 56rpx 0;
.top-title {
font-size: 19px;
font-family: Source Han Sans CN-Bold, Source Han Sans CN;
font-weight: bold;
color: #222222;
}
.more {
display: flex; display: flex;
justify-content: center;
.more-title { align-items: center;
font-size: 17px; flex-direction: column;
.text{
text-align: center;
padding: 42rpx 0;
font-size: 13px;
font-family: Source Han Sans CN-Regular, Source Han Sans CN; font-family: Source Han Sans CN-Regular, Source Han Sans CN;
font-weight: 400; font-weight: 400;
color: #848484; color: #B9B9B9;
margin-right: 14rpx; }
}
.recommendation-top {
display: flex;
justify-content: space-between;
margin: 56rpx 0;
.top-title {
font-size: 19px;
font-family: Source Han Sans CN-Bold, Source Han Sans CN;
font-weight: bold;
color: #222222;
} }
.more-image { .more {
display: flex; display: flex;
align-items: center;
.rightimage { .more-title {
width: 7px; font-size: 17px;
height: 12px; font-family: Source Han Sans CN-Regular, Source Han Sans CN;
font-weight: 400;
color: #848484;
margin-right: 14rpx;
}
.more-image {
display: flex;
align-items: center;
.rightimage {
width: 7px;
height: 12px;
}
} }
} }
} }
} }
.u-nav-slot {
display: flex;
align-items: center;
.text {
height: 44rpx;
font-size: 32rpx;
font-family: PingFang SC-Bold, PingFang SC;
font-weight: bold;
color: #000000;
margin-left: 14rpx;
line-height: 44rpx;
}
.img {
width: 22rpx;
height: 28rpx;
margin-left: 32rpx;
}
}
.card { .card {
display: grid; display: grid;
grid-template-columns: 330rpx 330rpx; grid-template-columns: 330rpx 330rpx;
grid-column-gap: 22rpx; grid-column-gap: 22rpx;
.recommendation-card { .recommendation-card {
width: 330rpx; width: 330rpx;
margin-bottom: 25rpx; margin-bottom: 25rpx;
...@@ -318,7 +324,6 @@ export default { ...@@ -318,7 +324,6 @@ export default {
} }
} }
} }
} }
.cnacleLike{ .cnacleLike{
height: 40rpx; height: 40rpx;
......
pagesme/set/blackList.vue
View file @ 2d5732e0
...@@ -42,70 +42,70 @@ export default { ...@@ -42,70 +42,70 @@ export default {
], ],
options4: [ options4: [
{ {
avatar: 'http://192.168.69.154/upload/opmArticle/20250205/D55F11DEB8C2410CB899978572F82981.jpg', avatar: 'http://192.168.1.23/upload/CmsNotice/20250210/00429923A8CE495ABA38CC2F527EADF5.jpg',
name: '杨涛', name: '杨涛',
read: 1, read: 1,
time: '23:59', time: '23:59',
msg: '没有消息就是最好的消息' msg: '没有消息就是最好的消息'
}, },
{ {
avatar: 'http://192.168.69.154/upload/opmArticle/20250205/D55F11DEB8C2410CB899978572F82981.jpg', avatar: 'http://192.168.1.23/upload/CmsNotice/20250210/00429923A8CE495ABA38CC2F527EADF5.jpg',
name: '雨中漫步', name: '雨中漫步',
read: 1, read: 1,
time: '23:59', time: '23:59',
msg: '没有消息就是最好的消息' msg: '没有消息就是最好的消息'
}, },
{ {
avatar: 'http://192.168.69.154/upload/opmArticle/20250205/D55F11DEB8C2410CB899978572F82981.jpg', avatar: 'http://192.168.1.23/upload/CmsNotice/20250210/00429923A8CE495ABA38CC2F527EADF5.jpg',
name: '糖果梦境', name: '糖果梦境',
read: 1, read: 1,
time: '23:59', time: '23:59',
msg: '没有消息就是最好的消息' msg: '没有消息就是最好的消息'
}, },
{ {
avatar: 'http://192.168.69.154/upload/opmArticle/20250205/D55F11DEB8C2410CB899978572F82981.jpg', avatar: 'http://192.168.1.23/upload/CmsNotice/20250210/00429923A8CE495ABA38CC2F527EADF5.jpg',
name: '海上日落', name: '海上日落',
read: 1, read: 1,
time: '23:59', time: '23:59',
msg: '没有消息就是最好的消息' msg: '没有消息就是最好的消息'
}, },
{ {
avatar: 'http://192.168.69.154/upload/opmArticle/20250205/D55F11DEB8C2410CB899978572F82981.jpg', avatar: 'http://192.168.1.23/upload/CmsNotice/20250210/00429923A8CE495ABA38CC2F527EADF5.jpg',
name: '男朋友', name: '男朋友',
read: 1, read: 1,
time: '23:59', time: '23:59',
msg: '没有消息就是最好的消息' msg: '没有消息就是最好的消息'
}, },
{ {
avatar: 'http://192.168.69.154/upload/opmArticle/20250205/D55F11DEB8C2410CB899978572F82981.jpg', avatar: 'http://192.168.1.23/upload/CmsNotice/20250210/00429923A8CE495ABA38CC2F527EADF5.jpg',
name: '女朋友', name: '女朋友',
read: 1, read: 1,
time: '23:59', time: '23:59',
msg: '没有消息就是最好的消息' msg: '没有消息就是最好的消息'
}, },
{ {
avatar: 'http://192.168.69.154/upload/opmArticle/20250205/D55F11DEB8C2410CB899978572F82981.jpg', avatar: 'http://192.168.1.23/upload/CmsNotice/20250210/00429923A8CE495ABA38CC2F527EADF5.jpg',
name: '静谧之夜', name: '静谧之夜',
read: 1, read: 1,
time: '23:59', time: '23:59',
msg: '没有消息就是最好的消息' msg: '没有消息就是最好的消息'
}, },
{ {
avatar: 'http://192.168.69.154/upload/opmArticle/20250205/D55F11DEB8C2410CB899978572F82981.jpg', avatar: 'http://192.168.1.23/upload/CmsNotice/20250210/00429923A8CE495ABA38CC2F527EADF5.jpg',
name: '风吹麦浪', name: '风吹麦浪',
read: 0, read: 0,
time: '23:59', time: '23:59',
msg: '没有消息就是最好的消息' msg: '没有消息就是最好的消息'
}, },
{ {
avatar: 'http://192.168.69.154/upload/opmArticle/20250205/D55F11DEB8C2410CB899978572F82981.jpg', avatar: 'http://192.168.1.23/upload/CmsNotice/20250210/00429923A8CE495ABA38CC2F527EADF5.jpg',
name: '路过岁月', name: '路过岁月',
read: 0, read: 0,
time: '23:59', time: '23:59',
msg: '没有消息就是最好的消息' msg: '没有消息就是最好的消息'
}, },
{ {
avatar: 'http://192.168.69.154/upload/opmArticle/20250205/D55F11DEB8C2410CB899978572F82981.jpg', avatar: 'http://192.168.1.23/upload/CmsNotice/20250210/00429923A8CE495ABA38CC2F527EADF5.jpg',
name: '繁星点点', name: '繁星点点',
read: 0, read: 0,
time: '23:59', time: '23:59',
......
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