Skip to content

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

1

parent 5e9bbfe8
Show whitespace changes
Inline Side-by-side
Showing with 65 additions and 13 deletions
pages/blindDate/personal/myrecruitstick.vue
View file @ bfa08969
...@@ -75,7 +75,7 @@ export default { ...@@ -75,7 +75,7 @@ export default {
}, },
data() { data() {
return { return {
pageTitle: "报名列表", pageTitle: "我的招募贴",
showAuth:false, showAuth:false,
u:{}, u:{},
show:false, show:false,
......
pages/blindDate/personal/mysignupList.vue
View file @ bfa08969
...@@ -57,7 +57,6 @@ ...@@ -57,7 +57,6 @@
</view> </view>
</view> </view>
</view> </view>
<u-loadmore <u-loadmore
:status="status" :status="status"
:load-text="loadText" :load-text="loadText"
......
pages/blindDate/postDetails.vue
View file @ bfa08969
...@@ -409,7 +409,7 @@ ...@@ -409,7 +409,7 @@
暂无活动 暂无活动
</view> </view>
</view> </view>
<view class="btn2" v-if="showreply==true" :style="{bottom:oneheight+'px'}"> <view class="btn2" v-if="showreply==true" :style="{'margin-bottom':oneheight+'px'}">
<view class="btn2-l"> <view class="btn2-l">
<view style="font-size: 11px;color: #B2B2B2;"> <view style="font-size: 11px;color: #B2B2B2;">
回复{{ParentName}} 回复{{ParentName}}
...@@ -523,7 +523,6 @@ ...@@ -523,7 +523,6 @@
<view class="popup-box-item" @click="show=false" style="height: 45px;"> <view class="popup-box-item" @click="show=false" style="height: 45px;">
取消 取消
</view> </view>
</view> </view>
</u-popup> </u-popup>
</view> </view>
...@@ -908,6 +907,8 @@ ...@@ -908,6 +907,8 @@
console.log(res.height,'高度') console.log(res.height,'高度')
if(res.height!=0){ if(res.height!=0){
this.oneheight=res.height-1; this.oneheight=res.height-1;
console.log(this.showreply)
this.showreply = true
this.$forceUpdate() this.$forceUpdate()
} }
}) })
......
pages/friendcircle/release.vue
View file @ bfa08969
...@@ -376,8 +376,13 @@ ...@@ -376,8 +376,13 @@
title: '发布中...' title: '发布中...'
}) })
console.log(this.addMsg) console.log(this.addMsg)
let mall_UserInfo = uni.getStorageSync("mall_UserInfo")?uni.getStorageSync("mall_UserInfo"):'';
let url='/api/AppletEducation/GetPublishDynamic'
if(mall_UserInfo.IsOpenMiAi==1){
url='/api/appletmiai/GetPublishDynamic'
}
this.request2({ this.request2({
url: '/api/AppletEducation/GetPublishDynamic', url: url,
data: this.addMsg data: this.addMsg
}, },
res => { res => {
......
pages/user-center/components/blinddate-user.vue
View file @ bfa08969
...@@ -15,7 +15,12 @@ ...@@ -15,7 +15,12 @@
<view class='topheard' style="margin-top: 30px;justify-content: space-between;" <view class='topheard' style="margin-top: 30px;justify-content: space-between;"
v-if="meueData.user_center.top_style == 1" @click="goperson()"> v-if="meueData.user_center.top_style == 1" @click="goperson()">
<view style="display: flex;flex-direction: row;align-items: center;"> <view style="display: flex;flex-direction: row;align-items: center;">
<u-avatar :src="user_info.avatar" size="140" style="margin-left: 50rpx;"></u-avatar> <view style="width: 140rpx;height: 140rpx;position: relative;margin-left: 50rpx;">
<u-avatar :src="user_info.avatar" size="140" ></u-avatar>
<image v-if="user_info.Sex==1" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/basic-nan.png" style="width: 32rpx;height: 32rpx;position: absolute;right: 0px;bottom: 0;"></image>
<image v-if="user_info.Sex==2" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/basic-nv.png" style="width: 32rpx;height: 32rpx;position: absolute;right: 0px;bottom: 0;"></image>
</view>
<view style="display: flex;flex-direction: column;justify-content: center;height: 50px;margin-left: 20rpx"> <view style="display: flex;flex-direction: column;justify-content: center;height: 50px;margin-left: 20rpx">
<Text style="color: #000000;font-size: 40rpx;max-width: 200px;overflow: hidden;display: inline-block;white-space: nowrap; text-overflow:ellipsis;" <Text style="color: #000000;font-size: 40rpx;max-width: 200px;overflow: hidden;display: inline-block;white-space: nowrap; text-overflow:ellipsis;"
@click="login(user_info)">{{ user_info.nickname ? user_info.nickname : '立即登录' }}</Text> @click="login(user_info)">{{ user_info.nickname ? user_info.nickname : '立即登录' }}</Text>
...@@ -23,6 +28,12 @@ ...@@ -23,6 +28,12 @@
<image :src="user_info.identity.level_icon" mode="aspectFill" style="width: 22px;height: 22px;border-radius: 11px;"></image> <image :src="user_info.identity.level_icon" mode="aspectFill" style="width: 22px;height: 22px;border-radius: 11px;"></image>
<Text style="margin-right: 10px;">{{ user_info.identity.level_name != null ? user_info.identity.level_name : '普通用户' }}</Text> <Text style="margin-right: 10px;">{{ user_info.identity.level_name != null ? user_info.identity.level_name : '普通用户' }}</Text>
</view> </view>
<view class="renzhen" v-if="user_info.isAttestation==0 " >
未认证
</view>
<view class="renzhen" v-if="user_info.isAttestation==1" :style="{'border':'1px solid '+mainColor,'color':mainColor}">
已认证
</view>
</view> </view>
</view> </view>
...@@ -38,16 +49,26 @@ ...@@ -38,16 +49,26 @@
</view> </view>
<view class="top_b"> <view class="top_b">
<view class="top_b_item2" @click="goUrl('/pages/blindDate/personal/followlist')"> <view class="top_b_item2" @click="goUrl('/pages/blindDate/personal/followlist')">
<text style="font-size: 20px;font-weight: bold;">{{user_info.favorite?user_info.favorite:0}}</text> <text style="font-size: 20px;font-weight: bold;">{{user_info.followNum?user_info.followNum:0}}</text>
<text style="color: #666666;">关注</text> <text style="color: #666666;">关注</text>
</view> </view>
<view class="top_b_item2" @click="goUrl('/pages/blindDate/personal/fanlist')"> <view class="top_b_item2" @click="goUrl('/pages/blindDate/personal/fanlist')">
<text style="font-size: 20px;font-weight: bold;">{{user_info.footprint?user_info.footprint:0}}</text> <text style="font-size: 20px;font-weight: bold;">{{user_info.myFollowNum?user_info.myFollowNum:0}}</text>
<text style="color: #666666;">粉丝</text> <text style="color: #666666;">粉丝</text>
</view> </view>
</view> </view>
</view> </view>
<view class="order_bar paike" style="" @click="gopointBalance">
<view style="display: flex;align-items: center;">
<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/base-xx.png" style="width: 22px;height: auto" mode='widthFix'></image>
<span style='font-size: 14px;color: #555555;margin-left: 15px'>我的星星值：</span>
</view>
<view style="display: flex;align-items: center;">
<span style='font-size: 12px;color: #A5A4AC;font-family: aa;margin-right: 20px;'>{{user_info.pointnum}}</span>
<u-icon name="arrow" color="#A5A4AC" size="20"></u-icon>
</view>
</view>
<template v-if="meueData.user_center&&meueData.user_center.nar_menus.length>0"> <template v-if="meueData.user_center&&meueData.user_center.nar_menus.length>0">
<view v-if="meueData.user_center && meueData.user_center.is_menu_status == 1" v-for="(mItem,mIndex) in meueData.user_center.nar_menus" <view v-if="meueData.user_center && meueData.user_center.is_menu_status == 1" v-for="(mItem,mIndex) in meueData.user_center.nar_menus"
:key="mIndex" :style="{'marginTop':mIndex==0&&(meueData.user_center.is_foot_bar_status==1||meueData.user_center.is_account_status==1)?'15px':''}" :key="mIndex" :style="{'marginTop':mIndex==0&&(meueData.user_center.is_foot_bar_status==1||meueData.user_center.is_account_status==1)?'15px':''}"
...@@ -80,6 +101,7 @@ ...@@ -80,6 +101,7 @@
pageTitle: '用户中心', pageTitle: '用户中心',
headStyle: {}, headStyle: {},
nav:0, nav:0,
mainColor:'',
} }
}, },
...@@ -87,6 +109,7 @@ ...@@ -87,6 +109,7 @@
this.nav = uni.getMenuButtonBoundingClientRect().top + 'px'; this.nav = uni.getMenuButtonBoundingClientRect().top + 'px';
this.headStyle.background = `linear-gradient(#9EE3E1 5%, #f3f4f6)`; this.headStyle.background = `linear-gradient(#9EE3E1 5%, #f3f4f6)`;
this.headStyle.paddingTop = this.nav; this.headStyle.paddingTop = this.nav;
this.mainColor = this.$uiConfig.mainColor;
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") ?
...@@ -117,7 +140,12 @@ ...@@ -117,7 +140,12 @@
url: '/pages/blindDate/persondetails?UserId='+ mall_UserInfo.UserId url: '/pages/blindDate/persondetails?UserId='+ mall_UserInfo.UserId
}); });
} }
} },
gopointBalance(){//跳转点数余额
uni.navigateTo({
url: '/pages/appointment/personal/pointBalance'
});
},
} }
} }
</script> </script>
...@@ -192,4 +220,7 @@ ...@@ -192,4 +220,7 @@
right: 26rpx; right: 26rpx;
top:10px ; top:10px ;
} }
.renzhen{
width: 40px;height: 15px;font-size: 10px;color: #555555;border-radius: 7px;border: 1px solid #999999;display: flex;align-items: center;justify-content: center;
}
</style> </style>
pages/user-center/user-center.vue
View file @ bfa08969
<template> <template>
<scroll-view :scroll-y="true" @scroll="scrollHandler" @scrolltoupper="scrollTopHandler" style="height: 100vh;"> <scroll-view :scroll-y="true" @scroll="scrollHandler" @scrolltoupper="scrollTopHandler" style="height: 100vh;">
<view class="userStyle"> <view class="userStyle" v-if="meueData.user_center && meueData.user_center.is_ppenmiai==0">
<view class="headStatus" v-if="scrollTop > 50" :style="[headStyle, <view class="headStatus" v-if="scrollTop > 50" :style="[headStyle,
{ {
zIndex: scrollTop < 10 ? 'unset' : 2, zIndex: scrollTop < 10 ? 'unset' : 2,
...@@ -167,12 +167,26 @@ ...@@ -167,12 +167,26 @@
<auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth="gbAuth"></auth> <auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth="gbAuth"></auth>
<tabbars></tabbars> <tabbars></tabbars>
</view> </view>
<view v-if="meueData.user_center && meueData.user_center.is_ppenmiai==1 && isloading== true">
<blinddate
:meueData='meueData'
:user_info ='user_info'
:scrollTop='scrollTop'
:modelstype='modelstype'
:bottommargin='bottommargin'
>
</blinddate>
<auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth="gbAuth"></auth>
<tabbars></tabbars>
</view>
</scroll-view> </scroll-view>
</template> </template>
<script> <script>
import tabbars from '@/components/tabbar/index'; import tabbars from '@/components/tabbar/index';
import auth from '../../components/auth/index.vue'; import auth from '../../components/auth/index.vue';
import blinddate from './components/blinddate-user.vue'
export default { export default {
data() { data() {
return { return {
...@@ -205,7 +219,8 @@ ...@@ -205,7 +219,8 @@
}, },
components: { components: {
tabbars, tabbars,
auth auth,
blinddate
}, },
created() { created() {
this.mainColor = this.$uiConfig.mainColor; this.mainColor = this.$uiConfig.mainColor;
...@@ -231,7 +246,7 @@ ...@@ -231,7 +246,7 @@
mounted() { mounted() {
let currentPages = getCurrentPages(); let currentPages = getCurrentPages();
let c = this.$uiConfig.is_bang ? 80 : 52; let c = this.$uiConfig.is_bang ? 80 : 52;
this.bottommargin = c - 2 + 'px'; this.bottommargin = c + 10 + 'px';
this.listbottom = c - 2 + 50 + 'px'; this.listbottom = c - 2 + 50 + 'px';
this.contentHeight = this.$utils.calcContentHeight(c); this.contentHeight = this.$utils.calcContentHeight(c);
if (this.contentHeight > 690 && this.contentHeight < 776) { if (this.contentHeight > 690 && this.contentHeight < 776) {
...@@ -337,6 +352,7 @@ ...@@ -337,6 +352,7 @@
if (this.mall_UserInfo && type == 1) { if (this.mall_UserInfo && type == 1) {
this.getLogin() this.getLogin()
} }
this.isloading= true
} }
); );
let u = uni.getStorageSync("mall_UserInfo"); let u = uni.getStorageSync("mall_UserInfo");
......
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