update 物流

packageUser/pages/user/logistics/logistics.wxml

@@ -1,6 +1,6 @@
 <view class="bg" style="background: #FFF;">
 	<view class="logistics-tit">
-	  <image src="{{order.product_list[0].cover}}"></image>
+	  <image src="../../../../images/footer/logistics.png" style="padding: 20rpx 20rpx 0;width: 80rpx;height: 70rpx;"></image>
 	  <view class="logistics-rbox">
 	    <h6 class="ellipsisLn">{{logistics.company}}快递</h6>
 		<p>快递单号：{{logistics.no}}</p>
@@ -9,14 +9,20 @@
 	</view>
 	<hr class="hrline" />
 	<view class="logistics-tit">
-	  <image src="../../../../images/footer/logistics.png" style="padding: 20rpx 20rpx 0;width: 90rpx;height: 90rpx;"></image>
+	  <image src="../../../../images/footer/location.png" style="padding: 20rpx 20rpx 0;width: 60rpx;height: 60rpx;"></image>
 	  <view class="logistics-rbox">
-	    <p style="margin-top:0">订单编号：{{order.order_id}}</p>
-		<p>收货地址：{{order.address}}</p>
+	  	<p style="margin-top:0">收货地址：{{order.address}}</p>
+	    <p>联系人：{{order.contact}}</p>
 	  </view>
 	  <view class="clean"></view>
 	</view>
 	<hr class="hrline" />
+	<view class="logistics-tit">
+	  	<p style="margin-top:0">订单编号：{{order.order_id}}</p>
+	    <p>下单时间：{{order.paied_time}}</p>
+	    <p>发货时间：{{order.dispatch_time}}</p>
+	</view>
+	<hr class="hrline" />
 	<view class="logistics-list">
 		<ul>
 			<li wx:for="{{logistics.list}}" wx:id="id">

packageUser/pages/user/logistics/logistics.wxss

@@ -253,14 +253,14 @@ font-size: 35rpx;
 color: #eab86a;
 }
 .logistics-tit p{
-font-size: 30rpx;
+font-size: 26rpx;
 color: #666;
 margin-top: 20rpx;
 display: block;
 
 }
 .hrline{
-height: 0.5px;
+height: 1px;
 width: 100%;
 background: #dfdfdf;
 display: block;

packageUser/pages/user/order/order.wxml

@@ -14,10 +14,12 @@
     <view class="orderDetail-express__main">
       <view class="orderDetail-express__title">物流信息</view>
       <view class="orderDetail-express__val">
+      <navigator class="orderDetail-express__com"  url="/packageUser/pages/user/logistics/logistics?id={{order.order_id}}">
         <text>{{express}}</text>
-        <text class="orderDetail-express__com">({{order.express_company}})</text>
+        <text>({{order.express_company}})</text>
+        </navigator>
       </view>
-      <view class="orderDetail-express__btn" bindtap="copeOrder">复制</view>
+      <!--<view class="orderDetail-express__btn" bindtap="copeOrder">复制</view>-->
     </view>
   </view>
   <view class="orderDetail-project">
@@ -76,7 +78,7 @@
       </view>
       <view class="clean"></view>
     </view>
-    <navigator wx:if="{{order.sign && order.express_order_no && order.express_code}}" url="/packageUser/pages/user/logistics/logistics?id={{order.order_id}}" style="text-align:right;padding: 25rpx 0;color: #333;" open-type="navigate">查看物流 ></navigator>
+    
   </view>
 <!--   <view class="orderDetail-info">
     <view class="orderDetail-info__line">订单编号：6546a13f13sf54a6f4464f</view>
@@ -90,6 +92,8 @@
     </navigator>
     <view class="orderDetail-btn__red" bindtap="confirmPopup" wx:if="{{order.status === 'dispatch'}}">确认收货</view>
     <view class="orderDetail-btn__black" bindtap="CancelPopup" wx:if="{{order.status === 'unpay'}}">取消订单</view>
-
+	<view wx:if="{{order.sign && order.express_order_no && order.express_code}}" class="orderDetail-btn__black">
+		<navigator url="/packageUser/pages/user/logistics/logistics?id={{order.order_id}}" open-type="navigate">查看物流 </navigator>
+	</view>
   </view>
 </view>

packageUser/pages/user/orders/orders.wxml

@@ -57,8 +57,12 @@
         </navigator>
         <view class="order-btn__red" bindtap="confirmPopup" data-val="{{item.order_id}}" wx:if="{{item.status === 'dispatch'}}">确认收货</view>
         <view class="order-btn__black" bindtap="CancelPopup" data-val="{{item.order_id}}" wx:if="{{item.status === 'unpay'}}">取消订单</view>
+        
 <!--         <view class="order-btn__black" wx:if="{{item.status === 'dispatch' && item.status === 'dispatch'}}">查看物流</view> -->
         <!-- <view class="order-btn__black">删除订单</view> -->
+        <view wx:if="{{item.sign && item.express_order_no && item.express_code}}" class="order-btn__black">
+			<navigator url="/packageUser/pages/user/logistics/logistics?id={{item.order_id}}" open-type="navigate">查看物流 </navigator>
+		</view>
       </view>
     </view>
     <view class="orders-no" wx:if="{{list.length <= 0}}">