Skip to content

M
mallapp
Commit 9b636fa9 authored by 黄媛媛's avatar 黄媛媛
Browse files
Options

修改样式

parent e1b18feb
Hide whitespace changes
Inline Side-by-side
Showing with 36 additions and 22 deletions
pages/share-order/share-order.vue
View file @ 9b636fa9
......@@ -33,7 +33,7 @@
<!-- <Text v-if='item.Grade==0'>自购返佣</Text>
<Text v-if='item.Grade==1'>一级分销</Text>
<Text v-if='item.Grade==2'>二级分销</Text> -->
<text>{{item.GradeDescription}}</text>
<text style="margin-left: 15px;">{{item.GradeDescription}}</text>
</view>
<view class="center_l">
......@@ -212,7 +212,7 @@
flex-direction: row;
align-items: center;
justify-content: space-between;
font-size: 14px;
font-size: 13px;
}
.corderStyle .center_l{
display: flex;flex-direction: row;align-items: center;
......
pages/share-team/share-team.vue
View file @ 9b636fa9
......@@ -102,6 +102,7 @@
},
onLoad(option){
console.log(option)
if(option && option.IsEnableFXGrade){
this.IsEnableFXGrade = option.IsEnableFXGrade;
}
......
pages/share/index/index.vue
View file @ 9b636fa9
......@@ -87,7 +87,7 @@
<Text style='font-size: 12px;margin-top: 5px;'>{{sharedata.CustomModel.ReferrerName}}：{{sharedata.UserInfo.SuperiorName}}</Text>
<Text style='font-size: 12px;margin-top: 5px;' >等级：{{sharedata.UserInfo.GradeName}}</Text>
<Text style='font-size: 12px;margin-top: 5px;height: 19px;' >{{sharedata.UserInfo.IsEnableFXGrade==1 && sharedata.UserInfo.IsVip==1?'会员日期：'+ sharedata.UserInfo.VipExpiryDate:''}}</Text>
<Text style='font-size: 12px;margin-top: 5px;height:19px;' >{{sharedata.UserInfo.IsEnableFXGrade==1 && sharedata.UserInfo.IsVip==1?'会员日期：'+ sharedata.UserInfo.VipExpiryDate:''}}</Text>
</view>
</view>
......@@ -355,15 +355,17 @@
}
},
goUrl(url){
console.log(url)
if(url=='/pages/share-team/share-team' && this.sharedata.UserInfo.IsEnableFXGrade ==1){//判断我的团队是否粉象模式
uni.navigateTo({
url: url+'?IsEnableFXGrade='+ this.sharedata.UserInfo.IsEnableFXGrade
});
}else{
uni.navigateTo({
url: url
});
}
uni.navigateTo({
url: url
});
},
goUrl2(url){
......
pages/share/vipBuyCommission/vipBuyCommission.vue
View file @ 9b636fa9
......@@ -19,8 +19,8 @@
<view style="display: flex;flex-direction: column;align-items: center;">
<view v-for="(item, index) in g" :key="index" class="listbox">
<view class="box_top">
<Text style='font-size: 14px;'>订单号：{{item.OrderNo}}</Text>
<Text style='font-size: 12px;color: #999999;'>{{item.CreateDate}}</Text>
<Text style='font-size: 13px;'>订单号：{{item.OrderNo}}</Text>
<Text style='font-size: 11px;color: #999999;'>{{item.CreateDate}}</Text>
</view>
<view class="box_center" >
<view class="center_l" >
......@@ -29,7 +29,7 @@
<view class="box_ltext">
<Text class='l_name'>{{item.UserName}}</Text>
</view>
<text style="margin-left: 8px;">{{item.GradeDescription}}</text>
<text style="margin-left: 15px;">{{item.GradeDescription}}</text>
</view>
<view class="center_l">
......@@ -183,7 +183,7 @@
flex-direction: row;
align-items: center;
justify-content: space-between;
font-size: 14px;
font-size: 13px;
}
.vipBuyCommission .center_l{
display: flex;flex-direction: row;align-items: center;
......
pages/user-center/user-center.vue
View file @ 9b636fa9
......@@ -27,21 +27,21 @@
class="imgbg"
>
<view class="titlenav" :style="{paddingTop:nav}">{{pageTitle}}</view>
<view style="display: flex;flex-direction: row;align-items: center;width: 100%;margin-top: 52px;" v-if="meueData.user_center.top_style == 1">
<view class='topheard' :style="{'margin-top':modelstype==0?'52px':(modelstype==1?'37px':(modelstype==2)?'33px':0) }" v-if="meueData.user_center.top_style == 1">
<u-avatar :src="user_info.avatar" size="140" style="margin-left: 50rpx;"></u-avatar>
<view style="display: flex;flex-direction: column;justify-content: center;">
<Text style="color: #FFF;margin-left: 20rpx;font-size: 36rpx;max-width: 200px;overflow: hidden;display: inline-block;white-space: nowrap; text-overflow:ellipsis;"
<view style="display: flex;flex-direction: column;justify-content: center;height: 50px;justify-content: space-between;margin-left: 20rpx">
<Text style="color: #FFF;font-size: 36rpx;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>
<view class="member" v-if="is_icon_members_grade == 1">
<image :src="meueData.user_center.top_pic_url" mode="aspectFill" style="width: 26px;height: 26px;border-radius: 13px;"></image>
<image :src="meueData.user_center.top_pic_url" 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>
</view>
</view>
</view>
<view style="display: flex;flex-direction: column;align-items: center;" v-if="meueData.user_center.top_style == 2">
<u-avatar :src="user_info.avatar" size="140"></u-avatar>
<view style="display: flex;flex-direction: column;align-items: center;margin-top: 50px;" v-if="meueData.user_center.top_style == 2">
<u-avatar :src="user_info.avatar" size="120"></u-avatar>
<Text style="color: #FFF;margin-left: 20rpx;font-size: 36rpx;" @click="login(user_info)">{{ user_info.nickname ? user_info.nickname : '立即登录' }}</Text>
<view class="member" v-if="is_icon_members_grade == 1">
<image :src="meueData.user_center.top_pic_url" mode="aspectFill" style="width: 26px;height: 26px;border-radius: 13px;"></image>
......@@ -174,6 +174,7 @@ export default {
nav:0,
scrollTop:0,
couponsObj:{},
modelstype:0,//机型类型
};
},
components: {
......@@ -204,6 +205,12 @@ export default {
this.bottommargin = c - 2 + 'px';
this.listbottom = c - 2 + 50 + 'px';
this.contentHeight = this.$utils.calcContentHeight(c);
if(this.contentHeight>690 && this.contentHeight<776){
this.modelstype=1
}else if(this.contentHeight>=776){
this.modelstype=2
}
this.is_icon_members_grade = uni.getStorageSync('basedata') ? uni.getStorageSync('basedata').mall.setting.is_icon_members_grade : 0;
let u = '/' + currentPages[currentPages.length - 1].route;
let pages = wx.getStorageSync('basedata') ? wx.getStorageSync('basedata').bar_title : [];
......@@ -300,6 +307,7 @@ export default {
display: flex;
flex-direction: column;
align-items: center;
position: relative;
}
.userStyle .headimg {
......@@ -360,7 +368,7 @@ export default {
flex-direction: column;
align-items: center;
padding: 30rpx;
margin-top: 70rpx;
margin-top: 80rpx;
}
.userStyle .order_bar .order_bar_list {
width: 100%;
......@@ -415,7 +423,7 @@ export default {
display: flex;
flex-direction: column;
align-items: center;
justify-content: space-between;
justify-content: space-around;
position: relative;
}
.menus_item2 .contButton,
......@@ -490,11 +498,11 @@ export default {
font-size: 12px;
}
.userStyle .Receiptbalance{
width: 92%;
width: 94%;
height: 62px;
position: absolute;
left: 4%;
top: 265px;
left: 3%;
bottom: -20px;
background: #FFFFFF;
border-radius: 6px;
display: flex;
......@@ -545,4 +553,7 @@ export default {
line-height: 34px;
text-align: center;
}
.userStyle .topheard{
display: flex;flex-direction: row;align-items: center;width: 100%;
}
</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