Skip to content

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

修改

parent 9d64311a
Hide whitespace changes
Inline Side-by-side
Showing with 119 additions and 38 deletions
pages/school/personal/orderDetail.vue
View file @ 00e7939d
<style> <style>
.orderDetail { .eduorderDetail {
background: #f6f6f6; background: #f0f4f7;
font-family: 'oswald'; font-family: 'oswald';
padding:0 5px; padding: 0 5px;
padding-bottom:60px; padding-bottom: 60px;
height:100%; height: 100vh;
} }
.orderDetail .orderItem { .eduorderDetail .orderItem {
background-color: #fff; background-color: #fff;
margin-bottom: 10px; margin-bottom: 10px;
padding: 0 15px; padding: 0 15px;
border-radius: 10px; border-radius: 10px;
} }
.orderDetail .order_big { .eduorderDetail .order_big {
font-size: 14px; font-size: 14px;
color: #08090E; color: #08090E;
font-weight: bold; font-weight: bold;
} }
.orderDetail .order_mini { .eduorderDetail .order_mini {
font-size: 11px; font-size: 11px;
color: #919191; color: #919191;
margin-top: 10px; margin-top: 10px;
} }
.orderDetail .orderCar { .eduorderDetail .orderCar {
background: #fff;
padding: 10px 0;
display: -webkit-box;
display: -webkit-flex;
display: flex; display: flex;
justify-content: space-between; -webkit-box-orient: horizontal;
padding: 30px 0; -webkit-box-direction: normal;
-webkit-flex-direction: row;
flex-direction: row;
font-family: aa;
} }
.orderDetail .order_carImg image { .eduorderDetail .order_carImg {
width: 200rpx; width: 125px;
height: 130rpx; height: 70px;
border-radius: 4px;
box-shadow: 0 4px 10px 1px #D2D2D2;
} }
.orderDetail .order_small { .eduorderDetail .order_small {
font-size: 14px; font-size: 14px;
color: #919191; color: #1C1E1F;
} }
.orderDetail .order_GName { .eduorderDetail .order_GName {
width: 100%; width: 100%;
height: 50px; height: 50px;
border-top: 1px solid rgba(0, 0, 0, 0.03); border-top: 1px solid rgba(0, 0, 0, 0.03);
...@@ -51,7 +60,7 @@ ...@@ -51,7 +60,7 @@
justify-content: space-between; justify-content: space-between;
} }
.orderDetail .order_dList { .eduorderDetail .order_dList {
border-bottom: 1px solid rgba(0, 0, 0, 0.03); border-bottom: 1px solid rgba(0, 0, 0, 0.03);
padding: 20px 0; padding: 20px 0;
} }
...@@ -60,11 +69,11 @@ ...@@ -60,11 +69,11 @@
border-bottom: 0; border-bottom: 0;
} }
.orderDetail .order_comLeft { .eduorderDetail .order_comLeft {
margin-left: 70px; margin-left: 70px;
} }
.orderDetail .order_Tprice { .eduorderDetail .order_Tprice {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
} }
...@@ -84,23 +93,23 @@ ...@@ -84,23 +93,23 @@
height: 60px; height: 60px;
} }
.orderDetail .order_ImgS { .eduorderDetail .order_ImgS {
width: 17px; width: 17px;
height: 17px; height: 17px;
margin-right: 5px; margin-right: 5px;
} }
.orderDetail .order_Line { .eduorderDetail .order_Line {
width: 1px; width: 1px;
height: 40px; height: 40px;
background-color: #e2e2e2; background-color: #e2e2e2;
} }
.orderDetail .order_nonBtm { .eduorderDetail .order_nonBtm {
border-bottom: 0 !important; border-bottom: 0 !important;
} }
.orderDetail .btn-box { .eduorderDetail .btn-box {
display: flex; display: flex;
flex-direction: row-reverse; flex-direction: row-reverse;
height: 60px; height: 60px;
...@@ -118,40 +127,111 @@ ...@@ -118,40 +127,111 @@
.order_Btn_Com { .order_Btn_Com {
padding: 5px 10px; padding: 5px 10px;
border: 1px solid #888888; border: 1px solid #999999;
border-radius: 14px; border-radius: 6px;
color: #888888; color: #999999;
font-size: 12px; font-size: 12px;
float: right; float: right;
margin-right: 15px; margin-right: 15px;
} }
.eduorderDetail .collect_right {
margin-left: 15px;
display: -webkit-box;
display: -webkit-flex;
display: flex;
-webkit-box-orient: vertical;
-webkit-box-direction: normal;
-webkit-flex-direction: column;
flex-direction: column;
-webkit-box-pack: justify;
-webkit-justify-content: space-between;
justify-content: space-between;
padding: 3px;
}
.eduorderDetail .collect_Name {
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
margin-bottom: 3px;
font-size: 14px;
color: #1B1D1E;
}
.eduorderDetail .collect_price {
height: 20px;
text-align: right;
font-size: 16px;
color: #ff4544;
}
.edu_orderList{
border-bottom: 1px solid rgba(0, 0, 0, 0.03);
padding:15px 0;
}
</style> </style>
<template> <template>
<view class="orderDetail"> <view class="eduorderDetail">
<template> <template>
<view class="orderItem"> <view class="orderItem">
<view class="orderCar"> <view class="orderCar">
<view class="order_carImg"> <view class="order_carImg">
<image mode="aspectFit"/> <image mode="aspectFit" :src="dataList.DetailList[0].CoverImagePath" style="width: 100%; height: 100%;border-radius: 4px;">
</image> </image>
</view> </view>
<view style="width:52%"> <view class="collect_right" :style="{'width': (windowWidth -166)+'px'}">
12321321 <view class="collect_Name">{{dataList.DetailList[0].GoodsName}}</view>
<view class="collect_price">
<template v-if="dataList.Income>0">
<text style="font-size:13px;">￥</text>{{dataList.Income}}
</template>
<template v-if="dataList.Income==0">
<text style="font-size:13px;color: #999999;">免费</text>
</template>
</view>
</view> </view>
</view> </view>
</view> </view>
<view class="orderItem"> <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" style="margin-left:20px;">123</text> <text class="order_big" style="margin-left:20px;">{{dataList.OrderNo}}</text>
</view> </view>
<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" style="margin-left:20px;">12334</text> <text class="order_big" style="margin-left:20px;">{{dataList.CreateDate}}</text>
</view> </view>
<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" style="margin-left:20px;">在线支付</text> <text class="order_big" style="margin-left:20px;">{{dataList.PaymentWayName}}</text>
</view>
</view>
<view class="orderItem">
<view class="order_dList order_Tprice">
<text class="order_small">商品总额</text>
<text class="order_big">¥ {{dataList.Income}}</text>
</view>
<view class="order_dList order_Tprice">
<text class="order_small">优惠</text>
<text class="order_big">¥ {{dataList.CouponMoney}}</text>
</view>
<!-- <view class="order_dList order_Tprice">
<text class="order_small">积分使用/抵扣</text>
<text class="order_big">{{dataList.DetailList[0].IntegralNumber!=null?dataList.DetailList[0].IntegralNumber:'0'}}积分/-¥{{dataList.DetailList[0].IntegralMoney!=null?dataList.DetailList[0].IntegralMoney:'0'}} </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 == 1">
<view class="item">
<view class="order_Btn_Com" v-on:click.stop="payment(dataList)" style="color:#00D6A6;border-color:#00D6A6;">立即支付</view>
</view>
<view class="item">
<view class="order_Btn_Com" @click="cancel">取消订单</view>
</view>
</view> </view>
</view> </view>
</template> </template>
...@@ -223,7 +303,8 @@ ...@@ -223,7 +303,8 @@
GoodsName: '' GoodsName: ''
}, },
payBtn: false, payBtn: false,
payExit: false payExit: false,
windowWidth: 0,
} }
}, },
created() { created() {
...@@ -242,9 +323,9 @@ ...@@ -242,9 +323,9 @@
uni.setNavigationBarTitle({ uni.setNavigationBarTitle({
title: this.pageTitle, title: this.pageTitle,
}); });
this.windowWidth = this.$utils.SystemInfo().windowWidth;
}, },
onLoad(option) { onLoad(option) {
console.log(option,'optionssss');
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;
...@@ -259,7 +340,7 @@ ...@@ -259,7 +340,7 @@
}, },
(res) => { (res) => {
if (res.resultCode == 1) { if (res.resultCode == 1) {
console.log(res,'数据'); console.log(res, '数据');
this.dataList = res.data; this.dataList = res.data;
} }
} }
...@@ -299,7 +380,7 @@ ...@@ -299,7 +380,7 @@
icon: 'none' icon: 'none'
}) })
uni.redirectTo({ uni.redirectTo({
url: "/pages/guidecar/orderList?status=1", url: "/pages/school/personal/orderList?status=1",
}); });
} }
......
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