Skip to content

J
jz_Travel
Commit e10657cc authored by 罗超's avatar 罗超
Browse files
Options

修改样式

parent 8b503633
Hide whitespace changes
Inline Side-by-side
Showing with 256 additions and 15 deletions
App.vue
View file @ e10657cc
......@@ -106,6 +106,7 @@ export default {
<style lang="scss">
@import "uview-ui/index.scss";
@import url("./asset/font/iconfont.css");
@import url('asset/font/tffont.css');
/* 0123456789首页订单我的暂无图片第天 */
@font-face {
font-family: "nav-font";src: url("//at.alicdn.com/wf/webfont/MQHUV6e56ce5/uWqIjWPWlbHR.woff2") format("woff2"),
......
asset/css/flex.css
View file @ e10657cc
......@@ -56,7 +56,10 @@
justify-content: space-between;
flex-wrap: wrap;
}
.flex1{
.items-center{
align-items: center;
}
.flex1,.col{
flex: 1;
}
.flexG{
......
asset/font/tffont.css 0 → 100644
View file @ e10657cc
@font-face {
font-family: "tffont"; /* Project id 4816119 */
src: url('//at.alicdn.com/t/c/font_4816119_ut3uqptmt1.woff2?t=1737444391856') format('woff2'),
url('//at.alicdn.com/t/c/font_4816119_ut3uqptmt1.woff?t=1737444391856') format('woff'),
url('//at.alicdn.com/t/c/font_4816119_ut3uqptmt1.ttf?t=1737444391856') format('truetype');
}
.tffont {
font-family: "tffont" !important;
font-size: 16px;
font-style: normal;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}
.tffont-shouye:before {
content: "\e634";
}
.tffont-5wodejifen:before {
content: "\e606";
}
.tffont-f-vip:before {
content: "\e76b";
}
.tffont-yongjin2:before {
content: "\e600";
}
components/coupons/coupons.vue
View file @ e10657cc
......@@ -5,7 +5,7 @@
<img src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/couponsbg.png" mode="widthFix" />
<view class="coupons-box">
<text style="font-size: 18px;color: #FFFFFF;">恭喜获得{{msgtype==1?'优惠券':'积分'}}</text>
<text style="font-size: 14px;color: #FDE005;;margin-top: 20rpx;">{{couponMessage}}</text>
<text style="font-size: 14px;color: #FDE005;;margin-top: 20rpx;" v-for="(x,i) in msgs" :key="i">{{x}}</text>
<text style="font-size: 12px;color: #FDE005;;margin-top: 20rpx;" v-if="cform!=null && cform!=''">{{cform}}</text>
<view class="btn" @click="goLook">
<text>立即查看</text>
......@@ -21,7 +21,7 @@
export default {
props: {
couponMessage: {
type: String,
type: String|Array,
default: 0
},
msgtype: {
......@@ -37,11 +37,15 @@
return {
pageinfo: {},
showDialog: true,
msgs:[]
};
},
created() {
if(typeof this.couponMessage == 'string'){
this.msgs.push(this.couponMessage)
}else{
this.msgs = this.couponMessage
}
},
methods: {
goLook() {
......
pages/coupon/index/index.vue
View file @ e10657cc
......@@ -55,7 +55,7 @@
<template v-if="x.lineteamNameStr&&x.lineteamNameStr!=''">适用系列:{{x.lineteamNameStr}}</template>
<template v-if="x.remark&&x.remark!=''">{{x.remark}}</template>
</view>
<view class="coupondLineGo" @click.stop="godetails(x)">去使用</view>
<view class="coupondLineGo" @click.stop="godetails(x)">查看</view>
</view>
<view class="date">{{x.effectDate}}至{{ x.expirationDate }}</view>
</view>
......@@ -283,6 +283,29 @@
}
arrList(res.data.pageData)
this.couponDataList = res.data.pageData;
if((this.msg.CouponsUseScope==-1||this.msg.CouponsUseScope==11) && this.msg.CouponsType!=2 && this.msg.CouponStatus!=3){
this.couponDataList.push({
UseState: 1,
couponId: 0,
couponName: "切位团专享1000元优惠券",
couponsType: 1,
couponsUseScope: 11,
couponsUseScopeName: "切位",
denomination: 1000,
effectDate: "2025-01-01",
expirationDate: "2025-12-31",
fromPlatform: "2",
id: 0,
instructions: null,
lineIds: "0",
lineNameStr: "",
lineteamIds: "0",
lineteamNameStr: "",
overlapUse: 0,
remark: "无限次使用优惠券",
useCondition: 0
})
}
this.couponDataList.forEach(x => {
if(x.couponsUseScope<=8){
if(x.couponsUseScope==0) x.backGroubd = this.lineImgs[0]
......@@ -541,7 +564,7 @@
.couponLine {
width: 100%;
position: absolute;
top: 74rpx;
top: 75rpx;
flex: 1;
z-index: 2;
background: #fff;
......
pages/jiuzhai/jz_LineDetail.vue
View file @ e10657cc
......@@ -18,7 +18,7 @@
<view class="mi-right">
<view style="color: #fff; margin-bottom: 6rpx; font-size: 22rpx">团队编号：{{ delMsg.tcnum }}
</view>
<view style="color: #fff; font-size: 22rpx">{{ dataList.startCityName }}集合出发 · 精品线路
<view style="color: #fff; font-size: 22rpx">{{ dataList.ltName }}
</view>
</view>
</view>
......@@ -43,9 +43,19 @@
</view>
</view>
<view class="jz_TopPrice">
<view class="jz_LineTitle">
<text class="jz_renmin">¥</text><text class="jz_B2bPrice">{{ $utils.getretailer()?currentPrice.b2BPrice:currentPrice.b2CPrice }}</text>
<text style="color: #999999; font-size: 28rpx; font-weight: 400">/人起</text>
<view class="jz_LineTitle row items-center">
<view class="col">
<text class="jz_renmin">¥</text><text class="jz_B2bPrice">{{ $utils.getretailer()?currentPrice.b2BPrice:currentPrice.b2CPrice }}</text>
<text style="color: #999999; font-size: 28rpx; font-weight: 400">/人起</text>
</view>
<view class="row items-center" style="border-radius: 4px;overflow: hidden;font-size: 12px;" v-if="dataList.currentPriceInfo.teamType==1">
<view style="background-color: #111;padding: 2px 5px;color: #FFF;">
独家
</view>
<view style="background-color: #dfbe6e;padding: 2px 5px; color: #111;">
高端定制小团
</view>
</view>
</view>
<view class="jz_MainTitle">
<text v-if="dataList.title">{{ dataList.title }}</text>
......@@ -54,10 +64,10 @@
<text>{{ dataList.productRecommend }}</text>
</view>
</view>
<view class="jz_TripDays">
<view style="display: flex; align-items: flex-start;">
<view style="margin-bottom: 40px;width:1px;flex:1;">
<view style="margin-bottom: 40rpx;width:1px;flex:1;">
<span style="display: inline-block; position: relative">
<text style="
position: relative;
......@@ -66,6 +76,113 @@
font-size: 36rpx;
font-weight: bold;
">
下单福利多
</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 class="row items-center" style="padding: 5px 0;font-size: 12px;" v-if="maxCouponDiscount>0">
<u-icon name="shouye" custom-prefix='tffont' color="#cecece" size="40" style="position: relative;z-index: 2;" ></u-icon>
<text style="color:#cecece; margin-left: 5px;">优惠券</text>
<view style="text-align: right;" class="col">
<text>最高可减：</text>
<text style="color:#ff3166; ">{{ maxCouponDiscount.toFixed(2) }}</text>
<text>;{{couponList.length}}张可用</text>
</view>
<u-icon name="arrow" color="#cecece" size="30" style="margin-left: 5px;" ></u-icon>
</view>
<view class="row items-center" style="padding: 5px 0;font-size: 12px;" v-if="currentPrice.teamType==0">
<u-icon name="5wodejifen" custom-prefix='tffont' color="#cecece" size="40" style="position: relative;z-index: 2;" ></u-icon>
<text style="color:#cecece; margin-left: 5px;">会员积分</text>
<view style="text-align: right;" class="col">
<text>预计可反：</text>
<text style="color:#ff3166; ">{{ (currentPrice.b2BPrice/100).toFixed(2) }}</text>
<text>分</text>
</view>
<u-icon name="arrow" color="#cecece" size="30" style="margin-left: 5px;" ></u-icon>
</view>
<view class="row items-center" style="padding: 5px 0;font-size: 12px;" v-if="currentPrice.teamType==0">
<u-icon name="yongjin2" custom-prefix='tffont' color="#cecece" size="40" style="position: relative;z-index: 2;" ></u-icon>
<text style="color:#cecece; margin-left: 5px;">幸福存折</text>
<view style="text-align: right;" class="col">
<text>返佣：</text>
<text style="color:#ff3166; ">{{ currentPrice.lineId==168?80.00:30.00 }}</text>
<text>/人</text>
</view>
<u-icon name="arrow" color="#cecece" size="30" style="margin-left: 5px;" ></u-icon>
</view>
<view class="row items-center" style="padding: 5px 0;font-size: 12px;" v-if='1==0'>
<u-icon name="f-vip" custom-prefix='tffont' color="#000" size="40" style="position: relative;z-index: 2;" ></u-icon>
<view style="background-color: #dfbe6e;margin-left: -11px;padding: 1px 5px;font-size: 8px;text-indent: 8px; color: #111;border-top-right-radius: 4px;border-bottom-right-radius: 4px;">
印象VIP
</view>
<view style="text-align: right;" class="col">
<text>优惠：</text>
<text style="color:#ff3166; ">{{ currentPrice.lineId==168?95:100.00 }}</text>
<text>{{ currentPrice.lineId==168?'折':'/人'}}</text>
</view>
<u-icon name="arrow" color="#cecece" size="30" style="margin-left: 5px;" ></u-icon>
</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 style="display: flex; align-items: flex-start;">
<view style="margin-bottom: 40px;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;
">
<text v-if="dataList.startCityName || (dataList.currentPriceInfo.priceUnion && dataList.currentPriceInfo.priceUnion.startCityName)">{{
dataList.currentPriceInfo.priceUnion && dataList.currentPriceInfo.priceUnion.startCityName?dataList.currentPriceInfo.priceUnion.startCityName:dataList.startCityName
}}</text>出发
......@@ -1070,6 +1187,20 @@
SaleName: '',
SaleId: 0,
mc: '',
couponList:[],
maxCouponDiscount:0,
numList: [{
name: ''
}, {
name: ''
}, {
name: ''
}, {
name: ''
}, {
name: ''
}
]
};
},
created() {},
......@@ -1153,6 +1284,44 @@
this.SaleName = item.EmName
this.SaleId = item.CreateBy
},
getUserCouponList() {
let couponParams = {
"lineId": this.dataList.lineId, //线路ID
"lineteamId": this.dataList.lineteamId, //系列ID
"userId": this.customer.accountId, //AccountId
"CouponsUseScope": 0, //特定使用平台(当地游=8 跟团游=2 小包团=10)
"isExpansion": 0, //是否启动膨胀金1-是
"CustomerType": 0, //客户类型 0-同行，1-直客
"TCID": this.currentPrice.tcid,
}
if (this.currentPrice.teamType == "0") {
//跟团游
couponParams.CouponsUseScope = 2;
} else if (this.currentPrice.teamType == "1") {
//小包团
couponParams.CouponsUseScope = 10;
} else if (this.currentPrice.teamType == "2") {
//当地游
couponParams.CouponsUseScope = 8;
}
this.apipost(
"coupon_post_GetUserCanUseCouponList", couponParams,
(res) => {
if (res.resultCode == 1) {
this.couponList = res.data
this.couponList.forEach(x=>{
if(x.couponsType==1 && x.denomination>this.maxCouponDiscount) this.maxCouponDiscount=x.denomination
if(x.couponsType==2){
const disMoney = this.currentPrice.b2BPrice*(1-x.denomination)
this.maxCouponDiscount = this.maxCouponDiscount<disMoney?disMoney:this.maxCouponDiscount
}
})
}
},
(err) => { }
);
},
getSale(){
this.apipost(
"b2b_get_GetCustomerCreateByList",
......@@ -1275,6 +1444,7 @@
this.customerDate = price;
}
this.showDateChosen = false;
this.getUserCouponList()
},
crChange(e) {
this.crCount = e.value;
......@@ -1381,7 +1551,7 @@
}
});
this.finishFirstLoad = true;
this.getUserCouponList()
// #ifdef MP-ALIPAY
if (this.dataList.feature.feeInclude) {
this.dataList.feature.feeInclude = parseHtml(
......@@ -1408,6 +1578,7 @@
this.dataList.feature.visaRemark
);
}
// #endif
} catch (e) {
console.log("getDetails_catch", e)
......@@ -1526,6 +1697,7 @@
this.delMsg.configId = item.configID;
this.currentPrice = item;
this.getDetails();
} else {
uni.showToast({
title: "该团期已售罄",
......@@ -1706,7 +1878,15 @@
url("//at.alicdn.com/wf/webfont/MQHUV6e56ce5/cHntSgti5kmY.woff") format("woff");
font-display: swap;
}
.row{
display: flex;
}
.items-center{
align-items: center;
}
.col{
flex: 1;
}
.jz_FlightItem {
display: flex;
justify-content: space-between;
......
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