Commit 11710390 authored by youjie's avatar youjie

优化样式

parent a8fcc67b
...@@ -50,9 +50,6 @@ ...@@ -50,9 +50,6 @@
<template v-if="g.couponsUseScopeName"> <template v-if="g.couponsUseScopeName">
{{ g.couponsUseScopeName }} {{ g.couponsUseScopeName }}
</template> </template>
<template v-if="g.couponsUseScope">
{{ g.couponsUseScope }}
</template>
</view> </view>
<view class="cdTiaojianBRText" v-if="g.remark&&g.remark!=''">备注:{{ g.remark }}</view> <view class="cdTiaojianBRText" v-if="g.remark&&g.remark!=''">备注:{{ g.remark }}</view>
</view> </view>
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
<u-empty v-if="couponDataList.length == 0 && !loading" text="暂无相关优惠券" mode="coupon"></u-empty> <u-empty v-if="couponDataList.length == 0 && !loading" text="暂无相关优惠券" mode="coupon"></u-empty>
<view v-if="couponDataList.length > 0" style=" height: calc(100vh - 50px); width: calc(100vw); overflow: hidden;padding-bottom: 50px;"> <view v-if="couponDataList.length > 0" style=" height: calc(100vh - 60px); width: calc(100vw); overflow: hidden;">
<scroll-view :scroll-y="true" :enable-back-to-top="true" :enable-flex="true" @scrolltolower="lower" :style="{ height: '100%' }"> <scroll-view :scroll-y="true" :enable-back-to-top="true" :enable-flex="true" @scrolltolower="lower" :style="{ height: '100%' }">
<view class="couponList"> <view class="couponList">
<view class="couponListBox" :class="[x.couponsUseScope>0&&msg.CouponStatus!=3?'active'+x.couponsUseScope:'active0']" <view class="couponListBox" :class="[x.couponsUseScope>0&&msg.CouponStatus!=3?'active'+x.couponsUseScope:'active0']"
...@@ -51,8 +51,8 @@ ...@@ -51,8 +51,8 @@
</view> </view>
<view class="coupondLineTb" > <view class="coupondLineTb" >
<view class="coupondLineTbt"> <view class="coupondLineTbt">
<template v-if="x.CouponsUseScopeNameStr&&x.CouponsUseScopeName!=''">适用线路:{{x.CouponsUseScopeNameStr}}</template> <template v-if="x.lineNameStr&&x.lineNameStr!=''">适用线路:{{x.lineNameStr}}</template>
<template v-if="x.lineteamNameStr&&x.lineteamNameStr!=''">适用系列:{{x.lineteamNameStr}}</template> <template v-if="x.lineteamNameStr&&x.lineteamNameStr!=''">适用系列:{{x.lineteamNameStr}}</template>
<template v-if="x.remark&&x.remark!=''">{{x.remark}}</template> <template v-if="x.remark&&x.remark!=''">{{x.remark}}</template>
</view> </view>
<!-- <view class="coupondLineGo" @click.stop="msg.CouponStatus!=3?godetails(x):''">{{msg.CouponStatus!=3?'详情':'已过期'}}</view> --> <!-- <view class="coupondLineGo" @click.stop="msg.CouponStatus!=3?godetails(x):''">{{msg.CouponStatus!=3?'详情':'已过期'}}</view> -->
...@@ -142,6 +142,10 @@ ...@@ -142,6 +142,10 @@
'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Upload/Goods/638726322567374491.png', //签证 'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Upload/Goods/638726322567374491.png', //签证
'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Upload/Goods/638726322567423518.png', //机票 'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Upload/Goods/638726322567423518.png', //机票
'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Upload/Goods/638726322570001132.png', //美食1 'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Upload/Goods/638726322570001132.png', //美食1
'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Upload/Goods/638726322574781584.png',
'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Upload/Goods/638754766455754748.png',
'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Upload/Goods/638754766515017739.png', //门票
'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Upload/Goods/638726322569972025.png', //美食2 'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Upload/Goods/638726322569972025.png', //美食2
], ],
b2bUserInfo: {}, b2bUserInfo: {},
...@@ -251,14 +255,30 @@ ...@@ -251,14 +255,30 @@
if(x.couponsUseScope==6) x.backGroubd = this.lineImgs[5] if(x.couponsUseScope==6) x.backGroubd = this.lineImgs[5]
if(x.couponsUseScope==7) x.backGroubd = this.lineImgs[6] if(x.couponsUseScope==7) x.backGroubd = this.lineImgs[6]
if(x.couponsUseScope==8) x.backGroubd = this.lineImgs[7] if(x.couponsUseScope==8) x.backGroubd = this.lineImgs[7]
if(x.couponsUseScope==9) x.backGroubd = this.lineImgs[0] if(x.couponsUseScope==9) x.backGroubd = this.lineImgs[8]
if(x.couponsUseScope==10) x.backGroubd = this.lineImgs[1] if(x.couponsUseScope==10) x.backGroubd = this.lineImgs[9]
if(x.couponsUseScope==11) x.backGroubd = this.lineImgs[2] if(x.couponsUseScope==11) x.backGroubd = this.lineImgs[10]
}else{ }else{
x.backGroubd = this.lineImgs[8] x.backGroubd = this.lineImgs[11]
} }
}) })
// for (let i = 0; i < 11; i++) {
// let obj = {
// couponsUseScope: i+1,
// backGroubd: this.lineImgs[i],
// couponsType: 1,
// denomination: '2025-01-01',
// couponName: '优惠券'+i,
// couponsUseScopeName: '优惠券名称'+i,
// CouponsUseScopeNameStr: '',
// lineteamNameStr: '',
// remark: '',
// effectDate: '2025-01-01',
// expirationDate: '2025-01-01',
// }
// this.couponDataList.push(obj)
// }
this.page_count = res.data.pageCount; this.page_count = res.data.pageCount;
this.couponDataList = this.couponDataList.concat(d) this.couponDataList = this.couponDataList.concat(d)
if(this.page_count==1) this.status = 'nomore' if(this.page_count==1) this.status = 'nomore'
...@@ -398,6 +418,7 @@ ...@@ -398,6 +418,7 @@
text-align: center; text-align: center;
display: flex; display: flex;
flex-wrap: nowrap; flex-wrap: nowrap;
justify-content: center;
} }
.couponStyle .item .miane .money .small { .couponStyle .item .miane .money .small {
...@@ -596,68 +617,68 @@ ...@@ -596,68 +617,68 @@
.couponListBox.active1 .nameType { .couponListBox.active1 .nameType {
color: rgba(29, 152, 144, 1); color: rgba(29, 152, 144, 1);
background: rgba(97, 220, 212, .5); background: rgba(97, 220, 212, .2);
} }
.couponListBox.active2 .nameType { .couponListBox.active2 .nameType {
color: rgba(212, 84, 42, 1); color: rgba(212, 84, 42, 1);
background: rgba(253, 127, 86, .5); background: rgba(253, 127, 86, .2);
} }
.couponListBox.active3 .nameType { .couponListBox.active3 .nameType {
color: rgba(60, 103, 160, 1); color: rgba(60, 103, 160, 1);
background: rgba(106, 168, 249, .5); background: rgba(106, 168, 249, .2);
} }
.couponListBox.active4 .nameType { .couponListBox.active4 .nameType {
color: rgba(204, 60, 110, 1); color: rgba(204, 60, 110, 1);
background: rgba(243, 108, 155, .5); background: rgba(243, 108, 155, .2);
} }
.couponListBox.active5 .nameType { .couponListBox.active5 .nameType {
color: rgba(40, 132, 163, 1); color: rgba(40, 132, 163, 1);
background: rgba(24, 184, 237, .5); background: rgba(24, 184, 237, .2);
} }
.couponListBox.active6 .nameType { .couponListBox.active6 .nameType {
color: rgba(184, 163, 19, 1); color: rgba(184, 163, 19, 1);
background: rgba(233, 235, 51, .5); background: rgba(233, 235, 51, .2);
} }
.couponListBox.active7 .nameType { .couponListBox.active7 .nameType {
color: rgba(186, 110, 1, 1); color: rgba(186, 110, 1, 1);
background: rgba(255, 150, 0, .5); background: rgba(255, 150, 0, .2);
} }
.couponListBox.active8 .nameType { .couponListBox.active8 .nameType {
color: rgba(55, 143, 71, 1); color: rgba(55, 143, 71, 1);
background: rgba(31, 193, 62, .5); background: rgba(31, 193, 62, .2);
} }
.couponListBox.active9 .nameType { .couponListBox.active9 .nameType {
color: rgba(29, 152, 144, 1); color: rgba(29, 152, 144, 1);
background: rgba(97, 220, 212, .5); background: rgba(97, 220, 212, .2);
} }
.couponListBox.active10 .nameType { .couponListBox.active10 .nameType {
color: rgba(212, 84, 42, 1); color: rgba(198, 56, 37, 1);
background: rgba(253, 127, 86, .5); background: rgba(198, 56, 37, .2);
} }
.couponListBox.active11 .nameType { .couponListBox.active11 .nameType {
color: rgba(60, 103, 160, 1); color: rgba(182, 39, 213, 1);
background: rgba(106, 168, 249, .5); background: rgba(182, 39, 213, .2);
} }
.couponListBox.active12 .nameType { // .couponListBox.active12 .nameType {
color: rgba(204, 60, 110, 1); // color: rgba(204, 60, 110, 1);
background: rgba(243, 108, 155, .5); // background: rgba(243, 108, 155, .2);
} // }
.couponListBox.active13 .nameType { // .couponListBox.active13 .nameType {
color: rgba(40, 132, 163, 1); // color: rgba(40, 132, 163, 1);
background: rgba(24, 184, 237, .5); // background: rgba(24, 184, 237, .2);
} // }
.coupondLineTb { .coupondLineTb {
position: relative; position: relative;
......
...@@ -96,16 +96,13 @@ ...@@ -96,16 +96,13 @@
title: failed.message, title: failed.message,
icon: "none", icon: "none",
}); });
let newUrl = '/pages/index/index';
uni.redirectTo({
url: newUrl
})
setTimeout(() => { setTimeout(() => {
let newUrl = '/pages/index/index'; this.ShareLoginstatus = false
uni.redirectTo({ }, 500)
url: newUrl
})
setTimeout(() => {
this.ShareLoginstatus = false
}, 2000)
}, 2000)
}) })
}, },
changeCurrentFocus(val) { changeCurrentFocus(val) {
...@@ -176,6 +173,7 @@ ...@@ -176,6 +173,7 @@
}) })
}, },
getUserProfileHandler() { getUserProfileHandler() {
// return
if(this.param.id && this.param.createBy){ if(this.param.id && this.param.createBy){
uni.showLoading({ uni.showLoading({
title:'绑定中...' title:'绑定中...'
......
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