Skip to content

A
Athena
Commit bc0c87b9 authored by 黄媛媛's avatar 黄媛媛
Browse files
Options

update

parent bcf457a9
Hide whitespace changes
Inline Side-by-side
Showing with 153 additions and 27 deletions
src/assets/css/common.css
View file @ bc0c87b9
......@@ -290,4 +290,19 @@
.commonF ._trip_xiangqing_tips span{
color: #3965B0;
cursor: pointer;
}
\ No newline at end of file
}
.commonF .yhqImg{
position: absolute;
right: 80px;
top: 10px;
width: 50px;
height: 50px;
}
.commonF .yhqImg img{
width: 100%;
height: 100%;
display: block;
}
.commonF .yhqUl .disab{
background-color: #ccc !important;
}
\ No newline at end of file
src/components/FreeTravel/OrderConfirmation.vue
View file @ bc0c87b9
......@@ -303,7 +303,7 @@
<p style="width:100%;margin:10px 0;">优惠券</p>
<p v-if="!Verification.length || Verification[0].ApplyState !== 1" class="_trip_xiangqing_tips">您还未进行 <span @click="goShenqing">实名认证</span>，认证后可使用优惠券哦~如果已提认证申请，申请审核通过后即可使用优惠券！</p>
<div v-if="UserCanUseCouponList.length>0" class="_coupon_box">
<div class="_coupon_item" v-for="(item, index) in UserCanUseCouponList" :class="{'blue':item.couponsType===1,'_active':item.active,'disab': !Verification.length || Verification[0].ApplyState !== 1}" @click="!Verification.length || Verification[0].ApplyState !== 1 ? '' : clickCoupon(item)">
<div class="_coupon_item" v-for="(item, index) in UserCanUseCouponList" :class="{'blue':item.couponsType===1,'_active':item.active,'disab':!Platfrom(item.fromPlatform) || !Verification.length || Verification[0].ApplyState !== 1}" @click="!Platfrom(item.fromPlatform) || !Verification.length || Verification[0].ApplyState !== 1 ? '' : clickCoupon(item)">
<div class="_left_raduis">
<span></span>
<span></span>
......@@ -323,9 +323,9 @@
<p class="_info_full">满{{item.useCondition}}可用</p>
<p class="_info_time _time">有效时间：{{item.effectDate | YMD}}-{{item.expirationDate | YMD}}</p>
<p class="_repeat" v-if="item.overlapUse === 1">可叠加</p>
<div class="_choice_box">
<span v-if="!item.active"></span>
<span v-else class="iconfont icon-xuanzhong2"></span>
<div v-if="Platfrom(item.fromPlatform)" class="_choice_box">
<span v-if="!item.active"></span>
<span v-else class="iconfont icon-xuanzhong2"></span>
</div>
</div>
</div>
......@@ -538,6 +538,16 @@ export default {
},
methods: {
Platfrom(str){
if(str){
if(str.indexOf('0')!=-1 || str.indexOf('3')!=-1){
return true;
}
else{
return false;
}
}
},
goShenqing: function () {
let dom = document.querySelector("#blankLink")
dom.href=`http://${window.location.host}/#/PsSystem/${1}`
......
src/components/Hotel/HotelSure.vue
View file @ bc0c87b9
......@@ -508,19 +508,19 @@
<li style="margin-left:20px;">成人男</li>
<li>
<el-select style="width:90px" v-model="item.roomMaleCount" :disabled="item.isShowMale" placeholder="成人男">
<el-option v-for="item in Pnumber" :value="item.num" :label="item.num"></el-option>
<el-option v-for="(item,index) in Pnumber" :value="item.num" :label="item.num" :key="index"></el-option>
</el-select>
</li>
<li>成人女</li>
<li>
<el-select style="width:90px" v-model="item.roomFemaleCount" :disabled="item.isShowFemale" placeholder="成人女">
<el-option v-for="item in Pnumber" :value="item.num" :label="item.num"></el-option>
<el-option v-for="(item,index) in Pnumber" :value="item.num" :label="item.num" :key="index"></el-option>
</el-select>
</li>
<li>儿童数</li>
<li>
<el-select style="width:90px" v-model="item.roomChildCount" :disabled="item.isShowChild" placeholder="儿童">
<el-option v-for="item in Pnumber" :value="item.num" :label="item.num"></el-option>
<el-option v-for="(item,index) in Pnumber" :value="item.num" :label="item.num" :key="index"></el-option>
</el-select>
</li>
</ul>
......@@ -563,7 +563,12 @@
<ul class="yhqUl">
<p v-if="!Verification.length || Verification[0].ApplyState !== 1" class="_trip_xiangqing_tips">您还未进行 <span @click="goShenqing">实名认证</span>，认证后可使用优惠券哦~如果已提认证申请，申请审核通过后即可使用优惠券！</p>
<li v-for="(item,index) in UserCanUseCouponList" :class="{'blue':item.couponsType===1,'_active':item.active,'disab': !Verification.length || Verification[0].ApplyState !== 1}" @click="!Verification.length || Verification[0].ApplyState !== 1 ? '' : clickCoupon(item)" :key="index+5000" class="sawtooth">
<li v-for="(item,index) in UserCanUseCouponList" :class="{'blue':item.couponsType===1,'_active':item.active,'disab': !Platfrom(item.fromPlatform)|| !Verification.length || Verification[0].ApplyState !== 1}" @click="!Platfrom(item.fromPlatform) || !Verification.length || Verification[0].ApplyState !== 1 ? '' : clickCoupon(item)" :key="index+5000" class="sawtooth">
<div class="yhqImg">
<img v-if="item.fromPlatform=='1'" src="../../assets/img/yhq/app.png" alt="">
<img v-if="item.fromPlatform=='2'" src="../../assets/img/yhq/xcx.png" alt="">
<img v-if="item.fromPlatform=='3'" src="../../assets/img/yhq/pc.png" alt="">
</div>
<span class="kdj">
<span v-if="item.overlapUse==1">可叠加</span>
<span v-else>不可叠加</span>
......@@ -578,9 +583,9 @@
有效期：{{item.effectDate | YMD}}-{{item.expirationDate | YMD}}
</p>
<div @click="clickCoupon(item)" class="_choice_box">
<span v-if="!item.active"></span>
<span v-else class="iconfont icon-xuanzhong2"></span>
<div v-if="Platfrom(item.fromPlatform)" class="_choice_box">
<span v-if="!item.active"></span>
<span v-else class="iconfont icon-xuanzhong2"></span>
</div>
</li>
<div v-if="UserCanUseCouponList.length==0" class="_no_coupon">
......@@ -890,6 +895,16 @@ export default {
},err => {});
},
methods: {
Platfrom(str){
if(str){
if(str.indexOf('0')!=-1 || str.indexOf('3')!=-1){
return true;
}
else{
return false;
}
}
},
goShenqing: function () {
let dom = document.querySelector("#blankLink")
dom.href=`http://${window.location.host}/#/PsSystem/${1}`
......
src/components/LocalTour/LocalCuisineDetails.vue
View file @ bc0c87b9
......@@ -234,7 +234,14 @@
<p style="width:100%;margin:10px 0;">优惠券</p>
<p v-if="!Verification.length || Verification[0].ApplyState !== 1" class="_trip_xiangqing_tips">您还未进行 <span @click="goShenqing">实名认证</span>，认证后可使用优惠券哦~如果已提认证申请，申请审核通过后即可使用优惠券！</p>
<div v-if="UserCanUseCouponList.length>0" class="_coupon_box">
<div class="_coupon_item" v-for="(item, index) in UserCanUseCouponList" :class="{'blue':item.couponsType===1,'_active':item.active,'disab': !Verification.length || Verification[0].ApplyState !== 1}" @click="!Verification.length || Verification[0].ApplyState !== 1 ? '' : clickCoupon(item)">
<div class="_coupon_item" v-for="(item, index) in UserCanUseCouponList" :class="{'blue':item.couponsType===1,'_active':item.active,'disab': !Platfrom(item.fromPlatform) || !Verification.length || Verification[0].ApplyState !== 1}" @click="!Platfrom(item.fromPlatform) || !Verification.length || Verification[0].ApplyState !== 1 ? '' : clickCoupon(item)">
<div class="yhqImg">
<img v-if="item.fromPlatform=='0'" src="../../assets/img/yhq/app.png" alt="">
<img v-if="item.fromPlatform=='1'" src="../../assets/img/yhq/app.png" alt="">
<img v-if="item.fromPlatform=='2'" src="../../assets/img/yhq/xcx.png" alt="">
<img v-if="item.fromPlatform=='3'" src="../../assets/img/yhq/pc.png" alt="">
</div>
<div class="_left_raduis">
<span></span>
<span></span>
......@@ -254,7 +261,7 @@
<p class="_info_full">满{{item.useCondition}}可用</p>
<p class="_info_time _time">有效时间：{{item.effectDate | YMD}}-{{item.expirationDate | YMD}}</p>
<p class="_repeat" v-if="item.overlapUse === 1">可叠加</p>
<div class="_choice_box">
<div v-if="Platfrom(item.fromPlatform)" class="_choice_box">
<span v-if="!item.active"></span>
<span v-else class="iconfont icon-xuanzhong2"></span>
</div>
......@@ -420,6 +427,16 @@ export default {
this.GetIds();
},
methods:{
Platfrom(str){
if(str){
if(str.indexOf('0')!=-1 || str.indexOf('3')!=-1){
return true;
}
else{
return false;
}
}
},
goShenqing: function () {
let dom = document.querySelector("#blankLink")
dom.href=`http://${window.location.host}/#/PsSystem/${1}`
......
src/components/Ticket/FillItinerary.vue
View file @ bc0c87b9
......@@ -226,7 +226,12 @@
<ul class="yhqUl">
<p v-if="!Verification.length || Verification[0].ApplyState !== 1" class="_trip_xiangqing_tips">您还未进行 <span @click="goShenqing">实名认证</span>，认证后可使用优惠券哦~如果已提认证申请，申请审核通过后即可使用优惠券！</p>
<li v-for="(item,index) in UserCanUseCouponList" :class="{'blue':item.couponsType===1,'_active':item.active,'disab': !Verification.length || Verification[0].ApplyState !== 1}" @click="!Verification.length || Verification[0].ApplyState !== 1 ? '' : clickCoupon(item)" :key="index+5000" class="sawtooth">
<li v-for="(item,index) in UserCanUseCouponList" :class="{'blue':item.couponsType===1,'_active':item.active,'disab': !Platfrom(item.fromPlatform)|| !Verification.length || Verification[0].ApplyState !== 1}" @click="!Platfrom(item.fromPlatform) || !Verification.length || Verification[0].ApplyState !== 1 ? '' : clickCoupon(item)" :key="index+5000" class="sawtooth">
<div class="yhqImg">
<img v-if="item.fromPlatform=='1'" src="../../assets/img/yhq/app.png" alt="">
<img v-if="item.fromPlatform=='2'" src="../../assets/img/yhq/xcx.png" alt="">
<img v-if="item.fromPlatform=='3'" src="../../assets/img/yhq/pc.png" alt="">
</div>
<span class="kdj">
<span v-if="item.overlapUse==1">可叠加</span>
<span v-else>不可叠加</span>
......@@ -241,9 +246,9 @@
有效期：{{item.effectDate | YMD}}-{{item.expirationDate | YMD}}
</p>
<div @click="clickCoupon(item)" class="_choice_box">
<span v-if="!item.active"></span>
<span v-else class="iconfont icon-xuanzhong2"></span>
<div v-if="Platfrom(item.fromPlatform)" class="_choice_box">
<span v-if="!item.active"></span>
<span v-else class="iconfont icon-xuanzhong2"></span>
</div>
</li>
<div v-if="UserCanUseCouponList.length==0" class="_no_coupon">
......@@ -345,6 +350,16 @@ export default {
this.getUserCanUseCouponList();
},
methods: {
Platfrom(str){
if(str){
if(str.indexOf('0')!=-1 || str.indexOf('3')!=-1){
return true;
}
else{
return false;
}
}
},
goShenqing: function () {
let dom = document.querySelector("#blankLink")
dom.href=`http://${window.location.host}/#/PsSystem/${1}`
......@@ -352,7 +367,7 @@ export default {
dom.click()
},
clickCoupon: function (item) {
console.log("item",item);
let list = [];
if (!item.active) { // 是否选中
if(item.denomination>this.SettlementPrice){
......
src/components/newPersonalCenter/block/model/SmallComponents/Coupon.vue
View file @ bc0c87b9
......@@ -26,7 +26,7 @@
color: #4C58A4;
}
._content_item div._top._gray{
background-color: #C3C3C3 !important;
background-color: #ccc !important;
}
._content_item div._top._gray ._overdue,._content_item div._top._gray ._info_bottom{
display: none
......@@ -114,10 +114,21 @@ p._info_coupon_name{
white-space: nowrap;
color: white;
}
._item .itemImg{
position: absolute;
right: 45px;
top: 42px;
}
</style>
<template>
<div class="_item">
<div class="_top" :class="{'_blue':item.couponsType===1,'_gray':item.couponEffectStatus===3,}">
<div class="itemImg">
<img v-if="item.fromPlatform=='0'" src="../../../../../assets/img/yhq/all.png" alt="">
<img v-if="item.fromPlatform=='1'" src="../../../../../assets/img/yhq/app.png" alt="">
<img v-if="item.fromPlatform=='2'" src="../../../../../assets/img/yhq/xcx.png" alt="">
<img v-if="item.fromPlatform=='3'" src="../../../../../assets/img/yhq/pc.png" alt="">
</div>
<div class="_top" :class="{'_blue':item.couponsType===1,'_gray':item.couponEffectStatus===3 || !Platfrom(item.fromPlatform)}">
<div class="_top_raduis">
<span></span>
<span></span>
......
src/components/trade/order/indexTwo.vue
View file @ bc0c87b9
......@@ -41,6 +41,18 @@
background-color: #F1BC69;
cursor: pointer;
}
._coupon_box ._coupon_item .yhqImg{
position: absolute;
width: 50px;
height: 50px;
right: 40px;
top: 48px;
}
._coupon_box ._coupon_item .yhqImg img{
display: block;
width: 100%;
height: 100%;
}
._coupon_box ._coupon_item ._coupon_info p{
color: #FFFFFF;
}
......@@ -295,7 +307,13 @@
<p style="width:100%">优惠券</p>
<p v-if="!Verification.length || Verification[0].ApplyState !== 1" class="_trip_xiangqing_tips">您还未进行 <span @click="goShenqing">实名认证</span>，认证后可使用优惠券哦~如果已提认证申请，申请审核通过后即可使用优惠券！</p>
<div v-if="UserCanUseCouponList.length>0" class="_coupon_box">
<div class="_coupon_item" v-for="(item, index) in UserCanUseCouponList" :class="{'blue':item.couponsType===1,'_active':item.active,'disab': !Verification.length || Verification[0].ApplyState !== 1}" @click="!Verification.length || Verification[0].ApplyState !== 1 ? '' : clickCoupon(item)">
<div class="_coupon_item" v-for="(item, index) in UserCanUseCouponList" :class="{'blue':item.couponsType===1,'_active':item.active,'disab':!Platfrom(item.fromPlatform) || !Verification.length || Verification[0].ApplyState !== 1}" @click="!Platfrom(item.fromPlatform) || !Verification.length || Verification[0].ApplyState !== 1 ? '' : clickCoupon(item)">
<div class="yhqImg">
<img v-if="item.fromPlatform=='0'" src="../../../assets/img/yhq/all.png" alt="">
<img v-if="item.fromPlatform=='1'" src="../../../assets/img/yhq/app.png" alt="">
<img v-if="item.fromPlatform=='2'" src="../../../assets/img/yhq/xcx.png" alt="">
<img v-if="item.fromPlatform=='3'" src="../../../assets/img/yhq/pc.png" alt="">
</div>
<div class="_left_raduis">
<span></span>
<span></span>
......@@ -315,7 +333,7 @@
<p class="_info_full">满{{item.useCondition}}可用</p>
<p class="_info_time _time">有效时间：{{item.effectDate | YMD}}-{{item.expirationDate | YMD}}</p>
<p class="_repeat" v-if="item.overlapUse === 1">可叠加</p>
<div class="_choice_box">
<div v-if="Platfrom(item.fromPlatform)" class="_choice_box">
<span v-if="!item.active"></span>
<span v-else class="iconfont icon-xuanzhong2"></span>
</div>
......@@ -563,6 +581,16 @@ export default {
},err => {});
},
methods: {
Platfrom(str){
if(str){
if(str.indexOf('0')!=-1 || str.indexOf('3')!=-1){
return true;
}
else{
return false;
}
}
},
// 输入使用余额
RedEnvelopeMoneyChange(){
console.log(this.RedEnvelopeMoney)
......
src/components/visa/SchedProduct.vue
View file @ bc0c87b9
......@@ -254,7 +254,12 @@
<p class="pfR" style="color:#000000;padding-left:20px">优惠券使用</p>
<ul class="yhqUl">
<p v-if="!Verification.length || Verification[0].ApplyState !== 1" class="_trip_xiangqing_tips">您还未进行 <span @click="goShenqing">实名认证</span>，认证后可使用优惠券哦~如果已提认证申请，申请审核通过后即可使用优惠券！</p>
<li v-for="(item,index) in UserCanUseCouponList" :class="{'blue':item.couponsType===1,'_active':item.active,'disab': !Verification.length || Verification[0].ApplyState !== 1}" @click="!Verification.length || Verification[0].ApplyState !== 1 ? '' : clickCoupon(item)" class="sawtooth">
<li v-for="(item,index) in UserCanUseCouponList" :class="{'blue':item.couponsType===1,'_active':item.active,'disab':!Platfrom(item.fromPlatform) || !Verification.length || Verification[0].ApplyState !== 1}" @click="!Platfrom(item.fromPlatform) ||!Verification.length || Verification[0].ApplyState !== 1 ? '' : clickCoupon(item)" class="sawtooth">
<div class="yhqImg">
<img v-if="item.fromPlatform=='1'" src="../../assets/img/yhq/app.png" alt="">
<img v-if="item.fromPlatform=='2'" src="../../assets/img/yhq/xcx.png" alt="">
<img v-if="item.fromPlatform=='3'" src="../../assets/img/yhq/pc.png" alt="">
</div>
<span class="kdj">
<span v-if="item.overlapUse==1">可叠加</span>
<span v-else>不可叠加</span>
......@@ -269,9 +274,9 @@
有效期：{{item.effectDate | YMD}}-{{item.expirationDate | YMD}}
</p>
<div @click="clickCoupon(item)" class="_choice_box">
<span v-if="!item.active"></span>
<span v-else class="iconfont icon-xuanzhong2"></span>
<div v-if="Platfrom(item.fromPlatform)" class="_choice_box">
<span v-if="!item.active"></span>
<span v-else class="iconfont icon-xuanzhong2"></span>
</div>
</li>
<div v-if="UserCanUseCouponList.length==0" class="_no_coupon">
......@@ -413,6 +418,16 @@ export default {
},err => {});
},
methods: {
Platfrom(str){
if(str){
if(str.indexOf('0')!=-1 || str.indexOf('3')!=-1){
return true;
}
else{
return false;
}
}
},
goShenqing: function () {
let dom = document.querySelector("#blankLink")
dom.href=`http://${window.location.host}/#/PsSystem/${1}`
......
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