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