Skip to content

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

修改一些样式问题

parent 04d7f8ce
Show whitespace changes
Inline Side-by-side
Showing with 48 additions and 28 deletions
components/rubik/index.vue
View file @ d1cb9a02
...@@ -27,7 +27,7 @@ export default { ...@@ -27,7 +27,7 @@ export default {
} }
}, },
created() { created() {
console.log(this.ad) // console.log(this.ad)
this.ad.list.forEach((x) => { this.ad.list.forEach((x) => {
x.formatStyle = { x.formatStyle = {
width: x.width, width: x.width,
......
pages/index/index.vue
View file @ d1cb9a02
...@@ -726,7 +726,8 @@ ...@@ -726,7 +726,8 @@
setTimeout(()=>{ setTimeout(()=>{
let UserId = uni.getStorageSync('mall_UserInfo')?uni.getStorageSync('mall_UserInfo').UserId : 0; let UserId = uni.getStorageSync('mall_UserInfo')?uni.getStorageSync('mall_UserInfo').UserId : 0;
uni.navigateTo({ uni.navigateTo({
url: "/pages/share/salesvolume?UserId="+UserId, // url: "/pages/share/salesvolume?UserId="+UserId,
url:'/pages/share-order/share-order'
}); });
},10) },10)
}, },
...@@ -1203,9 +1204,7 @@ ...@@ -1203,9 +1204,7 @@
yj(){ yj(){
uni.navigateTo({ uni.navigateTo({
url: '/pages/share/index/index'
url: '/pages/blindDate/userList'
// url: '/pages/share/index/index'
}) })
} }
......
pages/share/index/index.vue
View file @ d1cb9a02
...@@ -36,8 +36,8 @@ ...@@ -36,8 +36,8 @@
<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/img-share-status.png" style="width: 100%;height: 165px;"></image> <image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/img-share-status.png" style="width: 100%;height: 165px;"></image>
<Text style='margin-top: 70px;'>{{sharestatus.Msg}}</Text> <Text style='margin-top: 70px;'>{{sharestatus.Msg}}</Text>
</view> </view>
<view style="width: 100%;height: 100%;" v-if="sharestatus.Status==3"> <view style="width: 100%;height: 100%;background: #f3f4f6;" v-if="sharestatus.Status==3">
<view class="sharebox_top"> <view class="sharebox_top" :style="{height:topHeight+'rpx'}">
<view class="sharebox_top_nav" :style="{paddingTop:nav+'px'}"> <view class="sharebox_top_nav" :style="{paddingTop:nav+'px'}">
<view class="arrow" @click="redirectPrev"> <view class="arrow" @click="redirectPrev">
<u-icon name="arrow-left" size="48" color="#fff"></u-icon> <u-icon name="arrow-left" size="48" color="#fff"></u-icon>
...@@ -50,12 +50,12 @@ ...@@ -50,12 +50,12 @@
<u-avatar :src="sharedata.UserInfo.Photo" size="130"></u-avatar> <u-avatar :src="sharedata.UserInfo.Photo" size="130"></u-avatar>
<view style="display: flex;flex-direction: column;color: #fff;margin-left: 16px;"> <view style="display: flex;flex-direction: column;color: #fff;margin-left: 16px;">
<view style="display: flex;flex-direction: row;align-items: center"> <view style="display: flex;flex-direction: row;align-items: center">
<Text style='font-size: 18px;max-width: 150px;overflow: hidden;display: inline-block;white-space: nowrap; text-overflow:ellipsis;'> <Text style='font-size: 36rpx;max-width: 300rpx;overflow: hidden;display: inline-block;white-space: nowrap; text-overflow:ellipsis;'>
{{sharedata.UserInfo.UserName}} {{sharedata.UserInfo.UserName}}
</Text> </Text>
<view class="sj_style" style="" @click="goUrl('/pages/share/level/level_t')" v-if="sharedata.UserInfo.IsEnableFXGrade==1"> <view class="sj_style" style="" @click="goUrl('/pages/share/level/level_t')" v-if="sharedata.UserInfo.IsEnableFXGrade==1">
<image src="../../../static/images/sj.png" style="width: 9px;height: 10px;"></image> <image src="../../../static/images/sj.png" style="width: 9px;height: 20rpx;"></image>
<text style="font-size: 10px;color: #fff;"> <text style="font-size: 20rpx;color: #fff;">
升级规则 升级规则
</text> </text>
</view> </view>
...@@ -67,30 +67,30 @@ ...@@ -67,30 +67,30 @@
</text> </text>
</view> </view>
</view> </view>
<Text style='font-size: 12px;margin-top: 5px;'>{{sharedata.CustomModel.ReferrerName}}：{{sharedata.UserInfo.SuperiorName!=''&&sharedata.UserInfo.SuperiorName!=null?sharedata.UserInfo.SuperiorName:'总部'}}</Text> <Text style='font-size: 24rpx;margin-top: 5px;'>{{sharedata.CustomModel.ReferrerName}}：{{sharedata.UserInfo.SuperiorName!=''&&sharedata.UserInfo.SuperiorName!=null?sharedata.UserInfo.SuperiorName:'总部'}}</Text>
<view style="display:flex;align-items: center;margin-top: 5px;"> <view style="display:flex;align-items: center;margin-top: 5px;">
<Text style='font-size: 12px;'>等级：</Text> <Text style='font-size: 24rpx;'>等级：</Text>
<image v-if="sharedata.UserInfo.GradeIcon!=null && sharedata.UserInfo.GradeIcon!=''" :src="sharedata.UserInfo.GradeIcon" style="width:67px;height:22px;"></image> <image v-if="sharedata.UserInfo.GradeIcon!=null && sharedata.UserInfo.GradeIcon!=''" :src="sharedata.UserInfo.GradeIcon" style="width:67px;height:22px;"></image>
<text v-else style="font-size: 12px;">{{sharedata.UserInfo.GradeName}}</text> <text v-else style="font-size: 24rpx;">{{sharedata.UserInfo.GradeName}}</text>
</view> </view>
<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:38rpx;'>{{sharedata.UserInfo.IsEnableFXGrade==1 && sharedata.UserInfo.IsVip==1?'会员日期：'+ sharedata.UserInfo.VipExpiryDate:''}}</Text>
</view> </view>
</view> </view>
</view> </view>
<view class="sharebox_topc"> <view class="sharebox_topc">
<view class="center_item" style="font-size: 12px;color: #FFFFFF;justify-content: space-between;"> <view class="center_item" style="font-size: 24rpx;color: #FFFFFF;justify-content: space-between;">
<Text>{{sharedata.CustomModel.CommissionWithdrawnName}}</Text> <Text>{{sharedata.CustomModel.CommissionWithdrawnName}}</Text>
<Text>{{sharedata.UserInfo.TXCommission!=null ?sharedata.UserInfo.TXCommission:0}}元</Text> <Text>{{sharedata.UserInfo.TXCommission!=null ?sharedata.UserInfo.TXCommission:0}}元</Text>
</view> </view>
<view style="width: 2px;height: 25px;background: #FFFFFF;justify-content: space-between;"></view> <view style="width: 2px;height: 25px;background: #FFFFFF;justify-content: space-between;"></view>
<view class="center_item" style="font-size: 12px;color: #FFFFFF;"> <view class="center_item" style="font-size: 24rpx;color: #FFFFFF;">
<Text>{{sharedata.CustomModel.OutstandingCommissionName}}</Text> <Text>{{sharedata.CustomModel.OutstandingCommissionName}}</Text>
<Text>{{sharedata.UserInfo.WJSCommission!=null ?sharedata.UserInfo.WJSCommission:0}}元</Text> <Text>{{sharedata.UserInfo.WJSCommission!=null ?sharedata.UserInfo.WJSCommission:0}}元</Text>
</view> </view>
<view style="width: 2px;height: 25px;background: #FFFFFF;justify-content: space-between;"></view> <view style="width: 2px;height: 25px;background: #FFFFFF;justify-content: space-between;"></view>
<view class="center_item" style="font-size: 12px;color: #FFFFFF;" @click="gosales()"> <view class="center_item" style="font-size: 24rpx;color: #FFFFFF;" @click="gosales()">
<Text>销售额</Text> <Text>销售额</Text>
<Text>{{sharedata.UserInfo.MySellMoney!=null ? sharedata.UserInfo.MySellMoney.toFixed(0) :0}}元</Text> <Text>{{ sharedata.UserInfo.MySellMoney ? sharedata.UserInfo.MySellMoney.toFixed(0) :0}}元</Text>
</view> </view>
</view> </view>
<!-- 会员购买 --> <!-- 会员购买 -->
...@@ -237,6 +237,7 @@ ...@@ -237,6 +237,7 @@
IsEducation: 0, IsEducation: 0,
orderPopupdata:{},//离线收益的弹窗 orderPopupdata:{},//离线收益的弹窗
showorder:false,//显示弹出 showorder:false,//显示弹出
topHeight:500,//头部高度
} }
}, },
created() { created() {
...@@ -250,6 +251,23 @@ ...@@ -250,6 +251,23 @@
(uni.getStorageSync('basedata').mall.setting.mallStyle.IsEducation ? uni.getStorageSync('basedata').mall.setting.mallStyle (uni.getStorageSync('basedata').mall.setting.mallStyle.IsEducation ? uni.getStorageSync('basedata').mall.setting.mallStyle
.IsEducation : 0) : .IsEducation : 0) :
0; 0;
let that = this;
uni.getSystemInfo({
success: function (res) {
console.log(res);
if(res.windowHeight<=600){
that.topHeight = 550
}
if(res.windowHeight<=640){
that.topHeight = 510
}
if(res.safeAreaInsets.top==44){
that.topHeight = 530
}
}
});
}, },
mounted() { mounted() {
let currentPages = getCurrentPages(); let currentPages = getCurrentPages();
...@@ -359,7 +377,8 @@ ...@@ -359,7 +377,8 @@
setTimeout(()=>{ setTimeout(()=>{
let UserId = uni.getStorageSync('mall_UserInfo')?uni.getStorageSync('mall_UserInfo').UserId : 0; let UserId = uni.getStorageSync('mall_UserInfo')?uni.getStorageSync('mall_UserInfo').UserId : 0;
uni.navigateTo({ uni.navigateTo({
url: '/pages/share/salesvolume?UserId='+UserId // url: '/pages/share/salesvolume?UserId='+UserId
url:'/pages/share-order/share-order'
}); });
},10) },10)
...@@ -458,7 +477,7 @@ ...@@ -458,7 +477,7 @@
.shareindexStyle .sharebox_top { .shareindexStyle .sharebox_top {
width: 100%; width: 100%;
height: 242px; height: 540rpx;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
...@@ -473,8 +492,10 @@ ...@@ -473,8 +492,10 @@
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
height: 44px; /* height: 44px; */
line-height: 34px;
padding: 0 10px; padding: 0 10px;
} }
.shareindexStyle .sharebox_top .sharebox_top_t { .shareindexStyle .sharebox_top .sharebox_top_t {
...@@ -483,7 +504,7 @@ ...@@ -483,7 +504,7 @@
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
margin-top: 20px; margin-top: 40rpx;
} }
.shareindexStyle .sharebox_top .sharebox_top_t .top_t_l { .shareindexStyle .sharebox_top .sharebox_top_t .top_t_l {
...@@ -499,10 +520,10 @@ ...@@ -499,10 +520,10 @@
align-items: center; align-items: center;
justify-content: center; justify-content: center;
background: rgba(55, 55, 55, 0.1); background: rgba(55, 55, 55, 0.1);
width: 70px; width: 140rpx;
height: 20px; height: 40rpx;
border-radius: 10px; border-radius: 20rpx;
margin-left: 20px; margin-left: 40rpx;
} }
.shareindexStyle .steatus_t { .shareindexStyle .steatus_t {
...@@ -514,13 +535,13 @@ ...@@ -514,13 +535,13 @@
.shareindexStyle .sharebox_topc { .shareindexStyle .sharebox_topc {
width: 100%; width: 100%;
height: 40px; height: 76rpx;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
padding: 0 10px; padding: 0 10px;
margin-top: 18px; margin-top: 34rpx;
} }
.shareindexStyle .sharebox_c { .shareindexStyle .sharebox_c {
......
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