From 17f51e8dc2091da57e87765b13584e46cfdcf8fd Mon Sep 17 00:00:00 2001
From: xpz2018 <107107461@qq.com>
Date: Fri, 8 Jun 2018 18:07:43 +0800
Subject: [PATCH] no message

---
 components/actionsheet/index.wxss |  8 ++++----
 pages/order/order.js              |  8 ++++----
 pages/order/order.wxml            | 12 +++++-------
 pages/order/order.wxss            | 21 +++++++++++++++++++++
 4 files changed, 34 insertions(+), 15 deletions(-)

diff --git a/components/actionsheet/index.wxss b/components/actionsheet/index.wxss
index 68e934e..55bc8d5 100644
--- a/components/actionsheet/index.wxss
+++ b/components/actionsheet/index.wxss
@@ -97,11 +97,11 @@
   height: 20rpx;
   line-height: 20rpx;
   color: #333;
-  font-size: 16px;
+  font-size: 14px;
 }
 
 .icon-classname {
-  width: 80rpx;
-  height: 80rpx;
-  margin-top: 48rpx;
+  width: 90rpx;
+  height: 90rpx;
+  margin-top: 56rpx;
 }
diff --git a/pages/order/order.js b/pages/order/order.js
index 611f163..4ec9df5 100644
--- a/pages/order/order.js
+++ b/pages/order/order.js
@@ -180,9 +180,9 @@ Page({
         url: '../login/login'
       })
     }else{
-      wx.switchTab({
-        url: '../jz/jz'
-      })
+      wx.navigateBack({
+        delta: 1
+      });
     }
   },
   onLoad: function () {
@@ -206,6 +206,7 @@ Page({
         dataType: 'json',
         responseType: 'text',
         success: function (res) {
+          console.log(res)
           var data = res.data;
           var status = data.code;
           if (status != 0) {
@@ -235,7 +236,6 @@ Page({
         userInfo: app.globalData.userInfo,
         hasUserInfo: true
       })
-      console.log(app.globalData.userInfo);
     } else if (this.data.canIUse) {
       // 由于 getUserInfo 是网络请求，可能会在 Page.onLoad 之后才返回
       // 所以此处加入 callback 以防止这种情况
diff --git a/pages/order/order.wxml b/pages/order/order.wxml
index 38a9015..6e67572 100644
--- a/pages/order/order.wxml
+++ b/pages/order/order.wxml
@@ -1,5 +1,5 @@
 <view wx:if="{{sessionId}}">
-  <view wx:if="{{items!=[]}}">
+  <view wx:if="{{items!=[] && items.length > 0}}">
     <view wx:for-items="{{items}}" wx:key="goodsNo">
       <view class='box'>
           <text class='time'>{{item.createAtStr}}</text>
@@ -32,12 +32,10 @@
     </view>
   </view>
   <view wx:else>
-    <view class='user-msg'>
-      <view class="userinfo">  
-        <view class='loginText'>亲，您还没有下单呢！</view>
-        <button class='loginBtn' bindtap='goLogin'>立即下单</button>
-      </view>
-    </view>
+    <view class="empty-layout">
+    <image class="icon-empty" src="../../images/空.png" />
+    <text class="text-empty">亲，您还没有下单呢！</text>
+  </view>
   </view>
 </view>
 <view wx:else>
diff --git a/pages/order/order.wxss b/pages/order/order.wxss
index bfb818d..2f5d928 100644
--- a/pages/order/order.wxss
+++ b/pages/order/order.wxss
@@ -120,4 +120,25 @@ button::after{
   line-height: 60rpx;
   width: 34%;
   margin: 0 auto;
+}
+.empty-layout {
+  width: 100%;
+  height: 100%;
+  padding-top: 50%;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+}
+
+.icon-empty {
+  width: 80px;
+  height: 80px;
+  vertical-align: top;
+  margin-bottom: 40px;
+}
+
+.text-empty {
+  font-size: 15px;
+  float: left;
 }
\ No newline at end of file