Skip to content

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

1

parent 426bfeff
Hide whitespace changes
Inline Side-by-side
Showing with 65 additions and 45 deletions
pages/restaurant/detail.vue
View file @ 93823e4a
......@@ -165,18 +165,19 @@
export default {
data() {
return {
imgsList: [{
picUrl: "https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1622459632000_216.png"
},
{
picUrl: "https://ak-d.tripcdn.com/images/t1/hotel/533000/532930/3fcc6398b3c44c08bb1b57aef579793e_R_1080_808_R5_D.jpg"
},
{
picUrl: "https://ak-d.tripcdn.com/images/20010r000000hmqk32EF2_R_1080_808_R5_D.jpg"
},
{
picUrl: "https://ak-d.tripcdn.com/images/200v0f0000007d6wgBCD6_R_1080_808_R5_D.jpg"
}
imgsList: [
// {
// picUrl: "https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1622459632000_216.png"
// },
// {
// picUrl: "https://ak-d.tripcdn.com/images/t1/hotel/533000/532930/3fcc6398b3c44c08bb1b57aef579793e_R_1080_808_R5_D.jpg"
// },
// {
// picUrl: "https://ak-d.tripcdn.com/images/20010r000000hmqk32EF2_R_1080_808_R5_D.jpg"
// },
// {
// picUrl: "https://ak-d.tripcdn.com/images/200v0f0000007d6wgBCD6_R_1080_808_R5_D.jpg"
// }
],
ID: 0,
details: {},
......
pages/restaurant/list.vue
View file @ 93823e4a
......@@ -11,7 +11,10 @@
<u-dropdown-item v-model="msg.OrderBy" :title="optionsTitle[0]" :options="options1" @change="getFoodList">
</u-dropdown-item>
<u-dropdown-item v-model="msg.FoodTypeIds" :title="optionsTitle[1]" :options="classOptions" @change="getFoodList">
<u-dropdown-item v-model="msg.FoodTypeIds" :title="optionsTitle[1]" @change="getFoodList">
<view class="slot-content">
<restaurant-type @sure-type="sureType" :current="currentTypeObj"></restaurant-type>
</view>
</u-dropdown-item>
<u-dropdown-item :title="optionsTitle[2]">
<view class="slot-content" style="padding: 30rpx;background-color: #FFF;">
......@@ -301,13 +304,14 @@
this.getFoodList();
this.closeDropdown();
},
// sureType(item){
// this.searchObj.rtype=item.Id
// this.optionsTitle[1]=item.Id==-1?'菜系':item.Name
// this.closeDropdown();
// item.newTimespan=this.rand(1000,9999)
// this.currentTypeObj=item
// },
sureType(item){
console.log(item)
// this.searchObj.rtype=item.Id
// this.optionsTitle[1]=item.Id==-1?'菜系':item.Name
this.closeDropdown();
// item.newTimespan=this.rand(1000,9999)
// this.currentTypeObj=item
},
// rangechange4(e){
// if(e.minValue==0){
// if(e.maxValue==1000){
......
pages/ticketCoupons/components/buyNotice.vue
View file @ 93823e4a
......@@ -3,7 +3,7 @@
<scroll-view scroll-y="true" style="width: 100%;height: 100%; padding: 44rpx 0;" @scroll="scroll">
<view class="notice-box">
<view class="base-info">
<image class="left" :src="imgBaseUrl+coverImg" mode="aspectFit"></image>
<image class="left" :src="coverImg" mode="aspectFill"></image>
<view class="right">
<view class="name">
{{TicketData.TicketSubName}}({{TicketData.TicketName}})
......
pages/ticketCoupons/components/njzz-calendar/njzz-calendar.vue
View file @ 93823e4a
......@@ -25,7 +25,7 @@
<view class="day" v-for="(item,index) in space" v-bind:key="index"></view>
<view class="day" :class="[getDateStr(item.date)==getDateStr(dayActive.date)?'active':'']" v-for="(item,index) in dayList" v-bind:key="index" @tap="selectDate(item)">
<view :class="[isToday(item.date)?'today':'']">{{isToday(item.date) ? "今天" : item.date.getDate()}}</view>
<view class="calen-text-orange">{{item.price?'&yen;'+item.price:''}}</view>
<view class="calen-text-orange">{{item.price||item.price===0?'&yen;'+item.price:''}}</view>
</view>
</view>
</view>
......
pages/ticketCoupons/detail.vue
View file @ 93823e4a
<template>
<view style="height: 100vh; overflow: hidden;width:100vw;">
<scroll-view scroll-y="true" style="width: 100%;height: 100%;" @scroll="scroll">
<view style="height: 700rpx;position: relative;z-index: 1;" :style="{'opacity':(100-boxOption)+'%'}">
<view style="height: 500rpx;position: relative;z-index: 1;background-color: #E7E7E7;" :style="{'opacity':(100-boxOption)+'%'}">
<view @click="goback" :style="[titleStyle,{opacity:'100% !important'}]"
style="position: fixed;top: 0;left: 0;z-index: 9; padding-left: 6rpx;">
<u-icon name="arrow-left" size="44" color="#000" style="margin-top: 22rpx;"></u-icon>
</view>
<image class="banner-img" :src="details.AllPicList[0].TagPicList[0].Path" mode="aspectFit"
<image class="banner-img" :src="details.AllPicList[0].TagPicList[0].Path" mode="aspectFill"
@click="goUrl('/pages/ticketCoupons/imgList')"></image>
</view>
<view class="ticket-title" :style="[titleStyleFix]">
......@@ -416,7 +416,7 @@
<style lang="scss" scoped>
.banner-img {
width: 750rpx;
height: 700rpx;
height: 500rpx;
}
.ticket-title {
......@@ -798,7 +798,8 @@
.tag {
display: flex;
height: 32rpx;
max-width: 70%;
// height: 32rpx;
margin-bottom: 20rpx;
.tag-img {
......
pages/ticketCoupons/imgList.vue
View file @ 93823e4a
......@@ -8,7 +8,7 @@
<view class="img-list-box">
<view v-for="(item,index) in dataList.TagPicList" :key="item.ID" class="img-list-item" :style="{'margin-right':index%2 ==0?'20rpx':0}">
<view class="img-box" @click="previewImage(index,item.Path)" v-if="item.type==='image'">
<image :src="item.Path" mode="aspectFit" ></image>
<image :src="item.Path" mode="aspectFill" ></image>
</view>
<view class="img-box" style="position: relative" v-if="item.type==='video'">
<video id="myVideo" :src="item.Path"
......@@ -91,7 +91,15 @@
},
changeNav(index){
this.curNavIndex=index
this.getDetail(index)
this.dataList=this.navList[index]
this.dataList.TagPicList.forEach(item=>{
if(item.Path.indexOf('jpg')!==-1||item.Path.indexOf('png')!==-1||item.Path.indexOf('jpeg')!==-1){
item.type='image'
}else if(item.Path.indexOf('mp4')!==-1){
item.type='video'
}
})
},
//预览图片
previewImage(i,url) {
......@@ -118,13 +126,13 @@
},
videoControl(e){
if(e.detail.fullScreen===false){
this.videoContext.stop()
this.controls=false
}else{
this.videoContext.play()
this.controls=true
}
// if(e.detail.fullScreen===false){
// this.videoContext.stop()
// this.controls=false
// }else{
// this.videoContext.play()
// this.controls=true
// }
console.log(e.detail)
},
}
......@@ -135,11 +143,12 @@
.img-list{
.img-navs{
display: flex;
padding: 20rpx 45rpx;
margin: 0 45rpx;
padding: 20rpx 0;
overflow-x: scroll;
overflow-y: hidden;
.nav-btn{
width: 230rpx;
// width: 230rpx;
height: 60rpx;
background-color: #FFFFFF;
border: 1rpx solid #111111;
......@@ -147,8 +156,10 @@
font-family: PingFang SC;
font-weight: 500;
text-align: center;
line-height: 60rpx;
line-height: 58rpx;
padding: 0 20rpx;
margin-right: 30rpx;
white-space: nowrap;
}
.check-nav{
background-color: #111111;
......
pages/ticketCoupons/list.vue
View file @ 93823e4a
......@@ -23,13 +23,16 @@
<!-- <view class="u-text-center u-content-color">其他自定义内容</view>-->
<view class="slot-btn" :class="{'check-btn':msg.IsFree!=-1}" @click="changeScreen('IsFree')">是否免费</view>
<view class="slot-btn" :class="{'check-btn':msg.IsSameDayBuy!=-1}" @click="changeScreen('IsSameDayBuy')">是否闪入园</view>
<view class="slot-btn" :class="{'check-btn':msg.IsWorryFreeRefund!=-1}" @click="changeScreen('IsWorryFreeRefund')">是否无忧退款</view>
<view style="flex:1;margin-right: 30rpx;">
<u-button :custom-style="btnStyle" @click="resetPrice">重置</u-button>
</view>
<view style="flex:1;">
<u-button :custom-style="btnStyle2" @click="surePrice">完成</u-button>
<view class="slot-btn" :class="{'check-btn':msg.IsWorryFreeRefund!=-1}" @click="changeScreen('IsWorryFreeRefund')">是否无忧退款</view>
<view class="" style="display: flex;width: 100%;">
<view style="flex:1;margin-right: 30rpx;">
<u-button :custom-style="btnStyle" @click="resetPrice">重置</u-button>
</view>
<view style="flex:1;">
<u-button :custom-style="btnStyle2" @click="surePrice">完成</u-button>
</view>
</view>
</view>
</u-dropdown-item>
......@@ -48,7 +51,7 @@
<view class="ticket-list">
<view v-for="(item,index) in dataList" :key="item.ID" class="ticket-list-item" @click="goDetail(item.ID)">
<image class="left-box" :src="item.CoverImg" mode="aspectFit"></image>
<image class="left-box" :src="item.CoverImg" mode="aspectFill"></image>
<view class="right-box">
<view class="ticket-name">
......
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