Commit f648004b authored by Mac's avatar Mac

司导样式修改

parent 54e8a3cd
<template> <template>
<view class="guidecarOrderdetails" :style="{'height':contentHeight}" > <view class="guidecarOrderdetails" :style="{'height':contentHeight}" >
<view class="u-skeleton" v-if="isExsitGoods"> <view class="u-skeleton" v-if="isExsitGoods">
<view style="width: 100%;background: #FFFFFF;padding-bottom:5px ;"> <view style="width: 100%;background: #FFFFFF">
<view class="g_top"> <view class="g_top">
<view class="row"> <view class="row">
<u-icon name="location" :size="32" color="#EE4454"></u-icon> <u-icon name="location" :size="32" color="#EE4454"></u-icon>
...@@ -38,13 +38,13 @@ ...@@ -38,13 +38,13 @@
<video @click="startPlay(item)" style="width:100%;height:100%" id="myVideo" v-if="item.type==1" :src="item.pic_url" <video @click="startPlay(item)" style="width:100%;height:100%" id="myVideo" v-if="item.type==1" :src="item.pic_url"
:autoplay="false" loop muted show-play-btn :enable-progress-gesture="true" :autoplay="false" loop muted show-play-btn :enable-progress-gesture="true"
:controls="true" :show-progress="true" :show-mute-btn="true" objectFit="cover"></video> :controls="true" :show-progress="true" :show-mute-btn="true" objectFit="cover"></video>
<image @click="previewImage(index)" style="width:100%;height:100%;" v-else :src="item.pic_url" mode=""></image> <image @click="previewImage(index)" style="width:100%;height:100%;" v-else :src="item.pic_url" mode="widthFix"></image>
</swiper-item> </swiper-item>
</block> </block>
</swiper> </swiper>
</view> </view>
<view class="g-info"> <view class="g-info">
<view class="g-name u-skeleton-rect"> <view class="g-name u-skeleton-rect" style="font-family: aa;">
<view <view
v-if="g.marketingLogo.iswords&&g.marketingLogo.iswords==1 && g.marketingLogo.words!=''" v-if="g.marketingLogo.iswords&&g.marketingLogo.iswords==1 && g.marketingLogo.words!=''"
class="Logo" class="Logo"
...@@ -67,10 +67,11 @@ ...@@ -67,10 +67,11 @@
class="numfont" class="numfont"
>{{ g.price}}</text> >{{ g.price}}</text>
<text v-if='g.car_type==5'>/人</text> <text v-if='g.car_type==5'>/人</text>
</view>
<view class="sell u-skeleton-rect"> <view class="sell u-skeleton-rect">
<text class="oprice" v-if="setting.is_underline_price == 1">{{ g.original_price }}</text> <text class="oprice" v-if="setting.is_underline_price == 1">{{ g.original_price }}</text>
</view>
</view> </view>
</view> </view>
<view class="right u-skeleton-rect" @click="openShare" v-if="isAllowShare == 1"> <view class="right u-skeleton-rect" @click="openShare" v-if="isAllowShare == 1">
<image src="@/static/images/icon/icon-share.png" class="share-icon" /> <image src="@/static/images/icon/icon-share.png" class="share-icon" />
...@@ -334,6 +335,12 @@ ...@@ -334,6 +335,12 @@
} }
}, },
onLoad(option){ onLoad(option){
option={EndTime: "2020/09/27 13:55:10",
GoodsId: "368207",
Pickcar: "成都",
RideNum: "1",
StartTime: "2020/09/27 13:55:00",
address: "四川省成都市锦江区中纱帽街8号",}
console.log(option,'option') console.log(option,'option')
if(option && option.GoodsId){ if(option && option.GoodsId){
...@@ -537,8 +544,8 @@ ...@@ -537,8 +544,8 @@
obj.year = myDate.getFullYear(); //年 obj.year = myDate.getFullYear(); //年
obj.month = myDate.getMonth() + 1; //月 obj.month = myDate.getMonth() + 1; //月
obj.day = myDate.getDate(); //日 obj.day = myDate.getDate(); //日
obj.hour = myDate.getHours(); //时 obj.hour = (myDate.getHours()<10)?"0"+myDate.getHours() : myDate.getHours(); //时
obj.minute = myDate.getMinutes(); //分 obj.minute = (myDate.getMinutes()<10)?"0"+myDate.getMinutes() : myDate.getMinutes(); //分
let days = myDate.getDay(); let days = myDate.getDay();
obj.week = this.getweek(days)//星期几 obj.week = this.getweek(days)//星期几
return obj return obj
...@@ -705,9 +712,12 @@ ...@@ -705,9 +712,12 @@
font-size: 24px; font-size: 24px;
font-weight: bold; font-weight: bold;
height: 31px; height: 31px;
display: flex;flex-direction: row;
align-items: flex-end;
} }
.guidecarOrderdetails .g-info .g-price-box .left .price .small { .guidecarOrderdetails .g-info .g-price-box .left .price .small {
font-size: 16px; font-size: 16px;
margin-bottom: 3px;
} }
.guidecarOrderdetails .btnsmall{ .guidecarOrderdetails .btnsmall{
font-size: 16px; font-size: 16px;
...@@ -724,6 +734,7 @@ ...@@ -724,6 +734,7 @@
.guidecarOrderdetails .g-info .g-price-box .left .sell { .guidecarOrderdetails .g-info .g-price-box .left .sell {
font-size: 12px; font-size: 12px;
color: gray; color: gray;
margin-left: 10px;
} }
.guidecarOrderdetails .g-info .g-price-box .left .sell .oprice { .guidecarOrderdetails .g-info .g-price-box .left .sell .oprice {
text-decoration: line-through; text-decoration: line-through;
...@@ -914,4 +925,15 @@ ...@@ -914,4 +925,15 @@
align-items: center; align-items: center;
} }
.guidecarOrderdetails .screen-swiper {
min-height: 375upx;
}
.guidecarOrderdetails .screen-swiper image,
.guidecarOrderdetails .screen-swiper video{
width: 100%;
display: block;
height: 100%;
margin: 0;
pointer-events: none;
}
</style> </style>
<template> <template>
<div class="guidecarList" style="height: 100vh;"> <div class="guidecarList" style="height: 100vh;">
<view class="guide_ComHead"> <view class="guide_ComHead">
<div class='g_top'> <view style="width: 100%;background: #FFFFFF;padding-bottom:5px ;">
<view class="g_top">
<view class="row">
<u-icon name="location" :size="32" color="#EE4454"></u-icon>
<span>{{Pickcar}}</span>
<view style="width: 2px;color: #E7E7E7;height: 20px;margin:0 10px;"></view>
</view>
<view class='row' style="justify-content: space-between;width: 220px;">
<view class="topB" @click=""> <view class="topB" @click="">
<span class='ztext'>{{STime.month}}{{STime.day}}</span> <span class='ztext'>{{STime.month}}{{STime.day}}</span>
<span class='titext'>{{STime.week+' '+STime.hour+':'+STime.minute}}</span> <span class='titext'>{{STime.week+' '+STime.hour+':'+STime.minute}}</span>
...@@ -14,10 +21,12 @@ ...@@ -14,10 +21,12 @@
<span class='ztext'>{{ETime.month}}{{ETime.day}}</span> <span class='ztext'>{{ETime.month}}{{ETime.day}}</span>
<span class='titext'>{{ETime.week+' '+ETime.hour+':'+ETime.minute}}</span> <span class='titext'>{{ETime.week+' '+ETime.hour+':'+ETime.minute}}</span>
</view> </view>
</div> </view>
<view class="g_Second" style="padding: 10px 0 0;position: relative;background: #fff;width: 100%;height: 55px;"> </view>
</view>
<view class="g_Second" style="position: relative;background: #fff;width: 100%;">
<view style=" border-bottom: 1px solid #E2E2E2;"> <view style=" border-bottom: 1px solid #E2E2E2;">
<u-tabs :list="list" :is-scroll="false" :current="current" @change="change" :active-color="mainColor"></u-tabs> <u-tabs :list="list" :is-scroll="false" :current="current" @change="change" bar-height='4' active-color="#FF8585"></u-tabs>
</view> </view>
<view v-if="screenshow==true" class="tanchu" > <view v-if="screenshow==true" class="tanchu" >
<scroll-view <scroll-view
...@@ -38,8 +47,10 @@ ...@@ -38,8 +47,10 @@
<div class="left-slider"> <div class="left-slider">
<sidebar <sidebar
:active="tic" :active="tic"
bg='#FAF8F9'
name="Name" name="Name"
:active-color="mainColor" active-color="#FF8585"
:border="false" :border="false"
:list="classList" :list="classList"
@change="changeHandler" @change="changeHandler"
...@@ -61,35 +72,45 @@ ...@@ -61,35 +72,45 @@
<view class="c_t_l"> <view class="c_t_l">
<image :src="x.cover_pic" mode="aspectFill" style="width: 100%;height: 100%;"></image> <image :src="x.cover_pic" mode="aspectFill" style="width: 100%;height: 100%;"></image>
</view> </view>
<view class="c_t_r"> <view class="c_t_r" :style="{'width':windowWidth-85-30-110+'px'}">
<span class='ctr_name'>{{x.name}}</span> <span class='ctr_name'>{{x.name}}</span>
<span style='font-size: 11px;color: #111111;'>{{x.guidecartype}} · 可乘坐{{x.goods_stock}}人 · {{x.carcolorName}}</span> <span style='font-size: 11px;color: #111111;margin-top: 10px;font-family:aa;
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
'>{{x.guidecartype}} · 可乘坐{{x.goods_stock}}人 · {{x.carcolorName}}</span>
</view> </view>
</view> </view>
<view class="itemb" style="justify-content: space-between;margin-top: 10px;"> <view class="itemb" style="justify-content: space-between;margin-top: 10px;">
<view class="itemb" style="height:43px ;padding-right: 3px;"> <view class="itemb" style="height:43px ;padding-right: 3px;width: 180px;background: #FAF8F9;">
<image :src="x.guidephoto" mode="aspectFill" style="width: 30px;height: 30px;border-radius: 15px;"></image> <image :src="x.guidephoto" mode="aspectFill" style="width: 30px;height: 30px;border-radius: 15px;margin-left: 5px;"></image>
<view style="display: flex;flex-direction: column;justify-content: space-between;height: 30px;margin-left: 8px;"> <view style="display: flex;flex-direction: column;justify-content: space-between;height: 30px;margin-left: 8px;">
<view class="itemb"> <view class="itemb">
<span style='font-size: 11px;color: #111111;'>{{x.guidename}}</span> <span style='font-size: 11px;color: #111111;'>{{x.guidename}}</span>
<view v-if='x.guidescore>0' style="background-image: linear-gradient( to right,#FF8585, #EE4454);color: #FFF;font-size: 10px;border-radius: 1px;margin-left: 5px;padding: 0 2px;"> <view style="background-image: linear-gradient( to right,#FF8585, #EE4454);color: #FFF;font-size: 10px;border-radius: 1px;margin-left: 5px;padding: 0 2px;">
{{x.guidescore}} {{x.guidescore==0?'5':x.guidescore}}
</view> </view>
</view> </view>
<view class="itemb" style='font-size: 11px;color: #666666;'> <view class="itemb" style='font-size: 11px;color: #666666;'>
<view class="itemb"> <view class="itemb">
<image src="../../static/images/sidao/time.png" mode="aspectFill" style="width: 11px;height: 11px;margin-right: 3px;"></image> <image src="../../static/images/sidao/time.png" mode="aspectFill" style="width: 11px;height: 11px;margin-right: 3px;"></image>
<span >从业{{x.guideworkyears}}</span> <span >从业{{x.guideworkyears}}</span>
<image src="../../static/images/sidao/time.png" mode="aspectFill" style="width: 9px;height: 11px;margin-left: 5px;margin-right: 3px"></image>
<span>{{x.guidetelephone}}</span>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
<view style="display: flex;flex-direction: column;align-items: flex-end;"> <view style="display: flex;flex-direction: column;align-items: flex-end;">
<view class="price" :style="{ color: mainColor ,'font-size':'14px'}" v-if="msg.CarType==5">¥{{x.price}}/人</view> <view class="price" >
<view class="price" :style="{ color: mainColor ,'font-size':'16px'}" v-if="msg.CarType!=5">¥{{x.price}}</view> <text style='font-size: 11px;'></text>
<!-- <view style=" color: #999999;font-size: 11px; ">总价¥{{x.price*msg.RideNum}}</view> --> <text
class="numfont"
>{{ x.price.split('.')[0]}}</text>
<text style='font-size: 11px;' v-if='msg.CarType==5'>/人</text>
</view>
<view style=" color: #999999;font-size: 11px; ">原价¥{{x.original_price}}</view>
</view> </view>
</view> </view>
<view class="line"></view> <view class="line"></view>
...@@ -141,7 +162,7 @@ export default { ...@@ -141,7 +162,7 @@ export default {
}, },
screenList:[], screenList:[],
contents:[ contents:[
{'ID':0,Name:'全部'}, {'ID':0,Name:'综合排序'},
{'ID':1,Name:'价格升序'}, {'ID':1,Name:'价格升序'},
{'ID':2,Name:'价格降序'}, {'ID':2,Name:'价格降序'},
{'ID':3,Name:'评分升序'}, {'ID':3,Name:'评分升序'},
...@@ -150,7 +171,7 @@ export default { ...@@ -150,7 +171,7 @@ export default {
{'ID':6,Name:'最新降序'}, {'ID':6,Name:'最新降序'},
], ],
contents2:[],//品牌 contents2:[],//品牌
list: [{name: '综合排序'}, {name: '品牌'}], list: [{name: '综合排序'}, {name: '全部品牌'}],
STime:'', STime:'',
ETime:'', ETime:'',
intervalDay:'', intervalDay:'',
...@@ -166,6 +187,7 @@ export default { ...@@ -166,6 +187,7 @@ export default {
}, },
PagePath:'', PagePath:'',
scrollHeight: 0, scrollHeight: 0,
windowWidth:0
}; };
}, },
...@@ -220,7 +242,9 @@ export default { ...@@ -220,7 +242,9 @@ export default {
this.getCarClassList()//车辆类型 this.getCarClassList()//车辆类型
this.init(); this.init();
this.getGuideCarBrandList()//车辆品牌 this.getGuideCarBrandList()//车辆品牌
this.getPagePath()//获取详情跳转详情地址 this.getPagePath();//获取详情跳转详情地址
this.windowWidth = this.$utils.SystemInfo().windowWidth
}, },
created() { created() {
this.mainColor = this.$uiConfig.mainColor; this.mainColor = this.$uiConfig.mainColor;
...@@ -270,8 +294,8 @@ export default { ...@@ -270,8 +294,8 @@ export default {
obj.year = myDate.getFullYear(); //年 obj.year = myDate.getFullYear(); //年
obj.month = myDate.getMonth() + 1; //月 obj.month = myDate.getMonth() + 1; //月
obj.day = myDate.getDate(); //日 obj.day = myDate.getDate(); //日
obj.hour = myDate.getHours(); //时 obj.hour = (myDate.getHours()<10)?"0"+myDate.getHours() : myDate.getHours(); //时
obj.minute = myDate.getMinutes(); //分 obj.minute = (myDate.getMinutes()<10)?"0"+myDate.getMinutes() : myDate.getMinutes(); //分
let days = myDate.getDay(); let days = myDate.getDay();
obj.week = this.getweek(days)//星期几 obj.week = this.getweek(days)//星期几
return obj return obj
...@@ -302,7 +326,7 @@ getGuideCarBrandList(){ ...@@ -302,7 +326,7 @@ getGuideCarBrandList(){
}, },
(res) => { (res) => {
this.BrandList = res.data; this.BrandList = res.data;
let obj = {Name: "全部", ID: 0} let obj = {Name: "全部品牌", ID: 0}
this.BrandList.unshift(obj) this.BrandList.unshift(obj)
let list=[]; let list=[];
this.BrandList.forEach(x=>{ this.BrandList.forEach(x=>{
...@@ -351,10 +375,13 @@ getGuideCarBrandList(){ ...@@ -351,10 +375,13 @@ getGuideCarBrandList(){
this.current= val this.current= val
}, },
onItemSelect(val){ onItemSelect(val){
console.log(val)
if(this.current==0){ if(this.current==0){
this.msg.OrderBy = val.ID; this.msg.OrderBy = val.ID;
this.list[0].name = val.Name
}else{ }else{
this.msg.CarBrandId = val.ID this.msg.CarBrandId = val.ID;
this.list[1].name = val.Name
} }
this.screenshow = false this.screenshow = false
this.msg.pageIndex=1; this.msg.pageIndex=1;
...@@ -428,8 +455,8 @@ getGuideCarBrandList(){ ...@@ -428,8 +455,8 @@ getGuideCarBrandList(){
width: 1px; width: 1px;
flex: 1; flex: 1;
} }
.g_top{ .guidecarList .g_top{
width: 92%; width: 96%;
height: 45px; height: 45px;
border-radius: 22.5px; border-radius: 22.5px;
display: flex; display: flex;
...@@ -438,6 +465,14 @@ getGuideCarBrandList(){ ...@@ -438,6 +465,14 @@ getGuideCarBrandList(){
justify-content: space-around; justify-content: space-around;
background: #FAF8F9; background: #FAF8F9;
padding: 0 20px; padding: 0 20px;
margin: 10px 2%;
}
.guidecarList .row{
display: flex;
flex-direction: row;
align-items: center;
justify-content: center;
} }
.guidecarList .topB{ .guidecarList .topB{
display: flex; display: flex;
...@@ -464,15 +499,15 @@ getGuideCarBrandList(){ ...@@ -464,15 +499,15 @@ getGuideCarBrandList(){
display: flex;flex-direction: row;align-items: center; display: flex;flex-direction: row;align-items: center;
} }
.c_list_item .c_t_l{ .c_list_item .c_t_l{
width: 111px; width: 110px;
height: 62px; height: 62px;
} }
.c_list_item .c_t_r{ .c_list_item .c_t_r{
display: flex; display: flex;
flex-direction: column; flex-direction: column;
height: 62px; height: 62px;
padding:5px 10px; margin-left: 10px;
justify-content: space-around; /* justify-content: space-between; */
} }
.c_t_r .ctr_name{ .c_t_r .ctr_name{
width: 300rpx; width: 300rpx;
...@@ -482,10 +517,12 @@ getGuideCarBrandList(){ ...@@ -482,10 +517,12 @@ getGuideCarBrandList(){
white-space: nowrap; white-space: nowrap;
text-overflow: ellipsis; text-overflow: ellipsis;
font-weight: bold; font-weight: bold;
font-family: aa;
} }
.guidecarList .price{ .guidecarList .price{
font-size: 12px; font-size: 16px;
color: #ff4544; color: #FF4048;
} }
.guidecarList .line{ .guidecarList .line{
width: 100%; width: 100%;
...@@ -497,7 +534,7 @@ getGuideCarBrandList(){ ...@@ -497,7 +534,7 @@ getGuideCarBrandList(){
width: 100%;height: 100%;background: #000000;opacity: 0.3;position: absolute;left: 0;top: 130px;z-index: 999; width: 100%;height: 100%;background: #000000;opacity: 0.3;position: absolute;left: 0;top: 130px;z-index: 999;
} }
.guidecarList .tanchu{ .guidecarList .tanchu{
width: 100%;display: flex;flex-direction: column;align-items: center;background: #FFF;position: absolute;top: 55px;left: 0;z-index: 1999; width: 100%;display: flex;flex-direction: column;align-items: center;background: #FFF;position: absolute;top: 41px;left: 0;z-index: 1999;
} }
.guidecarList .tanchu_item{ .guidecarList .tanchu_item{
...@@ -510,6 +547,12 @@ getGuideCarBrandList(){ ...@@ -510,6 +547,12 @@ getGuideCarBrandList(){
justify-content: space-between; justify-content: space-between;
border-bottom: 1px solid #E2E2E2; border-bottom: 1px solid #E2E2E2;
} }
.guidecarList .numfont {
font-family: "oswald";
font-weight: unset;
font-weight: bold;
}
.guidecarList .guide_ComHead{ .guidecarList .guide_ComHead{
display: flex; display: flex;
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
......
...@@ -221,14 +221,14 @@ ...@@ -221,14 +221,14 @@
obj.year = myDate.getFullYear(); //年 obj.year = myDate.getFullYear(); //年
obj.month = myDate.getMonth() + 1; //月 obj.month = myDate.getMonth() + 1; //月
obj.day = myDate.getDate(); //日 obj.day = myDate.getDate(); //日
obj.hour = myDate.getHours(); //时 obj.hour = (myDate.getHours()<10)?"0"+myDate.getHours() : myDate.getHours(); //时
obj.minute = myDate.getMinutes(); //分 obj.minute = (myDate.getMinutes()<10)?"0"+myDate.getMinutes() : myDate.getMinutes(); //分
let day = myDate.getDay(); let day = myDate.getDay();
obj.week = this.getweek(day)//星期几 obj.week = this.getweek(day)//星期几
this.STime = obj; this.STime = obj;
this.ETime = obj; this.ETime = obj;
this.msg.StartTime = obj.year+'-'+obj.month+'-'+obj.day+' '+obj.hour+':'+obj.minute+':00'; this.msg.StartTime = obj.year+'/'+obj.month+'/'+obj.day+' '+obj.hour+':'+obj.minute+':00';
this.msg.EndTime = obj.year+'-'+obj.month+'-'+obj.day+' '+obj.hour+':'+obj.minute+':10'; this.msg.EndTime = obj.year+'/'+obj.month+'/'+obj.day+' '+obj.hour+':'+obj.minute+':10';
let startTime = new Date(this.msg.StartTime); // 开始时间 let startTime = new Date(this.msg.StartTime); // 开始时间
let endTime = new Date(this.msg.EndTime); // 结束时间 let endTime = new Date(this.msg.EndTime); // 结束时间
...@@ -366,13 +366,13 @@ ...@@ -366,13 +366,13 @@
}, },
btnStart(val){ btnStart(val){
if(this.timeType ==1){//出行时间的选择 if(this.timeType ==1){//出行时间的选择
this.msg.StartTime = val.year+'-'+val.month+'-'+val.day+' '+val.hour+':'+val.minute+':00'; this.msg.StartTime = val.year+'/'+val.month+'/'+val.day+' '+val.hour+':'+val.minute+':00';
this.STime = val this.STime = val
let myDate = new Date(this.msg.StartTime); let myDate = new Date(this.msg.StartTime);
let days = myDate.getDay(); let days = myDate.getDay();
this.STime.week = this.getweek(days) this.STime.week = this.getweek(days)
}else{//结束时间的选择 }else{//结束时间的选择
this.msg.EndTime = val.year+'-'+val.month+'-'+val.day+' '+val.hour+':'+val.minute+':10'; this.msg.EndTime = val.year+'/'+val.month+'/'+val.day+' '+val.hour+':'+val.minute+':10';
this.ETime = val this.ETime = val
let myDate = new Date(this.msg.EndTime); let myDate = new Date(this.msg.EndTime);
let days = myDate.getDay(); let days = myDate.getDay();
...@@ -382,8 +382,8 @@ ...@@ -382,8 +382,8 @@
let endTime = new Date(this.msg.EndTime); // 结束时间 let endTime = new Date(this.msg.EndTime); // 结束时间
console.log(startTime.getTime(),endTime.getTime()) console.log(startTime.getTime(),endTime.getTime())
if(startTime.getTime()>endTime.getTime()){//如果开始时间大于结束时间吧结束时间赋值和开始时间一样 if(startTime.getTime()>endTime.getTime()){//如果开始时间大于结束时间吧结束时间赋值和开始时间一样
this.msg.StartTime= val.year+'-'+val.month+'-'+val.day+' '+val.hour+':'+val.minute+':00'; this.msg.StartTime= val.year+'/'+val.month+'/'+val.day+' '+val.hour+':'+val.minute+':00';
this.msg.EndTime= val.year+'-'+val.month+'-'+val.day+' '+val.hour+':'+val.minute+':10'; this.msg.EndTime= val.year+'/'+val.month+'/'+val.day+' '+val.hour+':'+val.minute+':10';
this.STime = val this.STime = val
this.ETime = val this.ETime = val
let myDate = new Date(this.msg.EndTime); let myDate = new Date(this.msg.EndTime);
...@@ -597,7 +597,7 @@ ...@@ -597,7 +597,7 @@
.guidecar { .guidecar {
width: 100%; width: 100%;
height: 100%; height: 100%;
background: #f3f4f6; background: #FFFFFF;
} }
.guidecar .headStatus { .guidecar .headStatus {
overflow: hidden; overflow: hidden;
...@@ -635,6 +635,8 @@ ...@@ -635,6 +635,8 @@
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
margin-top: -50px; margin-top: -50px;
padding: 10px 0;
} }
.guidecar .content_box{ .guidecar .content_box{
width: 92%; width: 92%;
...@@ -644,6 +646,7 @@ ...@@ -644,6 +646,7 @@
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
padding: 15px; padding: 15px;
box-shadow:0 2px 2px 2px #FBF4F2;
} }
.guidecar .c_row{ .guidecar .c_row{
...@@ -677,6 +680,7 @@ ...@@ -677,6 +680,7 @@
.guidecar .ztext{ .guidecar .ztext{
font-size: 28rpx; font-size: 28rpx;
color: #1C1E1F; color: #1C1E1F;
font-weight: bold;
} }
.guidecar .btnstyle{ .guidecar .btnstyle{
width: 100%; width: 100%;
...@@ -685,6 +689,7 @@ ...@@ -685,6 +689,7 @@
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
box-shadow:0 2px 2px 2px #FBCED2;
} }
.guidecar .popupBox{ .guidecar .popupBox{
width: 100%; width: 100%;
......
...@@ -7,9 +7,19 @@ function calcContentHeight(chaliang) { ...@@ -7,9 +7,19 @@ function calcContentHeight(chaliang) {
}) })
return contentHeight return contentHeight
} }
function SystemInfo(){//获取屏幕宽高
let SystemInfo = {}
uni.getSystemInfo({
success(res) {
SystemInfo.windowWidth = res.windowWidth
SystemInfo.windowHeight = res.windowHeight
}
})
return SystemInfo
}
export default { export default {
calcContentHeight calcContentHeight,
SystemInfo
} }
\ No newline at end of file
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