Commit b86a4bfa authored by zhengke's avatar zhengke

修改

parent d65ab943
...@@ -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({
......
...@@ -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;
......
...@@ -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>
......
...@@ -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,6 +129,7 @@ ...@@ -128,6 +129,7 @@
</style> </style>
<template> <template>
<view class="orderDetail" style="height:100vh;"> <view class="orderDetail" style="height:100vh;">
<template v-if="dataList">
<view class="orderItem"> <view class="orderItem">
<view class="orderDay"> <view class="orderDay">
<view> <view>
...@@ -166,7 +168,8 @@ ...@@ -166,7 +168,8 @@
车牌号:{{dataList.DetailList[0].CarNumber}}, 车牌号:{{dataList.DetailList[0].CarNumber}},
{{dataList.DetailList[0].IsSpell==1?'拼座':'不拼座'}}, {{dataList.DetailList[0].IsSpell==1?'拼座':'不拼座'}},
{{dataList.DetailList[0].CarColorName}},
{{dataList.CarTypeStr}}
</view> </view>
</view> </view>
<view style="text-align: right;"> <view style="text-align: right;">
...@@ -175,7 +178,7 @@ ...@@ -175,7 +178,7 @@
</view> </view>
</view> </view>
<view class="order_GName"> <view class="order_GName">
<view class="order_small order_comLeft">匹配导游</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" :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>
...@@ -183,26 +186,26 @@ ...@@ -183,26 +186,26 @@
</view> </view>
</view> </view>
<view class="orderItem"> <view class="orderItem">
<view class="order_dList"> <view class="order_dList order_Tprice">
<text class="order_small order_comLeft">订单编号:</text> <text class="order_small">订单编号</text>
<text class="order_big" style="margin-left:20px;">{{dataList.OrderNo}}</text> <text class="order_big" style="margin-left:20px;">{{dataList.OrderNo}}</text>
</view> </view>
<view class="order_dList"> <view class="order_dList order_Tprice">
<text class="order_small order_comLeft">下单时间:</text> <text class="order_small">下单时间</text>
<text class="order_big" style="margin-left:20px;">{{dataList.CreateDate}}</text> <text class="order_big" style="margin-left:20px;">{{dataList.CreateDate}}</text>
</view> </view>
<view class="order_dList"> <view class="order_dList order_Tprice">
<text class="order_small order_comLeft">支付方式:</text> <text class="order_small">支付方式</text>
<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" style="padding-bottom:60px;">
<view class="order_dList order_Tprice"> <view class="order_dList order_Tprice">
<text class="order_small order_comLeft">商品总额</text> <text class="order_small">商品总额</text>
<text class="order_big">¥ {{dataList.Income}}</text> <text class="order_big">¥ {{dataList.Income}}</text>
</view> </view>
<view class="order_dList order_Tprice"> <view class="order_dList order_Tprice">
<text class="order_small order_comLeft">优惠</text> <text class="order_small">优惠</text>
<text class="order_big">¥ {{dataList.CouponMoney}}</text> <text class="order_big">¥ {{dataList.CouponMoney}}</text>
</view> </view>
<view class="order_dList" style="text-align: right" :class="{'order_nonBtm':dataList.OrderStatus!=3}"> <view class="order_dList" style="text-align: right" :class="{'order_nonBtm':dataList.OrderStatus!=3}">
...@@ -218,6 +221,7 @@ ...@@ -218,6 +221,7 @@
</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: {
...@@ -428,12 +432,12 @@ ...@@ -428,12 +432,12 @@
}) })
}, },
//支付 //支付
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;
......
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