Merge branch 'hotwind_dev_7.12.0' into 'hotwind_dev_7.13.0'

修改退单详情

See merge request !200

src/pages/refundDetail/refundDetail.wxml

@@ -29,23 +29,45 @@
 			<view class="desc">退货成功，很抱歉给您带来了不便~</view>
 		</view>
 	</view>
-
-	<view class="logistics-wrap">
-		<view class="logistics-info" wx:if="{{refundDetail.refundLogistic.supplierName}}">
+	<!-- t退单物流信息 -->
+	<view class="logistics-wrap" wx:if="{{refundDetail.refundLogistic.supplierName}}">
+		<view class="logistics-info">
 			<view class="logistics-item">
 				<text>物流公司</text>
 				<text class="company">{{refundDetail.refundLogistic.supplierName}}</text>
-			<!--	<text class="company">{{refundDetail.refundLogistic.supplierName}}</text> -->
 			</view>
 			<view class="logistics-item">
 				<text>快递单号</text>
 				<text class="company">{{refundDetail.refundLogistic.code}}</text>
-				<!--<text class="company">{{refundDetail.refundLogistic.code}}</text>-->
 			</view>
-			<view class="write-logistics" bindtap="tapWriteLogis" wx:if="{{refundDetail.status == 'A'}}">
-				<button class="btn btn-primary btn-outline write-btn">填写物流信息</button>
+			<!-- <view class="write-logistics" bindtap="tapWriteLogis" >
+				<button class="btn btn-primary btn-outline write-btn">查看物流信息</button>
+			</view> -->
+		</view>
+	</view>
+	<!-- 商品退单说明 -->
+	<!-- 寄回提示 -->
+	<view class="warn-tips" wx:if="{{openRefundTips}}">
+		<view class="header">请将退货商品，邮寄到以下地址:</view>
+		<view class="tips-content gray-bg">
+			<view class="tips-content-item flex-item">
+					<label>收货人：{{refundDetail.refundLogistic.receiverName}}</label>
+					<label>{{refundDetail.refundLogistic.receiverPhone}}</label>
+			</view>
+			<view class="tips-content-item">
+					<!-- <label>地址：{{refundDetail.refundLogistic.receiverAddress}}</label> -->
+					<label>地址：{{refundDetail.refundLogistic.receiverAddress}}
+					<view class="copy" wx:if="{{refundDetail.refundLogistic.receiverAddress}}" bindtap="copy" data-content="{{refundDetail.refundLogistic.receiverAddress}}">复制</view>
+					</label>
+			</view>
 		</view>
 	</view>
+	<!-- 温馨提示 -->
+	<view class="warn-tips" wx:if="{{openRefundTips}}">
+		<view class="header">退货须知:</view>
+		<view class="tips-content">
+			{{refundTips}}
+		</view>
 	</view>
 
 	<view class="pro-wrap">
@@ -72,29 +94,7 @@
 			</view>
 		</block>
 	</view>
-	<!-- 寄回提示 -->
-	<view class="warn-tips" wx:if="{{openRefundTips}}">
-		<view class="header">请将退货商品，邮寄到以下地址:</view>
-		<view class="tips-content gray-bg">
-			<view class="tips-content-item flex-item">
-					<label>收货人：{{refundDetail.refundLogistic.receiverName}}</label>
-					<label>{{refundDetail.refundLogistic.receiverPhone}}</label>
-			</view>
-			<view class="tips-content-item">
-					<!-- <label>地址：{{refundDetail.refundLogistic.receiverAddress}}</label> -->
-					<label>地址：{{refundDetail.refundLogistic.receiverAddress}}
-					<view class="copy" wx:if="{{refundDetail.refundLogistic.receiverAddress}}" bindtap="copy" data-content="{{refundDetail.refundLogistic.receiverAddress}}">复制</view>
-					</label>
-			</view>
-		</view>
-	</view>
-	<!-- 温馨提示 -->
-	<view class="warn-tips" wx:if="{{openRefundTips}}">
-		<view class="header">退货须知:</view>
-		<view class="tips-content">
-			{{refundTips}}
-		</view>
-	</view>
+	
 
 	<view class="refund-info">
 		<view class="refund-item">

src/pages/refundDetail/refundDetail.wxss

@@ -72,10 +72,13 @@ page{
 .pro-wrap{
   padding: 19rpx 32rpx 53rpx 30rpx;
   background-color: #ffffff;
+  margin-top: 10rpx;
 }
 .choose-pro{
   color: #757575;
   font-size: 26rpx;
+  color: #333333;
+  font-weight: bold;
 }
 .pro-total-price{
   font-size: 26rpx;