资讯

@@ -41,11 +41,9 @@ const getOrderData = (type, page) => {
         };
 
         const order = Object.assign(fakeData, {
-            orderList: result && result.length && result || false
+            orderList: result.length && result || false
         }, navBar);
 
-        console.log(order.orderList);
-
         return {
             order: order
         };

-<div class="table table-body">
+<div class="table table-body{{#unless orderList}} empty{{/unless}}">
 {{#if orderList}}
 {{#orderList}}
     <div class="order">
@@ -55,6 +55,11 @@
     </div>
 {{/orderList}}
 {{^}}
-数据为空
+<div class="bg"></div>
+<div class="msg">
+    <p class="msg-zh bold">您暂时还没有订单</p>
+    <p class="msg-en">You do not have an order for the time being</p>
+    <span class="btn">去购物</span>
+</div>
 {{/if}}
 </div>

@@ -14,28 +14,28 @@ order: {
     // 是否显示搜索
     showSearch: true/false,
 
-    // 订单数据
-    orders: [
+    // 订单列表
+    orderList: [
         {
-            orderTime: ''                // 下单时间
-            validLeftTime: '',           // 订单剩余有效时间
-            serialNumber: ''             // 订单编码
+            createTime: ''               // 下单时间
+            payLeftTime: '',             // 订单剩余有效时间
+            orderCode: ''                // 订单编码
             showMobile: true/false,      // 是否是手机下单
-            cost: '',                    // 订单花费
-            status: '',                  // 订单状态
-            payVia: '',                  // 支付方式
+            amount: '',                    // 订单花费
+            statusStr: '',                  // 订单状态
+            paymentTypeStr: '',                  // 支付方式
             showPayButton: true/false,   // 是否显示立即付款按钮
             showEditOption: true/false   // 是否显示编辑项
 
             // 订单中的商品
-            goods: [
+            orderGoods: [
                 {
-                    img: '',
-                    name: '',
-                    price: '',
-                    color: '',
-                    size: '',
-                    quantity: ''
+                    goodsImage: '',
+                    productName: '',
+                    goodsAmount: '',
+                    colorName: '',
+                    sizeName: '',
+                    buyNumber: ''
                 }
             ]
         }

@@ -102,7 +102,7 @@
     "yoho-jquery-accordion": "0.0.2",
     "yoho-jquery-lazyload": "^1.9.7",
     "yoho-jquery-placeholder": "^2.3.1",
-    "yoho-jquery-qrcode": "0.0.2",
+    "yoho-jquery-qrcode": "0.0.3",
     "yoho-slider": "0.0.2"
   }
 }

@@ -5,9 +5,7 @@
  */
 
 var $ = require('yoho-jquery'),
-    regx = require('../common/mail-phone-regx'),
-    emailReg = regx.emailRegx,
-    phoneRegx = regx.phoneRegx;
+    regx = require('../common/mail-phone-regx');
 
 var emailAc = require('../common/ac-email'); // 邮箱自动完成
 
@@ -23,6 +21,8 @@ var $cr = $('#country-code-hide'),
     hasPh = false,
     hasCa = false;
 
+var emailReg = regx.emailRegx,
+    phoneRegx = regx.phoneRegx;
 
 require('yoho-jquery-placeholder');
 

@@ -124,6 +124,10 @@ function pwdKeyupEvt() {
             $pwdParent.addClass('green').removeClass('yellow red');
             $pwdIntensity.addClass('color');
             break;
+        default:
+            $pwdParent.removeClass('red yellow green');
+            $pwdIntensity.removeClass('color');
+            break;
     }
 
     // 提示框

@@ -45,8 +45,8 @@ var $ = require('yoho-jquery'),
         _createOrient: function() {
 
             var orientHtml = '<div class="slide-switch">' +
-                    '<a class="prev" href="javascript:;"><span class="iconfont">&#xe607;</span></a>' +
-                    '<a class="next" href="javascript:;"><span class="iconfont">&#xe606;</span></a>' +
+                    '<a class="prev" href="javascript:;"><span class="iconfont">&#xe635;</span></a>' +
+                    '<a class="next" href="javascript:;"><span class="iconfont">&#xe636;</span></a>' +
                 '</div>';
 
             if (this.$element.find('.slide-switch').length > 0) {

@@ -39,8 +39,8 @@
     }
 
     .search-bar {
-        $height: 24px;
-        $buttonWidth: 65px;
+        $height: 30px;
+        $buttonWidth: 67px;
 
         height: calc($liHeight);
         float: right;

@@ -10,6 +10,7 @@
     $goodImgHeight: 90px;
 
     $normalSize: 14px;
+    $bigSize: 16px;
 
     $smallSpace: 8px;
     $space: 20px;
@@ -176,5 +177,35 @@
             margin: 0;
         }
     }
+
+    &.empty {
+        width: 100%;
+
+        .bg {
+            height: 250px;
+            background-image: resolve('me/no-order.png');
+            background-repeat: no-repeat;
+            background-position: center bottom;
+            background-size: 100px 125px;
+        }
+
+        .msg {
+            margin-top: 50px;
+            text-align: center;
+
+            .msg-zh {
+                font-size: $bigSize;
+                margin-bottom: $space;
+            }
+
+            .msg-en {
+                margin-bottom: 40px;
+            }
+
+            .btn {
+                display: inline-block;
+            }
+        }
+    }
 }
 

@@ -25,7 +25,7 @@
 
     .title {
         float: left;
-        margin: 0px;
+        margin: 0;
         font-size: 22px;
         line-height: 40px;
         color: #000;
@@ -122,7 +122,7 @@
     }
 
     .no-find {
-        margin: 10px 0 0 0;
+        margin: 10px 0 0;
         line-height: 20px;
         color: #a5a4a4;
         text-align: center;

@@ -2,10 +2,9 @@
     line-height: 0;		/* remove line-height */
     display: inline-block;	/* circle wraps image */
     margin: 5px;
-    border: 0.5px solid rgba(255,255,255,0.4);
+    border: 0.5px solid white;
     border-radius: 50%;	/* relative value */
-    /*box-shadow: 0px 0px 5px rgba(0,0,0,0.4);*/
     transition: linear 0.25s;
     height: 100px;
     width: 100px;
-}
\ No newline at end of file
+}