lilei 7 months ago
parent
commit
71e2dab2ec

+ 2 - 3
pagesB/procureOrder/creatOrder.vue

@@ -399,16 +399,15 @@
 						align-items: center;
 						justify-content: space-between;
 						padding: 6px 0;
+						font-size: 24rpx;
 						.price{
 							color: #333;
-							font-size: 24rpx;
 						}
 						&:first-child{
-							border-bottom: 1px solid #eee;
+							font-size: 28rpx;
 							.price{
 								color: #d81e06;
 								font-weight: bold;
-								font-size: 28rpx;
 							}
 						}
 					}

+ 29 - 8
pagesB/procureOrder/orderDetail.vue

@@ -107,7 +107,7 @@
 					<text class="cText">¥{{Number(info.totalTicketGiveAmount).toFixed(2)}}</text>
 				</view>
 			</view>
-			<view class="info" v-if="info">
+			<view class="info" v-if="!hasPay && info">
 				<view class="infoList">
 					<view class="title">订单信息</view>
 					<view class="statu"></view>
@@ -124,9 +124,26 @@
 					<text>下单人员</text>
 					<text>{{info.purchaserName || '--'}}</text>
 				</view>
-				
-				<!-- 线上支付 显示 -->
-				<view v-if="hasPay">
+			</view>
+			<!-- 线上支付 显示 -->
+			<view class="info" v-if="hasPay && info">
+				<u-read-more ref="uReadMore" :text-indent="0" toggle close-text="更多信息" :show-height="460">
+					<view class="infoList">
+						<view class="title">订单信息</view>
+						<view class="statu"></view>
+					</view>
+					<view class="infoList dju">
+						<text>订单编号</text>
+						<text>{{info.purchaseNo||'--'}}</text>
+					</view>
+					<view class="infoList">
+						<text>下单时间</text>
+						<text>{{info.purchaseDate||'--'}}</text>
+					</view>
+					<view class="infoList">
+						<text>下单人员</text>
+						<text>{{info.purchaserName || '--'}}</text>
+					</view>
 					<view class="infoList" v-if="info&&info.billStatus != 'WAIT_AUDIT'&&info.billStatus != 'WAIT_PAY'&&isPayOk">
 						<text>审核时间</text>
 						<text>{{info.auditDate||'--'}}</text>
@@ -139,6 +156,10 @@
 						<text>支付时间</text>
 						<text>{{info.payInfo.payDate||'--'}}</text>
 					</view>
+					<view class="infoList" v-if="info&&info.billStatus == 'CANCEL'">
+						<text>取消时间</text>
+						<text>{{info.cancelDate ||'--'}}</text>
+					</view>
 					<view class="infoList" v-if="info&&info.billStatus == 'CANCEL'&&isPayOk">
 						<text>退款方式</text>
 						<text>原支付返回</text>
@@ -147,15 +168,15 @@
 						<text>退款时间</text>
 						<text>{{info.payInfo.refundDate ||'--'}}</text>
 					</view>
-					<view class="infoList" v-if="info&&info.billStatus == 'CANCEL'">
-						<text>取消时间</text>
-						<text>{{info.cancelDate ||'--'}}</text>
+					<view class="infoList" v-if="info&&info.billStatus == 'CANCEL'&&isPayOk">
+						<text>退款状态</text>
+						<text>{{info.payInfo.refundState=='FINISH'?'已退款':'退款失败'}}</text>
 					</view>
 					<view class="infoList" v-if="shelfInfo">
 						<text>配送汽配商</text>
 						<text>{{shelfInfo.dealerName}}</text>
 					</view>
-				</view>
+				</u-read-more>
 			</view>
 		</view>
 		<view v-if="info&&info.billStatus == 'WAIT_AUDIT'||info.billStatus == 'WAIT_PAY'||info.billStatus == 'WAIT_RECEIVE'" style="background-color: #fff;">

+ 6 - 2
pagesB/procureOrder/orderList.vue

@@ -72,6 +72,10 @@
 										 <u-button style="margin-left: 10px;" v-if="item.billStatus == 'WAIT_PAY'" size="mini" shape="round" type="error" plain @click="payOrder(item)">立即支付</u-button>
 										 <!-- <u-button style="margin-left: 10px;" v-if="item.billStatus == 'CANCEL'" size="mini" shape="round" type="error" plain @click="buyAgain(item)">再次购买</u-button> -->
 										 <u-button style="margin-left: 10px;" v-if="item.billStatus == 'WAIT_RECEIVE'" size="mini" shape="round" type="error" plain @click="receiveOrder(item)">确认收货</u-button>
+										 <view v-if="item.billStatus == 'CANCEL'&&item.payInfo">
+											<u-tag type="success" size="mini" v-if="item.payInfo.refundState=='FINISH'" mode="plain" text="已退款" shape="square"/>
+											<u-tag type="error" size="mini" v-else text="退款失败" shape="square" mode="plain"/>
+										 </view>
 									 </view>
 								 </view>
 							 </view>
@@ -100,8 +104,8 @@
 				status: 'loading',
 				noDataText: '暂无数据',
 				showPopu: false,
-				current: 1,
-				swiperCurrent: 1,
+				current: 0,
+				swiperCurrent: 0,
 				// 查询条件
 				pageNo: 1,
 				pageSize: 10,