Skip to content

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

Merge branch 'B2C' of http://gitlab.oytour.com/zk123/jz_travel into B2C

parents ca1876e2 171a41af
Hide whitespace changes
Inline Side-by-side
Showing with 1380 additions and 1087 deletions
App.vue
View file @ a321732b
...@@ -72,6 +72,7 @@ export default { ...@@ -72,6 +72,7 @@ export default {
pid:u.erpBaseInfo?u.erpBaseInfo.employeeId:u.pid, pid:u.erpBaseInfo?u.erpBaseInfo.employeeId:u.pid,
erpBaseInfo: u.erpBaseInfo, erpBaseInfo: u.erpBaseInfo,
count: 0, count: 0,
isVip:u.isVip,
customerType: 1, //直客，2-同行 customerType: 1, //直客，2-同行
directCustomerId: u.directCustomerId //直客Id directCustomerId: u.directCustomerId //直客Id
} }
......
components/auth/index.vue
View file @ a321732b
...@@ -237,6 +237,7 @@ ...@@ -237,6 +237,7 @@
pid:u.erpBaseInfo?u.erpBaseInfo.employeeId:u.pid, pid:u.erpBaseInfo?u.erpBaseInfo.employeeId:u.pid,
erpBaseInfo: u.erpBaseInfo, erpBaseInfo: u.erpBaseInfo,
count: 0, count: 0,
isVip:u.isVip,
customerType: 1, //直客，2-同行 customerType: 1, //直客，2-同行
directCustomerId: u.directCustomerId //直客Id directCustomerId: u.directCustomerId //直客Id
} }
...@@ -291,6 +292,7 @@ ...@@ -291,6 +292,7 @@
b2bResult.createBy = b2bData.createBy; b2bResult.createBy = b2bData.createBy;
b2bResult.salesBaseInfo = b2bData.salesBaseInfo; b2bResult.salesBaseInfo = b2bData.salesBaseInfo;
b2bResult.groupId = b2bData.groupId; b2bResult.groupId = b2bData.groupId;
b2bResult.isVip=b2bData.isVip;
b2bResult.contactNumber = b2bData.contactNumber; b2bResult.contactNumber = b2bData.contactNumber;
uni.setStorageSync('b2b_user', b2bResult) uni.setStorageSync('b2b_user', b2bResult)
that.$emit("changeuserinfo"); that.$emit("changeuserinfo");
......
components/vip/vip.vue 0 → 100644
View file @ a321732b
<template>
<view class="vip-box">
<template v-if="vipInfo && vipInfo.FinishOrderCount>0 && vipInfo.FinishOrderCount<vipInfo.OrderCount">
<view class="vip-box-unactive row">
<view style="margin-top: 25rpx;" class="col">
<view class="remark row items-center">
再完成{{vipInfo.OrderCount-vipInfo.FinishOrderCount}}单即可成为VIP，享永久折扣！
<image style="width: 21rpx;height: 21rpx;margin-left: 10rpx;" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Upload/Goods/638732528690203686.png"></image>
</view>
<view class="step-box row items-center">
<view class="line" :style="{width:`${(vipInfo.FinishOrderCount/vipInfo.OrderCount)*100}%`}"></view>
<view class="step-item" :class="{'active':x<vipInfo.FinishOrderCount}" v-for="x in vipInfo.OrderCount">
{{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:{
lineId:{
type:Number
}
},
data() {
return {
user:{},
vipInfo:null,
userVipRights:{}
};
},
mounted() {
this.user = uni.getStorageSync('b2b_user')
this.user = this.user?this.user:{customerId:0},
this.getUserVipInfo()
},
methods:{
getUserVipInfo(){
const parameter = {
VipCusType:1,
CustomerId:this.user.customerId
}
// #ifdef MP-DI
parameter.VipCusType = 2
// #endif
this.apipost( "vip_post_CheckCustomerIsVip", parameter,(r) => {
this.vipInfo = r.data
const v = r.data
this.$emit('setUserOrder',v.FinishOrderCount)
if(v.FinishOrderCount == v.OrderCount){
let rule = v.RuleList.find(x=>x.LineId==this.lineId)
if(!rule) rule = v.RuleList.find(x=>x.LineId==0)
if(rule) {
this.userVipRights = rule
this.$emit('change',this.userVipRights)
}
}
})
}
}
}
</script>
<style>
@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-unactive{
margin: 25rpx 0rpx;
padding:0rpx 34rpx 0rpx 34rpx;
height: 120rpx;
background: linear-gradient(90deg, #3F423F, #313131);
position: relative;
border-radius: 18rpx;
}
.vip-box-unactive .vip-logo{
right: 34rpx;
width: 87rpx;
height: 99rpx;
top: 15rpx;
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: 30rpx;
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.json
View file @ a321732b
...@@ -332,6 +332,13 @@ ...@@ -332,6 +332,13 @@
"style": { "style": {
"navigationStyle": "custom" "navigationStyle": "custom"
} }
},
{
"path" : "aggregation/aggregation",
"style" :
{
"navigationBarTitleText" : "订单中心"
}
} }
] ]
}, },
......
pages/jiuzhai/components/sign/index.vue
View file @ a321732b
<template> <template>
<view class="content"> <view class="content">
<scroll-view :scroll-y="true" style="height: 100%; flex: 1; box-sizing: border-box"> <scroll-view :scroll-y="true" class="sign-scroll" scroll-with-animation="true" style="height: 100%; flex: 1; box-sizing: border-box" :scroll-top="scrollTop">
<view class="header"> <view class="header">
<!-- <view class="bar"></view>
<view class="set text-gray">
<text @click="close" style="font-size:40upx;">返回</text>
<text @click="reset" style="font-size:35upx;color:#DDDDDD">清空</text>
</view> -->
<!-- <view class="in-and-out">
<view class="item" v-if="start.length > 0">
<view style="font-size:30upx;color:#C0C0C0">入住日期</view>
<view style="font-weight: bold;margin-top:10upx;font-size:36upx">{{ startDay }}</view>
<view style="font-size:24upx;margin-top:10upx">{{ startWeek }}</view>
</view>
<view class="item text" v-if="start.length == 0">
<view>入住日期</view>
</view>
<view class="item">
<view class="count-border" :class="day == 0 ? 'gray' : 'orange'">
<view class="count" style="font-size:26upx;line-height:26upx;">共{{ day }}晚</view>
</view>
</view>
<view class="item text" v-if="end.length == 0">
<view>离店日期</view>
</view>
<view class="item" v-if="end.length > 0">
<view style="font-size:30upx;color:#C0C0C0">离店日期</view>
<view style="font-weight: bold;margin-top:10upx;font-size:36upx">{{ endDay }}</view>
<view style="font-size:24upx;margin-top:10upx">{{ endWeek }}</view>
</view>
</view> -->
<view style=" <view style="
font-size: 32rpx; font-size: 32rpx;
color: #111; color: #111;
...@@ -150,27 +123,7 @@ ...@@ -150,27 +123,7 @@
computed: { computed: {
//房间是否能预订 //房间是否能预订
isSub() { isSub() {
// if (this.priceStauts.length > 0) {
// for (var i = this.start[0]; i <= this.end[0]; i++) {
// if (i == this.start[0]) {
// for (var j = this.start[1]; j < this.date[i].length; j++) {
// if (this.priceStauts[i][j] == -1) return false
// }
// } else if (this.end[0] == this.start[0]) {
// for (var j = this.start[1]; j < this.end[1]; j++) {
// if (this.priceStauts[i][j] == -1) return false
// }
// } else if (i == this.end[0]) {
// for (var j = 0; j < this.end[1]; j++) {
// if (this.priceStauts[i][j] == -1) return false
// }
// } else {
// for (var j = 0; j < this.priceStauts[i].length; j++) {
// if (this.priceStauts[i][j] == -1) return false
// }
// }
// }
// }
return this.start.length == 2; return this.start.length == 2;
}, },
//计算日历里的节假日 //计算日历里的节假日
...@@ -217,7 +170,9 @@ ...@@ -217,7 +170,9 @@
day: 0, //多少晚 day: 0, //多少晚
priceStauts: [], //价格状态 priceStauts: [], //价格状态
lastNot: [0, 10], //前置的无房操作 lastNot: [0, 10], //前置的无房操作
userDefaultDate: "", userDefaultDate: "",
scrollTop:0,
scrollHeight:0
}; };
}, },
mounted() { mounted() {
...@@ -236,21 +191,23 @@ ...@@ -236,21 +191,23 @@
this.start = this.setDefaultDate(this.userDefaultDate); this.start = this.setDefaultDate(this.userDefaultDate);
} }
this.priceStauts = this.initPrice(); this.priceStauts = this.initPrice();
// #ifdef MP-ALIPAY setTimeout(()=>{
uni.setNavigationBarTitle({ const that =this
title: "", const query = uni.createSelectorQuery().in(this);
}); query.selectAll('.sign-scroll').boundingClientRect((rects) => {
// #endif that.scrollHeight = rects[0].height
that.calcDefautlOffset()
}).exec();
},200)
}, },
watch: {
watch: {
defaultDate(newVal) { defaultDate(newVal) {
this.userDefaultDate = newVal; this.userDefaultDate = newVal;
if (this.userDefaultDate != "") { if (this.userDefaultDate != "") {
this.start = this.setDefaultDate(this.userDefaultDate); this.start = this.setDefaultDate(this.userDefaultDate);
} }
this.priceStauts = this.initPrice(); this.priceStauts = this.initPrice();
console.log(this.priceStauts)
}, },
//入住日期 //入住日期
start(newVal) { start(newVal) {
...@@ -269,13 +226,11 @@ ...@@ -269,13 +226,11 @@
} }
if (this.priceStauts.length > 0) { if (this.priceStauts.length > 0) {
console.log(this.lastNot);
for (var i = newVal[0]; i < this.priceStauts.length; i++) { for (var i = newVal[0]; i < this.priceStauts.length; i++) {
if (i == newVal[0]) { if (i == newVal[0]) {
for (var j = newVal[1]; j < this.priceStauts[i].length; j++) { for (var j = newVal[1]; j < this.priceStauts[i].length; j++) {
if (this.priceStauts[i][j] == -1) { if (this.priceStauts[i][j] == -1) {
this.lastNot = [i, j]; this.lastNot = [i, j];
console.log(this.lastNot);
return; return;
} }
} }
...@@ -283,7 +238,6 @@ ...@@ -283,7 +238,6 @@
for (var j = 0; j < this.priceStauts[i].length; j++) { for (var j = 0; j < this.priceStauts[i].length; j++) {
if (this.priceStauts[i][j] == -1) { if (this.priceStauts[i][j] == -1) {
this.lastNot = [i, j]; this.lastNot = [i, j];
console.log(this.lastNot);
return; return;
} }
} }
...@@ -294,14 +248,22 @@ ...@@ -294,14 +248,22 @@
} }
}, },
}, },
methods: { methods: {
calcDefautlOffset(){
const that =this
const query = uni.createSelectorQuery().in(this);
query.selectAll('.select-style').boundingClientRect((rects) => {
const top = rects[0].top-(that.scrollHeight) - 20
that.scrollTop = top>0?top:0
}).exec();
},
initPrice() { initPrice() {
//年份 //年份
var year = new Date().getFullYear(); var year = new Date().getFullYear();
let data = []; let data = [];
//月份 //月份
var month = new Date().getMonth(); var month = new Date().getMonth();
console.log('执行。。。。')
for (let i = 0; i < this.count; i++) { for (let i = 0; i < this.count; i++) {
var days = []; var days = [];
var week = 0; var week = 0;
...@@ -562,7 +524,6 @@ ...@@ -562,7 +524,6 @@
//月份 //月份
var month = new Date().getMonth(); var month = new Date().getMonth();
console.log("执行了...");
for (let i = 0; i < this.count; i++) { for (let i = 0; i < this.count; i++) {
var day = []; var day = [];
var week = 0; var week = 0;
...@@ -618,7 +579,6 @@ ...@@ -618,7 +579,6 @@
}; };
let tempPrice = {}; let tempPrice = {};
this.priceList.forEach((x, i) => { this.priceList.forEach((x, i) => {
console.log(x.startDate, obj.start);
if (obj.start == x.startDate) { if (obj.start == x.startDate) {
obj.priceObj = i; obj.priceObj = i;
} }
......
pages/jiuzhai/jz_Line.vue
View file @ a321732b
...@@ -345,11 +345,11 @@ ...@@ -345,11 +345,11 @@
'active2':msg.teamType==2}"> 'active2':msg.teamType==2}">
<headerLine></headerLine> <headerLine></headerLine>
<view class="search-box" style="margin-top: 24rpx;"> <view class="search-box" style="margin-top: 24rpx;">
<view class="date" @click="showBranch=true"> <view class="date" @click="showBranch=true" v-if="branchVisible">
<u-icon name="location" color="#B99846" size="24"></u-icon> <u-icon name="location" color="#B99846" size="24"></u-icon>
<text style="margin-left: 20rpx;color: #B99846;">{{currentBrachName}}</text> <text style="margin-left: 20rpx;color: #B99846;">{{currentBrachName}}</text>
</view> </view>
<view style="width: 1px;height: 26rpx;margin-right: 10rpx; background: #E5E3E1;flex-shrink: 0;"> <view v-if="branchVisible" style="width: 1px;height: 26rpx;margin-right: 10rpx; background: #E5E3E1;flex-shrink: 0;">
<view style="opacity: 0;"> <view style="opacity: 0;">
1 1
</view> </view>
...@@ -633,6 +633,7 @@ ...@@ -633,6 +633,7 @@
branchList: [], branchList: [],
currentBrachName: "", currentBrachName: "",
showBranch: false, showBranch: false,
branchVisible:false,
optionsTitle: [ optionsTitle: [
"推荐排序", "推荐排序",
"线路玩法", "线路玩法",
...@@ -650,6 +651,9 @@ ...@@ -650,6 +651,9 @@
uni.setNavigationBarTitle({ uni.setNavigationBarTitle({
title: "精品旅游线路" title: "精品旅游线路"
}) })
// #ifdef MP-DI
this.branchVisible=false
// #endif
}, },
onLoad(option) { onLoad(option) {
console.log("option", option); console.log("option", option);
......
pages/jiuzhai/jz_LineDetail.vue
View file @ a321732b
...@@ -44,16 +44,16 @@ ...@@ -44,16 +44,16 @@
</view> </view>
<view class="jz_TopPrice"> <view class="jz_TopPrice">
<view class="jz_LineTitle row items-center"> <view class="jz_LineTitle row items-center">
<view class="jz_LineTitleL" v-if="stepNumber>4"> <view class="jz_LineTitleL" v-if="userVipRights">
<view class="jz_LineTitleLImg"> <view class="jz_LineTitleLImg">
<img src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Upload/Goods/638733242185514996.png"/> <img src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Upload/Goods/638733242185514996.png"/>
</view> </view>
<view class="jz_LineTitleLText" v-if="dataList.lineId==168">9.5折</view> <view class="jz_LineTitleLText">
<view class="jz_LineTitleLText" v-else>返100/人</view> {{userVipRights.DiscountType==1?`${userVipRights.DiscountValue*10}折`:`减${userVipRights.DiscountValue}/人`}}
</view>
</view> </view>
<view class="col"> <view class="col">
<!-- <text>同业价：</text>
<text class="jz_renmin">¥</text><text class="jz_B2bPrice">{{ discountPrice }}</text> -->
<!-- #ifdef MP-AG --> <!-- #ifdef MP-AG -->
<text>原价：</text> <text>原价：</text>
<!-- #endif --> <!-- #endif -->
...@@ -91,7 +91,7 @@ ...@@ -91,7 +91,7 @@
<!-- #endif --> <!-- #endif -->
</view> </view>
<view v-if="TotalDiscount>0" class="jz_LineDetaYJDKQ" style="padding: 0rpx 0 0 0;"> <view v-if="maxCouponDiscount>0" class="jz_LineDetaYJDKQ" style="padding: 0rpx 0 0 0;">
<view class="jz_LineDetaYJ"> <view class="jz_LineDetaYJ">
<view class="jz_LineDetaYJL"> <view class="jz_LineDetaYJL">
<!-- #ifdef MP-DI --> <!-- #ifdef MP-DI -->
...@@ -101,7 +101,7 @@ ...@@ -101,7 +101,7 @@
<!-- 原价 ¥{{ currentPrice.b2BPrice }}/人起 --> <!-- 原价 ¥{{ currentPrice.b2BPrice }}/人起 -->
<!-- #endif --> <!-- #endif -->
</view> </view>
<view class="jz_LineDetaYJR">最高可减{{TotalDiscount}}</view> <view class="jz_LineDetaYJR">最高可减{{maxCouponDiscount}}</view>
</view> </view>
<view v-if="couponList.length>0" class="jz_LineDetaRDKQ"> <view v-if="couponList.length>0" class="jz_LineDetaRDKQ">
<view>{{couponList.length}}张可用优惠券</view> <view>{{couponList.length}}张可用优惠券</view>
...@@ -122,9 +122,6 @@ ...@@ -122,9 +122,6 @@
</view> </view>
</view> </view>
<!-- #endif --> <!-- #endif -->
<!-- <view class="jz_LineDetaFLJf" >
预计：{{}}积分
</view> -->
</view> </view>
<view class="jz_LineDetaRDKQ"> <view class="jz_LineDetaRDKQ">
<view>共{{Discounts}}项福利</view> <view>共{{Discounts}}项福利</view>
...@@ -144,53 +141,19 @@ ...@@ -144,53 +141,19 @@
<view class="jz_LineDetaSCRText">新户注册即得</view> <view class="jz_LineDetaSCRText">新户注册即得</view>
</view> </view>
</view> </view>
<view class="jz_LineDetaVip" v-if="stepNumber>0&&stepNumber<5">
<view class="jz_LineDetaVipTop"> <vip :line-id="dataList.lineId" v-if="dataList.lineId" @change="(v)=>userVipRights=v" @setUserOrder='(c)=>stepNumber=c'></vip>
<view>
<template v-if="stepNumber<5">
再完成{{UnfOddNumber}}单即可成为VIP，享永久折扣！
</template>
<template v-else>
您已是VIP，将享永久折扣！
</template>
</view>
<view>
<img src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Upload/Goods/638732528690203686.png"/>
</view>
</view>
<view class="jz_LineDetaVipPr">
<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 class="jz_LineDetaQTS" v-if="stepNumber==0&&couponList.length>0"> <view class="jz_LineDetaQTS" v-if="stepNumber==0&&couponList.length>0">
<img class="jz_LineDetaQTSImg" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Upload/Goods/638732463534129379.png" /> <img class="jz_LineDetaQTSImg" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Upload/Goods/638732463534129379.png" />
<view class="jz_LineDetaQTSText"> <view class="jz_LineDetaQTSText">
<view>完成首单，即可获得</view> <view>完成首单，即可获得</view>
<!-- #ifdef MP-DI -->
<view class="jz_LineDetaQTSTextRed">2张*100元</view>
<!-- #endif -->
<!-- #ifdef MP-AG -->
<view class="jz_LineDetaQTSTextRed">4张*150元</view> <view class="jz_LineDetaQTSTextRed">4张*150元</view>
<!-- #endif -->
<view>出境散拼团抵扣券</view> <view>出境散拼团抵扣券</view>
</view> </view>
</view> </view>
...@@ -210,42 +173,6 @@ ...@@ -210,42 +173,6 @@
</view> </view>
</view> </view>
<view class="jz_TripDays" v-if='1==0'>
<view style="display: flex; align-items: flex-start;">
<view style="margin-bottom: 40rpx;width:1px;flex:1;">
<span style="display: inline-block; position: relative">
<text style="
position: relative;
z-index: 2;
color: #1f1f1f;
font-size: 36rpx;
font-weight: bold;
">
VIP免费送
</text>
<span style="
width: 40px;
background-color: #dfbe6e;
height: 6px;
bottom: 2px;
left: 0;
right: 0;
position: absolute;
z-index: 1;
"></span>
</span>
</view>
</view>
<view style="padding: 5px 0;font-size: 12px;">
<u-steps :list="numList" active-color="#dfbe6e" un-active-color='#000'></u-steps>
<view style="font-size:12px;text-align:center;margin-top:10px;color:#cecece">
从2025年1月19日起，完成5个订单即可免费升级到【印象VIP同业】,终身享受特权折扣价。
</view>
</view>
</view>
<view class="jz_TripDays"> <view class="jz_TripDays">
<view style="display: flex; align-items: flex-start;"> <view style="display: flex; align-items: flex-start;">
<view style="margin-bottom: 40px;width:1px;flex:1;"> <view style="margin-bottom: 40px;width:1px;flex:1;">
...@@ -468,6 +395,7 @@ ...@@ -468,6 +395,7 @@
z-index: 1; z-index: 1;
"></span> "></span>
</span> </span>
<!-- <view class="jz_TripMain"> <!-- <view class="jz_TripMain">
<view class="jz_TripLine"></view> <view class="jz_TripLine"></view>
<view v-for="(item, index) in dataList.dayList" :key="index"> <view v-for="(item, index) in dataList.dayList" :key="index">
...@@ -1029,8 +957,8 @@ ...@@ -1029,8 +957,8 @@
<!-- <view class="jz_TripDays" style="width:100%;height:50rpx;background-color: transparent;"> <!-- <view class="jz_TripDays" style="width:100%;height:50rpx;background-color: transparent;">
</view> --> </view> -->
<u-popup v-model="showDateChosen" mode="bottom" border-radius="20" length="90%" :safe-area-inset-bottom="true"> <u-popup v-model="showDateChosen" mode="bottom" border-radius="20" length="90%" :safe-area-inset-bottom="true">
<canlendar @finish="chosenDateResult" :defaultDate="currentPrice.startDate" :priceList="dataList.priceList"></canlendar> <canlendar @finish="chosenDateResult" v-if="showDateChosen" :defaultDate="currentPrice.startDate" :priceList="dataList.priceList"></canlendar>
</u-popup> </u-popup>
<u-popup v-model="showOrderPreviwe" mode="bottom" border-radius="20" length="90%" :safe-area-inset-bottom="true"> <u-popup v-model="showOrderPreviwe" mode="bottom" border-radius="20" length="90%" :safe-area-inset-bottom="true">
<view style=" <view style="
...@@ -1040,7 +968,7 @@ ...@@ -1040,7 +968,7 @@
flex-direction: column; flex-direction: column;
"> ">
<view style="flex: 1; width: 100%; height: 1rpx"> <view style="flex: 1; width: 100%; height: 1rpx">
<canlendar @finish="chosenDateResult" :immediately="true" :defaultDate="currentPrice.startDate" :priceList="dataList.priceList" <canlendar @finish="chosenDateResult" v-if="showOrderPreviwe" :immediately="true" :defaultDate="currentPrice.startDate" :priceList="dataList.priceList"
title="确定日期和人数"></canlendar> title="确定日期和人数"></canlendar>
</view> </view>
<view style="background: #ecf1f4; padding: 20rpx 0"> <view style="background: #ecf1f4; padding: 20rpx 0">
...@@ -1240,14 +1168,13 @@ ...@@ -1240,14 +1168,13 @@
<script> <script>
import hParse from "@/components/u-parse/parse.vue"; import hParse from "@/components/u-parse/parse.vue";
import canlendar from "./components/sign/index.vue"; import canlendar from "./components/sign/index.vue";
// #ifdef MP-ALIPAY
import parseHtml from "../../plugin/htmlparse.js";
// #endif
import auth from "@/components/auth/index.vue"; import auth from "@/components/auth/index.vue";
import vip from "../../components/vip/vip.vue";
export default { export default {
components: { components: {
canlendar, canlendar,
auth, auth,
vip
}, },
data() { data() {
return { return {
...@@ -1305,7 +1232,6 @@ ...@@ -1305,7 +1232,6 @@
SaleId: 0, SaleId: 0,
mc: '', mc: '',
couponList:[], couponList:[],
maxCouponDiscount:0,
numList: [{ numList: [{
name: '' name: ''
}, { }, {
...@@ -1353,69 +1279,37 @@ ...@@ -1353,69 +1279,37 @@
}, },
], ],
stepNumber: 0,//当前完成单数 stepNumber: 0,//当前完成单数
UnfOddNumber: 0,//剩余完成订单数 可成为vip
discountPrice: 0,//优惠后金额 discountPrice: 0,//优惠后金额
Discounts: 1,//福利项 Discounts: 1,//福利项
TotalDiscount: 0,//合计优惠金额 vipInfo:null,
userVipRights:null
}; };
}, },
watch: { computed:{
stepNumber: { maxCouponDiscount(){
deep: true, let money = 0
immediate: true, //#ifdef MP-DI
handler(newVal, oldVal) { money = this.currentPrice.b2CPrice
this.progress.forEach((x,index)=>{ //#endif
if(this.stepNumber==0){ //#ifdef MP-AG
x.colorStyle = "" money = this.currentPrice.b2BPrice
x.radiusR = "" //#endif
x.radiusL = "" let discount = 0
} this.couponList.forEach(x=>{
if(this.stepNumber>0&&index<1){ if(x.couponsType==1 && x.denomination>discount) discount=x.denomination
x.colorStyle = "active" if(x.couponsType==2){
x.radiusR = "VPBLRadiusR" let disMoney = money*(1-x.denomination)
} discount = discount<disMoney?disMoney:discount
if(this.stepNumber>1&&index<2){ }
x.colorStyle = "active" })
x.radiusL = ""
if(index<1){ if(this.userVipRights){
x.radiusR = "" const v = this.userVipRights
}else{ if(v.DiscountType==1) discount += ((money-discount)*(1-v.DiscountValue))
x.radiusR = "VPBLRadiusR" else discount+=v.DiscountValue
} }
} return discount
if(this.stepNumber>2&&index<3){ }
x.colorStyle = "active"
x.radiusL = ""
if(index<2){
x.radiusR = ""
}else{
x.radiusR = "VPBLRadiusR"
}
}
if(this.stepNumber>3&&index<4){
x.colorStyle = "active"
x.radiusL = ""
if(index<3){
x.radiusR = ""
}else{
x.radiusR = "VPBLRadiusR"
}
}
if(this.stepNumber>4&&index<5){
x.colorStyle = "active"
x.radiusL = ""
if(index<4){
x.radiusR = ""
}else{
x.radiusR = "VPBLRadiusR"
x.radiusL = "VPBLRadiusL"
}
}
})
},
},
},
created() {
}, },
onLoad(option) { onLoad(option) {
...@@ -1514,9 +1408,6 @@ ...@@ -1514,9 +1408,6 @@
x.denomination =x.expansionModel.denomination x.denomination =x.expansionModel.denomination
} }
}) })
// setTimeout(()=>{
// console.log(this.currentPrice,'=======222')
// ,1000})
}, },
SelectSales(item){ SelectSales(item){
this.SaleName = item.EmName this.SaleName = item.EmName
...@@ -1557,50 +1448,13 @@ ...@@ -1557,50 +1448,13 @@
this.Discounts += 1 this.Discounts += 1
} }
this.calcPzCouponHandler() this.calcPzCouponHandler()
this.couponList.forEach(x=>{
if(x.couponsType==1 && x.denomination>this.maxCouponDiscount) this.maxCouponDiscount=x.denomination
if(x.couponsType==2){
let disMoney = 0
// #ifdef MP-DI
disMoney = this.currentPrice.b2CPrice*(1-x.denomination)
// #endif
// #ifdef MP-AG
disMoney = this.currentPrice.b2BPrice*(1-x.denomination)
// #endif
this.maxCouponDiscount = this.maxCouponDiscount<disMoney?disMoney:this.maxCouponDiscount
}
})
let money = 0
//#ifdef MP-DI
money = this.currentPrice.b2CPrice
//#endif
//#ifdef MP-AG
money = this.currentPrice.b2BPrice
//#endif
let maxCouponDiscount = this.maxCouponDiscount
this.TotalDiscount = this.maxCouponDiscount
if(this.stepNumber<5){
this.discountPrice = money-this.maxCouponDiscount
}else{
let discountPrice = money-this.maxCouponDiscount
if(this.dataList.lineId==168){
this.discountPrice = (discountPrice*0.95).toFixed(2)
maxCouponDiscount += money-Number(this.discountPrice)
console.log(discountPrice*0.95,'-----欧洲线')
}else{
this.discountPrice = Number(discountPrice)-100
maxCouponDiscount+=100
console.log(Number(discountPrice)-100,'-----其他线')
}
console.log(maxCouponDiscount,'------已减')
this.TotalDiscount = maxCouponDiscount.toFixed(2)
}
} }
}, },
(err) => { } (err) => { }
); );
}, },
getSale(){ getSale(){
this.apipost( this.apipost(
"b2b_get_GetCustomerCreateByList", "b2b_get_GetCustomerCreateByList",
...@@ -1645,15 +1499,7 @@ ...@@ -1645,15 +1499,7 @@
let fileName = let fileName =
`${this.dataList.currentPriceInfo?.startDate+'_'}${this.dataList.ltName.replace(/\s+/g,"").replaceAll("/","")}` `${this.dataList.currentPriceInfo?.startDate+'_'}${this.dataList.ltName.replace(/\s+/g,"").replaceAll("/","")}`
// if (this.delMsg.lineId && (this.delMsg.lineId == 168 || this.delMsg.lineId == 119)) {
// fileName = `${this.dataList.currentPriceInfo?.startDate+'_'} `
// if (this.dataList.title.length > 50) {
// fileName += this.dataList.title.substring(0, 50);
// } else {
// fileName += this.dataList.title;
// }
// }
console.log(fileName, "fileName");
const filePath = wx.env.USER_DATA_PATH + `/${fileName}.pdf` const filePath = wx.env.USER_DATA_PATH + `/${fileName}.pdf`
uni.downloadFile({ uni.downloadFile({
url: url, url: url,
...@@ -1801,9 +1647,6 @@ ...@@ -1801,9 +1647,6 @@
this.getStartCitiesHandler() this.getStartCitiesHandler()
res.data.tempImgCover = JSON.parse(res.data.imgCover); res.data.tempImgCover = JSON.parse(res.data.imgCover);
this.dataList = res.data; this.dataList = res.data;
this.stepNumber = this.dataList.orderNum
this.UnfOddNumber = (Number(this.stepNumber)-5)*-1
if(this.stepNumber>4) this.Discounts += 1
// #ifdef MP-AG // #ifdef MP-AG
if(this.dataList.currentPriceInfo.teamType==0) this.Discounts += 1 if(this.dataList.currentPriceInfo.teamType==0) this.Discounts += 1
// #endif // #endif
...@@ -1846,34 +1689,6 @@ ...@@ -1846,34 +1689,6 @@
}); });
this.finishFirstLoad = true; this.finishFirstLoad = true;
this.getUserCouponList() this.getUserCouponList()
// #ifdef MP-ALIPAY
if (this.dataList.feature.feeInclude) {
this.dataList.feature.feeInclude = parseHtml(
this.dataList.feature.feeInclude
);
}
if (this.dataList.feature.feeNonInclude) {
this.dataList.feature.feeNonInclude = parseHtml(
this.dataList.feature.feeNonInclude
);
}
if (this.dataList.feature.importantTip) {
this.dataList.feature.importantTip = parseHtml(
this.dataList.feature.importantTip
);
}
if (this.dataList.feature.warmTip) {
this.dataList.feature.warmTip = parseHtml(
this.dataList.feature.warmTip
);
}
if (this.dataList.feature.visaRemark) {
this.dataList.feature.visaRemark = parseHtml(
this.dataList.feature.visaRemark
);
}
// #endif
} catch (e) { } catch (e) {
console.log("getDetails_catch", e) console.log("getDetails_catch", e)
uni.showToast({ uni.showToast({
......
pages/order/aggregation/aggregation.vue 0 → 100644
View file @ a321732b
<template>
<view>
</view>
</template>
<script>
export default {
data() {
return {
}
},
methods: {
}
}
</script>
<style>
</style>
pages/reserve/share_qrcode.vue
View file @ a321732b
...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
that.request2({ that.request2({
url: '/api/AppletUser/GetWeiXinQRCodeForApplet', url: '/api/AppletUser/GetWeiXinQRCodeForApplet',
data: { data: {
Path: '/pages/index/index?user_id=' + that.UserInfo.UserId + '&SmallShopId=' + SmallShopId+'&storeId=' + this.storeId+'&id=' + this.ID+'&JumpType=8', Path: '/pages/index/index?user_id=' + that.UserInfo.UserId + '&SmallShopId=' + SmallShopId+'&storeId=' + this.storeId+'&id=' + this.ID+'&JumpType=8'+this.$uiConfig.DIRECT_PARAMETER,
With: that.qrcode.QrCodeSize, With: that.qrcode.QrCodeSize,
} }
}, },
......
pages/share-qrcode/share-qrcode.vue
View file @ a321732b
...@@ -91,7 +91,7 @@ ...@@ -91,7 +91,7 @@
that.request2({ that.request2({
url: '/api/AppletUser/GetWeiXinQRCodeForApplet', url: '/api/AppletUser/GetWeiXinQRCodeForApplet',
data: { data: {
Path: '/pages/index/index?user_id=' + that.UserInfo.UserId + '&SmallShopId=' + SmallShopId, Path: '/pages/index/index?user_id=' + that.UserInfo.UserId + '&SmallShopId=' + SmallShopId+this.$uiConfig.DIRECT_PARAMETER,
With: that.qrcode.QrCodeSize, With: that.qrcode.QrCodeSize,
} }
}, },
......
pages/user-center/components/userHeader.vue
View file @ a321732b
...@@ -74,6 +74,7 @@ ...@@ -74,6 +74,7 @@
</view> </view>
</view> </view>
</view> </view>
</view> </view>
</template> </template>
......
pages/user-center/user-bind-erp.vue
View file @ a321732b
...@@ -108,6 +108,7 @@ ...@@ -108,6 +108,7 @@
pid:u.erpBaseInfo?u.erpBaseInfo.employeeId:u.pid, pid:u.erpBaseInfo?u.erpBaseInfo.employeeId:u.pid,
erpBaseInfo: u.erpBaseInfo, erpBaseInfo: u.erpBaseInfo,
count: 0, count: 0,
isVip:u.isVip,
customerType: 1, //直客，2-同行 customerType: 1, //直客，2-同行
directCustomerId: u.directCustomerId //直客Id directCustomerId: u.directCustomerId //直客Id
} }
......
pages/user-center/user-center copy.vue 0 → 100644
View file @ a321732b
<template>
<scroll-view :scroll-y="true" @scroll="scrollHandler" @scrolltoupper="scrollTopHandler" style="height: 100vh">
<view class="userStyle" style="min-height:100vh" v-if="meueData.user_center && meueData.user_center.is_ppenmiai == 0"
:class="{ dark: isCompany }">
<!-- 修改 -->
<view class="headStatus" v-if="scrollTop > 50" :style="[
headStyle,
{
zIndex: scrollTop < 10 ? 'unset' : 2,
opacity: scrollTop < 10 ? '100' : scrollTop,
},
]">
<view class="title" v-if="scrollTop > 50">{{ pageTitle }}</view>
</view>
<view class="userBox" :style="{ 'padding-bottom': bottommargin }">
<view :style="{
'background-image':'url(' + (meueData.user_center.top_pic_url ? meueData.user_center.top_pic_url : '') + ')',
backgroundSize: '100% 310px',
}"
class="imgbg" :class="{
miniHeadTop: meueData.user_center.is_foot_bar_status != 1 && meueData.user_center.is_account_status != 1, }">
<view class="titlenav" :style="{ paddingTop: nav }">{{ pageTitle }}</view>
<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="b2b_user_info.photo?b2b_user_info.photo:user_info.avatar" size="140" shape="circle"></u-avatar>
<view style=" display: flex;flex-direction: column; justify-content: center; height: 100rpx; margin-left: 20rpx; ">
<view class="row items-center" @click="navigatorToProfile">
<Text class="nickname" style=" color: #fff; font-size: 36rpx;font-weight: 800; max-width: 400rpx; overflow: hidden; display: inline-block; white-space: nowrap;text-overflow: ellipsis; font-family:'microsoft yahei ui light'"
@click="login(user_info)">
<template v-if="b2b_user_info&&b2b_user_info.name">
{{b2b_user_info.name}}
</template>
<template v-else-if="mall_UserInfo&&mall_UserInfo.Name">
{{mall_UserInfo.Name}}
</template>
<template v-else>
立即登录
</template>
</Text>
<u-icon name="pen_" size="24" class="q-ml-sm" custom-prefix="tffont" color="#121212"></u-icon>
</view>
<view style="font-size:12px; margin-top:3px;">
<template v-if='b2b_user_info.erpBaseInfo'>
<view class="empolyee-tag row items-center">
<text style="padding: 6rpx;" class="text-center">{{ b2b_user_info.erpBaseInfo.branchName }}</text>
<text class="text-center" style="padding:6rpx;color:#fff;background-color: #B99846;">{{b2b_user_info.erpBaseInfo.emName}}</text>
</view>
</template>
<template v-else-if="b2b_user_info&&b2b_user_info.customerName&&b2b_user_info.customerName!=''">
{{b2b_user_info.customerName}}
</template>
<template v-else>
{{b2b_user_info ? b2b_user_info.name : ""}}
</template>
</view>
</view>
</view>
<view style=" display: flex; flex-direction: column; align-items: center; margin-top: 23px;margin-bottom: 5px; "
v-if="meueData.user_center.top_style == 2">
<u-avatar :src="user_info.avatar" shape="circle" size="120"></u-avatar>
<Text style="color: #fff; font-size: 40rpx; font-weight: 800" class="nickname" @click="login(user_info)">{{ user_info.nickname ? user_info.nickname : "立即登录" }}</Text>
<view class="member" v-if="is_icon_members_grade == 1 && user_info.nickname">
<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>
</view>
</view>
<view class="top_b">
<!--我的收藏-->
<view class="top_b_item" v-if="meueData.user_center.is_foot_bar_status == 1" @click="goUrl('/pages/favorite/favorite')">
<text style="font-size: 21px">{{ user_info.favorite ? user_info.favorite : 0 }}</text>
<text>{{ meueData.user_center.foot_bar[0].name }}</text>
</view>
<!--我的足迹-->
<view class="top_b_item" v-if="meueData.user_center.is_foot_bar_status == 1" @click="goUrl('/pages/foot/index/index')">
<text style="font-size: 21px">{{ user_info.footprint ? user_info.footprint : 0 }}</text>
<text>{{ meueData.user_center.foot_bar[1].name }}</text>
</view>
<!--优惠劵-->
<!-- <view class="top_b_item" v-if=" meueData.user_center && meueData.user_center.is_account_status == 1" @click="goUrl(couponsObj.link_url)">
<text style="font-size: 21px">{{ user_info.coupon ? user_info.coupon : 0 }}</text>
<text>{{ couponsObj.name }}</text>
</view> -->
</view>
<view class="Receiptbalance" v-if=" meueData.user_center && meueData.user_center.is_account_status == 1">
<!--余额-->
<view class="Receiptbalance_item" v-for="(item, index) in meueData.user_center.account" :key="index" v-if="item.link_url == '/pages/balance/balance'"
@click="goUrl(item.link_url)">
<image :src="item.icon_url" style="width: 22px; height: auto" mode="widthFix"></image>
<view style="margin-left: 15px;display: flex;flex-direction: column;justify-content: space-between;">
<span style="font-size: 21px; color: #0d0d0d; font-weight: 200">
{{ user_info.balance ? user_info.balance > 10000? (user_info.balance / 10000).toFixed(1) + "w": user_info.balance: 0 }}
</span>
<span style="">{{ item.name }}</span>
</view>
</view>
<view style="width: 1px; height: 34px; background: #e8e8e8"></view>
<!--积分明细-->
<view class="Receiptbalance_item" v-for="(item, index) in meueData.user_center.account" :key="index" v-if="item.link_url =='/pages/user-center/integral-detail/integral-detail'"
@click="goUrl(item.link_url)">
<image :src="item.icon_url" style="width: 17px; height: auto" mode="widthFix"></image>
<view style="margin-left: 15px; display: flex;flex-direction: column;justify-content: space-between;">
<span style="font-size: 21px; color: #0d0d0d; font-weight: 200">
{{user_info.integral? user_info.integral > 10000? (user_info.integral / 10000).toFixed(1) + "w": user_info.integral: 0}}
</span>
<span>{{ item.name }}</span>
</view>
</view>
</view>
</view>
<!-- 排课点数 -->
<view class="order_bar paike" style="" @click="gopointBalance" v-if="meueData.user_center.is_point_status == 1">
<span style="font-size: 14px; color: #111111">可用余额(点数)：</span>
<span style="font-size: 22px; color: #111111; font-family: aa">{{ PointNum }}</span>
</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>
<view class="order_bar_list">
<view class="order_bar_item" v-for="(item, index) in meueData.user_center.order_bar" :key="index" :name="item.name"
@click="goUrl(item.link_url)">
<image :src="item.icon_url" style="width: 60rpx; height: auto" mode="widthFix"></image>
<Text style="margin-top: 10rpx">{{ item.name }}</Text>
<!-- 待付款 -->
<view v-if="item.link_url == '/pages/order/index/index?status=1' && user_info.MyOrder.NonPayment > 0" class="badge"
:style="{ background: mainColor }">
{{ user_info.MyOrder.NonPayment }}
</view>
<!-- 待发货 -->
<view v-if="item.link_url == '/pages/order/index/index?status=2' &&user_info.MyOrder.WaitSendGoods > 0" class="badge"
:style="{ background: mainColor }">
{{ user_info.MyOrder.WaitSendGoods }}
</view>
<!-- 待收货 -->
<view v-if="item.link_url == '/pages/order/index/index?status=3' &&user_info.MyOrder.WaitReceiving > 0" class="badge"
:style="{ background: mainColor }">
{{ user_info.MyOrder.WaitReceiving }}
</view>
<!-- 待评价 -->
<view v-if="item.link_url == '/pages/order/order-commit' && user_info.MyOrder.WaitCommentNum > 0" class="badge"
:style="{ background: mainColor }">
{{ user_info.MyOrder.WaitCommentNum }}
</view>
<!-- 售后 -->
<view v-if="item.link_url == '/pages/order/after-sale/refunds-list' && user_info.MyOrder.AfterSaleNum > 0" class="badge"
:style="{ background: mainColor }">
{{ user_info.MyOrder.AfterSaleNum }}
</view>
</view>
</view>
</view>
<view class="order_bar" style="margin-top: 20rpx" v-if="meueData.user_center.is_sdorder_bar_status == 1">
<u-section title="司导订单" sub-title="查看更多" style="width: 100%; padding: 0px 0 10px" @click="goUrl('/pages/guidecar/orderList?status=0')"></u-section>
<view class="order_bar_list">
<view class="order_bar_item" v-for="(item, index) in meueData.user_center.sdorder_bar" :key="index" :name="item.name"
@click="goUrl(item.link_url)">
<image :src="item.icon_url" style="width: 60rpx; height: auto" mode="widthFix"></image>
<Text style="margin-top: 10rpx">{{ item.name }}</Text>
<!-- 待付款 -->
<view v-if="item.link_url == '/pages/guidecar/orderList?status=1' && user_info.MyGuideCarOrder.NonPayment>0"
class="badge" :style="{ background: mainColor }">
{{ user_info.MyGuideCarOrder.NonPayment }}
</view>
<!-- 待确认 -->
<view v-if="item.link_url == '/pages/guidecar/orderList?status=2' && user_info.MyGuideCarOrder.WaitSendGoods>0"
class="badge" :style="{ background: mainColor }">
{{ user_info.MyGuideCarOrder.WaitSendGoods }}
</view>
<!-- 待出行 -->
<view v-if="item.link_url == '/pages/guidecar/orderList?status=3' &&user_info.MyGuideCarOrder.WaitReceiving>0"
class="badge" :style="{ background: mainColor }">
{{ user_info.MyGuideCarOrder.WaitReceiving }}
</view>
<!-- 出行中 -->
<view v-if=" item.link_url == '/pages/guidecar/orderList?status=4' && user_info.MyGuideCarOrder.Completed>0 "
class="badge" :style="{ background: mainColor }">
{{ user_info.MyGuideCarOrder.Completed }}
</view>
<!-- 待评价 -->
<view v-if="item.link_url == '/pages/guidecar/order-commit' && user_info.MyGuideCarOrder.GuideCarWaitCommentNum>0"
class="badge" :style="{ background: mainColor }">
{{ user_info.MyGuideCarOrder.GuideCarWaitCommentNum }}
</view>
</view>
</view>
</view>
<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"
:key="mIndex" :style="{ marginTop: mIndex == 0 && (meueData.user_center.is_foot_bar_status == 1 || meueData.user_center.is_account_status == 1)? '25px' : '', }"
class="headCommon">
<view style="margin: 10px">{{ mItem.MenuNavTitle }}</view>
<view :class="mItem.MenuNavStyle == 1 ? 'menus' : 'menus2'" style="width: 100%">
<view :class="mItem.MenuNavStyle == 1 ? 'menus_item' : 'menus_item2'" v-for="(item, index) in mItem.MeunList"
:key="index" :name="item.name" @click="goUrl(item.link_url)" v-if="pandu(item)">
<image :src="item.icon_url" :style="{width: mItem.MenuNavStyle == 1 ? '20px' : '16px',height: 'auto',}" mode="widthFix"></image>
<Text style="font-size: 26rpx" :style="{'margin-top': mItem.MenuNavStyle == 1 ? '10rpx' : '0rpx','margin-left': mItem.MenuNavStyle == 1 ? '0rpx' : '24rpx', }">
{{ item.name }}
</Text>
<!-- #ifdef MP-WEIXIN -->
<button open-type="contact" class="contButton" v-if="item.link_url == 'contact' && item.name == '客服'"></button>
<!-- #endif -->
<!-- #ifdef MP-ALIPAY -->
<view class="contButton" style="display: flex;justify-content: center;align-items: center;" v-if="item.link_url == 'contact' && item.name == '客服'">
<contact-button tnt-inst-id="QqR_ZV6m" scene="SCE01203509" :icon="item.icon_url" size="70rpx" :alipay-card-no="2088 + userId"
:ext-info="appid">
</contact-button>
</view>
<!-- #endif -->
</view>
</view>
</view>
</template>
<!-- <view class="login-btn" style="margin:30px 0" @click='signOutHandler'>退出登录</view> -->
</view>
<auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth="gbAuth"></auth>
<tabbars></tabbars>
</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"
:PointNum="PointNum" @fatherMethod="login">
</blinddate>
<auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth="gbAuth"></auth>
<tabbars></tabbars>
</view>
</scroll-view>
</template>
<script>
import tabbars from "@/components/tabbar/index";
import auth from "../../components/auth/index.vue";
import blinddate from "./components/blinddate-user.vue";
export default {
data() {
return {
isloading: true,
pageTitle: "用户中心",
navHeight: 0,
contentHeight: 0,
cstyle: {},
meueData: {}, //菜单
user_info: {}, //个人信息
b2b_user_info: {},
headStyle: {},
bottommargin: 0,
listbottom: 0,
showAuth: false,
mainColor: "",
secondary: "",
u: {},
is_icon_members_grade: 0,
nav: 0,
scrollTop: 0,
couponsObj: {},
modelstype: 0, //机型类型
shopBasics: {},
mall_UserInfo: {},
IsEducation: 0, //1是0否是网课模式
PointNum: 0,
setting: {},
isCompany: true, //TODO 完成动态加载系统所属类型
companyStatus: 2,
companyName: "",
is_show_korea: 0, //是否显示认证标识
IsDeposit: 0, //是否开启储蓄卡功能
AppletID: 0, //小程序id 5-8日 判断是否是甲鹤
isAttestationEdu: 0, //学员是否认证了 0否1是
appid: encodeURIComponent(JSON.stringify({
appId: "2021002181604459"
})),
userId: uni.getStorageSync("mall_UserInfo").UserId,
};
},
components: {
tabbars,
auth,
blinddate,
},
created() {
this.mainColor = this.$uiConfig.mainColor;
this.secondary = this.$uiConfig.secondary;
this.IsEducation = uni.getStorageSync("basedata") ?
uni.getStorageSync("basedata").mall.setting.mallStyle.IsEducation ?
uni.getStorageSync("basedata").mall.setting.mallStyle.IsEducation :
0 :
0;
this.setting = uni.getStorageSync("basedata").mall.setting;
this.isCompany = uni.getStorageSync("user_type") ?
uni.getStorageSync("user_type") == "company" :
true; //完成动态加载系统所属类型
let basedata = uni.getStorageSync("basedata") ?
uni.getStorageSync("basedata") :
"";
this.AppletID = basedata.home_pages.id ? basedata.home_pages.id : 0;
this.isAttestationEdu = basedata.user_info.isAttestationEdu ?
basedata.user_info.isAttestationEdu :
0;
},
onLoad() {
this.navHeight = this.$navHeight - 2;
this.u = wx.getStorageSync("basedata").user_info;
this.b2b_user_info = uni.getStorageSync('b2b_user')
this.mall_UserInfo = uni.getStorageSync("mall_UserInfo");
this.nav = uni.getSystemInfoSync().statusBarHeight + "px";
this.headStyle.background = `linear-gradient(to right, '#e6b865',80%, '#ebb45e')`;
this.headStyle.paddingTop = this.nav;
if (!this.mall_UserInfo) {
this.showAuth = true;
} else if (!this.b2b_user_info ) {
//&& this.setting && this.setting.is_show_auth == 1
this.showAuth = true;
}
},
mounted() {
let currentPages = getCurrentPages();
let c = this.$uiConfig.is_bang ? 80 : 52;
this.bottommargin = c + 10 + "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;
this.is_show_korea = uni.getStorageSync("basedata") ?
uni.getStorageSync("basedata").mall.setting.is_show_korea :
0;
this.IsDeposit = uni.getStorageSync("basedata") ?
uni.getStorageSync("basedata").mall.setting.IsDeposit :
0;
let u = "/" + currentPages[currentPages.length - 1].route;
let pages = wx.getStorageSync("basedata") ?
wx.getStorageSync("basedata").bar_title : [];
// #ifdef MP-WEIXIN
uni.setNavigationBarTitle({
title: "用户中心",
});
// #endif
},
onShow() {
this.userCenterinfo(2);
let basedata = uni.getStorageSync("basedata") ?
uni.getStorageSync("basedata") :
"";
this.isAttestationEdu = basedata.user_info.isAttestationEdu ?
basedata.user_info.isAttestationEdu :
0;
},
methods: {
navigatorToProfile(){
uni.navigateTo({
url:'/pages/user-center/user-profile'
})
},
//退出登录
signOutHandler() {
uni.removeStorageSync('b2b_user')
uni.removeStorageSync('mall_UserInfo')
uni.redirectTo({
url: '/pages/index/index'
})
},
pandu(item) {
let flag = true;
let IsOpen =
this.shopBasics.model && this.shopBasics.model.IsOpen ?
this.shopBasics.model.IsOpen :
1;
let SmallShopId = this.mall_UserInfo.SmallShopId ?
this.mall_UserInfo.SmallShopId :
0;
let UserSmallShopId = this.mall_UserInfo.UserSmallShopId ?
this.mall_UserInfo.UserSmallShopId :
0;
switch (item.link_url) {
case "/pages/share/index/index":
if (this.user_info.isShowDistributionCenter == 1 && this.user_info && this.user_info.identity && this.user_info.identity
.fx_grade_id != 5) {
flag = true;
} else {
flag = false;
}
break;
case "/pages/friendcircle/my-news":
if (this.mall_UserInfo.UserTeacher > 0) {
flag = true;
} else {
flag = false;
}
break;
case "/pages/microShop/index/index":
//开启
if (IsOpen == 2) {
flag = true;
}
//关闭
else {
if (SmallShopId != 0 || UserSmallShopId != 0) {
flag = true;
} else {
flag = false;
}
}
break;
case "/pages/appointment/personal/studentAppointmentList":
if (this.meueData.user_center.is_point_status == 1) {
flag = true;
} else {
flag = false;
}
break;
case "/pages/appointment/personal/teacherOrderList":
if (
this.meueData.user_center.is_point_status == 1 &&
this.mall_UserInfo.UserTeacher > 0
) {
flag = true;
} else {
flag = false;
}
break;
case "/pages/appointment/appointment?teacher=1":
if (
this.meueData.user_center.is_point_status == 1 &&
this.mall_UserInfo.UserTeacher > 0
) {
flag = true;
} else {
flag = false;
}
break;
case "/pages/coupon/cards/purchase":
if (this.IsDeposit == 1) {
flag = true;
} else {
flag = false;
}
break;
//(旅小友)绑定同行
case "/pages/jiuzhai/bind_Customer":
if (this.b2b_user_info && this.b2b_user_info.customerType == 1) {
flag = true;
} else {
flag = false;
}
flag = true;
break;
case "/pages/jiuzhai/direct_Customer":
if (this.b2b_user_info && this.b2b_user_info.customerType == 1) {
flag = true;
} else {
flag = false;
}
break;
}
return flag;
},
//获取菜单配置
userCenterinfo(type = 1) {
uni.showNavigationBarLoading();
this.request2({
url: "/api/Mall/GetUserCenter",
data: {},
},
(res) => {
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;
}
});
if (this.mall_UserInfo && type == 1) {
// this.getLogin()
}
this.isloading = true;
}
);
let u = uni.getStorageSync("mall_UserInfo");
if (u && type == 1) {
this.getMicroShopBasics();
}
},
getLogin() {
var that = this;
let pid = uni.getStorageSync("pid") ? uni.getStorageSync("pid").pid : 0;
let Up = uni.getStorageSync("Up") ? uni.getStorageSync("Up").Up : 0;
let SmallShopId = uni.getStorageSync("SmallShopId") ?
uni.getStorageSync("SmallShopId").SmallShopId :
0;
let CounponPassword = uni.getStorageSync("CounponPassword") ?
uni.getStorageSync("CounponPassword").CounponPassword :
0;
let KeyWord = uni.getStorageSync("KeyWord") ?
uni.getStorageSync("KeyWord").KeyWord :
"";
that.request2({
url: "/api/AppletLogin/Login",
data: {
Source: this.mall_UserInfo.Source,
OpenId: this.mall_UserInfo.OpenId,
Name: this.mall_UserInfo.Name,
Photo: this.mall_UserInfo.Photo,
Moblie: "",
SuperiorId: pid,
SmallShopId: SmallShopId,
UserPageType: Up,
CounponPassword: CounponPassword,
KeyWord: KeyWord,
},
},
(res) => {
if (res.resultCode == 1) {
uni.setStorageSync("mall_UserInfo", res.data);
uni.removeStorageSync("pid");
uni.removeStorageSync("SmallShopId");
uni.removeStorageSync("Up");
uni.removeStorageSync("CounponPassword");
uni.removeStorageSync("KeyWord");
}
}
);
},
getMicroShopBasics() {
this.request2({
url: "/api/AppletUser/GetMicroShopBasics",
data: {},
},
(res) => {
this.shopBasics = res.data;
}
);
},
getUserPoint() {
this.request2({
url: "/api/AppletPoint/GetAppletUserPointDetailPageList",
data: {
pageIndex: 1,
pageSize: 10,
Type: 0
},
},
(res) => {
this.PointNum = res.data.pageData.PointNum;
}
);
},
goUrl(url) {
if (url == "/pages/balance/balance") {
uni.navigateTo({
url: "/pages/balance/balance?balance=" + this.user_info.balance,
});
} else {
uni.navigateTo({
url: url,
});
}
},
reloadUserinfo() {
this.b2b_user_info = uni.getStorageSync('b2b_user');
this.userCenterinfo();
this.u = this.user_info;
this.mall_UserInfo = uni.getStorageSync("mall_UserInfo") ?
uni.getStorageSync("mall_UserInfo") : {};
this.getUserPoint();
},
login(name) {
if ((name && name.nickname == "") || !name || !name.nickname) {
this.showAuth = true;
}
},
//关闭登录窗口
gbAuth() {
this.showAuth = false;
},
scrollHandler(e) {
this.scrollTop = e.detail.scrollTop;
},
scrollTopHandler() {
this.scrollTop = 0;
},
gopointBalance() {
//跳转点数余额
uni.navigateTo({
url: "/pages/appointment/personal/pointBalance",
});
},
// 获取公司认证信息
getComponyStatus() {
let that = this;
let parms = {
url: "/api/AppletTrade/GetUserCompany",
};
this.request2(parms, (res) => {
if (res.resultCode == 1 && res.data != null) {
// 获取公司名字和认证状态
that.companyStatus = res.data.CompanyStatus;
that.companyName = res.data.CompanyName;
}
});
},
//去认证页
goIdentification() {
uni.navigateTo({
url: "/pages/kotra/identification",
});
},
},
};
</script>
<style>
@import url('../../asset/css/flex.css');
.body {
background: #f3f4f6;
height: 100vh;
}
.userStyle .userBox {
display: flex;
flex-direction: column;
align-items: center;
background: #f3f4f6;
height: 100%;
min-height: 100vh;
}
.userStyle .imgbg {
width: 100%;
height: 310px;
display: flex;
flex-direction: column;
align-items: center;
position: relative;
}
.userStyle .headimg {
width: 140rpx;
height: 140rpx;
border-radius: 50%;
margin-left: 60rpx;
}
.userStyle .footprint {
width: 80%;
height: 140rpx;
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-around;
}
.userStyle .footprint_item {
width: 200rpx;
height: 90rpx;
display: flex;
flex-direction: column;
align-items: center;
justify-content: space-between;
}
.userStyle .footprint_item_bottom {
display: flex;
flex-direction: row;
align-items: center;
justify-content: center;
}
.userStyle .account_bar {
width: 94%;
height: 110rpx;
border-radius: 10rpx;
background: #fff;
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-around;
padding: 0 20rpx;
}
.userStyle .account_bar_item {
display: flex;
flex-direction: column;
align-items: center;
justify-content: space-between;
border-right: 1px solid #d1d1d1;
width: 25%;
}
.userStyle .account_bar_item:last-child {
border-right: 0;
}
.userStyle .order_bar {
width: 94%;
border-radius: 10rpx;
background: #fff;
display: flex;
flex-direction: column;
align-items: center;
padding: 30rpx;
margin-top: 80rpx;
}
.userStyle .order_bar .order_bar_list {
width: 100%;
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-between;
}
.userStyle .order_bar_item {
display: flex;
flex-direction: column;
align-items: center;
margin-top: 20rpx;
position: relative;
}
.userStyle .badge {
position: absolute;
right: -10rpx;
top: -10rpx;
padding: 0 12rpx;
display: flex;
align-items: center;
justify-content: center;
font-size: 20rpx;
color: #fff;
height: 30rpx;
border-radius: 15rpx;
}
.userStyle .menus {
width: 94%;
border-radius: 10rpx;
background: #fff;
display: flex;
flex-direction: row;
flex-wrap: wrap;
align-items: center;
margin-top: 30rpx;
}
.userStyle .menus2 {
width: 94%;
border-radius: 10rpx;
background: #fff;
display: flex;
flex-direction: column;
margin-top: 20rpx;
}
.userStyle .menus .menus_item {
width: 25%;
height: 110rpx;
margin: 20rpx 0 10rpx;
display: flex;
flex-direction: column;
align-items: center;
justify-content: space-around;
position: relative;
}
.menus_item2 .contButton,
.menus_item .contButton {
width: 100%;
height: 100%;
position: absolute;
left: 0;
top: 0;
opacity: 0;
}
.userStyle .menus2 .menus_item2 {
width: 100%;
height: 90rpx;
display: flex;
flex-direction: row;
align-items: center;
margin-left: 30rpx;
position: relative;
}
.userStyle .copyright {
padding: 70rpx 0;
display: flex;
flex-direction: column;
align-items: center;
}
.userStyle .ReceiptAdder {
position: absolute;
right: 0;
top: 160rpx;
width: 100px;
height: 24px;
border-top-left-radius: 12px;
border-bottom-left-radius: 12px;
display: flex;
flex-direction: row;
align-items: center;
padding: 0 20rpx;
background: rgba(55, 55, 55, 0.15);
}
.userStyle .member {
background: #3b3641;
font-size: 10px;
color: #fff;
height: 18px;
border-radius: 9px;
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-between;
margin-top: 10px;
}
.userStyle .titlenav {
width: 100%;
text-align: center;
font-size: 16px;
color: #ffffff;
}
.userStyle .top_b {
width: 86%;
height: 65px;
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-between;
}
.userStyle .top_b_item {
width: 26%;
height: 50px;
display: flex;
flex-direction: column;
align-items: center;
justify-content: space-between;
color: #ffffff;
font-size: 12px;
}
.userStyle .Receiptbalance {
width: 94%;
height: 62px;
position: absolute;
left: 3%;
bottom: -20px;
background: #ffffff;
border-radius: 6px;
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-around;
padding: 0 10px;
}
.userStyle .Receiptbalance_item {
width: 40%;
height: 50px;
display: flex;
flex-direction: row;
align-items: center;
font-size: 12px;
color: #534d62;
}
.userStyle .headStatus {
overflow: hidden;
position: relative;
width: 140vw;
padding-right: 40vw;
padding-bottom: 10px;
position: fixed;
left: 0;
right: 0;
top: 0;
display: flex;
background-image: linear-gradient(to right, #e6b865, #ebb45e);
}
.userStyle .headStatus .arrow {
height: 24px;
margin: 5px 10px;
width: 24px;
}
.userStyle .headStatus .title {
font-size: 18px;
color: #fff;
flex: 1;
width: 1px;
line-height: 34px;
text-align: center;
}
.dark .userStyle .headStatus .title {
color: #111 !important;
}
.dark .nickname {
color: #111 !important;
}
.userStyle .topheard {
display: flex;
flex-direction: row;
align-items: center;
width: 100%;
margin-bottom: 40rpx;
box-sizing: border-box;
padding-left: 30rpx;
}
.userStyle .miniHeadTop {
height: 400rpx;
}
.userBox .headCommon {
width: 94%;
margin-top: 25px;
border-radius: 10px;
background-color: #fff;
}
.userBox .headHasTOP {
margin-top: 25px;
}
.userBox .paike {
margin-top: 15px;
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-between;
}
.empolyee-tag{
border-radius: 7rpx;
background-color: #100000;
font-size: 22rpx;
font-weight: 400;
color: #f1f2f4;
overflow: hidden;
padding: 0;
line-height: 1;
}
.componyStatusBox .renzhen {
height: 15px;
font-size: 10px;
margin-top: 10px;
color: #555555;
border-radius: 7px;
border: 1px solid #999999;
display: flex;
align-items: center;
justify-content: center;
padding: 0 10rpx;
margin-left: 10rpx;
}
.componyStatusBox .companyName {
font-size: 26rpx;
font-weight: 500;
color: #888888;
}
.userBox .login-btn {
height: 80rpx;
background-color: #111111;
text-align: center;
line-height: 80rpx;
color: #fff;
font-size: 28rpx;
border-radius: 16rpx;
font-family: logo-font;
font-size: 16px;
width: calc(100vw - 40px);
margin: 30px 0;
box-sizing: border-box;
}
</style>
pages/user-center/user-center.vue
View file @ a321732b
<template> <template>
<scroll-view :scroll-y="true" @scroll="scrollHandler" @scrolltoupper="scrollTopHandler" style="height: 100vh"> <view style="width:100vw;height:100vh;" class="column">
<view class="userStyle" style="min-height:100vh" v-if="meueData.user_center && meueData.user_center.is_ppenmiai == 0" <scroll-view :scroll-y="true" @scroll="scrollHandler" @scrolltoupper="scrollTopHandler" class="col" style="height: 1px;width: 100%;">
:class="{ dark: isCompany }"> <view class="userStyle" style="min-height:100vh">
<!-- 修改 --> <view class="headStatus" v-if="scrollTop > 50" :style="{
<view class="headStatus" v-if="scrollTop > 50" :style="[ zIndex: scrollTop < 10 ? 'unset' : 2,
headStyle, opacity: scrollTop < 10 ? '100' : scrollTop,
{ }">
zIndex: scrollTop < 10 ? 'unset' : 2, <view class="title">{{ pageTitle }}</view>
opacity: scrollTop < 10 ? '100' : scrollTop, </view>
}, <view class="userBox">
]"> <vipUserHeader></vipUserHeader>
<view class="title" v-if="scrollTop > 50">{{ pageTitle }}</view> <view class="userMyOrderBox">
</view> <view style="position: relative;top:-13rpx">
<view class="userBox" :style="{ 'padding-bottom': bottommargin }"> <view class="userMyOrder">
<!-- <userHeader></userHeader> --> <view class="userMyOrderTitle row-sbas-n col">
<vipUserHeader></vipUserHeader> <view class="userMyOrderTitL">我的订单</view>
<view class="userMyOrderBox width100One"> <view class="userMyOrderTitR row" @click="goUrl('/pages/order/index/index')">
<view style="position: relative;top:-13rpx"> <text>全部</text>
<view class="userMyOrder"> <view>
<view class="userMyOrderTitle row-sbas-n col"> <u-icon class="userMyOrderTitRIght" name="arrow-up" size="30" color="#B2B3B3"></u-icon>
<view class="userMyOrderTitL">我的订单</view> </view>
<view class="userMyOrderTitR row" @click="goUrl('/pages/order/index/index')">
<text>全部</text>
<view>
<u-icon class="userMyOrderTitRIght" name="arrow-up" size="30" color="#B2B3B3"></u-icon>
</view> </view>
</view> </view>
</view> <view class="order_bar_list">
<view class="order_bar_list"> <view class="order_bar_item" @click="goUrl('/pages/order/index/index?status=1')">
<view class="order_bar_item" @click="goUrl('/pages/order/index/index?status=1')"> <image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Upload/Goods/638748963970628311.png" style="width: 66rpx; height: auto" mode="widthFix"></image>
<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Upload/Goods/638748963970628311.png" style="width: 66rpx; height: auto" mode="widthFix"></image> <Text style="margin-top: 10rpx;font-size: 24rpx;">待付款</Text>
<Text style="margin-top: 10rpx;font-size: 24rpx;">待付款</Text> <view class="badge"></view>
<view class="badge"></view> </view>
</view> <view class="order_bar_item" @click="goUrl('/pages/order/index/index?status=2')">
<view class="order_bar_item" @click="goUrl('/pages/order/index/index?status=2')"> <image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Upload/Goods/638748963971941398.png" style="width: 66rpx; height: auto" mode="widthFix"></image>
<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Upload/Goods/638748963971941398.png" style="width: 66rpx; height: auto" mode="widthFix"></image> <Text style="margin-top: 10rpx;font-size: 24rpx;">未确认</Text>
<Text style="margin-top: 10rpx;font-size: 24rpx;">未确认</Text> <view class="badge"></view>
<view class="badge"></view> </view>
</view> <view class="order_bar_item" @click="goUrl('/pages/order/index/index?status=3')">
<view class="order_bar_item" @click="goUrl('/pages/order/index/index?status=3')"> <image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Upload/Goods/638748963971902348.png" style="width: 66rpx; height: auto" mode="widthFix"></image>
<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Upload/Goods/638748963971902348.png" style="width: 66rpx; height: auto" mode="widthFix"></image> <Text style="margin-top: 10rpx;font-size: 24rpx;">已完成</Text>
<Text style="margin-top: 10rpx;font-size: 24rpx;">已完成</Text> <view class="badge"></view>
<view class="badge"></view> </view>
<view class="order_bar_item">
<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Upload/Goods/638748964440207840.png" style="width: 66rpx; height: auto" mode="widthFix"></image>
<Text style="margin-top: 10rpx;font-size: 24rpx;">待处理</Text>
<view class="badge"></view>
</view>
</view> </view>
<view class="order_bar_item"> <view class="orderProductBox">
<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Upload/Goods/638748964440207840.png" style="width: 66rpx; height: auto" mode="widthFix"></image> <view class="orderProduct row items-center">
<Text style="margin-top: 10rpx;font-size: 24rpx;">待处理</Text> <view class="orderProductL">
<view class="badge"></view> <image style="width: 91rpx; height: 88rpx;" mode="aspectFill" src="http://imgfile.oytour.com/Upload/WebSite/202501090355546390000000073.jpg"></image>
</view>
<view class="orderProductR col column" style="width: 1px;">
<view class="orderProductR_state">待处理</view>
<view class="orderProductR_text">(东东一地) 河津樱早樱东京富士山纯 河津樱早樱东京富士山纯</view>
</view>
</view>
</view> </view>
</view> </view>
<view class="orderProductBox"> <view style="height: 20rpx;"></view>
<view class="orderProduct row"> <view class="userMyOrder" style="padding: 12rpx 0 20rpx 0;">
<view class="orderProductL"> <view class="order_bar_list">
<image style="width: 91rpx; height: 88rpx;" <view class="order_bar_item relative" style="margin-top: 0;">
mode="aspectFill" <image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Upload/Goods/638749519965857485.png" style="width: 70rpx; height: 70rpx" mode="widthFix"></image>
src=" http://imgfile.oytour.com/Upload/WebSite/202501090355546390000000073.jpg"></image> <Text style="margin-top: 10rpx;font-size: 24rpx;">在线客服</Text>
<button open-type="contact" style="position: absolute;left: 0;top: 0;bottom: 0;right: 0;z-index: 1;opacity: 0;"></button>
</view> </view>
<view class="orderProductR col column"> <view class="order_bar_item" style="margin-top: 0;">
<view class="orderProductR_state">待处理</view> <image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Upload/Goods/638749520007722617.png" style="width: 70rpx; height: 70rpx" mode="widthFix"></image>
<view class="orderProductR_text">(东东一地) 河津樱早樱东京富士山纯 河津樱早樱东京富士山纯</view> <Text style="margin-top: 10rpx;font-size: 24rpx;">年底大红包</Text>
</view>
<view class="order_bar_item" style="margin-top: 0;" @click="goUrl('/pages/index/index')">
<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Upload/Goods/638749520286130928.png" style="width: 70rpx; height: 70rpx" mode="widthFix"></image>
<Text style="margin-top: 10rpx;font-size: 24rpx;">我的旅行社</Text>
</view>
<view class="order_bar_item" style="margin-top: 0;" @click="goUrl('/pages/coupon/list/list')">
<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Upload/Goods/638749520367368328.png" style="width: 70rpx; height: 70rpx" mode="widthFix"></image>
<Text style="margin-top: 10rpx;font-size: 24rpx;">领券中心</Text>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
<view style="height: 20rpx;"></view>
<view class="userMyOrder" style="padding: 12rpx 0 20rpx 0;">
<view class="order_bar_list">
<view class="order_bar_item relative" style="margin-top: 0;">
<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Upload/Goods/638749519965857485.png" style="width: 70rpx; height: 70" mode="widthFix"></image>
<Text style="margin-top: 10rpx;font-size: 24rpx;">在线客服</Text>
<button open-type="contact" style="position: absolute;left: 0;top: 0;
bottom: 0;right: 0;z-index: 1;opacity: 0;"></button>
</view>
<view class="order_bar_item" style="margin-top: 0;">
<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Upload/Goods/638749520007722617.png" style="width: 70rpx; height: 70" mode="widthFix"></image>
<Text style="margin-top: 10rpx;font-size: 24rpx;">年底大红包</Text>
</view>
<view class="order_bar_item" style="margin-top: 0;"
@click="goUrl('/pages/index/index')">
<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Upload/Goods/638749520286130928.png" style="width: 70rpx; height: 70" mode="widthFix"></image>
<Text style="margin-top: 10rpx;font-size: 24rpx;">我的旅行社</Text>
</view>
<view class="order_bar_item" style="margin-top: 0;"
@click="goUrl('/pages/coupon/list/list')">
<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Upload/Goods/638749520367368328.png" style="width: 70rpx; height: 70" mode="widthFix"></image>
<Text style="margin-top: 10rpx;font-size: 24rpx;">领券中心</Text>
</view>
</view>
</view>
</view> </view>
</view> </view>
</view> </view>
<auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth="gbAuth"></auth> </scroll-view>
<tabbars></tabbars> <auth v-if="showAuth"></auth>
</view> <tabbars></tabbars>
<view v-if="meueData.user_center&& meueData.user_center.is_ppenmiai == 1 && isloading == true "> </view>
<!-- 修改 -->
<blinddate :meueData="meueData" :user_info="user_info" :scrollTop="scrollTop" :modelstype="modelstype" :bottommargin="bottommargin"
:PointNum="PointNum" @fatherMethod="login">
</blinddate>
<auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth="gbAuth"></auth>
<tabbars></tabbars>
</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";
import userHeader from "./components/userHeader.vue";
import vipUserHeader from "./components/vipUserHeader.vue"; import vipUserHeader from "./components/vipUserHeader.vue";
export default { export default {
components: { components: {
tabbars, tabbars,
auth, auth,
blinddate, vipUserHeader
userHeader,
vipUserHeader,
}, },
data() { data() {
return { return {
isloading: true,
pageTitle: "个人中心", pageTitle: "个人中心",
navHeight: 0,
contentHeight: 0,
cstyle: {},
meueData: {}, //菜单
user_info: {}, //个人信息
b2b_user_info: {},
headStyle: {},
bottommargin: 0,
listbottom: 0,
showAuth: false,
mainColor: "",
secondary: "",
u: {},
is_icon_members_grade: 0,
nav: 0,
scrollTop: 0, scrollTop: 0,
couponsObj: {}, showAuth: false,
modelstype: 0, //机型类型 b2b_user_info: {},
shopBasics: {}, mall_UserInfo: {}
mall_UserInfo: {},
IsEducation: 0, //1是0否是网课模式
PointNum: 0,
setting: {},
isCompany: true, //TODO 完成动态加载系统所属类型
companyStatus: 2,
companyName: "",
is_show_korea: 0, //是否显示认证标识
IsDeposit: 0, //是否开启储蓄卡功能
AppletID: 0, //小程序id 5-8日 判断是否是甲鹤
isAttestationEdu: 0, //学员是否认证了 0否1是
appid: encodeURIComponent(JSON.stringify({
appId: "2021002181604459"
})),
userId: uni.getStorageSync("mall_UserInfo").UserId,
}; };
}, },
created() {
this.mainColor = this.$uiConfig.mainColor;
this.secondary = this.$uiConfig.secondary;
this.IsEducation = uni.getStorageSync("basedata") ?
uni.getStorageSync("basedata").mall.setting.mallStyle.IsEducation ?
uni.getStorageSync("basedata").mall.setting.mallStyle.IsEducation :
0 :
0;
this.setting = uni.getStorageSync("basedata").mall.setting;
this.isCompany = uni.getStorageSync("user_type") ?
uni.getStorageSync("user_type") == "company" :
true; //完成动态加载系统所属类型
let basedata = uni.getStorageSync("basedata") ?
uni.getStorageSync("basedata") :
"";
this.AppletID = basedata.home_pages.id ? basedata.home_pages.id : 0;
this.isAttestationEdu = basedata.user_info.isAttestationEdu ?
basedata.user_info.isAttestationEdu :
0;
},
onLoad() { onLoad() {
this.navHeight = this.$navHeight - 2; this.b2b_user_info = uni.getStorageSync('b2b_user');
this.u = wx.getStorageSync("basedata").user_info;
this.b2b_user_info = uni.getStorageSync('b2b_user')
this.mall_UserInfo = uni.getStorageSync("mall_UserInfo"); this.mall_UserInfo = uni.getStorageSync("mall_UserInfo");
this.nav = uni.getSystemInfoSync().statusBarHeight + "px"; this.showAuth = !this.mall_UserInfo || !this.b2b_user_info;
this.headStyle.background = `#232323`;
this.headStyle.paddingTop = this.nav;
if (!this.mall_UserInfo) {
this.showAuth = true;
} else if (!this.b2b_user_info ) {
//&& this.setting && this.setting.is_show_auth == 1
this.showAuth = true;
}
},
mounted() {
let currentPages = getCurrentPages();
let c = this.$uiConfig.is_bang ? 80 : 52;
this.bottommargin = c + 10 + "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;
this.is_show_korea = uni.getStorageSync("basedata") ?
uni.getStorageSync("basedata").mall.setting.is_show_korea :
0;
this.IsDeposit = uni.getStorageSync("basedata") ?
uni.getStorageSync("basedata").mall.setting.IsDeposit :
0;
let u = "/" + currentPages[currentPages.length - 1].route;
let pages = wx.getStorageSync("basedata") ?
wx.getStorageSync("basedata").bar_title : [];
// #ifdef MP-WEIXIN
uni.setNavigationBarTitle({
title: "用户中心",
});
// #endif
},
onShow() {
this.userCenterinfo(2);
let basedata = uni.getStorageSync("basedata") ?
uni.getStorageSync("basedata") :
"";
this.isAttestationEdu = basedata.user_info.isAttestationEdu ?
basedata.user_info.isAttestationEdu :
0;
}, },
methods: { methods: {
//退出登录
signOutHandler() {
uni.removeStorageSync('b2b_user')
uni.removeStorageSync('mall_UserInfo')
uni.redirectTo({
url: '/pages/index/index'
})
},
pandu(item) {
let flag = true;
let IsOpen =
this.shopBasics.model && this.shopBasics.model.IsOpen ?
this.shopBasics.model.IsOpen :
1;
let SmallShopId = this.mall_UserInfo.SmallShopId ?
this.mall_UserInfo.SmallShopId :
0;
let UserSmallShopId = this.mall_UserInfo.UserSmallShopId ?
this.mall_UserInfo.UserSmallShopId :
0;
switch (item.link_url) {
case "/pages/share/index/index":
if (this.user_info.isShowDistributionCenter == 1 && this.user_info && this.user_info.identity && this.user_info.identity
.fx_grade_id != 5) {
flag = true;
} else {
flag = false;
}
break;
case "/pages/friendcircle/my-news":
if (this.mall_UserInfo.UserTeacher > 0) {
flag = true;
} else {
flag = false;
}
break;
case "/pages/microShop/index/index":
//开启
if (IsOpen == 2) {
flag = true;
}
//关闭
else {
if (SmallShopId != 0 || UserSmallShopId != 0) {
flag = true;
} else {
flag = false;
}
}
break;
case "/pages/appointment/personal/studentAppointmentList":
if (this.meueData.user_center.is_point_status == 1) {
flag = true;
} else {
flag = false;
}
break;
case "/pages/appointment/personal/teacherOrderList":
if (
this.meueData.user_center.is_point_status == 1 &&
this.mall_UserInfo.UserTeacher > 0
) {
flag = true;
} else {
flag = false;
}
break;
case "/pages/appointment/appointment?teacher=1":
if (
this.meueData.user_center.is_point_status == 1 &&
this.mall_UserInfo.UserTeacher > 0
) {
flag = true;
} else {
flag = false;
}
break;
case "/pages/coupon/cards/purchase":
if (this.IsDeposit == 1) {
flag = true;
} else {
flag = false;
}
break;
//(旅小友)绑定同行
case "/pages/jiuzhai/bind_Customer":
if (this.b2b_user_info && this.b2b_user_info.customerType == 1) {
flag = true;
} else {
flag = false;
}
flag = true;
break;
case "/pages/jiuzhai/direct_Customer":
if (this.b2b_user_info && this.b2b_user_info.customerType == 1) {
flag = true;
} else {
flag = false;
}
break;
}
return flag;
},
//获取菜单配置
userCenterinfo(type = 1) {
uni.showNavigationBarLoading();
this.request2({
url: "/api/Mall/GetUserCenter",
data: {},
},
(res) => {
uni.hideNavigationBarLoading();
this.meueData = res.data.config;
console.log(this.meueData.user_center.order_bar,'--------');
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;
}
});
if (this.mall_UserInfo && type == 1) {
// this.getLogin()
}
this.isloading = true;
}
);
let u = uni.getStorageSync("mall_UserInfo");
if (u && type == 1) {
this.getMicroShopBasics();
}
},
getLogin() {
var that = this;
let pid = uni.getStorageSync("pid") ? uni.getStorageSync("pid").pid : 0;
let Up = uni.getStorageSync("Up") ? uni.getStorageSync("Up").Up : 0;
let SmallShopId = uni.getStorageSync("SmallShopId") ?
uni.getStorageSync("SmallShopId").SmallShopId :
0;
let CounponPassword = uni.getStorageSync("CounponPassword") ?
uni.getStorageSync("CounponPassword").CounponPassword :
0;
let KeyWord = uni.getStorageSync("KeyWord") ?
uni.getStorageSync("KeyWord").KeyWord :
"";
that.request2({
url: "/api/AppletLogin/Login",
data: {
Source: this.mall_UserInfo.Source,
OpenId: this.mall_UserInfo.OpenId,
Name: this.mall_UserInfo.Name,
Photo: this.mall_UserInfo.Photo,
Moblie: "",
SuperiorId: pid,
SmallShopId: SmallShopId,
UserPageType: Up,
CounponPassword: CounponPassword,
KeyWord: KeyWord,
},
},
(res) => {
if (res.resultCode == 1) {
uni.setStorageSync("mall_UserInfo", res.data);
uni.removeStorageSync("pid");
uni.removeStorageSync("SmallShopId");
uni.removeStorageSync("Up");
uni.removeStorageSync("CounponPassword");
uni.removeStorageSync("KeyWord");
}
}
);
},
getMicroShopBasics() {
this.request2({
url: "/api/AppletUser/GetMicroShopBasics",
data: {},
},
(res) => {
this.shopBasics = res.data;
}
);
},
getUserPoint() {
this.request2({
url: "/api/AppletPoint/GetAppletUserPointDetailPageList",
data: {
pageIndex: 1,
pageSize: 10,
Type: 0
},
},
(res) => {
this.PointNum = res.data.pageData.PointNum;
}
);
},
goUrl(url) {
if (url == "/pages/balance/balance") {
uni.navigateTo({
url: "/pages/balance/balance?balance=" + this.user_info.balance,
});
} else {
uni.navigateTo({
url: url,
});
}
},
reloadUserinfo() {
this.b2b_user_info = uni.getStorageSync('b2b_user');
this.userCenterinfo();
this.u = this.user_info;
this.mall_UserInfo = uni.getStorageSync("mall_UserInfo") ?
uni.getStorageSync("mall_UserInfo") : {};
this.getUserPoint();
},
login(name) {
if ((name && name.nickname == "") || !name || !name.nickname) {
this.showAuth = true;
}
},
//关闭登录窗口
gbAuth() {
this.showAuth = false;
},
scrollHandler(e) { scrollHandler(e) {
this.scrollTop = e.detail.scrollTop; this.scrollTop = e.detail.scrollTop;
}, },
scrollTopHandler() { scrollTopHandler() {
this.scrollTop = 0; this.scrollTop = 0;
}, },
gopointBalance() { goUrl(url) {
//跳转点数余额 uni.navigateTo({ url });
uni.navigateTo({ }
url: "/pages/appointment/personal/pointBalance", }
});
},
// 获取公司认证信息
getComponyStatus() {
let that = this;
let parms = {
url: "/api/AppletTrade/GetUserCompany",
};
this.request2(parms, (res) => {
if (res.resultCode == 1 && res.data != null) {
// 获取公司名字和认证状态
that.companyStatus = res.data.CompanyStatus;
that.companyName = res.data.CompanyName;
}
});
},
//去认证页
goIdentification() {
uni.navigateTo({
url: "/pages/kotra/identification",
});
},
},
}; };
</script> </script>
<style lang="scss" scoped> <style>
@import url("@/asset/css/flex.css"); @import url('../../asset/css/flex.css');
.body { .row-sbas-n {
background: #f3f4f6; justify-content: space-between;
height: 100vh; }
.relative {
position: relative;
} }
.userStyle .userBox { .userStyle .userBox {
...@@ -508,96 +141,19 @@ ...@@ -508,96 +141,19 @@
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
background: #f3f4f6; background: #f3f4f6;
height: 100%;
min-height: 100vh; min-height: 100vh;
} padding-bottom: env(safe-area-inset-bottom);
.userStyle .imgbg {
width: 100%;
height: 310px;
display: flex;
flex-direction: column;
align-items: center;
position: relative;
}
.userStyle .headimg {
width: 140rpx;
height: 140rpx;
border-radius: 50%;
margin-left: 60rpx;
}
.userStyle .footprint {
width: 80%;
height: 140rpx;
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-around;
}
.userStyle .footprint_item {
width: 200rpx;
height: 90rpx;
display: flex;
flex-direction: column;
align-items: center;
justify-content: space-between;
}
.userStyle .footprint_item_bottom {
display: flex;
flex-direction: row;
align-items: center;
justify-content: center;
}
.userStyle .account_bar {
width: 94%;
height: 110rpx;
border-radius: 10rpx;
background: #fff;
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-around;
padding: 0 20rpx;
}
.userStyle .account_bar_item {
display: flex;
flex-direction: column;
align-items: center;
justify-content: space-between;
border-right: 1px solid #d1d1d1;
width: 25%;
}
.userStyle .account_bar_item:last-child {
border-right: 0;
}
.userStyle .order_bar {
width: 94%;
border-radius: 10rpx;
background: #fff;
display: flex;
flex-direction: column;
align-items: center;
padding: 30rpx;
margin-top: 80rpx;
} }
.order_bar_list { .order_bar_list {
padding: 22rpx 55rpx 34rpx 55rpx; padding: 22rpx 55rpx;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
} }
.userStyle .order_bar_item { .order_bar_item {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
...@@ -605,7 +161,7 @@ ...@@ -605,7 +161,7 @@
position: relative; position: relative;
} }
.userStyle .badge { .badge {
position: absolute; position: absolute;
right: -10rpx; right: -10rpx;
top: -10rpx; top: -10rpx;
...@@ -621,151 +177,11 @@ ...@@ -621,151 +177,11 @@
border-radius: 14rpx; border-radius: 14rpx;
} }
.userStyle .menus { .headStatus {
width: 94%; position: fixed;
border-radius: 10rpx;
background: #fff;
display: flex;
flex-direction: row;
flex-wrap: wrap;
align-items: center;
margin-top: 30rpx;
}
.userStyle .menus2 {
width: 94%;
border-radius: 10rpx;
background: #fff;
display: flex;
flex-direction: column;
margin-top: 20rpx;
}
.userStyle .menus .menus_item {
width: 25%;
height: 110rpx;
margin: 20rpx 0 10rpx;
display: flex;
flex-direction: column;
align-items: center;
justify-content: space-around;
position: relative;
}
.menus_item2 .contButton,
.menus_item .contButton {
width: 100%;
height: 100%;
position: absolute;
left: 0;
top: 0;
opacity: 0;
}
.userStyle .menus2 .menus_item2 {
width: 100%;
height: 90rpx;
display: flex;
flex-direction: row;
align-items: center;
margin-left: 30rpx;
position: relative;
}
.userStyle .copyright {
padding: 70rpx 0;
display: flex;
flex-direction: column;
align-items: center;
}
.userStyle .ReceiptAdder {
position: absolute;
right: 0;
top: 160rpx;
width: 100px;
height: 24px;
border-top-left-radius: 12px;
border-bottom-left-radius: 12px;
display: flex;
flex-direction: row;
align-items: center;
padding: 0 20rpx;
background: rgba(55, 55, 55, 0.15);
}
.userStyle .member {
background: #3b3641;
font-size: 10px;
color: #fff;
height: 18px;
border-radius: 9px;
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-between;
margin-top: 10px;
}
.userStyle .titlenav {
width: 100%;
text-align: center;
font-size: 16px;
color: #ffffff;
}
.userStyle .top_b {
width: 86%;
height: 65px;
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-between;
}
.userStyle .top_b_item {
width: 26%;
height: 50px;
display: flex;
flex-direction: column;
align-items: center;
justify-content: space-between;
color: #ffffff;
font-size: 12px;
}
.userStyle .Receiptbalance {
width: 94%;
height: 62px;
position: absolute;
left: 3%;
bottom: -20px;
background: #ffffff;
border-radius: 6px;
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-around;
padding: 0 10px;
}
.userStyle .Receiptbalance_item {
width: 40%;
height: 50px;
display: flex;
flex-direction: row;
align-items: center;
font-size: 12px;
color: #534d62;
}
.userStyle .headStatus {
overflow: hidden;
position: relative;
width: 140vw; width: 140vw;
padding-right: 40vw; padding-right: 40vw;
padding-bottom: 10px; padding-bottom: 10px;
position: fixed;
left: 0; left: 0;
right: 0; right: 0;
top: 0; top: 0;
...@@ -773,13 +189,7 @@ ...@@ -773,13 +189,7 @@
background-image: linear-gradient(to right, #e6b865, #ebb45e); background-image: linear-gradient(to right, #e6b865, #ebb45e);
} }
.userStyle .headStatus .arrow { .headStatus .title {
height: 24px;
margin: 5px 10px;
width: 24px;
}
.userStyle .headStatus .title {
font-size: 18px; font-size: 18px;
color: #fff; color: #fff;
flex: 1; flex: 1;
...@@ -788,145 +198,68 @@ ...@@ -788,145 +198,68 @@
text-align: center; text-align: center;
} }
.dark .userStyle .headStatus .title { .userMyOrderBox {
color: #111 !important;
}
.dark .nickname {
color: #111 !important;
}
.userStyle .topheard {
display: flex;
flex-direction: row;
align-items: center;
width: 100%;
margin-bottom: 40rpx;
box-sizing: border-box;
padding-left: 30rpx;
}
.userStyle .miniHeadTop {
height: 400rpx;
}
.userBox .headCommon {
width: 94%;
margin-top: 25px;
border-radius: 10px;
background-color: #fff;
}
.userBox .headHasTOP {
margin-top: 25px;
}
.userBox .paike {
margin-top: 15px;
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-between;
}
.componyStatusBox .renzhen {
height: 15px;
font-size: 10px;
margin-top: 10px;
color: #555555;
border-radius: 7px;
border: 1px solid #999999;
display: flex;
align-items: center;
justify-content: center;
padding: 0 10rpx;
margin-left: 10rpx;
}
.componyStatusBox .companyName {
font-size: 26rpx;
font-weight: 500;
color: #888888;
}
.userBox .login-btn {
height: 80rpx;
background-color: #111111;
text-align: center;
line-height: 80rpx;
color: #fff;
font-size: 28rpx;
border-radius: 16rpx;
font-family: logo-font;
font-size: 16px;
width: calc(100vw - 40px);
margin: 30px 0;
box-sizing: border-box;
}
.userMyOrderBox{
padding: 0 31rpx; padding: 0 31rpx;
} }
.userMyOrder{ .userMyOrder {
background: #FFF; background: #FFF;
border-radius: 20rpx; border-radius: 20rpx;
padding: 33rpx 0 22rpx 0; padding: 33rpx 0 22rpx 0;
} }
.userMyOrderTitle{ .userMyOrderTitle {
padding: 23rpx 31rpx 0 31rpx; padding: 23rpx 31rpx 0 31rpx;
} }
.userMyOrderTitL{ .userMyOrderTitL {
font-family: PingFang SC; font-family: PingFang SC;
font-weight: 800; font-weight: 800;
font-size: 32rpx; font-size: 32rpx;
color: #080A09; color: #080A09;
} }
.userMyOrderTitR{ .userMyOrderTitR {
font-family: PingFang SC; font-family: PingFang SC;
font-weight: 500; font-weight: 500;
font-size: 24rpx; font-size: 24rpx;
color: #B2B3B3; color: #B2B3B3;
align-items: center; align-items: center;
} }
.userMyOrderTitRIght{ .userMyOrderTitRIght {
margin-left: 11rpx; margin-left: 11rpx;
transform: rotate(90deg); transform: rotate(90deg);
} }
.orderProductBox{
.orderProductBox {
padding: 0 20rpx; padding: 0 20rpx;
} }
.orderProduct{ .orderProduct {
width: 648rpx; width: 648rpx;
height: 132rpx; height: 132rpx;
background: #F7F7F7; background: #F7F7F7;
border-radius: 18rpx; border-radius: 18rpx;
padding: 21rpx 20rpx; padding: 21rpx 20rpx;
} }
.orderProductL{ .orderProductL {
width: 91rpx; width: 91rpx;
height: 88rpx; height: 88rpx;
border-radius: 14rpx; border-radius: 14rpx;
overflow: hidden; overflow: hidden;
margin-right: 18rpx; margin-right: 18rpx;
} }
.orderProductR_state{ .orderProductR_state {
font-family: PingFang SC; font-family: PingFang SC;
font-weight: 500; font-weight: 500;
font-size: 28rpx; font-size: 28rpx;
color: #080A09; color: #080A09;
padding-top: 5rpx; padding-top: 5rpx;
} }
.orderProductR_text{ .orderProductR_text {
width: 100%; width: 100%;
font-family: PingFang SC; font-family: PingFang SC;
font-weight: 500; font-weight: 500;
font-size: 24rpx; font-size: 24rpx;
color: #8C8C8C; color: #8C8C8C;
padding-top: 4rpx; padding-top: 4rpx;
word-break: break-all; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
display: -webkit-box; white-space: nowrap;
-webkit-box-orient: vertical;
-webkit-line-clamp: 1;
overflow: hidden;
} }
</style> </style>
\ No newline at end of file
plugin/api.js
View file @ a321732b
...@@ -27,6 +27,7 @@ export default { ...@@ -27,6 +27,7 @@ export default {
Vue.prototype.host3 = "http://192.168.5.214" Vue.prototype.host3 = "http://192.168.5.214"
//Vue.prototype.host2 = "https://erpmallapi.oytour.com" //Vue.prototype.host2 = "https://erpmallapi.oytour.com"
//Vue.prototype.host3 = "https://reborn.oytour.com" //Vue.prototype.host3 = "https://reborn.oytour.com"
console.log(process.env)
Vue.prototype.request = function(param, success, failed) { Vue.prototype.request = function(param, success, failed) {
//网络请求 //网络请求
......
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