Skip to content

M
mallapp
Commit 47f11f15 authored by zhengke's avatar zhengke
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/viitto/mallapp

parents e35b3643 35c309c6
Show whitespace changes
Inline Side-by-side
Showing with 136 additions and 112 deletions
pages/guidecar/guidecarGoodsdetails.vue
View file @ 47f11f15
......@@ -31,14 +31,14 @@
indicator-dots
:autoplay="false"
:interval="1000"
style="height:200px;"
style="height:260px;"
>
<block v-for="(item, index) in g.pic_url" :key="index">
<swiper-item>
<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"
: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="widthFix"></image>
<image @click="previewImage(index)" style="width:100%;height:100%;" v-else :src="item.pic_url" mode=""></image>
</swiper-item>
</block>
</swiper>
......@@ -79,6 +79,7 @@
</view>
</view>
</view>
<view :style="{'width':(windowWidth-20)+'px',height:'1px',background:'#f1f1f1','margin-left':'10px'}"></view>
<view class="sku-box" style="justify-content: space-between;" @click="goguide(1)">
<view class="row">
<span class='skub_text'>导游信息</span>
......@@ -99,6 +100,7 @@
size="20"
:disabled="true"
></u-rate>
<span style='font-size: 11px;color: #A8A8A8;margin-left: 5px;'>{{g.guide_score}}</span>
</view>
</view>
......@@ -107,7 +109,7 @@
<u-icon name="arrow" :size="32" color="#111"></u-icon>
</view>
<view class="sku-box u-skeleton-rect" style="align-items: flex-start;">
<view class="sku-box u-skeleton-rect" style="align-items: flex-start;margin: 10px 0;">
<view class="label" style="margin-top: 5px;">活动</view>
<view class="content" style="display: flex;flex-direction: column">
<view
......@@ -145,7 +147,7 @@
</view>
<view class="sku-box" style="justify-content: space-between;">
<view class="sku-box" style="justify-content: space-between;margin-top: 10px;padding: 10px;">
<view class="row">
<span class='skub_text'>服务类型</span>
<view class="row" style="margin-left: 20px;">
......@@ -153,6 +155,7 @@
</view>
</view>
</view>
<view :style="{'width':(windowWidth-20)+'px',height:'1px',background:'#f1f1f1','margin-left':'10px'}"></view>
<view class="sku-box" style="justify-content: space-between;">
<view class="row">
<span class='skub_text'>是否拼坐</span>
......@@ -162,13 +165,11 @@
</view>
</view>
</view>
<view style="width: 100%;height: 10px;background: #f5f5f5;"></view>
<view class="sku-box u-skeleton-rect" v-if="comments.length == 0 && setting.is_comment == 1">
<view class="sku-box u-skeleton-rect" style="margin-top: 10px;" v-if="comments.length == 0 && setting.is_comment == 1">
<view class="label">暂无评论信息</view>
</view>
<view v-if="comments.length > 0">
<view class="chead" style="padding: 10px;">
<view class="comment" v-if="comments.length > 0" style="margin-top: 10px;">
<view class="chead" >
<u-section
:bold="false"
:sub-color="secondary"
......@@ -245,6 +246,9 @@
</view>
</view>
</view>
</view>
<view class="actionsheet" :style="{ 'height': bian ? '78px' : '50px' }">
<view class="actionsheet-item" style="height: 50px;">
<view style="width: 22px; margin: auto;margin-left: 15px;"><u-icon name="service-o" size="44" color="#4578FF"></u-icon></view>
......@@ -332,6 +336,8 @@
RideNum:1,//出行人数
contentHeight:0,
san:'100px',
windowWidth:0,
}
},
onLoad(option){
......@@ -471,6 +477,7 @@
that.san = (res.windowWidth-20)/3+'px'
}
})
this.windowWidth = this.$utils.SystemInfo().windowWidth
},
mounted() {
......@@ -714,6 +721,7 @@
.guidecarOrderdetails .btnsmall{
font-size: 16px;
margin-left: 8px;
margin-bottom: 2px;
}
.guidecarOrderdetails .btnnumfont{
font-size: 22px;
......@@ -746,7 +754,7 @@
margin-bottom: 12rpx;
}
.guidecarOrderdetails .sku-box {
margin: 10px 0;
background: #fff;
display: flex;
padding: 15px 10px;
......@@ -929,4 +937,9 @@
margin: 0;
pointer-events: none;
}
.guidecarOrderdetails .comment .chead {
padding-bottom: 10px;
border-bottom: 1px solid #f1f1f1;
width: 100%;
}
</style>
pages/guidecar/guidedetails.vue
View file @ 47f11f15
<template>
<view class="guidedetails" >
<view class="guide" v-if='type==1'>
<view class="guide" :style="{'height':(windowHeight-30)+'px'}" v-if='type==1&& loading==true'>
<view class="guide-top">
<u-avatar :src="guideModel.GuidePhoto" :size="120"></u-avatar>
......@@ -13,12 +13,13 @@
<u-rate
:current="guideModel.Score"
active-color="#FF8C10"
inactive-color="#b2b2b2"
inactive-color="#D5D5D5"
active-icon="star"
inactive-icon="star-o"
size="20"
size="34"
:disabled="true"
></u-rate>
<span style='font-size: 14px;color: #A8A8A8;margin-left: 10px;'>{{guideModel.Score}}</span>
</view>
</view>
......@@ -28,10 +29,10 @@
<span class='info-text'>工龄：</span>
<span>{{guideModel.WorkYears}}年</span>
</view>
<view class="guide-info-item">
<!-- <view class="guide-info-item">
<span class='info-text'>电话：</span>
<span>{{guideModel.Telephone}}</span>
</view>
</view> -->
<view class="guide-info-item">
<span class='info-text'>服务人数：</span>
<span>{{guideModel.OrderGuestNum}}人</span>
......@@ -52,7 +53,7 @@
<h-parse :content="detailContent" @navigate="clickDescription"></h-parse>
</view>
</view>
<view class="guide" v-if='type==2&& loading==true'>
<view class="guide" v-if='type==2&& loading==true' :style="{'height':(windowHeight-30)+'px'}">
<view class="u-skeleton-rect">
<swiper
indicator-dots
......@@ -78,35 +79,38 @@
<u-rate
:current="carModel.Score"
active-color="#FF8C10"
inactive-color="#b2b2b2"
inactive-color="#D5D5D5"
active-icon="star"
inactive-icon="star-o"
size="20"
size="34"
:disabled="true"
></u-rate>
<span style='font-size: 14px;color: #A8A8A8;margin-left: 10px;'>{{guideModel.Score}}</span>
</view>
<view style="width: 98%;height: 1px;background: #E2E2E2;margin-top: 10px;"></view>
<view class="guide-info">
<view class="guide-info-item">
<span class='info-text'>购买年限：</span>
<span>{{g.car_buyyear}}年</span>
</view>
<view class="guide-info-item">
<span class='info-text'>颜色：</span>
<span>{{guidecar.ColorName}}</span>
</view>
<view class="guide-info-item">
<span class='info-text'>座位数：</span>
<span>{{carModel.GuestNum}}座</span>
</view>
<view class="guide-info-item">
<span class='info-text'>分类：</span>
<span>{{carModel.CarClassStr}}</span>
</view>
<view class="guide-info-item">
<span class='info-text'>座位数：</span>
<span>{{carModel.GuestNum}}座</span>
</view>
<view class="guide-info-item">
<span class='info-text'>型号：</span>
<span>{{carModel.CarType}}</span>
</view>
<view class="guide-info-item" style="width: 100%;">
<span class='info-text'>购买年限：</span>
<span>{{g.car_buyyear}}年</span>
</view>
</view>
</view>
</view>
......@@ -133,6 +137,7 @@ export default {
carModel:{},
guideModel:{},
guidecar:{},
windowHeight:0,
};
},
......@@ -174,6 +179,7 @@ export default {
uni.setNavigationBarTitle({
title: this.pageTitle,
});
this.windowHeight = this.$utils.SystemInfo().windowHeight
},
......@@ -193,7 +199,7 @@ export default {
(res) => {
this.guideModel = res.data;
uni.hideLoading();
// this.loading=true
this.loading=true
}
......@@ -232,7 +238,7 @@ getGuideCarModel(){
},
previewImage(i) {
uni.previewImage({
urls: this.imgs,
urls: this.guidecar.PicList,
current: i,
longPressActions: {
itemList: ["发送给朋友", "保存图片", "收藏"],
......@@ -259,19 +265,22 @@ getGuideCarModel(){
.guidedetails {
height: 100%;
background: #f5f5f5;
padding: 20px 0;
height: 100%;
background: #FAF8F9;
padding: 15px;
font-family: aa;
}
.guidedetails .guide{
width: 94%;
margin-left: 3%;
width: 100%;
/* height: 96%; */
border-radius: 10px;
background: #FFF;
display: flex;
flex-direction: column;
align-items: center;
padding: 15px;
overflow-y: auto;
box-shadow:0 2px 2px 2px #E9E7E8;
}
.guidedetails .guide-top{
......@@ -284,7 +293,7 @@ getGuideCarModel(){
display: flex;
flex-direction: row;
align-items: center;
justify-content: center;
/* justify-content: center; */
}
.guidedetails .column{
display: flex;
......@@ -307,7 +316,9 @@ getGuideCarModel(){
.guidedetails .info-text{
font-size: 14px;
color: #727272;
margin-right: 10px;
/* margin-right: 10px; */
padding: 10px 0;
width: 75px;
text-align: right;
}
</style>
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