Merge branch 'dev_7.1.0' into fixbug-ZYW

src/pages/order/order.wxml

@@ -23,7 +23,7 @@
 				<view class="order-header">
 					<view class="order-number" wx:if="{{currentIndex == 5}}">
 						<text>退单号</text>
-						<text class="number">	{{item.tradeId}}</text>
+						<text class="number">	{{item.id}}</text>
 					</view>
 					<view class="order-number" wx:else>
 						<text>订单号</text>

src/pages/refundDetail/refundDetail.js

@@ -13,7 +13,8 @@ wxService.page({
     showApplyRefundModal: false,
     id: '',
     refundDetail: null,
-    refundId : null
+    refundId : null,
+    baseImgUrl: app.globalData.imageUrl,
   },
 
   /**

src/pages/refundDetail/refundDetail.wxml

 <!--pages/refundDetail/refundDetail.wxml-->
+<wxs src="../../wxs/utils.wxs" module="utils" />
+
 <view class="page-refund-detail">
 	<view class="header-wrap" style="background-image:url('/assets/imgs/7_1_0/rf_bgc.jpg')">
 		<view class="refund-status" wx-if="{{refundDetail.status == 'C'}}">
@@ -31,11 +33,13 @@
 		<view class="logistics-info">
 			<view class="logistics-item">
 				<text>物流公司</text>
-				<text class="company">{{refundDetail.refundLogistic.supplierName}}</text>
+				<text class="company">{{refundDetail.tradeVO.logistic.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.tradeVO.logistic.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>
@@ -79,11 +83,11 @@
 		</view>
 		<view class="refund-item">
 			<text class="refund-label">退单编号</text>
-			<text class="refund-desc">{{refundDetail.tradeId}}</text>
+			<text class="refund-desc">{{refundDetail.id}}</text>
 		</view>
 		<view class="refund-item">
 			<text class="refund-label">订单编号</text>
-			<text class="refund-desc">{{refundDetail.id}}</text>
+			<text class="refund-desc">{{refundDetail.tradeId}}</text>
 		</view>
 		<view class="refund-item">
 			<text class="refund-label">寄回信息</text>
@@ -94,7 +98,7 @@
 			<text class="refund-label">退货凭证</text>
 			<view class="refund-certificate">
 				<view class="refund-img" wx:for="{{refundDetail.proofImgUrls}}" wx:key="{{index}}">
-					<image src="{{item}}" />
+					<image src="{{utils.formateUrl(item,baseImgUrl)}}" />
 				</view>
 				<!-- <view class="refund-img">
 					<image src="/assets/imgs/7_1_0/address-line.png" />