Skip to content

J
jz_Travel
Commit 89f7ed66 authored by youjie's avatar youjie
Browse files
Options

个人中心

parent 26718e28
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 357 additions and 187 deletions
components/vip/vip.vue
View file @ 89f7ed66
...@@ -136,7 +136,7 @@ ...@@ -136,7 +136,7 @@
text-align: center; text-align: center;
font-family: dinAli; font-family: dinAli;
text-align: center; text-align: center;
line-height: 30rpx; line-height: 34rpx;
font-weight: bolder; font-weight: bolder;
} }
.vip-box-unactive .step-item.active{ .vip-box-unactive .step-item.active{
......
components/vip/vipUser.vue 0 → 100644
View file @ 89f7ed66
<template>
<view class="vip-box">
<template v-if="vipInfo && vipInfo.vipOrderCount<vipInfo.vipCondition">
<view class="vip-box-unactive row">
<view class="col">
<view class="step-box row items-center">
<view class="line" :style="{width:`${(vipInfo.vipOrderCount/vipInfo.vipCondition)*100}%`}"></view>
<view class="step-item" :class="{'active':x<vipInfo.vipOrderCount}" v-for="x in vipInfo.vipCondition">
{{x+1}}
</view>
</view>
</view>
<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Upload/Goods/638732528736165089.png" class="vip-logo"></image>
</view>
</template>
</view>
</template>
<script>
export default {
name:"vip",
props:['statistics'],
data() {
return {
vipInfo:null,
};
},
watch:{
statistics:{
handler(newVal,oldVal){
this.vipInfo = newVal
},
deep:true,
}
},
mounted() {
},
methods:{
}
}
</script>
<style scoped>
@import url('../../asset/css/flex.css');
@font-face {
font-family: "dinAli";
src: url("//at.alicdn.com/wf/webfont/MQHUV6e56ce5/BFOHNMvFqM80.woff2") format("woff2");
font-display: swap;
}
.vip-box{
padding-top: 28rpx;
}
.vip-box-unactive{
padding:0rpx;
background: linear-gradient(90deg, #3F423F, #313131);
position: relative;
border-radius: 18rpx;
}
.vip-box-unactive .vip-logo{
right: 34rpx;
width: 87rpx;
height: 99rpx;
top: -37rpx;
position: absolute;
z-index: 4;
}
.vip-box-unactive .remark{
font-size: 24rpx;
color: #E2C27A;
line-height: 1;
margin-bottom: 16rpx;
}
.vip-box-unactive .step-box{
position: relative;
justify-content: space-between;
}
.vip-box-unactive .step-box::after,
.vip-box-unactive .step-box .line{
height: 10rpx;
background: #C99E59;
border-radius: 5rpx;
left: 0;
top: 10rpx;
position: absolute;
z-index: 2;
}
.vip-box-unactive .step-box::after{
z-index: 1;
background: #2E2E2E;
border-radius: 0;
right: 0;
content: ' ';
display: block;
}
.vip-box-unactive .step-item{
/* font-weight: 400; */
font-size: 24rpx;
color: #494949;
width: 30rpx;
height: 30rpx;
background: #2E2E2E;
border-radius: 50%;
position: relative;
z-index: 3;
text-align: center;
font-family: dinAli;
text-align: center;
line-height: 34rpx;
font-weight: bolder;
}
.vip-box-unactive .step-item.active{
background: linear-gradient(270deg, #C99E59, #FFFFB3);
color: #583F2C;
}
</style>
\ No newline at end of file
pages/AggregateOrders/components/orders.vue
View file @ 89f7ed66
...@@ -479,6 +479,6 @@ export default { ...@@ -479,6 +479,6 @@ export default {
background: #CBCBCB; background: #CBCBCB;
} }
.visaList.active .visaListL image{ .visaList.active .visaListL image{
filter: grayscale(100%); // filter: grayscale(100%);
} }
</style> </style>
\ No newline at end of file
pages/airTicket/airTicketOrderDetail.vue
View file @ 89f7ed66
...@@ -222,7 +222,7 @@ ...@@ -222,7 +222,7 @@
</view> </view>
</template> </template>
<cancelProgress v-if="order.OrderStatus==2||order.OrderStatus==5" :datas="order" type="1"></cancelProgress> <cancelProgress v-if="order.OrderStatus==5" :datas="order" type="1"></cancelProgress>
<view style="padding-bottom: 20rpx;"></view> <view style="padding-bottom: 20rpx;"></view>
</scroll-view> </scroll-view>
<view class="botton-box" :style="{paddingBottom:`${bottomSafeHeight}rpx`}"> <view class="botton-box" :style="{paddingBottom:`${bottomSafeHeight}rpx`}">
......
pages/jiuzhai/jz_SureOrder.vue
View file @ 89f7ed66
...@@ -445,7 +445,7 @@ ...@@ -445,7 +445,7 @@
</view> </view>
</view> </view>
<view class="empty-block"></view> <view class="empty-block"></view>
<cancelProgress :datas="orderData" v-if="orderData.OrderStatus==2||orderData.OrderStatus==5"></cancelProgress> <cancelProgress v-if="orderData.OrderStatus==5" :datas="orderData"></cancelProgress>
<view class="empty-block"></view> <view class="empty-block"></view>
<view style="padding: 50rpx 40rpx"> <view style="padding: 50rpx 40rpx">
<view class="big-title"> <view class="big-title">
......
pages/user-center/components/userHeader.vue
View file @ 89f7ed66
<template> <template>
<view class="userHeaderBox"> <view class="userHeaderBox" v-if="statistics">
<view class="titlenav" :style="{ paddingTop: nav }">{{ pageTitle }}</view> <view class="titlenav" :style="{ paddingTop: nav }">{{ pageTitle }}</view>
<view class="userHeadPic row"> <view class="userHeadPic row">
<view class="userHeadPicL"> <view class="userHeadPicL">
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
</view> </view>
<view class="col column"> <view class="col column">
<text v-if="b2b_user_info&&b2b_user_info.name" <text v-if="b2b_user_info&&b2b_user_info.name"
class="userHeadPicR_title" @click="navigatorToProfile"> class="userHeadPicR_title" @click="goUrl('/pages/user-center/user-profile')">
{{ b2b_user_info.name }} {{ b2b_user_info.name }}
</text> </text>
<text v-else-if="mall_UserInfo&&mall_UserInfo.Name" <text v-else-if="mall_UserInfo&&mall_UserInfo.Name"
...@@ -18,35 +18,38 @@ ...@@ -18,35 +18,38 @@
<text v-else class="userHeadPicR_title" @click="login(user_info)"> <text v-else class="userHeadPicR_title" @click="login(user_info)">
立即登录 立即登录
</text> </text>
<text class="userHeadPicR_text">销售:{{ b2b_user_info.salesBaseInfo.emName }}等3人</text> <text class="userHeadPicR_text" v-if="statistics.saleList&&statistics.saleList.length>0">
<!-- #ifdef MP-DI -->销售:{{ b2b_user_info.salesBaseInfo.emName }}<!-- #endif -->
<!-- #ifdef MP-AG -->销售:{{ statistics.saleList[0].saleName }}<template v-if="statistics.saleList.length>0">等{{statistics.saleList.length}}位</template><!-- #endif -->
</text>
</view> </view>
</view> </view>
<view class="userHeadPasBox"> <view class="userHeadPasBox">
<view class="userHeadPas column"> <view class="userHeadPas column">
<view class="userHeadPasTop"> <view class="userHeadPasTop">
<view class="userHeadPasT_Num row-sb-n"> <view class="userHeadPasT_Num row-sb-n" v-if="statistics.balance>=0">
<!-- #ifdef MG-AG--> <!-- #ifdef MP-AG-->
<view class="column"> <view class="column">
<text>{{formatNumberWithUnit(user_info.balance)}}</text> <text>{{formatNumberWithUnit(statistics.balance)}}</text>
<text class="userHeadPasTTeT"> <text class="userHeadPasTTeT">
幸福存折 幸福存折
</text> </text>
</view> </view>
<!-- #endif --> <!-- #endif -->
<view class="column"> <view class="column">
<text>{{ user_info.integral }}</text> <text>{{ statistics.integral }}</text>
<text class="userHeadPasTTeT"> <text class="userHeadPasTTeT">
我的积分 我的积分
</text> </text>
</view> </view>
<view class="column"> <view class="column">
<text> <text>
{{formatNumberWithUnit(user_info.totalSavings)}} {{formatNumberWithUnit(statistics.totalSavings)}}
</text> </text>
<text class="userHeadPasTTeT">累计已省</text> <text class="userHeadPasTTeT">累计已省</text>
</view> </view>
<view class="column"> <view class="column" @click="goUrl('/pages/coupon/index/index')">
<text>{{ user_info.couponNum }}</text> <text>{{ statistics.couponNum }}</text>
<text class="userHeadPasTTeT">优惠券</text> <text class="userHeadPasTTeT">优惠券</text>
</view> </view>
</view> </view>
...@@ -54,33 +57,11 @@ ...@@ -54,33 +57,11 @@
<view class="userHeadPasButtom column"> <view class="userHeadPasButtom column">
<view class="userHeadPasButText"> <view class="userHeadPasButText">
再完成 再完成
<text class="userHeadPasButTNum">4单</text>即可成为 <text class="userHeadPasButTNum">{{statistics&&statistics.vipCondition?(statistics.vipCondition-statistics.vipOrderCount):''}}单</text>即可成为
<text class="userHeadPasButTVip">VIP</text>享永久折扣！ <text class="userHeadPasButTVip">VIP</text>享永久折扣！
<img class="userHeadPasButImg" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Upload/Goods/638732528690203686.png"/> <img class="userHeadPasButImg" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Upload/Goods/638732528690203686.png"/>
</view> </view>
<view class="jz_LineDetaVipPr"> <vipUser :statistics="statistics"></vipUser>
<view class="jz_LineDetaVPB">
<view class="jz_LineDetaVPBBox" v-for="(item,index) in progress"
:key="index">
<view class="jz_LineDetaVPBLine" :style="{'opacity':index==0?'0':1}"></view>
<view class="jz_LineDetaVPBN">{{item.text}}</view>
<view class="jz_LineDetaVPBBoxI" v-if="item.img"><img :src="item.img"/></view>
<view class="jz_LineDetaVPBLine" v-else></view>
</view>
</view>
<view class="jz_LineDetaVPB jz_LineDetaVPBY">
<view class="jz_LineDetaVPBBox" v-for="(item,index) in progress"
:key="index"
:class="[item.colorStyle]">
<view class="jz_LineDetaVPBLine" :style="{'opacity':index==0?'0':1}"></view>
<view class="jz_LineDetaVPBN">{{item.text}}</view>
<view class="jz_LineDetaVPBBoxI" v-if="item.img"></view>
<view class="jz_LineDetaVPBLine"
:class="[item.radiusR]" v-else></view>
</view>
</view>
</view>
</view> </view>
</view> </view>
</view> </view>
...@@ -88,50 +69,29 @@ ...@@ -88,50 +69,29 @@
</template> </template>
<script> <script>
import vipUser from "@/components/vip/vipUser.vue";
export default { export default {
props:['user_info','b2b_user_info'], props:['user_info','statistics','b2b_user_info'],
components: {vipUser},
data() { data() {
return { return {
pageTitle: "个人中心", pageTitle: "个人中心",
nav: 0, nav: 0,
progress:[ progress:[],
{
text:'1',
colorStyle: 'active',
radiusL: '',
radiusR: '',
},
{
text:'2',
colorStyle: 'active',
radiusL: '',
radiusR: '',
},
{
text:'3',
colorStyle: 'active',
radiusL: '',
radiusR: '',
},
{
text:'4',
colorStyle: 'active',
radiusL: '',
radiusR: '',
},
{
text:'',
colorStyle: '',
radiusL: '',
radiusR: '',
img:'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Upload/Goods/638732528736165089.png'
},
],
}; };
}, },
components: {},
computed: { computed: {
},
watch:{
statistics:{
handler(newVal,oldVal){
},
deep:true,
}
}, },
created() { created() {
...@@ -177,6 +137,19 @@ ...@@ -177,6 +137,19 @@
}) })
// #endif // #endif
}, },
goUrl(url){
if(url=='/pages/user-center/user-profile'){
// #ifdef MP-DI
uni.navigateTo({
url:url
})
return
// #endif
}
uni.navigateTo({
url:url
})
}
}, },
}; };
</script> </script>
...@@ -231,8 +204,8 @@ ...@@ -231,8 +204,8 @@
} }
.jz_LineDetaVipPr{ .jz_LineDetaVipPr{
margin-top: 28rpx; margin-top: 28rpx;
position: relative; // position: relative;
left: -20rpx; // left: -20rpx;
} }
.jz_LineDetaVip{ .jz_LineDetaVip{
width: 100%; width: 100%;
...@@ -315,7 +288,7 @@ ...@@ -315,7 +288,7 @@
} }
.jz_LineDetaVPBY{ .jz_LineDetaVPBY{
position: absolute; position: absolute;
left: -29rpx; left: -0;
right: 0; right: 0;
top: 0; top: 0;
} }
...@@ -344,7 +317,7 @@ ...@@ -344,7 +317,7 @@
padding-top: 7rpx; padding-top: 7rpx;
} }
.userHeadPasButtom{ .userHeadPasButtom{
padding: 21rpx 0 40rpx 39rpx; padding: 30rpx 0 50rpx 39rpx;
} }
.userHeadPasButText{ .userHeadPasButText{
font-family: PingFang SC; font-family: PingFang SC;
......
pages/user-center/components/vipUserHeader.vue
View file @ 89f7ed66
...@@ -25,31 +25,39 @@ ...@@ -25,31 +25,39 @@
</view> </view>
<view class="userHeadInfoBox"> <view class="userHeadInfoBox">
<view class="userHeadInfo"> <view class="userHeadInfo">
<view class="userHeadInfo_Name">{{ b2b_user_info.name }}</view> <view class="userHeadInfo_Name">
<view class="userHeadInfo_text">销售:{{ b2b_user_info.salesBaseInfo.emName }}等3位</view> <template v-if="b2b_user_info&&b2b_user_info.name">{{ b2b_user_info.name }}</template>
<template v-if="mall_UserInfo&&mall_UserInfo.Name" >{{ mall_UserInfo.Name }}</template>
</view>
<view class="userHeadInfo_text" v-if="statistics.saleList&&statistics.saleList.length>0">
<!-- #ifdef MP-DI -->销售:{{ b2b_user_info.salesBaseInfo.emName }}<!-- #endif -->
<!-- #ifdef MP-AG -->销售:{{ statistics.saleList[0].saleName }}<template v-if="statistics.saleList.length>0">等{{statistics.saleList.length}}位</template><!-- #endif -->
</view>
<image class="userHeadInfo_vip" mode="aspectFit" <image class="userHeadInfo_vip" mode="aspectFit"
style="width: 385rpx;height: 49rpx;" style="width: 385rpx;height: 49rpx;"
src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/202502111735zk.png" /> src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/202502111735zk.png" />
<view class="userHeadPasTop"> <view class="userHeadPasTop">
<view class="userHeadPasT_Num row-sbs-n"> <view class="userHeadPasT_Num row-sbs-n" v-if="statistics">
<!-- #ifdef MP-AG-->
<view class="column"> <view class="column">
<text>60k</text> <text>{{formatNumberWithUnit(statistics.balance)}}</text>
<text class="userHeadPasTTeT"> <text class="userHeadPasTTeT">
幸福存折 幸福存折
</text> </text>
</view> </view>
<!-- #endif -->
<view class="column"> <view class="column">
<text>1852</text> <text>{{ statistics.integral }}</text>
<text class="userHeadPasTTeT"> <text class="userHeadPasTTeT">
我的积分 我的积分
</text> </text>
</view> </view>
<view class="column"> <view class="column">
<text>248.2w</text> <text>{{formatNumberWithUnit(statistics.totalSavings)}}</text>
<text class="userHeadPasTTeT">累计已省</text> <text class="userHeadPasTTeT">累计已省</text>
</view> </view>
<view class="column"> <view class="column" @click="goUrl('/pages/coupon/index/index')">
<text class="userHeadPasTextb">3</text> <text class="userHeadPasTextb">{{ statistics.couponNum }}</text>
<text class="userHeadPasTTeT">优惠券</text> <text class="userHeadPasTTeT">优惠券</text>
</view> </view>
</view> </view>
...@@ -62,44 +70,11 @@ ...@@ -62,44 +70,11 @@
<script> <script>
export default { export default {
props:['user_info','b2b_user_info'], props:['user_info','b2b_user_info','statistics'],
data() { data() {
return { return {
pageTitle: "个人中心", pageTitle: "个人中心",
nav: 0, nav: 0,
progress:[
{
text:'1',
colorStyle: 'active',
radiusL: '',
radiusR: '',
},
{
text:'2',
colorStyle: 'active',
radiusL: '',
radiusR: '',
},
{
text:'3',
colorStyle: 'active',
radiusL: '',
radiusR: '',
},
{
text:'4',
colorStyle: 'active',
radiusL: '',
radiusR: '',
},
{
text:'',
colorStyle: 'active',
radiusL: '',
radiusR: '',
img:'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Upload/Goods/638732528736165089.png'
},
],
}; };
}, },
components: {}, components: {},
...@@ -149,6 +124,11 @@ ...@@ -149,6 +124,11 @@
// #endif // #endif
}, },
goUrl(url){
uni.navigateTo({
url:url
})
}
}, },
}; };
</script> </script>
......
pages/user-center/userVip-center.vue
View file @ 89f7ed66
This diff is collapsed.
pages/visa/visa_SureOrder.vue
View file @ 89f7ed66
...@@ -456,7 +456,7 @@ ...@@ -456,7 +456,7 @@
</view> </view>
</view> </view>
<view class="empty-block"></view> <view class="empty-block"></view>
<cancelProgress v-if="orderData.OrderStatus==2||orderData.OrderStatus==5" :datas="orderData"></cancelProgress> <cancelProgress v-if="orderData.OrderStatus==5" :datas="orderData"></cancelProgress>
<view class="empty-block"></view> <view class="empty-block"></view>
<view style="padding: 50rpx 40rpx" v-if="orderData.OrderModel"> <view style="padding: 50rpx 40rpx" v-if="orderData.OrderModel">
<view class="big-title"> <view class="big-title">
...@@ -788,7 +788,6 @@ ...@@ -788,7 +788,6 @@
icon: "success", icon: "success",
}); });
this.getOrderInfoHandler() this.getOrderInfoHandler()
this.initOrderInfo(this.orderId)
// uni.navigateTo({ // uni.navigateTo({
// url: "/pages/AggregateOrders/AggregateOrdersList", // url: "/pages/AggregateOrders/AggregateOrdersList",
// }); // });
......
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