From 07d9c77f47623c8ff60200fcc7d33d5223e0f99e Mon Sep 17 00:00:00 2001
From: yvan.ni <765199919@qq.com>
Date: Thu, 2 Jul 2020 17:07:38 +0800
Subject: [PATCH] 1。会员中心的我的订单的界面优化

---
 pages/user/index/index.wxml | 35 ++++++++++++++++++++++++-----------
 pages/user/index/index.wxss | 10 ++++++++--
 2 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/pages/user/index/index.wxml b/pages/user/index/index.wxml
index 3d6fa58..fa24005 100644
--- a/pages/user/index/index.wxml
+++ b/pages/user/index/index.wxml
@@ -92,12 +92,33 @@
 
   </view>
   <view class="xc-after-sale rel">
+    <!-- 顶上的一栏 -->
+    <view class="xc-equity-title flex-level" bindtap="go_qy">
+      <view class="xc-title-frame flex-space-between">
+        <view class="flex-vertical xc-title-content">
+          <image class="xc-title-img" src="{{iurl}}/miniapp/images/hdindan.png" style="width: 50rpx; height: 55rpx;margin-right: 5rpx"></image>
+          <view class="three-level-word">我的订单</view>
+        </view>
+      </view>
+      <view class="three-level-word  xc-more-frame flex-vertical">
+        <view class="three-level-word xc-more">更多</view>
+        <view class="bg_right xc-more-click bcolor"></view>
+      </view>
+    </view>
+    <!-- 内容的一栏 -->
     <view class="xc-after-sale-left flex-center-around">
       <view class="t-c margin-auto rel" bindtap="go_order" data-url="/pages/user/order_list/order_list?type=1">
         <image class="xc-no-money" src="{{iurl}}/miniapp/images/daifuk.png"></image>
         <view class=" xc-word-color four-level-word">待付款</view>
         <text class="order-num" hidden='{{toji.wait_pay>0?"":"true"}}'>{{toji.wait_pay}}</text>
       </view>
+
+      <view class="t-c margin-auto rel" bindtap="go_order" data-url="/pages/user/order_list/order_list?type=2">
+        <image class="xc-send" src="{{iurl}}/miniapp/images/dfahuo.png?v=1"></image>
+        <view class="xc-word-color four-level-word">待发货</view>
+        <text class="order-num" hidden='{{toji.wait_receive>0?"":"true"}}'>{{toji.wait_send}}</text>
+      </view>
+
       <view class="t-c margin-auto rel" bindtap="go_order" data-url="/pages/user/order_list/order_list?type=3">
         <image class="xc-await" src="{{iurl}}/miniapp/images/shouhuo1.png"></image>
         <view class="xc-word-color four-level-word">待收货</view>
@@ -115,15 +136,8 @@
         <!--<text class="order-num" hidden='{{toji.wait_return>0>0?"":"true"}}' style="right: -20rpx">{{toji.wait_return}}</text>-->
       </view>
 
-      <view class='xc-hump abs'></view>
-      <view class="flex-verticalr xc-after-sale-right">
-        <view class=" xc-order t-c" bindtap="go_order" data-url="/pages/user/order_list/order_list">
-          <image class="xc-no-money xc-my-order" src="{{iurl}}/miniapp/images/dindan.png"></image>
-          <view class="xc-word-color four-level-word" style='margin-left:20rpx;'>我的订单</view>
-        </view>
-      </view>
-
     </view>
+    <view style="clear: both"></view>
 
   </view>
 
@@ -133,9 +147,7 @@
       <view class="xc-title-frame flex-space-between">
         <view class="flex-vertical xc-title-content">
           <image class="xc-title-img" src="{{iurl}}/miniapp/images/medal.png"></image>
-          <view class="three-level-word">
-            我的权益
-          </view>
+            <view class="three-level-word">我的权益</view>
         </view>
       </view>
       <view class="three-level-word  xc-more-frame flex-vertical">
@@ -143,6 +155,7 @@
         <view class="bg_right xc-more-click bcolor"></view>
       </view>
     </view>
+
     <view class="xc-specific-more-frame flex-vertical">
 
       <view bindtap="click_pre">
diff --git a/pages/user/index/index.wxss b/pages/user/index/index.wxss
index d367144..2f178e1 100644
--- a/pages/user/index/index.wxss
+++ b/pages/user/index/index.wxss
@@ -202,13 +202,14 @@
 
 .xc-after-sale {
   width: 100%;
-  height: 160rpx;
   border-bottom: 10px solid #f2f2f2;
 }
 
 .xc-after-sale-left {
-  width: 90%;
+  width: 96%;
   height: 100%;
+  margin-top: 40rpx;
+  margin-bottom: 25rpx;
 }
 
 .xc-no-money {
@@ -300,6 +301,11 @@
   height: 50rpx;
 }
 
+.xc-send{
+  width: 50rpx;
+  height: 50rpx;
+}
+
 .xc-more-click {
   width: 15rpx;
   height: 15rpx;
--
libgit2 0.21.4