Skip to content

M
mallapp
Commit f648004b authored by Mac's avatar Mac
Browse files
Options

司导样式修改

parent 54e8a3cd
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 142 additions and 62 deletions
pages/guidecar/guidecarGoodsdetails.vue
View file @ f648004b
<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 class="sell u-skeleton-rect">
<text class="oprice" v-if="setting.is_underline_price == 1">￥{{ g.original_price }}</text>
</view>
</view> </view>
<view class="sell u-skeleton-rect">
<text class="oprice" v-if="setting.is_underline_price == 1">{{ g.original_price }}</text>
</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>
pages/guidecar/guidecarList.vue
View file @ f648004b
This diff is collapsed.
pages/guidecar/index.vue
View file @ f648004b
...@@ -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%;
......
plugin/utils.js
View file @ f648004b
...@@ -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