Skip to content

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

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

parents f648004b f3d80fb5
Hide whitespace changes
Inline Side-by-side
Showing with 45 additions and 36 deletions
pages/guidecar/orderDetail.vue
View file @ 89b9200a
<style> <style>
.orderDetail { .orderDetail {
background-color: #FAF8F9; background: #f6f6f6;
font-family: 'oswald';
padding:0 5px;
padding-bottom:60px;
height:100%;
} }
.orderDetail .orderItem { .orderDetail .orderItem {
background-color: #fff; background-color: #fff;
margin-bottom: 10px; margin-bottom: 10px;
padding: 0 15px; padding: 0 15px;
border-radius: 10px;
} }
.orderDetail .orderDay { .orderDetail .orderDay {
...@@ -46,14 +51,14 @@ ...@@ -46,14 +51,14 @@
.orderDetail .order_GName { .orderDetail .order_GName {
width: 100%; width: 100%;
height: 50px; height: 50px;
border-top: 1px solid #e2e2e2; border-top: 1px solid rgba(0, 0, 0, 0.03);
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
} }
.orderDetail .order_dList { .orderDetail .order_dList {
border-bottom: 1px solid #e2e2e2; border-bottom: 1px solid rgba(0, 0, 0, 0.03);
padding: 20px 0; padding: 20px 0;
} }
...@@ -128,7 +133,7 @@ ...@@ -128,7 +133,7 @@
} }
</style> </style>
<template> <template>
<view class="orderDetail" style="height:100vh;"> <view class="orderDetail">
<template v-if="dataList"> <template v-if="dataList">
<view class="orderItem"> <view class="orderItem">
<view class="orderDay"> <view class="orderDay">
...@@ -156,17 +161,17 @@ ...@@ -156,17 +161,17 @@
<image mode="aspectFit" :src="dataList.DetailList[0].CoverImagePath" /> <image mode="aspectFit" :src="dataList.DetailList[0].CoverImagePath" />
</image> </image>
</view> </view>
<view style="width:55%"> <view style="width:52%">
<view class="order_big" style="overflow: hidden; <view class="order_big" style="overflow: hidden;
white-space: nowrap; white-space: nowrap;
text-overflow: ellipsis; text-overflow: ellipsis;
font-weight: bold; font-weight: bold;
width: 100%;"> width: 100%;">
{{dataList.DetailList[0].GoodsName}} {{dataList.DetailList[0].CarBrandName}}
</view> </view>
<view class="order_small" style="margin-top:5px;"> <view class="order_small" style="margin-top:5px;">
{{dataList.DetailList[0].UseDay==0.5?'半':dataList.DetailList[0].UseDay}}天, {{dataList.DetailList[0].UseDay==0.5?'半':dataList.DetailList[0].UseDay}}天,
{{dataList.DetailList[0].CarBrandName}}, {{dataList.DetailList[0].CarName}},
{{dataList.DetailList[0].GuideCarType}}, {{dataList.DetailList[0].GuideCarType}},
{{dataList.DetailList[0].RideNum}}座, {{dataList.DetailList[0].RideNum}}座,
</view> </view>
...@@ -177,7 +182,7 @@ ...@@ -177,7 +182,7 @@
{{dataList.CarTypeStr}} {{dataList.CarTypeStr}}
</view> </view>
</view> </view>
<view style="text-align: right;"> <view style="text-align: right;width:55px;">
<view class="order_big">¥ {{getPrice()}}</view> <view class="order_big">¥ {{getPrice()}}</view>
<view style="color:#727272;font-size:13px;">×{{dataList.DetailList[0].Number}}</view> <view style="color:#727272;font-size:13px;">×{{dataList.DetailList[0].Number}}</view>
</view> </view>
...@@ -185,7 +190,7 @@ ...@@ -185,7 +190,7 @@
<view class="order_GName"> <view class="order_GName">
<view class="order_small">匹配导游</view> <view class="order_small">匹配导游</view>
<view style="display: flex;align-items: center;"> <view style="display: flex;align-items: center;">
<u-avatar mode="circle" :src="dataList.DetailList[0].GuidePhoto" size="60"></u-avatar> <u-avatar mode="circle" style="margin-top:8px;" :src="dataList.DetailList[0].GuidePhoto" size="60"></u-avatar>
<text class="order_big" style="margin-left:5px;">{{dataList.DetailList[0].GuideName}}</text> <text class="order_big" style="margin-left:5px;">{{dataList.DetailList[0].GuideName}}</text>
</view> </view>
</view> </view>
...@@ -204,7 +209,7 @@ ...@@ -204,7 +209,7 @@
<text class="order_big" style="margin-left:20px;">{{dataList.PaymentWayName}}</text> <text class="order_big" style="margin-left:20px;">{{dataList.PaymentWayName}}</text>
</view> </view>
</view> </view>
<view class="orderItem" style="padding-bottom:60px;"> <view class="orderItem">
<view class="order_dList order_Tprice"> <view class="order_dList order_Tprice">
<text class="order_small">商品总额</text> <text class="order_small">商品总额</text>
<text class="order_big">¥ {{dataList.Income}}</text> <text class="order_big">¥ {{dataList.Income}}</text>
......
pages/guidecar/orderList.vue
View file @ 89b9200a
...@@ -132,7 +132,7 @@ ...@@ -132,7 +132,7 @@
</view> </view>
<view class="order_guidIndfo"> <view class="order_guidIndfo">
<view>匹配导游：{{item.GuideName}}·<text style="font-weight: normal;">{{item.GuideTelephone}}</text></view> <view>匹配导游：{{item.GuideName}}·<text style="font-weight: normal;">{{item.GuideTelephone}}</text></view>
<view> <view style="margin-top:6px;">
<u-avatar mode="circle" size="60" :src="item.GuidePhoto"></u-avatar> <u-avatar mode="circle" size="60" :src="item.GuidePhoto"></u-avatar>
</view> </view>
</view> </view>
......
pages/guidecar/place_order.vue
View file @ 89b9200a
<style> <style>
.place_order { .place_order {
height: 100%; height: 100%;
background: #f5f5f5; background: #f6f6f6;
font-family: 'oswald';
padding:0 5px;
padding-bottom:50px;
} }
.place_order .orderItem { .place_order .orderItem {
background-color: #fff; background-color: #fff;
margin-bottom: 10px; margin-bottom: 12px;
padding: 0 15px; padding: 0 15px;
border-radius: 10px;
} }
.place_order .order_big { .place_order .order_big {
...@@ -25,7 +29,7 @@ ...@@ -25,7 +29,7 @@
.place_order .orderCar { .place_order .orderCar {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
padding: 30px 0; padding: 10px 0;
} }
.place_order .order_carImg image { .place_order .order_carImg image {
...@@ -36,7 +40,7 @@ ...@@ -36,7 +40,7 @@
.place_order .order_GName { .place_order .order_GName {
width: 100%; width: 100%;
height: 50px; height: 50px;
border-top: 1px solid rgba(0, 0, 0, 0.05); border-top: 1px solid rgba(0, 0, 0, 0.03);
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
...@@ -62,7 +66,7 @@ ...@@ -62,7 +66,7 @@
.or_Image { .or_Image {
width: 10px; width: 10px;
height: 14px; height: 14px;
margin-right: 5px; margin-top:3px;
} }
.place_order .btnstyle { .place_order .btnstyle {
...@@ -156,34 +160,38 @@ ...@@ -156,34 +160,38 @@
line-clamp: 2; line-clamp: 2;
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
} }
.Order_placeTitle{
margin:20px 0 15px 0;
}
</style> </style>
<template> <template>
<view class="place_order"> <view class="place_order">
<template v-if="mchs.length>0"> <template v-if="mchs.length>0">
<view class="orderItem"> <view class="orderItem">
<view class="Order_placeTitle">商品信息</view>
<view class="orderCar"> <view class="orderCar">
<view class="order_carImg"> <view class="order_carImg">
<image mode="aspectFit" :src="mchs[0].goods_list[0].cover_pic" /> <image mode="aspectFit" :src="mchs[0].goods_list[0].cover_pic" />
</image> </image>
</view> </view>
<view style="width:48%"> <view style="width:68%;">
<view class="order_big">{{mchs[0].goods_list[0].goods_attr.name}}</view> <view class="order_big" style="display:flex;justify-content: space-between;">
<view>{{mchs[0].goods_list[0].goods_attr.car_name}}</view>
<view class="order_big" style="font-size:15px;">¥ {{mchs[0].goods_list[0].unit_price}}</view>
</view>
<view class="order_carBg" style="margin-top:10px;"> <view class="order_carBg" style="margin-top:10px;">
<view style="margin-bottom:5px;">天数：{{mchs[0].goods_list[0].goods_attr.advance_day}}天</view>
<view style="margin-bottom:5px;">颜色：{{mchs[0].goods_list[0].goods_attr.carcolor_name}}</view>
<view>类型：{{mchs[0].goods_list[0].goods_attr.car_model}}/{{mchs[0].goods_list[0].goods_attr.ride_num}}座 <view>类型：{{mchs[0].goods_list[0].goods_attr.car_model}}/{{mchs[0].goods_list[0].goods_attr.ride_num}}座
{{mchs[0].goods_list[0].goods_attr.car_class}}</view> {{mchs[0].goods_list[0].goods_attr.car_class}} 颜色：{{mchs[0].goods_list[0].goods_attr.carcolor_name}}</view>
</view> </view>
</view> </view>
<view style="text-align: right;"> <!-- <view style="text-align: right;">
<view class="order_big">¥ {{mchs[0].goods_list[0].unit_price}}</view> <view class="order_big">¥ {{mchs[0].goods_list[0].unit_price}}</view>
<view style="color:#727272;font-size:13px;">×{{mchs[0].goods_list[0].num}}</view> </view> -->
</view>
</view> </view>
<view class="order_GName"> <view class="order_GName">
<view class="order_big order_comLeft">匹配导游</view> <view class="order_big order_comLeft">匹配导游</view>
<view style="display: flex;align-items: center;"> <view style="display: flex;align-items: center;">
<u-avatar mode="circle" style="margin-top:9px;" :size="50" :src="mchs[0].goods_list[0].goods_attr.guide_photo"></u-avatar> <u-avatar mode="circle" :size="50" :src="mchs[0].goods_list[0].goods_attr.guide_photo"></u-avatar>
<text class="order_big" style="margin-left:3px;">{{mchs[0].goods_list[0].goods_attr.guide_name}}</text> <text class="order_big" style="margin-left:3px;">{{mchs[0].goods_list[0].goods_attr.guide_name}}</text>
</view> </view>
</view> </view>
...@@ -206,27 +214,22 @@ ...@@ -206,27 +214,22 @@
</view> </view>
</template> </template>
<view class="orderItem"> <view class="orderItem">
<view style="padding-top:20px;margin-bottom:15px;">联系人信息</view>
<view class="order_GName" style="border-top:0;"> <view class="order_GName" style="border-top:0;">
<view class="order_big order_comLeft">联系人</view> <view class="order_big order_comLeft">联系人</view>
<view style="display: flex;align-items: center;"> <view style="display: flex;align-items: center;">
<input class="uni-input" v-model="orderMsg.Consignee" placeholder="请输入联系人" style="border:none;padding-left:5px;text-align: right;" /> <input class="uni-input" v-model="orderMsg.Consignee" placeholder="请输入联系人" style="border:none;padding-left:5px;text-align: right;" />
</view> </view>
</view> </view>
<view class="order_GName" style="border-top:0;border-top: 1px solid rgba(0, 0, 0, 0.05);"> <view class="order_GName" style="border-top:0;border-top: 1px solid rgba(0, 0, 0, 0.03);">
<view class="order_big order_comLeft">联系电话</view> <view class="order_big order_comLeft">联系电话</view>
<view style="display: flex;align-items: center;"> <view style="display: flex;align-items: center;">
<input class="uni-input" v-model="orderMsg.Mobile" placeholder="请输入联系电话" style="border:none;padding-left:5px;text-align: right;" /> <input class="uni-input" v-model="orderMsg.Mobile" placeholder="请输入联系电话" style="border:none;padding-left:5px;text-align: right;" />
</view> </view>
</view> </view>
<view class="order_GName" style="border-top:0;border-top: 1px solid rgba(0, 0, 0, 0.05);">
<view class="order_big order_comLeft">取车城市</view>
<view style="display: flex;align-items: center;">
四川 成都市
</view>
</view>
<view class="order_GName" @click="openmap(),isShowStart=1"> <view class="order_GName" @click="openmap(),isShowStart=1">
<view class="order_big order_comLeft">出发地址</view> <view class="order_big order_comLeft">出发地址</view>
<view style="display: flex;align-items: center;width:56%" v-if="msg.ShoppingAddress!=''"> <view style="display: flex;max-width:56%;" v-if="msg.ShoppingAddress!=''">
<image class="or_Image" mode="aspectFit" style="width:30px;" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/o_address.png"></image> <image class="or_Image" mode="aspectFit" style="width:30px;" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/o_address.png"></image>
<text class="Shop_Address">{{msg.ShoppingAddress}}</text> <text class="Shop_Address">{{msg.ShoppingAddress}}</text>
</view> </view>
...@@ -236,7 +239,7 @@ ...@@ -236,7 +239,7 @@
</view> </view>
<view class="order_GName" v-if="mchs[0].goods_list[0].goods_attr.car_type!=5" @click="openmap(),isShowStart=2"> <view class="order_GName" v-if="mchs[0].goods_list[0].goods_attr.car_type!=5" @click="openmap(),isShowStart=2">
<view class="order_big order_comLeft">目的地</view> <view class="order_big order_comLeft">目的地</view>
<view style="display: flex;align-items: center;width:56%" v-if="orderMsg.DestinationAddress!=''"> <view style="display: flex;max-width:56%" v-if="orderMsg.DestinationAddress!=''">
<image class="or_Image" mode="aspectFit" style="width:30px;" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/o_address.png"></image> <image class="or_Image" mode="aspectFit" style="width:30px;" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/o_address.png"></image>
<text>{{orderMsg.DestinationAddress}}</text> <text>{{orderMsg.DestinationAddress}}</text>
</view> </view>
...@@ -268,7 +271,7 @@ ...@@ -268,7 +271,7 @@
</view> </view>
</view> </view>
</view> </view>
<view class="orderItem" style="padding-bottom:60px;"> <view class="orderItem">
<view class="order_GName" style="border-top:0;"> <view class="order_GName" style="border-top:0;">
<view class="order_big order_comLeft">优惠券</view> <view class="order_big order_comLeft">优惠券</view>
<view style="display: flex;align-items: center;"> <view style="display: flex;align-items: center;">
...@@ -329,7 +332,7 @@ ...@@ -329,7 +332,7 @@
</view> </view>
<view class="count-box"> <view class="count-box">
<text class="label">购买数量</text> <text class="label">购买数量</text>
<u-number-box v-model="msg.DetailList[0].Number" :min="1" @change="valChange"></u-number-box> <u-number-box v-model="msg.DetailList[0].Number" :min="1" :max="mchs[0].goods_list[0].surplus_num" @change="valChange"></u-number-box>
</view> </view>
<view class="btn-box"> <view class="btn-box">
<view style="flex: 1;"> <view style="flex: 1;">
...@@ -741,6 +744,7 @@ ...@@ -741,6 +744,7 @@
//人数 //人数
valChange(e) { valChange(e) {
this.msg.DetailList[0].Number = e.value; this.msg.DetailList[0].Number = e.value;
this.getData();
}, },
//点击确定 //点击确定
sureBuyNum() { sureBuyNum() {
......
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