Skip to content

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

修改样式

parent 7f69350b
Show whitespace changes
Inline Side-by-side
Showing with 419 additions and 90 deletions
pages/cart/cart.vue
View file @ b66790aa
<template>
<template>
<div class="cartStyle" v-if="!isloading" :style="{ height: contentHeight }">
<view
style="
......@@ -129,7 +129,8 @@
</scroll-view>
</view>
<view class="box_bottom">
<view class="box_bottom" :style="{'margin-bottom':bottommargin}">
<div style="margin-left: 30rpx;">
<u-checkbox-group @change="SelectAll">
<u-checkbox v-model="allchecked" shape="circle" :active-color="mc">全选</u-checkbox>
......@@ -701,7 +702,7 @@ export default {
.cartStyle .box_bottom {
width: 100%;
height: 50px;
position: absolute;
position: fixed;
background: #fff;
left: 0;
bottom: 0;
......
pages/share-team/share-team.vue
View file @ b66790aa
......@@ -81,7 +81,7 @@
pageIndex: 1,
pageSize:10,
FXGradeId:0,
Name:''
},
page_count:1,
status: "loadmore",
......
pages/share/index/index.vue
View file @ b66790aa
......@@ -65,12 +65,12 @@
<view class="top_t_l">
<u-avatar :src="sharedata.UserInfo.Photo" size="130"></u-avatar>
<view style="display: flex;flex-direction: column;color: #fff;margin-left: 16px;height: 130rpx;justify-content: space-between;">
<view style="display: flex;flex-direction: row;">
<view style="display: flex;flex-direction: column;color: #fff;margin-left: 16px;">
<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;'>
{{sharedata.UserInfo.UserName}}
</Text>
<view class="sj_style" style="" @click="goUrl('/pages/share/level/level')" 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>
<text style="font-size: 10px;color: #fff;">
升级规则
......@@ -85,19 +85,15 @@
</view>
</view>
<Text style='font-size: 12px;'>{{sharedata.CustomModel.ReferrerName}}：{{sharedata.UserInfo.SuperiorName}}</Text>
<Text style='font-size: 12px;' v-if='sharedata.UserInfo.IsEnableFXGrade==1 && sharedata.UserInfo.IsVip==1'>会员日期：{{sharedata.UserInfo.VipExpiryDate}}</Text>
<Text style='font-size: 12px;margin-top: 5px;'>{{sharedata.CustomModel.ReferrerName}}：{{sharedata.UserInfo.SuperiorName}}</Text>
<Text style='font-size: 12px;margin-top: 5px;' v-if='sharedata.UserInfo.IsEnableFXGrade==1 && sharedata.UserInfo.IsVip==1'>会员日期：{{sharedata.UserInfo.VipExpiryDate}}</Text>
<Text style='font-size: 12px;margin-top: 5px;' >等级：{{sharedata.UserInfo.GradeName}}</Text>
</view>
</view>
<!-- <view v-if='sharedata.UserInfo.DistributorGradeEntrance==1' style="display: flex;flex-direction: row;align-items: center;color: #fff;" @click="goUrl('/pages/share/level/level')">
<Text>升级条件</Text>
<u-icon name="arrow" color='#fff'></u-icon>
</view> -->
</view>
<view style="width: 100%;margin-top: 5px;">
<!-- <view style="width: 100%;margin-top: 5px;">
<span style='font: 12px;color: #FFFFFF;margin-left: 30px;'>等级：{{sharedata.UserInfo.GradeName}}</span>
</view>
</view> -->
<view class="sharebox_topc">
<view class="center_item" style="font-size: 12px;color: #FFFFFF;justify-content: space-between;">
<Text>{{sharedata.CustomModel.CommissionWithdrawnName}}</Text>
......@@ -174,10 +170,10 @@
</view>
</view>
<view class="menus_item" @click="goUrl('/pages/share-team/share-team')" v-if="sharedata.UserInfo.IsEnableFXGrade==1">
<view class="menus_item" @click="goUrl('/pages/share/vipBuyCommission/vipBuyCommission')" v-if="sharedata.UserInfo.IsEnableFXGrade==1">
<view style="display: flex;flex-direction: row;align-items: center;">
<image src="../../../static/images/icon/GradeAudit.png" style="width: 14px;" mode='widthFix'></image>
<text style="font-size: 13px;color:#07090D;margin-left: 15px;">Vip购买返佣</text>
<image src="../../../static/images/vipbuyc.png" style="width: 14px;" mode='widthFix'></image>
<text style="font-size: 13px;color:#07090D;margin-left: 15px;">VIP购买返佣</text>
</view>
<view style="display: flex;flex-direction: row;align-items: center;">
<text :style="{color:mainColor}">{{sharedata.UserInfo.VipBuyCommission!=null ?sharedata.UserInfo.VipBuyCommission:0}}</text>
......@@ -196,7 +192,7 @@
</view>
</view>
<view class="sharebox_menus" style="margin-bottom: 20px;">
<view class="sharebox_menus">
<view class="menus_item" @click="goUrl('/pages/share-qrcode/share-qrcode')">
<view style="display: flex;flex-direction: row;align-items: center;">
<image :src="sharedata.CustomModel.PromoteQRCodeImage" style="width: 14px;" mode='widthFix'></image>
......@@ -208,6 +204,7 @@
</view>
</view>
</view>
<view style="width: 100%;height: 30px;background: #f3f4f6;"></view>
</view>
......@@ -528,7 +525,7 @@
/* text-align: center; */
}
.shareindexStyle .buyvip{
position: fixed;
position: absolute;
width: 116px;
right: 0;
top: 100px;
......
pages/share/level/level.vue
View file @ b66790aa
<template>
<view :style="{'height':contentHeight}" class="levelStyle">
<image src="../../../static/images/icon/no-level-bg.png" v-if="level.Status==2 " style="width: 100%;height: 100%;"></image>
<view class="imgbg" v-if="level.Status== 1">
<view class="leve_box">
<text style="font-size: 18px;">等级名称：{{level.GradeInfo.GradeName}}</text>
<view style="display: flex;flex-direction: row;align-items: center;justify-content: space-between;margin-top: 15px;">
<text>升级所需数量:{{level.GradeInfo.UpgradeNum}}</text>
<text>已达成数量:{{level.GradeInfo.MeetNum}}</text>
<image src="../../../static/images/icon/no-level-bg.png" v-if="level=='' " style="width: 100%;height: 100%;"></image>
<view class="imgbg">
<Text class='leveltop'>满足以下条件即可升级</Text>
<view class='levelc'>
<Text>{{level.GradeInfo.UpGradeConditionName?level.GradeInfo.UpGradeConditionName:''}}{{level.GradeInfo.ReferralsNumber?level.GradeInfo.ReferralsNumber:0}}人</Text>
<view style="display: flex;flex-direction: row;align-items: center;" @click="show=true">
<Text style='font-size: 14px;color:#c8c9cc ;'>等级说明</Text>
<u-icon name="arrow" color='#c8c9cc'></u-icon>
</view>
</view>
<text style="font-size: 16px;margin-top: 15px;">升级所需下级等级：{{level.GradeInfo.UpgradeIdName}}</text>
<view class="level_b" @click="Upgrade">
<Text>立即升级</Text>
</view>
</view>
<u-popup v-model="show"
mode="center"
length="80%"
......@@ -22,7 +25,7 @@
<Text>等级说明</Text>
</view>
<view class="popup_c">
<Text>{{level.UpgradeIdName}}</Text>
<Text>{{level.GradeInfo.GradeExplain}}</Text>
</view>
<view class="popup_t" style="border-top: 1px solid #f5f5f5;" @click="show=false">
<Text>我知道了</Text>
......@@ -36,12 +39,13 @@
export default {
data() {
return {
pageTitle: "升级规则",
pageTitle: "升级条件",
contentHeight:0,
show:false,
mainColor:'',
secondary:'',
level:'',
level_bg:'',
level_bg2:'',
}
},
......@@ -57,7 +61,6 @@
let pages = wx.getStorageSync("basedata")
? wx.getStorageSync("basedata").bar_title
: [];
uni.setNavigationBarTitle({
title: this.pageTitle,
});
......@@ -68,7 +71,7 @@
this.request2(
{
url: '/api/AppletUser/GetUserDistrbutorUpgradeConditionsForFX',
url: '/api/AppletUser/GetUserDistrbutorUpgradeConditions',
data: {}
},
......@@ -96,6 +99,7 @@
icon:'none'
})
this.init()
}
);
}
......@@ -111,6 +115,23 @@
flex-direction: column;
align-items: center;
}
.levelStyle .leveltop{
font-size: 26px;
margin-top: 50px;
}
.levelStyle .levelc{
width: 94%;
height:70px ;
border-radius: 8px;
background: #fff;
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-between;
padding: 0 15px;
margin-top:50px ;
}
.levelStyle .popup{
width: 100%;
height: 285px;
......@@ -136,16 +157,17 @@
align-items: center;
justify-content: center;
}
.levelStyle .leve_box{
width: 94%;
height: 130px;
border-radius: 6px;
background-image: url(../../../static/images/shareTop.png);
background-repeat: no-repeat;
background-size: 100% 100%;
.levelStyle .level_b{
width: 70%;
height: 50px;
border-radius: 25px;
display: flex;
flex-direction: column;
padding: 10px;
color: #FFFFFF
align-items: center;
justify-content: center;
background: #F8DBAF;
color: #825E4F;
font-size: 18px;
margin-top: 40px;
font-weight: 500;
}
</style>
pages/share/level/level_t.vue 0 → 100644
View file @ b66790aa
<template>
<view :style="{'height':contentHeight}" class="levelStyle">
<image src="../../../static/images/icon/no-level-bg.png" v-if="level.Status==2 " style="width: 100%;height: 100%;"></image>
<view class="imgbg" v-if="level.Status== 1">
<view class="leve_box">
<text style="font-size: 18px;">等级名称：{{level.GradeInfo.GradeName}}</text>
<view style="display: flex;flex-direction: row;align-items: center;justify-content: space-between;margin-top: 15px;">
<text>升级所需数量:{{level.GradeInfo.UpgradeNum}}</text>
<text>已达成数量:{{level.GradeInfo.MeetNum}}</text>
</view>
<text style="font-size: 16px;margin-top: 15px;">升级所需下级等级：{{level.GradeInfo.UpgradeIdName}}</text>
</view>
</view>
</view>
</template>
<script>
export default {
data() {
return {
pageTitle: "升级规则",
contentHeight:0,
show:false,
mainColor:'',
secondary:'',
level:'',
level_bg2:'',
}
},
created(){
this.contentHeight = this.$utils.calcContentHeight(-40)+'px';
this.mainColor = this.$uiConfig.mainColor;
this.secondary = this.$uiConfig.secondary;
this.init()
},
mounted() {
let currentPages = getCurrentPages();
let u = "/" + currentPages[currentPages.length-1].route;
let pages = wx.getStorageSync("basedata")
? wx.getStorageSync("basedata").bar_title
: [];
uni.setNavigationBarTitle({
title: this.pageTitle,
});
},
methods: {
init(){
uni.showNavigationBarLoading();
this.request2(
{
url: '/api/AppletUser/GetUserDistrbutorUpgradeConditionsForFX',
data: {}
},
(res) => {
uni.hideNavigationBarLoading()
this.level = res.data
}
);
},
Upgrade(){
uni.showNavigationBarLoading();
this.request2(
{
url: '/api/AppletUser/SetUserDistrbutorUpgrade',
data: {
Id:this.level.GradeInfo.Id
}
},
(res) => {
uni.hideNavigationBarLoading()
uni.showToast({
title:res.message,
icon:'none'
})
}
);
}
}
}
</script>
<style>
.levelStyle .imgbg{
width: 100%;
height: 100%;
display: flex;
flex-direction: column;
align-items: center;
}
.levelStyle .popup{
width: 100%;
height: 285px;
background: #fff;
display: flex;
flex-direction: column;
align-items: center;
border-radius: 8px;
overflow: hidden;
justify-content: space-between;
}
.levelStyle .popup_c{
width: 94%;
height: 160px;
padding: 10px;
border-radius: 5px;
border: 1px solid #f5f5f5;
}
.levelStyle .popup_t{
width: 100%;
height:50px ;
display: flex;
align-items: center;
justify-content: center;
}
.levelStyle .leve_box{
width: 94%;
height: 130px;
border-radius: 6px;
background-image: url(../../../static/images/shareTop.png);
background-repeat: no-repeat;
background-size: 100% 100%;
display: flex;
flex-direction: column;
padding: 10px;
color: #FFFFFF
}
</style>
pages/share/vipBuyCommission/vipBuyCommission.vue
View file @ b66790aa
<template>
<view>
<view class="vipBuyCommission" :style="{'height':contentHeight}">
<view style="width: 100%;height: 100%;">
<u-empty v-if="g.length==0" text="暂无数据" mode="data"></u-empty>
<template v-if="g.length > 0">
<view
style="
height: calc(100vh - 50px);
width: calc(100vw);
overflow: hidden;
padding: 10px 0;
">
<scroll-view
:scroll-y="true"
:enable-back-to-top="true"
:enable-flex="true"
@scrolltolower="lower"
:style="{ height: '100%' }">
<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>
</view>
<view class="box_center" >
<view class="center_l" >
<u-avatar :src="item.Photo" mode="square" size="70"></u-avatar>
<view class="box_ltext">
<Text class='l_name'>{{item.UserName}}</Text>
</view>
<!-- <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>
</view>
<view class="center_l">
<Text>购买返佣：<Text :style="{color:mainColor}">{{item.Commission}}</Text>元 </Text>
</view>
</view>
<view style="margin: 5px 0;width: 100%;">
<text style="line-height: 20px;font-size: 12px;color: #888888;">
备注:{{item.Remark}}
</text>
</view>
</view>
</view>
<u-loadmore
:status="status"
:load-text="loadText"
:font-size="24"
:margin-top="20"
:margin-bottom="20"
bg-color="#f3f4f6"
/>
</scroll-view>
</view>
</template>
</view>
</view>
</template>
......@@ -8,15 +68,155 @@
export default {
data() {
return {
pageTitle: "VIP购买返佣",
contentHeight:0,
mainColor:'',
secondary:'',
g:[],
msg:{
pageIndex: 1,
pageSize:10,
Type:1,
},
page_count:1,
status: "loadmore",
loadText: {
loadmore: "轻轻上拉，加载更多",
loading: "努力加载中",
nomore: "没有更多了",
},
}
},
created(){
this.contentHeight = this.$utils.calcContentHeight(-40)+'px';
this.mainColor = this.$uiConfig.mainColor;
this.secondary = this.$uiConfig.secondary;
this.init()
},
mounted() {
let currentPages = getCurrentPages();
let u = "/" + currentPages[currentPages.length-1].route;
let pages = wx.getStorageSync("basedata")
? wx.getStorageSync("basedata").bar_title
: [];
pages.forEach((x) => {
if (x.value == u) {
this.pageTitle = x.new_name ? x.new_name : x.name;
}
});
uni.setNavigationBarTitle({
title: this.pageTitle,
});
},
methods: {
init(){
uni.showLoading({
title: '加载中'
});
this.request2(
{
url: '/api/AppletUser/GetUserVipCommissionOrdersPageList',
data: this.msg
},
(res) => {
uni.hideLoading();
let list = res.data.pageData;
this.g = this.g.concat(list);
this.page_count = res.data.pageCount;
if (this.page_count == 1) {
this.status = "nomore";
}
}
);
},
change(index){
this.msg.DistrbutionOrderSelectStatus = index;
this.msg.pageIndex=1;
this.g=[]
this.init()
},
isdetail(index){
this.g[index].showdetail = !this.g[index].showdetail
},
lower(e) {
if (this.msg.pageIndex < this.page_count) {
this.msg.pageIndex++;
this.status = "loading";
this.init();
} else {
this.status = "nomore";
}
},
}
}
</script>
<style>
.vipBuyCommission{
background: #f3f4f6;
}
.vipBuyCommission .listbox{
width: 100%;
background: #fff;
padding: 0 15px;
margin-bottom: 15px;
display: flex;
flex-direction: column;
align-items: center;
}
.vipBuyCommission .listbox .box_top{
width: 100%;
height: 45px;
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-between;
border-bottom: 1px solid #f5f5f5;
}
.vipBuyCommission .listbox .box_center{
width: 100%;
height: 45px;
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-between;
font-size: 14px;
}
.vipBuyCommission .center_l{
display: flex;flex-direction: row;align-items: center;
}
.vipBuyCommission .listbox .box_ltext{
width: 90px;
margin-left: 5px;
}
.vipBuyCommission .listbox .l_name{
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 1;
-webkit-box-orient: vertical;
}
.vipBuyCommission .listbox .box_bottom{
width: 100%;
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-between;
padding: 15px 0 0;
border-top: 1px solid #f5f5f5;
font-size: 13px;
}
.box_bottom .b_r{
width: calc(100vw - 30px - 50px - 20px);
display: flex;
flex-direction: column;
justify-content: space-between;
}
</style>
pages/user-center/user-center.vue
View file @ b66790aa
......@@ -30,7 +30,8 @@
<view style="display: flex;flex-direction: row;align-items: center;width: 100%;margin-top: 52px;" 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;" @click="login(user_info)">{{ user_info.nickname ? user_info.nickname : '立即登录' }}</Text>
<Text style="color: #FFF;margin-left: 20rpx;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>
<Text style="margin-right: 10px;">{{ user_info.identity.level_name != null ? user_info.identity.level_name : '普通用户' }}</Text>
......@@ -56,10 +57,11 @@
<text style="font-size: 21px;">{{user_info.footprint}}</text>
<text>{{meueData.user_center.foot_bar[1].name}}</text>
</view>
<view class="top_b_item" v-if="meueData.user_center.is_account_status == 1" @click="goUrl('/pages/coupon/index/index')">
<view class="top_b_item" v-if="meueData.user_center.is_account_status == 1" @click="goUrl(couponsObj.link_url)">
<text style="font-size: 21px;">{{user_info.coupon}}</text>
<text v-for="(item, index) in meueData.user_center.account" :key="index">{{item.link_url == '/pages/coupon/index/index'?item.name:''}}</text>
<text>{{couponsObj.name}}</text>
</view>
</view>
<view class="ReceiptAdder" @click="goUrl('/pages/address/address')" style=" background: rgba(55, 55, 55, 0.15) ">
<u-icon name="location" color="#fff" size="23"></u-icon>
......@@ -85,41 +87,7 @@
</view>
</view>
</view>
<!-- <view class="footprint" v-if="meueData.user_center.is_foot_bar_status == 1">
<view class="footprint_item" @click="goUrl('/pages/favorite/favorite')">
<text>{{ user_info.favorite }}</text>
<view class="footprint_item_bottom">
<image :src="meueData.user_center.foot_bar[0].icon_url" style="width: 40rpx;height: 40rpx;"></image>
<Text style="margin-left: 10rpx;">{{ meueData.user_center.foot_bar[0].name }}</Text>
</view>
</view>
<view style="width: 1px;height: 60rpx;background: #000000;"></view>
<view class="footprint_item" @click="goUrl('/pages/foot/index/index')">
<text>{{ user_info.footprint }}</text>
<view class="footprint_item_bottom">
<image :src="meueData.user_center.foot_bar[1].icon_url" style="width: 40rpx;height: 40rpx;"></image>
<Text style="margin-left: 10rpx;">{{ meueData.user_center.foot_bar[1].name }}</Text>
</view>
</view>
</view> -->
<!-- <view class="account_bar" v-if="meueData.user_center.is_account_status == 1">
<view class="account_bar_item" v-for="(item, index) in meueData.user_center.account" @click="goUrl(item.link_url)" :key="index">
优惠券
<Text :style="{ color: secondary }" v-if="item.link_url == '/pages/coupon/index/index'">{{ user_info.coupon }}</Text>
积分
<Text :style="{ color: secondary }" v-if="item.link_url == '/pages/user-center/integral-detail/integral-detail'">{{ user_info.integral }}</Text>
余额
<Text :style="{ color: secondary }" v-if="item.link_url == '/pages/balance/balance'">{{ user_info.balance }}</Text>
卡券
<Text :style="{ color: secondary }" v-if="item.link_url == '/pages/card/index/index'">{{ user_info.card }}</Text>
<view class="footprint_item_bottom">
<image :src="item.icon_url" style="width: 26rpx;height: 26rpx;"></image>
<Text style="margin-left: 10rpx;">{{ item.name }}</Text>
</view>
</view>
<view style="width: 1px;height: 60rpx;background: #f5f5f5;" v-if="meueData.user_center.account_bar.integral.status == 1"></view>
</view> -->
<view class="order_bar" v-if="meueData.user_center.is_order_bar_status == 1">
<u-section title="我的订单" sub-title="查看更多" style="width: 100%;padding:0px 0 10px ;" @click="goUrl('/pages/order/index/index?status=0')"></u-section>
......@@ -204,7 +172,8 @@ export default {
u: {},
is_icon_members_grade: 0,
nav:0,
scrollTop:0
scrollTop:0,
couponsObj:{},
};
},
components: {
......@@ -268,6 +237,11 @@ export default {
uni.hideNavigationBarLoading();
this.meueData = res.data.config;
this.user_info = res.data.user_info;
this.meueData.user_center.account.forEach(x=>{
if(x.link_url =="/pages/coupon/index/index" ){
this.couponsObj = x
}
})
}
);
},
......@@ -471,7 +445,7 @@ export default {
.userStyle .ReceiptAdder {
position: absolute;
right: 0;
top: 225rpx;
top: 160rpx;
width: 100px;
height: 24px;
border-top-left-radius: 12px;
......
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