Skip to content

J
jz_Travel
Commit 372ebd84 authored by 黄奎's avatar 黄奎
Browse files
Options

1

parent 3422f301
Hide whitespace changes
Inline Side-by-side
Showing with 159 additions and 115 deletions
pages/coupon/index/index.vue
View file @ 372ebd84
......@@ -2,49 +2,44 @@
<view class="couponStyle" :style="{ height: contentHeight }" @click="lineShow=false">
<!-- <u-tabs :list="list" :is-scroll="false" :current="currentIndex" @change="change" :active-color="mainColor" :show-bar="showBar"
height="100"></u-tabs> -->
<view class="couponHeaderBox">
<view class="couponHeaderBox">
<view class="couponHeader">
<view class="couponHeadLeft">
<view class="couponHeadLText" @click.stop="lineShow=!lineShow">
<text class="couponHeadLTextL">{{ lineName }}</text>
<view><u-icon :name="!lineShow?'arrow-down':'arrow-up'" size="24"></u-icon></view>
<view>
<u-icon :name="!lineShow?'arrow-down':'arrow-up'" size="24"></u-icon>
</view>
</view>
</view>
<view class="couponHeadRight">
<text v-for="(item,index) in list" :key="index"
:class="[msg.CouponType==item.id?'active':'']" @click.stop="msg.CouponType=item.id,ResetQuery()">{{ item.name }}</text>
<text v-for="(item,index) in list" :key="index" :class="[msg.CouponType==item.id?'active':'']" @click.stop="msg.CouponType=item.id,ResetQuery()">{{ item.name }}</text>
</view>
</view>
<view class="couponLine" v-if="lineShow">
<view class="couponLineT" v-for="(item,index) in lineList"
>
<view class="couponLineAllName" :class="[msg.lineId==item.id?'active':'']"
@click.stop="msg.lineId=item.id,lineName=item.text">
<view class="couponLineT" v-for="(item,index) in lineList">
<view class="couponLineAllName" :class="[msg.lineId==item.id?'active':'']" @click.stop="msg.lineId=item.id,lineName=item.text">
<text>{{ item.text }}</text>
</view>
</view>
</view>
</view>
</view>
<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;">
<scroll-view :scroll-y="true" :enable-back-to-top="true" :enable-flex="true" @scrolltolower="lower" :style="{ height: '100%' }">
<view class="couponList">
<view class="couponListBox"
:class="{
<view class="couponListBox" :class="{
'active0': x.couponsType,'active1': '',
'active2': '','active3': '',
'active4': '','active5': '',
'active6': '','active7': '',
'active8': '',
}"
v-for="(x, i) in couponDataList" :key="i">
v-for="(x, i) in couponDataList" :key="i">
<view class="item">
<view
:style="{'background-image':`url(${x.backGroubd}) `}"
class="couponItemLeft"
>
<view :style="{'background-image':`url(${x.backGroubd}) `}" class="couponItemLeft">
<view class="miane">
<view class="money">
<text class="small" style="font-family: microsoft yahei ui light;margin-right: 5rpx;" v-if="x.couponsType == 1">￥</text>
......@@ -58,7 +53,7 @@
<view class="detail">
<view class="coupond">
<view class="name" style="font-family:'microsoft yahei ui light';">
<view class="nameText">{{ x.couponName }}</view>
<view class="nameText">{{ x.couponName }}</view>
<view class="nameType">跟团游</view>
</view>
<view class="coupondLineTb">
......@@ -122,10 +117,14 @@
msg: {
"pageIndex": 1,
"pageSize": 8,
"userId": 15625, //CustomerAccountId
"CouponStatus": 1, // 优惠券状态 1未使用 2已使用 3已过期
"CouponType": 0,//优惠券类型
"lineId": 0,//线路
"userId": 0, //CustomerAccountId
"lineId": 0, //线路
"lineteamId": 0, //系列ID
"CustomerType": 1, //0-同行，1-直客
"CouponStatus": 1, //优惠券状态 1未使用 2已使用 3已过期
"CouponsUseScope": 0, //优惠券使用范围 有枚举
"FromPlatform": 0, //来源平台 1app 2小程序
"CouponType": 0, //优惠券类型 1：抵用券，2：折扣卷
},
page_count: 1,
couponDataList: [],
......@@ -137,60 +136,64 @@
nomore: "没有更多了",
},
showBar: true,
lineList:[
{
text: '通用',
id: 0
},
lineList: [{
text: '通用',
id: 0
},
{
text: '跟团游',
id: 1
text: '跟团游',
id: 1
},
{
text: '自由行',
id: 2
text: '自由行',
id: 2
},
{
text: '景点',
id: 3
text: '景点',
id: 3
},
{
text: '当地游',
id: 4
text: '当地游',
id: 4
},
{
text: '定制游',
id: 5
text: '定制游',
id: 5
},
{
text: '美食',
id: 6
text: '美食',
id: 6
},
{
text: '门票',
id: 7
text: '门票',
id: 7
},
{
text: '签证',
id: 8
text: '签证',
id: 8
},
],
lineName: '通用',
lineShow: false,
lineImgs:[
'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Upload/Goods/638726322574781584.png',//跟团游
'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Upload/Goods/638726322566159036.png',//自由行
'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Upload/Goods/638726322566207695.png',//门票
'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Upload/Goods/638726323205591893.png',//当地游
'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Upload/Goods/638726326034522587.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/638726322570001132.png',//美食1
'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Upload/Goods/638726322569972025.png',//美食2
]
lineImgs: [
'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Upload/Goods/638726322574781584.png', //跟团游
'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Upload/Goods/638726322566159036.png', //自由行
'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Upload/Goods/638726322566207695.png', //门票
'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Upload/Goods/638726323205591893.png', //当地游
'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Upload/Goods/638726326034522587.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/638726322570001132.png', //美食1
'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Upload/Goods/638726322569972025.png', //美食2
],
b2bUserInfo: {},
};
},
created() {
this.b2bUserInfo = uni.getStorageSync('b2b_user');
if (this.b2bUserInfo && this.b2bUserInfo.accountId) {
this.msg.userId = this.b2bUserInfo.accountId;
}
this.contentHeight = this.$utils.calcContentHeight(-40) + "px";
this.mainColor = this.$uiConfig.mainColor;
// #ifdef MP-ALIPAY
......@@ -216,9 +219,9 @@
this.init()
},
methods: {
ResetQuery(){
ResetQuery() {
this.couponDataList = []
this.msg.pageIndex=1
this.msg.pageIndex = 1
this.init()
},
change(index) {
......@@ -234,14 +237,14 @@
this.apipost("coupon_post_GetUserCanUseCouponPageList", this.msg, (res) => {
this.loading = false;
if (res.resultCode == 1) {
let arrList = function(list){
list.forEach(x=>{
let arrList = function(list) {
list.forEach(x => {
x.backGroubd = ''
})
}
arrList(res.data.pageData)
this.couponDataList = res.data.pageData;
this.couponDataList.forEach(x=>{
this.couponDataList.forEach(x => {
x.backGroubd = this.lineImgs[0]
})
this.page_count = res.data.pageCount;
......@@ -283,12 +286,7 @@
"&type=1",
});
}
},
goUrl() {
uni.navigateTo({
url: "/pages/coupon/list/list",
});
},
}
},
};
</script>
......@@ -378,6 +376,7 @@
align-items: center;
color: #fff;
}
.couponStyle .item .miane .money {
font-family: "oswald";
font-weight: bold;
......@@ -417,6 +416,7 @@
display: flex;
flex-wrap: nowrap;
}
.couponStyle .item .detail .coupond .date {
font-family: "23";
margin-top: 5px;
......@@ -433,43 +433,50 @@
.couponStyle .item .detail .chosen {
width: 20px;
}
.couponHeaderBox{
.couponHeaderBox {
background: #fff;
position: relative;
}
.couponHeader{
}
.couponHeader{
.couponHeader {}
.couponHeader {
display: flex;
justify-content: space-between;
align-items: center;
padding: 10px 0;
}
.couponHeadLeft{
.couponHeadLeft {
flex-shrink: 0;
}
.couponHeadLText{
.couponHeadLText {
display: flex;
align-items: center;
flex: 1;
padding-left: 43rpx;
border-right: 1rpx solid rgba(207, 207, 207, .4);
}
.couponHeadLTextL{
.couponHeadLTextL {
margin-right: 42rpx;
font-size: 28rpx;
}
.couponHeadLText view{
.couponHeadLText view {
flex-shrink: 0;
margin-right: 25rpx;
}
.couponHeadLAuto{
.couponHeadLAuto {
flex-shrink: 0;
width: 2px;
background: rgba(207, 207, 207, 1);
}
.couponLine{
.couponLine {
width: 100%;
position: absolute;
top: 75rpx;
......@@ -477,30 +484,36 @@
z-index: 2;
background: #fff;
}
.couponHeadRight{
.couponHeadRight {
display: flex;
justify-content: space-between;
flex: 1;
}
.couponHeadRight text{
.couponHeadRight text {
display: inline-block;
padding: 0 31rpx;
font-size: 28rpx;
white-space: nowrap;
}
.couponHeadRight text.active{
.couponHeadRight text.active {
color: rgba(238, 68, 84, 1);
}
.couponLine{
.couponLine {
display: flex;
flex-wrap: wrap;
padding: 40rpx 17rpx 10rpx 17rpx;
border-top: 1rpx solid rgba(207, 207, 207, .4);
}
.couponLineT{
.couponLineT {
padding: 0 19.8rpx;
}
.couponLineAllName{
.couponLineAllName {
width: 142rpx;
padding: 18rpx 0;
border-radius: 10rpx;
......@@ -509,18 +522,21 @@
text-align: center;
font-size: 28rpx;
}
.couponLineAllName.active{
.couponLineAllName.active {
background: rgba(238, 68, 84, .2);
color: #EE4454;
}
.couponListBox{
.couponListBox {
margin-top: 30rpx;
width: 100%;
padding: 24rpx 28rpx;
background: #fff;
border-radius: 20rpx;
}
.couponItemLeft{
.couponItemLeft {
width: 146rpx;
height: 143rpx;
padding: 0 36rpx;
......@@ -532,12 +548,14 @@
justify-content: center;
align-items: center;
}
.couponStyle .item .detail .coupond .nameText{
.couponStyle .item .detail .coupond .nameText {
width: calc(100%-48rpx);
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
}
.couponStyle .item .detail .coupond .nameType {
flex-shrink: 0;
margin-left: 14rpx;
......@@ -546,60 +564,72 @@
font-size: 24rpx;
font-weight: 100;
}
.couponListBox.active0 .nameType{
.couponListBox.active0 .nameType {
color: rgba(29, 152, 144, 1);
background: rgba(97, 220, 212, 1);
}
.couponListBox.active1 .nameType{
.couponListBox.active1 .nameType {
color: rgba(212, 84, 42, 1);
background: rgba(253, 127, 86, 1);
}
.couponListBox.active2 .nameType{
.couponListBox.active2 .nameType {
color: rgba(60, 103, 160, 1);
background: rgba(106, 168, 249, 1);
}
.couponListBox.active3 .nameType{
.couponListBox.active3 .nameType {
color: rgba(204, 60, 110, 1);
background: rgba(243, 108, 155, 1);
}
.couponListBox.active4 .nameType{
.couponListBox.active4 .nameType {
color: rgba(40, 132, 163, 1);
background: rgba(24, 184, 237, 1);
}
.couponListBox.active5 .nameType{
.couponListBox.active5 .nameType {
color: rgba(184, 163, 19, 1);
background: rgba(233, 235, 51, 1);
}
.couponListBox.active6 .nameType{
.couponListBox.active6 .nameType {
color: rgba(186, 110, 1, 1);
background: rgba(255, 150, 0, 1);
}
.couponListBox.active7 .nameType{
.couponListBox.active7 .nameType {
color: rgba(55, 143, 71, 1);
background: rgba(31, 193, 62, 1);
}
.couponListBox.active8 .nameType{
.couponListBox.active8 .nameType {
color: #c6c6c6;
background: #e1e1e1;
}
.coupondLineTb{
.coupondLineTb {
position: relative;
}
.coupondLineTbt{
.coupondLineTbt {
height: 56rpx;
word-break: break-all;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 2;
overflow: hidden;
overflow: hidden;
font-size: 22rpx;
font-weight: 400;
margin-top: 14rpx;
line-height: 28rpx;
color: #666;
}
.coupondLineGo{
.coupondLineGo {
position: absolute;
right: 0;
top: 56rpx;
......@@ -611,31 +641,40 @@
text-align: center;
line-height: 44rpx;
}
.couponListBox.active0 .coupondLineGo{
.couponListBox.active0 .coupondLineGo {
background: linear-gradient(133deg, #26C6A5, #61DCD4);
}
.couponListBox.active1 .coupondLineGo{
.couponListBox.active1 .coupondLineGo {
background: linear-gradient(133deg, #FD7F56, #FFC291);
}
.couponListBox.active2 .coupondLineGo{
.couponListBox.active2 .coupondLineGo {
background: linear-gradient(133deg, #3C67A0, #88ADDD);
}
.couponListBox.active3 .coupondLineGo{
.couponListBox.active3 .coupondLineGo {
background: linear-gradient(133deg, #F36C9B, #FEA7C6);
}
.couponListBox.active4 .coupondLineGo{
.couponListBox.active4 .coupondLineGo {
background: linear-gradient(133deg, #18B8ED, #89D6EF);
}
.couponListBox.active5 .coupondLineGo{
.couponListBox.active5 .coupondLineGo {
background: linear-gradient(133deg, #EBD333, #EBF38C);
}
.couponListBox.active6 .coupondLineGo{
.couponListBox.active6 .coupondLineGo {
background: linear-gradient(133deg, #FF9600, #FFC600);
}
.couponListBox.active7 .coupondLineGo{
.couponListBox.active7 .coupondLineGo {
background: linear-gradient(133deg, #1FC13E, #5AE19A);
}
.couponListBox.active8 .coupondLineGo{
.couponListBox.active8 .coupondLineGo {
background: linear-gradient(133deg, #c6c6c6, #e1e1e1);
}
</style>
pages/jiuzhai/jz_Reserve.vue
View file @ 372ebd84
......@@ -849,18 +849,23 @@
(res) => {
if (res.resultCode == 1) {
uni.showToast({
title: '订单创建成功，正在拉取微信支付',
title: '订单创建成功.',
icon: 'none'
})
let data = res.data;
data.CoverImg = this.currentPriceInfo.CoverImg;
let myData = JSON.stringify(data);
this.orderData = encodeURIComponent(myData);
uni.redirectTo({
url: "/pages/jiuzhai/jz_MyOrder",
});
// let data = res.data;
// data.CoverImg = this.currentPriceInfo.CoverImg;
// let myData = JSON.stringify(data);
// this.orderData = encodeURIComponent(myData);
// #ifdef MP-WEIXIN
this.queren(data.OrderId);
// 去掉支付
//this.queren(data.OrderId);
// #endif
// #ifdef MP-ALIPAY
this.querenAli(data);
//去掉支付
//this.querenAli(data);
// #endif
} else {}
this.submit = false;
......
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