Skip to content

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

修改

parent d65ab943
Hide whitespace changes
Inline Side-by-side
Showing with 104 additions and 91 deletions
pages/guidecar/guidecarGoodsdetails.vue
View file @ b86a4bfa
...@@ -212,6 +212,7 @@ ...@@ -212,6 +212,7 @@
v-for="(item, index) in comments[0].CommentList[1].CommentImgList" :key="index" v-for="(item, index) in comments[0].CommentList[1].CommentImgList" :key="index"
mode="aspectFill" mode="aspectFill"
:src="item" :src="item"
@click="previewImage2(index,comments[0].CommentList[1].CommentImgList)"
:style="{'width':san,'height':san}" :style="{'width':san,'height':san}"
/> />
</view> </view>
...@@ -237,6 +238,7 @@ ...@@ -237,6 +238,7 @@
v-for="(item, index) in comments[0].CommentList[0].CommentImgList" :key="index" v-for="(item, index) in comments[0].CommentList[0].CommentImgList" :key="index"
mode="aspectFill" mode="aspectFill"
:src="item" :src="item"
@click="previewImage2(index,comments[0].CommentList[0].CommentImgList)"
:style="{'width':san,'height':san}" :style="{'width':san,'height':san}"
/> />
</view> </view>
...@@ -479,6 +481,13 @@ ...@@ -479,6 +481,13 @@
}); });
}, },
methods: { methods: {
//图片预览
previewImage2(index, images) {
uni.previewImage({
urls: images,
current: index,
});
},
init(){ init(){
this.loading = true; this.loading = true;
uni.showLoading({ uni.showLoading({
......
pages/guidecar/order-commit-detail.vue
View file @ b86a4bfa
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
</view> </view>
<view class="editor"> <view class="editor">
<textarea placeholder="写入评价" v-model="msg[1].Content" maxlength="200"></textarea> <textarea placeholder="写入评价" v-model="msg[1].Content" maxlength="200"></textarea>
<u-upload :action="action" :file-list="fileList2" @on-remove="onRemove2" max-count="9" :custom-btn="true" <u-upload :action="action" :file-list="fileList2" style="display:none;" @on-remove="onRemove2" max-count="9" :custom-btn="true"
@on-success="uploadSuccessHandler2"> @on-success="uploadSuccessHandler2">
<view slot="addBtn" class="slot-btn"> <view slot="addBtn" class="slot-btn">
<u-icon name="photograph" size="40" color="#888"></u-icon> <u-icon name="photograph" size="40" color="#888"></u-icon>
...@@ -328,7 +328,7 @@ ...@@ -328,7 +328,7 @@
.commit-detail .good_List .editor-box .editor textarea { .commit-detail .good_List .editor-box .editor textarea {
width: 100%; width: 100%;
height: 150px; height: 100px;
font-size: 14px; font-size: 14px;
color: #000; color: #000;
border: none; border: none;
......
pages/guidecar/order-commit.vue
View file @ b86a4bfa
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
ripple ripple
plain plain
shape="circle" shape="circle"
:custom-style="{color:mc,borderColor:mc}" :custom-style="{color:mc,borderColor:mc,width:60+'px'}"
@click="goCommit(x)" @click="goCommit(x)"
>评价</u-button> >评价</u-button>
</view> </view>
......
pages/guidecar/orderDetail.vue
View file @ b86a4bfa
...@@ -116,6 +116,7 @@ ...@@ -116,6 +116,7 @@
display: flex; display: flex;
align-items: center; align-items: center;
} }
.order_Btn_Com { .order_Btn_Com {
padding: 5px 10px; padding: 5px 10px;
border: 1px solid #888888; border: 1px solid #888888;
...@@ -128,96 +129,99 @@ ...@@ -128,96 +129,99 @@
</style> </style>
<template> <template>
<view class="orderDetail" style="height:100vh;"> <view class="orderDetail" style="height:100vh;">
<view class="orderItem"> <template v-if="dataList">
<view class="orderDay"> <view class="orderItem">
<view> <view class="orderDay">
<template v-if="dataList.DetailList&&dataList.DetailList.length>0"> <view>
<view class="order_big">{{getStart(dataList.DetailList[0].TripSTime)}}</view> <template v-if="dataList.DetailList&&dataList.DetailList.length>0">
<view class="order_mini">{{getWeek(dataList.DetailList[0].TripSTime)}}</view> <view class="order_big">{{getStart(dataList.DetailList[0].TripSTime)}}</view>
</template> <view class="order_mini">{{getWeek(dataList.DetailList[0].TripSTime)}}</view>
</view> </template>
<view style="text-align: center;margin-top:8px;"> </view>
<view style="font-size:13px;color:#1B1D1E;" v-if="dataList.DetailList&&dataList.DetailList.length>0">{{getDays()}}</view> <view style="text-align: center;margin-top:8px;">
<view style="position: relative;top:-8px;"> <view style="font-size:13px;color:#1B1D1E;" v-if="dataList.DetailList&&dataList.DetailList.length>0">{{getDays()}}</view>
<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/dir_arrow.png" mode="aspectFill" style="width: 55px;height: 4px;"></image> <view style="position: relative;top:-8px;">
<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/dir_arrow.png" mode="aspectFill" style="width: 55px;height: 4px;"></image>
</view>
</view>
<view>
<template v-if="dataList.DetailList&&dataList.DetailList.length>0">
<view class="order_big">{{getStart(dataList.DetailList[0].TripETime)}}</view>
<view class="order_mini">{{getWeek(dataList.DetailList[0].TripETime)}}</view>
</template>
</view> </view>
</view> </view>
<view> <view class="orderCar">
<template v-if="dataList.DetailList&&dataList.DetailList.length>0"> <view class="order_carImg">
<view class="order_big">{{getStart(dataList.DetailList[0].TripETime)}}</view> <image mode="aspectFit" :src="dataList.DetailList[0].CoverImagePath" />
<view class="order_mini">{{getWeek(dataList.DetailList[0].TripETime)}}</view> </image>
</template>
</view>
</view>
<view class="orderCar">
<view class="order_carImg">
<image mode="aspectFit" :src="dataList.DetailList[0].CoverImagePath" />
</image>
</view>
<view style="width:55%">
<view class="order_big">{{dataList.DetailList[0].CarName}}</view>
<view class="order_small" style="margin-top:5px;">
{{dataList.DetailList[0].UseDay==0.5?'半':dataList.DetailList[0].UseDay}}天,
{{dataList.DetailList[0].GoodsName}},
{{dataList.DetailList[0].GuideCarType}},
{{dataList.DetailList[0].RideNum}}座,
</view> </view>
<view class="order_small" style="margin-top:5px;"> <view style="width:55%">
<view class="order_big">{{dataList.DetailList[0].CarName}}</view>
车牌号:{{dataList.DetailList[0].CarNumber}}, <view class="order_small" style="margin-top:5px;">
{{dataList.DetailList[0].IsSpell==1?'拼座':'不拼座'}}, {{dataList.DetailList[0].UseDay==0.5?'半':dataList.DetailList[0].UseDay}}天,
{{dataList.DetailList[0].GoodsName}},
{{dataList.DetailList[0].GuideCarType}},
{{dataList.DetailList[0].RideNum}}座,
</view>
<view class="order_small" style="margin-top:5px;">
车牌号:{{dataList.DetailList[0].CarNumber}},
{{dataList.DetailList[0].IsSpell==1?'拼座':'不拼座'}},
{{dataList.DetailList[0].CarColorName}},
{{dataList.CarTypeStr}}
</view>
</view>
<view style="text-align: right;">
<view class="order_big">¥ {{getPrice()}}</view>
<view style="color:#727272;font-size:13px;">×{{dataList.DetailList[0].Number}}</view>
</view> </view>
</view> </view>
<view style="text-align: right;"> <view class="order_GName">
<view class="order_big">¥ {{getPrice()}}</view> <view class="order_small">匹配导游</view>
<view style="color:#727272;font-size:13px;">×{{dataList.DetailList[0].Number}}</view> <view style="display: flex;align-items: center;">
<u-avatar mode="circle" :src="dataList.DetailList[0].GuidePhoto" size="60"></u-avatar>
<text class="order_big" style="margin-left:5px;">{{dataList.DetailList[0].GuideName}}</text>
</view>
</view> </view>
</view> </view>
<view class="order_GName"> <view class="orderItem">
<view class="order_small order_comLeft">匹配导游</view> <view class="order_dList order_Tprice">
<view style="display: flex;align-items: center;"> <text class="order_small">订单编号</text>
<u-avatar mode="circle" :src="dataList.DetailList[0].GuidePhoto" size="60"></u-avatar> <text class="order_big" style="margin-left:20px;">{{dataList.OrderNo}}</text>
<text class="order_big" style="margin-left:5px;">{{dataList.DetailList[0].GuideName}}</text> </view>
<view class="order_dList order_Tprice">
<text class="order_small">下单时间</text>
<text class="order_big" style="margin-left:20px;">{{dataList.CreateDate}}</text>
</view>
<view class="order_dList order_Tprice">
<text class="order_small">支付方式</text>
<text class="order_big" style="margin-left:20px;">{{dataList.PaymentWayName}}</text>
</view> </view>
</view> </view>
</view> <view class="orderItem" style="padding-bottom:60px;">
<view class="orderItem"> <view class="order_dList order_Tprice">
<view class="order_dList"> <text class="order_small">商品总额</text>
<text class="order_small order_comLeft">订单编号:</text> <text class="order_big">¥ {{dataList.Income}}</text>
<text class="order_big" style="margin-left:20px;">{{dataList.OrderNo}}</text>
</view>
<view class="order_dList">
<text class="order_small order_comLeft">下单时间:</text>
<text class="order_big" style="margin-left:20px;">{{dataList.CreateDate}}</text>
</view>
<view class="order_dList">
<text class="order_small order_comLeft">支付方式:</text>
<text class="order_big" style="margin-left:20px;">{{dataList.PaymentWayName}}</text>
</view>
</view>
<view class="orderItem" style="padding-bottom:60px;">
<view class="order_dList order_Tprice">
<text class="order_small order_comLeft">商品总额</text>
<text class="order_big">¥ {{dataList.Income}}</text>
</view>
<view class="order_dList order_Tprice">
<text class="order_small order_comLeft">优惠</text>
<text class="order_big">¥ {{dataList.CouponMoney}}</text>
</view>
<view class="order_dList" style="text-align: right" :class="{'order_nonBtm':dataList.OrderStatus!=3}">
<text class="order_big">实付款：</text>
<text class="order_redPrice">¥ {{dataList.Income}}</text>
</view>
<view class="btn-box" v-if="dataList.OrderStatus != 5">
<view class="item" v-if="dataList.OrderStatus == 1">
<view class="order_Btn_Com" v-on:click.stop="payment(dataList)" style="color:#FF4048;border-color:#FF4048;">立即支付</view>
</view> </view>
<view class="item" v-if="dataList.OrderStatus == 1||dataList.OrderStatus==2||dataList.OrderStatus==3"> <view class="order_dList order_Tprice">
<view class="order_Btn_Com" @click="cancel">取消订单</view> <text class="order_small">优惠</text>
<text class="order_big">¥ {{dataList.CouponMoney}}</text>
</view>
<view class="order_dList" style="text-align: right" :class="{'order_nonBtm':dataList.OrderStatus!=3}">
<text class="order_big">实付款：</text>
<text class="order_redPrice">¥ {{dataList.Income}}</text>
</view>
<view class="btn-box" v-if="dataList.OrderStatus != 5">
<view class="item" v-if="dataList.OrderStatus == 1">
<view class="order_Btn_Com" v-on:click.stop="payment(dataList)" style="color:#FF4048;border-color:#FF4048;">立即支付</view>
</view>
<view class="item" v-if="dataList.OrderStatus == 1||dataList.OrderStatus==2||dataList.OrderStatus==3">
<view class="order_Btn_Com" @click="cancel">取消订单</view>
</view>
</view> </view>
</view> </view>
</view> </template>
<after-sale :list="dataList.DetailList" v-if="showAfter" @close="closeAfterHandler"></after-sale> <after-sale :list="dataList.DetailList" v-if="showAfter" @close="closeAfterHandler"></after-sale>
<u-popup v-model="showModal" mode="center" length="80%"> <u-popup v-model="showModal" mode="center" length="80%">
<view style='display: flex;flex-direction: column;align-items: center;background: #fff;'> <view style='display: flex;flex-direction: column;align-items: center;background: #fff;'>
...@@ -286,8 +290,8 @@ ...@@ -286,8 +290,8 @@
OrderPayType: 1, OrderPayType: 1,
GoodsName: '' GoodsName: ''
}, },
payBtn:false, payBtn: false,
payExit:false payExit: false
} }
}, },
created() { created() {
...@@ -310,7 +314,7 @@ ...@@ -310,7 +314,7 @@
onLoad(option) { onLoad(option) {
this.u = uni.getStorageSync("mall_UserInfo"); this.u = uni.getStorageSync("mall_UserInfo");
this.msg.OrderId = option.OrderId; this.msg.OrderId = option.OrderId;
this.payInfo.OpenId=uni.getStorageSync('mall_UserInfo').OpenId; this.payInfo.OpenId = uni.getStorageSync('mall_UserInfo').OpenId;
this.getData(); this.getData();
}, },
methods: { methods: {
...@@ -419,21 +423,21 @@ ...@@ -419,21 +423,21 @@
icon: 'none' icon: 'none'
}) })
uni.redirectTo({ uni.redirectTo({
url: "/pages/guidecar/orderList?status=1", url: "/pages/guidecar/orderList?status=1",
}); });
} }
); );
} }
}) })
}, },
//支付 //支付
payment(e){ payment(e) {
this.payInfo.OrderId = e.OrderId; this.payInfo.OrderId = e.OrderId;
this.payInfo.GoodsName = e.DetailList[0].GoodsName.slice(0,10); this.payInfo.GoodsName = e.DetailList[0].GoodsName.slice(0, 10);
this.payInfo.PaymentWay = e.PaymentWay; this.payInfo.PaymentWay = e.PaymentWay;
this.payInfo.total_price = e.Income; this.payInfo.total_price = e.Income;
this.payBtn=true this.payBtn = true
}, },
closePay() { closePay() {
this.payBtn = false; this.payBtn = false;
...@@ -441,7 +445,7 @@ ...@@ -441,7 +445,7 @@
}, },
exitPay() { exitPay() {
this.payExit = false; this.payExit = false;
}, },
} }
} }
</script> </script>
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