Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop

--Subproject commit 119c247f5cf929aa1e059e40609bb16dd6b58f05
++Subproject commit 75bbc3b075de19f239532f60c5995d06c5f814e2

@@ -18,14 +18,15 @@ class Yohobuy
 {
 {
 
 
    /* 正式环境 */
    /* 正式环境 */
-   // const API_URL = 'http://api2.open.yohobuy.com/';
-   // const SERVICE_URL = 'http://service.api.yohobuy.com/';
-   // const YOHOBUY_URL = 'http://www.yohobuy.com/';
+    const API_URL = 'http://api2.open.yohobuy.com/';
+    const API_URL2 = 'http://api.open.yohobuy.com/';
+    const SERVICE_URL = 'http://service.api.yohobuy.com/';
+    const YOHOBUY_URL = 'http://www.yohobuy.com/';
 
 
    /* 测试环境 */
    /* 测试环境 */
-   const API_URL = 'http://test2.open.yohobuy.com/';
-   const SERVICE_URL = 'http://test.service.api.yohobuy.com/';
-   const YOHOBUY_URL = 'http://www.yohobuy.com/';
+//   const API_URL = 'http://test2.open.yohobuy.com/';
+//   const SERVICE_URL = 'http://test.service.api.yohobuy.com/';
+//   const YOHOBUY_URL = 'http://www.yohobuy.com/';
 
 
     /**
     /**
      * 私钥列表
      * 私钥列表

@@ -42,5 +42,6 @@ class CacheConfig
     const KEY_ACTION_HOME_PREFERENTIAL = 'key_action_home_preferential';//会员特权详情
     const KEY_ACTION_HOME_PREFERENTIAL = 'key_action_home_preferential';//会员特权详情
     const KEY_ACTION_GUANG_PLUSTAR_DATA = 'key_action_guang_plustar_data'; // 逛PLUSTAR
     const KEY_ACTION_GUANG_PLUSTAR_DATA = 'key_action_guang_plustar_data'; // 逛PLUSTAR
     const KEY_ACTION_GUANG_DETAIL_DATA = 'key_action_guang_detail_data'; // 逛内容详情
     const KEY_ACTION_GUANG_DETAIL_DATA = 'key_action_guang_detail_data'; // 逛内容详情
+    const KEY_ACTION_HOME_ORDER_ORDER = 'key_action_home_order_order';//订单列表
 
 
 }
 }

@@ -19,7 +19,7 @@ class GradeData
      * @param  string  $uid          用户id
      * @param  string  $uid          用户id
      * @return array                 接口返回的会员等级数据
      * @return array                 接口返回的会员等级数据
      */
      */
-    public function getGradeData($gender,$channel, $uid) {
+    public function getGradeData($gender, $channel, $uid) {
         $urlList = array();
         $urlList = array();
         //获取会员等级数据
         //获取会员等级数据
         $param = Yohobuy::param();
         $param = Yohobuy::param();
@@ -27,7 +27,7 @@ class GradeData
         $param['uid'] = $uid;
         $param['uid'] = $uid;
         $param['method'] = 'app.Passport.vip';
         $param['method'] = 'app.Passport.vip';
         $param['client_secret'] = Sign::getSign($param);
         $param['client_secret'] = Sign::getSign($param);
-        $urlList['grade'] = Yohobuy::httpBuildQuery(Yohobuy::API_URL,$param);
+        $urlList['grade'] = Yohobuy::httpBuildQuery(Yohobuy::API_URL, $param);
 
 
         //获取用户基本信息数据（用来得到username）
         //获取用户基本信息数据（用来得到username）
         $param = Yohobuy::param();
         $param = Yohobuy::param();
@@ -36,7 +36,7 @@ class GradeData
         $param['yh_channel'] = $channel;
         $param['yh_channel'] = $channel;
         $param['method'] = 'app.passport.profile';
         $param['method'] = 'app.passport.profile';
         $param['client_secret'] = Sign::getSign($param);
         $param['client_secret'] = Sign::getSign($param);
-        $urlList['userProfile'] = Yohobuy::httpBuildQuery(Yohobuy::API_URL,$param);
+        $urlList['userProfile'] = Yohobuy::httpBuildQuery(Yohobuy::API_URL, $param);
 
 
         return Yohobuy::getMulti($urlList);
         return Yohobuy::getMulti($urlList);
     }
     }

@@ -4,6 +4,7 @@ namespace LibModels\Wap\Home;
 
 
 use Api\Yohobuy;
 use Api\Yohobuy;
 use Api\Sign;
 use Api\Sign;
+
 /*
 /*
  * To change this license header, choose License Headers in Project Properties.
  * To change this license header, choose License Headers in Project Properties.
  * To change this template file, choose Tools | Templates
  * To change this template file, choose Tools | Templates
@@ -22,7 +23,9 @@ class OrderData
      * To change this template file, choose Tools | Templates
      * To change this template file, choose Tools | Templates
      * and open the template in the editor.
      * and open the template in the editor.
      */
      */
-    public function getOrderData($type,$page,$limit,$gender,$yh_channel,$uid){
+
+    public function getOrderData($type, $page, $limit, $gender, $yh_channel, $uid) {
+        //构建必传参数
         $param = Yohobuy::param();
         $param = Yohobuy::param();
         $param['gender'] = $gender;
         $param['gender'] = $gender;
         $param['limit'] = $limit;
         $param['limit'] = $limit;
@@ -32,7 +35,8 @@ class OrderData
         $param['uid'] = $uid;
         $param['uid'] = $uid;
         $param['yh_channel'] = $yh_channel;
         $param['yh_channel'] = $yh_channel;
         $param['client_secret'] = Sign::getSign($param);
         $param['client_secret'] = Sign::getSign($param);
-        print_r($param);
-        return Yohobuy::get(Yohobuy::API_URL,$param);
+        //调用接口获得数据
+        return Yohobuy::get(Yohobuy::API_URL2, $param);
     }
     }
+
 }
 }

@@ -2,7 +2,7 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
 <svg xmlns="http://www.w3.org/2000/svg">
 <svg xmlns="http://www.w3.org/2000/svg">
 <metadata>
 <metadata>
-Created by FontForge 20120731 at Mon Nov 16 11:40:15 2015
+Created by FontForge 20120731 at Mon Nov 16 18:08:15 2015
  By Ads
  By Ads
 </metadata>
 </metadata>
 <defs>
 <defs>
@@ -19,7 +19,7 @@ Created by FontForge 20120731 at Mon Nov 16 11:40:15 2015
     bbox="-0.75 -224 3943 812.871"
     bbox="-0.75 -224 3943 812.871"
     underline-thickness="50"
     underline-thickness="50"
     underline-position="-100"
     underline-position="-100"
-    unicode-range="U+0078-E632"
+    unicode-range="U+0078-E63E"
   />
   />
 <missing-glyph horiz-adv-x="374" 
 <missing-glyph horiz-adv-x="374" 
 d="M34 0v682h272v-682h-272zM68 34h204v614h-204v-614z" />
 d="M34 0v682h272v-682h-272zM68 34h204v614h-204v-614z" />
@@ -196,5 +196,56 @@ q0 58 40.5 98.5t98.5 40.5t98.5 -40.5t40.5 -98.5t-40.5 -99t-98.5 -41q-28 0 -54 11
     <glyph glyph-name="uniE632" unicode="&#xe632;" 
     <glyph glyph-name="uniE632" unicode="&#xe632;" 
 d="M313 163h397v69h-397v-69zM313 26h397v68h-397v-68zM611 747h-430q-4 0 -7 -0.5t-6 -2t-6 -3.5t-5 -4t-4 -5t-3 -6t-1.5 -6.5t-0.5 -6.5v-825q0 -5 1.5 -10.5t4.5 -9.5t7 -7.5t9 -5t11 -1.5h661q9 0 17 4.5t12.5 12.5t4.5 17v619zM644 626l131 -119h-131v119zM809 -77
 d="M313 163h397v69h-397v-69zM313 26h397v68h-397v-68zM611 747h-430q-4 0 -7 -0.5t-6 -2t-6 -3.5t-5 -4t-4 -5t-3 -6t-1.5 -6.5t-0.5 -6.5v-825q0 -5 1.5 -10.5t4.5 -9.5t7 -7.5t9 -5t11 -1.5h661q9 0 17 4.5t12.5 12.5t4.5 17v619zM644 626l131 -119h-131v119zM809 -77
 h-595v755h364v-206q0 -14 9.5 -24t23.5 -10h198v-515zM313 300h397v69h-397v-69z" />
 h-595v755h364v-206q0 -14 9.5 -24t23.5 -10h198v-515zM313 300h397v69h-397v-69z" />
+    <glyph glyph-name="uniE633" unicode="&#xe633;" horiz-adv-x="1304" 
+d="M1303 454l-161 242h-304v-443h233q12 0 23 6.5t17 17t6 23.5q0 8 -2.5 15t-6.5 12.5t-10 10t-13 7t-14 2.5h-140v256h161l118 -177v-242h-442v577q0 14 -7 25.5t-18.5 18.5t-25.5 7h-666q-21 0 -36 -15t-15 -36v-620q0 -21 15 -35.5t36 -14.5h142q-30 -49 -30 -105
+q0 -82 58 -140t140 -58t140 58t58 140q0 28 -8 54.5t-23 50.5h363q-30 -49 -30 -105q0 -82 58 -140t140 -58t140 58t58 140q0 56 -31 105h77v363zM93 719h582v-535h-582v535zM465 -14q0 -43 -30.5 -74t-74 -31t-74 31t-30.5 74t30.5 74t74 31t74 -31t30.5 -74zM1164 -14
+q0 -29 -14 -53t-38.5 -38t-52.5 -14q-43 0 -74 31t-31 74t31 74t74 31t74 -31t31 -74z" />
+    <glyph glyph-name="uniE634" unicode="&#xe634;" horiz-adv-x="1476" 
+d="M1403 812h-1331q-14 0 -27.5 -5.5t-23.5 -15.5t-15.5 -23.5t-5.5 -27.5v-880q0 -30 21 -51t51 -21h1331q30 0 51.5 21t21.5 51v880q0 19 -10 36t-26.5 26.5t-36.5 9.5zM120 692h1235v-151h-1235v151zM120 330h1235v-422h-1235v422zM211 210h572v-61h-572v61zM211 89h331
+v-60h-331v60z" />
+    <glyph glyph-name="uniE635" unicode="&#xe635;" 
+d="M512 797q-102 0 -194.5 -39.5t-160 -106.5t-107 -160t-39.5 -195q0 -68 18 -133t50.5 -119.5t78.5 -101t101 -79t120 -50.5t133 -18q102 0 194.5 40t160 107t107 160t39.5 194q0 82 -25.5 158.5t-71.5 138t-108 108t-138 71.5t-158 25zM512 -118q-112 0 -207.5 55.5
+t-151 151t-55.5 207.5q0 84 33 161t88.5 132.5t132 88t160.5 32.5q112 0 207.5 -55.5t151 -150.5t55.5 -207.5t-55.5 -208t-151 -151t-207.5 -55.5zM512 471q25 0 43 -18t18 -44h87q0 50 -29 89t-75 53v50q0 6 -3 11t-8 8t-11 3h-44q-9 0 -15.5 -6.5t-6.5 -15.5v-50
+q-22 -7 -41.5 -20.5t-33.5 -32t-21.5 -41.5t-7.5 -48q0 -104 133 -154q27 -9 44 -20t23 -22t7.5 -16.5t1.5 -13.5q0 -25 -18 -43t-43 -18q-17 0 -31 8.5t-22 22.5t-8 30h-87q0 -73 59 -118q21 -16 45 -24v-50q0 -9 6.5 -15t15.5 -6h44q6 0 11 2.5t8 7.5t3 11v50q46 15 75 54
+t29 88q0 105 -133 154q-18 7 -32 14.5t-22 14.5t-13 13t-6.5 12.5t-2 10t-0.5 7.5q0 26 18 44t43 18z" />
+    <glyph glyph-name="uniE636" unicode="&#xe636;" 
+d="M947 675h-892q-23 0 -39 -16t-16 -38v-642q0 -23 16 -39t39 -16h892q22 0 38 16t16 39v642q0 15 -7 27.5t-19.5 19.5t-27.5 7zM836 584l-335 -260l-336 260h671zM91 16v511l376 -293q4 -3 8 -5t8 -3.5t8.5 -2t9.5 -0.5q18 0 33 11l376 293v-511h-819z" />
+    <glyph glyph-name="uniE637" unicode="&#xe637;" 
+d="M512 572q-31 0 -59 -12t-48.5 -32.5t-32.5 -48.5t-12 -59q0 -63 44.5 -107.5t107.5 -44.5q31 0 59 12t48.5 32.5t32.5 48.5t12 59q0 63 -44.5 107.5t-107.5 44.5zM512 796q-149 0 -257 -103q-107 -100 -117 -245q-1 -14 -1 -28q0 -56 36 -137.5t81 -151t104 -146.5
+t85 -107t44 -50l25 -28l25 28q18 20 44 50t85 107t104 146.5t81 151t36 137.5q0 76 -29.5 145.5t-80 120t-120 80.5t-145.5 30zM512 -97q-46 54 -93.5 115.5t-98.5 137t-83 147t-32 117.5q0 127 90 217t217 90t217 -90t90 -217q0 -46 -32 -117.5t-83 -147t-98.5 -137
+t-93.5 -115.5z" />
+    <glyph glyph-name="uniE638" unicode="&#xe638;" horiz-adv-x="1335" 
+d="M1273 -88h-1179q-26 0 -44 -18t-18 -44t18 -44t44 -18h1179q17 0 31 8.5t22.5 22.5t8.5 31t-8.5 31.5t-22.5 22.5t-31 8zM841 657h429q27 0 46 18t19 44t-19 44t-46 18h-429q-27 0 -46 -18t-19 -44q0 -10 3.5 -19.5t9.5 -17t14 -13.5t17.5 -9t20.5 -3zM841 230h429
+q27 0 46 18t19 44q0 17 -8.5 31.5t-23.5 22.5t-33 8h-429q-13 0 -25 -5t-20.5 -13t-14 -19.5t-5.5 -24t5.5 -24t14 -20t20.5 -13.5t25 -5zM85 230h434q26 0 44 18t18 44v435q0 17 -8 31t-22.5 22.5t-31.5 8.5h-434q-26 0 -44 -18.5t-18 -43.5v-435q0 -25 18 -43.5t44 -18.5z
+M147 665h310v-311h-310v311z" />
+    <glyph glyph-name="uniE639" unicode="&#xe639;" 
+d="M507 811q-81 0 -157.5 -25.5t-138 -72t-108 -108t-72 -138t-25.5 -157.5q0 -185 121 -326q115 -134 287 -167q47 -8 93 -9q46 0 90.5 8.5t85 23.5t78 37t70 49.5t60 60t49.5 70t37 78t23.5 85t8.5 90.5q0 101 -40 194t-107 160t-160 107t-195 40zM507 -104
+q-112 0 -207.5 55.5t-150.5 150.5t-55 207.5t55 208t150.5 151t207.5 55.5q68 0 131 -21t114 -59.5t89.5 -89.5t59 -114t20.5 -130q0 -113 -55.5 -208t-150.5 -150.5t-208 -55.5zM506 605h-1h-1q-67 0 -115 -47q-48 -48 -48 -116q0 -9 3 -17t9 -14t14 -9.5t17 -3.5t17 3.5
+t14 9.5t9.5 14t3.5 17q0 32 22 54q22 21 55 22q10 0 19.5 -3t17.5 -8t15 -12t12 -15t8 -17.5t3 -19.5q1 -24 -12 -43t-34 -29q-22 -9 -39 -26t-26 -39.5t-9 -47.5v-36q0 -18 13 -30.5t31 -12.5t31 12.5t13 30.5v36q0 24 20 33q46 20 73 61.5t26 91.5q-1 66 -48 113t-113 48z
+M504 135q-23 0 -39 -16t-16 -38q0 -5 1 -10t3 -9.5t4 -8.5t5 -7.5t6.5 -6.5t8 -5.5t8.5 -4t9 -2.5t10 -1q23 0 38.5 16t15.5 39q0 9 -2.5 17t-7.5 15t-12 12t-15 7.5t-17 2.5z" />
+    <glyph glyph-name="uniE63A" unicode="&#xe63a;" 
+d="M964 376q14 1 25 8t17.5 18.5t6.5 25.5v147q0 14 -7 26t-19 19t-26 7h-898q-10 0 -20 -4t-17 -11t-11 -17t-4 -20v-147q0 -21 14 -36t35 -16q29 -2 49.5 -24t20.5 -52t-20.5 -52t-49.5 -24q-21 -1 -35 -16t-14 -36v-147q0 -21 15.5 -36.5t36.5 -15.5h898q21 0 36.5 15.5
+t15.5 36.5v147q0 21 -14 36t-35 16q-19 2 -35.5 12.5t-25.5 27t-9 36.5q0 15 5.5 28.5t15 23.5t22.5 16.5t27 7.5zM926 143v-83h-828v83q52 15 85.5 58.5t33.5 98.5t-33.5 98.5t-85.5 58.5v83h283v-66h66v66h479v-83q-52 -15 -85.5 -58.5t-33.5 -98.5t33.5 -98.5t85.5 -58.5
+zM381 278h66v-109h-66v109zM381 431h66v-109h-66v109zM381 126h66v-66h-66v66z" />
+    <glyph glyph-name="uniE63B" unicode="&#xe63b;" horiz-adv-x="1199" 
+d="M1149 812h-1099q-21 0 -35.5 -14.5t-14.5 -35.5v-350q0 -20 14.5 -35t35.5 -15h1099q13 0 24.5 7t18.5 18.5t7 24.5v350q0 21 -14.5 35.5t-35.5 14.5zM100 712h999v-250h-999v250zM1024 312q-21 0 -35.5 -14.5t-14.5 -34.5v-375h-749v375q0 20 -14.5 34.5t-35.5 14.5
+t-35.5 -14.5t-14.5 -34.5v-425q0 -21 14.5 -35.5t35.5 -14.5h849q10 0 19.5 4t16 10.5t10.5 16t4 19.5v425q0 20 -14.5 34.5t-35.5 14.5zM325 312q-10 0 -19.5 -3.5t-16 -10.5t-10.5 -16t-4 -19v-200q0 -33 30 -46q10 -4 20 -4h549q21 0 35.5 14.5t14.5 35.5v200
+q0 20 -14.5 34.5t-35.5 14.5t-35.5 -14.5t-14.5 -34.5v-150h-449v150q0 32 -30 45q-10 4 -20 4z" />
+    <glyph glyph-name="uniE63C" unicode="&#xe63c;" horiz-adv-x="1048" 
+d="M298 437q-21 0 -35.5 -14.5t-14.5 -35.5t14.5 -35.5t35.5 -14.5q13 0 24.5 7t18.5 18.5t7 25t-7 25t-18.5 18t-24.5 6.5zM953 -55q95 93 95 215t-94 214q0 2 0.5 7t1 9t0.5 7q0 111 -64 205t-174.5 148.5t-239.5 54.5q-97 0 -185.5 -32.5t-152.5 -87t-102 -130
+t-38 -158.5q0 -78 33 -148.5t93 -125.5l-77 -123q-8 -12 -6.5 -26t10.5 -25l5 -5q2 -2 4.5 -3.5t5 -2.5t5.5 -2t6 -1.5t6 -0.5q9 0 18 4l180 80q4 2 7 4q20 -7 39 -12q48 -80 138.5 -128t199.5 -48q38 0 74.5 6t70.5 19q1 -1 2 -1l140 -62q2 -2 5 -2l6 -2h6q20 0 32 15
+q10 10 11 24t-7 26zM286 160q0 -17 2 -35v1q-35 16 -64.5 38t-53 48t-40.5 55.5t-26 62.5t-9 67q0 85 51.5 157t139.5 114t192 42q142 0 249.5 -76.5t128.5 -189.5q-43 21 -91 32t-98 11q-39 0 -77 -6.5t-71.5 -19t-64.5 -30.5t-56.5 -40t-46.5 -48.5t-35.5 -55.5t-22 -61
+t-7.5 -66zM381 160q0 63 38.5 116.5t104 84.5t143.5 31q118 0 202 -68t84 -164q0 -62 -38.5 -115.5t-104.5 -84.5t-143 -31q-118 0 -202 68t-84 163zM527 191q-16 0 -27.5 -11t-11.5 -27q0 -11 5.5 -20t14.5 -14t19 -5q16 0 27.5 11.5t11.5 27.5t-11.5 27t-27.5 11zM667 191
+q-16 0 -27.5 -11t-11.5 -27t11.5 -27.5t27.5 -11.5q10 0 19 5t14.5 14t5.5 20q0 7 -3.5 14.5t-8.5 12.5t-12 8t-15 3zM806 191q-16 0 -27 -11t-11 -27t11 -27.5t27 -11.5t27.5 11.5t11.5 27.5q0 7 -3 14.5t-8 12.5t-12.5 8t-15.5 3z" />
+    <glyph glyph-name="uniE63E" unicode="&#xe63e;" 
+d="M521 317zM768 -178h-1h-1h-1h-1h-1h-1h-1h-1h-1h-1h-1q-11 1 -23 2h-1h-1h-1h-1h-1l-1 1h-1h-1h-1h-1h-1h-1h-1l-1 1h-1h-1h-1h-1h-1l-1 1h-1h-1h-1h-1h-1h-1l-1 1h-1h-1h-1h-1l-1 1h-1h-1h-1h-1l-1 1h-1h-1h-1h-1l-1 1h-1h-1h-1l-1 1h-1h-1h-1h-1l-1 1h-1h-1l-1 1h-1h-1
+h-1h-1l-1 1h-1h-1h-1l-1 1h-1h-1h-1l-1 1h-1l-1 1h-1h-1h-1l-1 1h-1h-1h-1l-1 1h-1h-1l-1 1h-1h-1h-1l-1 1h-1h-1l-1 1h-1l-1 1h-1h-1l-1 1h-1h-1l-1 1h-1h-1l-1 1h-1h-1l-1 1h-1h-1l-1 1h-1h-1l-1 1h-1h-1l-1 1h-1l-1 1h-1h-1l-1 1h-1l-1 1h-1l-1 1h-1h-1l-1 1h-1h-1l-1 1
+h-1l-1 1h-1h-1l-1 1h-1l-1 1h-1l-1 1h-1h-1l-1 1h-1l-1 1h-1l-1 1h-1h-1l-1 1h-1l-1 1h-1l-1 1h-1l-1 1h-1h-1l-1 1h-1l-1 1h-1l-1 1h-1l-1 1h-1l-1 1h-1l-1 1h-1l-1 1h-1l-1 1h-1l-1 1h-1l-1 1q-145 72 -277 204.5t-205 277.5q-55 113 -56.5 201t52.5 140q13 13 30 13
+t30 -13q8 -8 11 -19t0 -21.5t-11 -19.5q-32 -32 -26.5 -98t47.5 -149q68 -137 187.5 -256.5t256.5 -187.5q83 -42 149 -47.5t98 26.5q13 13 30 13t30 -13t13 -30t-13 -30q-54 -47 -141 -47zM333 355q-26 0 -39 26q-9 16 -4 32.5t21 23.5l99 46q15 8 26 23t8 33q0 13 -17 30
+l-141 145q-10 9 -24.5 12.5t-31.5 0.5q-12 -7 -25 -13l-68 -73q-9 -8 -19.5 -11t-21.5 0t-19 11q-13 13 -13 30t13 30l68 68q28 28 60 34q80 20 141 -34l140 -140q4 -4 7 -8l6 -8q3 -4 6 -8.5t5 -8.5l4 -10q2 -4 4 -9l2 -10q2 -5 3 -10l2 -10q1 -8 1 -16.5t-1 -16.5
+t-3.5 -16.5t-5.5 -16.5t-7.5 -15.5t-10 -15t-11.5 -14t-13 -12.5t-14.5 -11.5t-15.5 -10.5l-98 -47q0 2 -2.5 2t-6 -1t-4.5 -1zM875 -139q-10 0 -17 3t-13 9q-13 13 -13 30t13 30l68 68q13 13 13 26q7 35 -13 55l-141 141q-4 4 -30 17q-12 2 -23.5 -2t-19.5 -12.5t-12 -19.5
+l-47 -98q-3 -6 -7 -11t-10 -8t-12.5 -4t-13 0.5t-12.5 5.5q-8 3 -13.5 9t-8 13.5t-1.5 16.5t5 16l47 99q23 42 62 64.5t83 16.5q45 -7 77 -39l141 -141q29 -28 38 -65t-4 -75q-17 -43 -34 -60l-72 -73q-5 -4 -9.5 -7t-9.5 -4t-11 -1zM602 87q-4 0 -9 1.5t-8 2.5t-9 4
+q-77 58 -154 128q-76 77 -128 154q-9 12 -6 29.5t19 30.5q6 3 13 5t13.5 2t13 -2t11.5 -5.5t9 -8.5q15 -21 27 -36.5t27.5 -35t32 -37t32.5 -32.5q14 -12 21 -18.5t19.5 -17.5t20.5 -18t19.5 -17t20.5 -17.5t19.5 -15.5t20.5 -15q11 -7 16 -17t3 -21.5t-10 -21.5
+q-6 -21 -34 -21z" />
   </font>
   </font>
 </defs></svg>
 </defs></svg>

@@ -80,10 +80,15 @@
             line-height: 1.5;
             line-height: 1.5;
         }
         }
 
 
+        .iconfont {
+            font-size: rem(46);
+        }
+
         .icon-yoho-enter {
         .icon-yoho-enter {
             color: #ccc;
             color: #ccc;
             float: right;
             float: right;
         }
         }
+
         .connect-item {
         .connect-item {
             position: relative;
             position: relative;
             a {
             a {

@@ -33,55 +33,55 @@
             </div>
             </div>
             <div class="order-type clearfix">
             <div class="order-type clearfix">
                 <a class="type-item" href="/home/order">
                 <a class="type-item" href="/home/order">
-                    <span class="iconfont">&#xe620;</span>
-                    <br>代付款
+                    <span class="iconfont">&#xe634;</span>
+                    <br>待付款
                 </a>
                 </a>
                 <a class="type-item" href="/home/order">
                 <a class="type-item" href="/home/order">
-                    <span class="iconfont">&#xe620;</span>
-                    <br>代发货
+                    <span class="iconfont">&#xe63b;</span>
+                    <br>待发货
                 </a>
                 </a>
                 <a class="type-item" href="/home/order">
                 <a class="type-item" href="/home/order">
-                    <span class="iconfont">&#xe620;</span>
-                    <br>代收货
+                    <span class="iconfont">&#xe633;</span>
+                    <br>待收货
                 </a>
                 </a>
             </div>
             </div>
         </div>
         </div>
         <div class="group-list">
         <div class="group-list">
             <div class="list-item">
             <div class="list-item">
-                <span class="iconfont icon">&#xe620;</span>
+                <span class="iconfont icon">&#xe637;</span>
                 地址管理
                 地址管理
                 <span class="iconfont num">3 &#xe604;</span>
                 <span class="iconfont num">3 &#xe604;</span>
             </div>
             </div>
         </div>
         </div>
         <div class="group-list">
         <div class="group-list">
             <div class="list-item">
             <div class="list-item">
-                <span class="iconfont icon">&#xe620;</span>
+                <span class="iconfont icon">&#xe63a;</span>
                 优惠券
                 优惠券
                 <span class="iconfont num">{{coupon_num}} &#xe604;</span>
                 <span class="iconfont num">{{coupon_num}} &#xe604;</span>
             </div>
             </div>
             <div class="list-item">
             <div class="list-item">
-                <span class="iconfont icon">&#xe620;</span>
+                <span class="iconfont icon">&#xe635;</span>
                 YOHO 币
                 YOHO 币
                 <span class="iconfont num">{{yoho_coin_num}} &#xe604;</span>
                 <span class="iconfont num">{{yoho_coin_num}} &#xe604;</span>
             </div>
             </div>
         </div>
         </div>
         <div class="group-list">
         <div class="group-list">
             <div class="list-item">
             <div class="list-item">
-                <span class="iconfont icon">&#xe620;</span>
+                <span class="iconfont icon">&#xe636;</span>
                 消息
                 消息
                 <span class="iconfont num">{{inbox_total}} &#xe604;</span>
                 <span class="iconfont num">{{inbox_total}} &#xe604;</span>
             </div>
             </div>
         </div>
         </div>
         <div class="group-list">
         <div class="group-list">
             <div class="list-item">
             <div class="list-item">
-                <span class="iconfont icon">&#xe620;</span>
+                <span class="iconfont icon">&#xe63c;</span>
                 在线客服
                 在线客服
                 <span class="iconfont num">&#xe604;</span>
                 <span class="iconfont num">&#xe604;</span>
             </div>
             </div>
         </div>
         </div>
         <div class="group-list">
         <div class="group-list">
             <div class="list-item">
             <div class="list-item">
-                <span class="iconfont icon">&#xe620;</span>
+                <span class="iconfont icon">&#xe639;</span>
                 帮助
                 帮助
                 <span class="iconfont num">&#xe604;</span>
                 <span class="iconfont num">&#xe604;</span>
             </div>
             </div>

@@ -26,14 +26,14 @@
     <div class="connect-info">
     <div class="connect-info">
         <div class="connect-item connect-online">
         <div class="connect-item connect-online">
             <a href="http://chat80.live800.com/live800/chatClient/chatbox.jsp?companyID=493979&amp;configID=123576&amp;jid=9277320930" target="_blank" title="在线客服">
             <a href="http://chat80.live800.com/live800/chatClient/chatbox.jsp?companyID=493979&amp;configID=123576&amp;jid=9277320930" target="_blank" title="在线客服">
-                <span class="icon iconfont icon-chat">&#xe620;</span>
+                <span class="icon iconfont icon-chat">&#xe63c;</span>
                 在线客服
                 在线客服
                 <span class="iconfont icon-yoho-enter">&#xe604;</span>
                 <span class="iconfont icon-yoho-enter">&#xe604;</span>
             </a>
             </a>
         </div>
         </div>
         <div class="connect-item connect-tel">
         <div class="connect-item connect-tel">
             <a href="tel:400-889-9649" title="电话客服">
             <a href="tel:400-889-9649" title="电话客服">
-                <span class="icon iconfont icon-tel">&#xe620;</span>
+                <span class="icon iconfont icon-tel">&#xe63e;</span>
                 电话客服
                 电话客服
                 <p>
                 <p>
                 400-889-9649 &nbsp;&nbsp; 09:00 - 22:30 &nbsp; (周一至周日)
                 400-889-9649 &nbsp;&nbsp; 09:00 - 22:30 &nbsp; (周一至周日)

@@ -16,11 +16,11 @@ use Plugin\Helpers;
  */
  */
 class HomeController extends AbstractAction
 class HomeController extends AbstractAction
 {
 {
+
     /**
     /**
      * 个人中心入口
      * 个人中心入口
      */
      */
-    public function indexAction()
-    {
+    public function indexAction() {
         // 设置网站标题
         // 设置网站标题
         $this->setTitle('个人中心');
         $this->setTitle('个人中心');
         $this->setNavHeader('个人中心', true, SITE_MAIN);
         $this->setNavHeader('个人中心', true, SITE_MAIN);
@@ -44,11 +44,9 @@ class HomeController extends AbstractAction
     /**
     /**
      * 用户订单
      * 用户订单
      */
      */
-	public function ordersAction()
-	{
+    public function ordersAction() {
         // $uid = $this->getUid();
         // $uid = $this->getUid();
         // $type = $this->get('type', 1);
         // $type = $this->get('type', 1);
-
         // $orders = \Index\UserModel::getUserOrderData(967016, $type);
         // $orders = \Index\UserModel::getUserOrderData(967016, $type);
 
 
         $order = array(
         $order = array(
@@ -91,8 +89,7 @@ class HomeController extends AbstractAction
     /**
     /**
      * 用户收藏的商品
      * 用户收藏的商品
      */
      */
-	public function favoriteAction()
-	{
+    public function favoriteAction() {
         $uid = $this->getUid();
         $uid = $this->getUid();
 
 
         $favProducts = \Index\UserModel::getFavProductData($uid);
         $favProducts = \Index\UserModel::getFavProductData($uid);
@@ -116,8 +113,7 @@ class HomeController extends AbstractAction
     /**
     /**
      * 用户收藏的品牌
      * 用户收藏的品牌
      */
      */
-	public function favoritebrandAction()
-	{
+    public function favoritebrandAction() {
         $uid = $this->getUid();
         $uid = $this->getUid();
         $gender = Helpers::getGenderByCookie();
         $gender = Helpers::getGenderByCookie();
 
 
@@ -129,8 +125,7 @@ class HomeController extends AbstractAction
     /**
     /**
      * 个人信息
      * 个人信息
      */
      */
-	public function personalDetailsAction()
-	{
+    public function personalDetailsAction() {
         $this->setTitle('个人信息');
         $this->setTitle('个人信息');
         $this->setNavHeader('个人信息', true, SITE_MAIN);
         $this->setNavHeader('个人信息', true, SITE_MAIN);
 
 
@@ -139,30 +134,18 @@ class HomeController extends AbstractAction
         $data = \Index\UserModel::getUserProfileData($uid);
         $data = \Index\UserModel::getUserProfileData($uid);
         $data['pageFooter'] = true;
         $data['pageFooter'] = true;
         $this->_view->display('personal-details', $data);
         $this->_view->display('personal-details', $data);
-
-
     }
     }
 
 
     /**
     /**
      * YOHO币
      * YOHO币
      */
      */
-	public function currencyAction()
-	{
+    public function currencyAction() {
         // $uid = $this->getUid();
         // $uid = $this->getUid();
         $this->setNavHeader('YOHO币', true, false);
         $this->setNavHeader('YOHO币', true, false);
 
 
         $uid = 967016;
         $uid = 967016;
         $currency = \Index\UserModel::getYohoCoinData($uid);
         $currency = \Index\UserModel::getYohoCoinData($uid);
 
 
-		$this->_view->display('currency', $currency);
-	}
-
-	/**
-	 * 优惠券
-	 */
-	public function couponsAction()
-	{
-
         $this->setTitle('优惠券');
         $this->setTitle('优惠券');
 	    $this->setNavHeader('优惠券', true, SITE_MAIN);
 	    $this->setNavHeader('优惠券', true, SITE_MAIN);
 		// $uid = $this->getUid();
 		// $uid = $this->getUid();
@@ -177,14 +160,30 @@ class HomeController extends AbstractAction
 		
 		
 		print_r($coupons);
 		print_r($coupons);
         $this->_view->display('coupons', $coupons);
         $this->_view->display('coupons', $coupons);
+    }
+    /**
+     * 优惠券
+     */
+    public function couponsAction() {
 
 
+        $this->setTitle('优惠券');
+        $this->setNavHeader('优惠券', true, SITE_MAIN);
+        // $uid = $this->getUid();
+        $uid = 8826435;
+        $status = $this->get('status', 0);
+        $coupons = array(
+            'couponsUrl' => \Index\UserModel::getCouponData($uid, $status),
+            'couponsPage' => true
+        );
+
+        print_r($coupons);
+        $this->_view->display('coupons', $coupons);
     }
     }
 
 
     /**
     /**
      * 我的消息
      * 我的消息
      */
      */
-	public function messageAction()
-	{
+    public function messageAction() {
         // $uid = $this->getUid();
         // $uid = $this->getUid();
         $page = $this->get('page', 0);
         $page = $this->get('page', 0);
         $size = $this->get('size', 10);
         $size = $this->get('size', 10);
@@ -193,14 +192,12 @@ class HomeController extends AbstractAction
         $messages = \Index\UserModel::getMessageData($uid, $page, $size);
         $messages = \Index\UserModel::getMessageData($uid, $page, $size);
 
 
         print_r($messages);
         print_r($messages);
-
     }
     }
 
 
     /**
     /**
      * 地址管理
      * 地址管理
      */
      */
-	public function addressAction()
-	{
+    public function addressAction() {
         // 设置网站标题
         // 设置网站标题
         $this->setTitle('地址管理');
         $this->setTitle('地址管理');
         $this->setNavHeader('地址管理', true, SITE_MAIN);
         $this->setNavHeader('地址管理', true, SITE_MAIN);
@@ -274,8 +271,7 @@ class HomeController extends AbstractAction
 	}
 	}
 
 
     //在线客服
     //在线客服
-    public function onlineServiceAction()
-    {
+    public function onlineServiceAction() {
         // 设置网站标题
         // 设置网站标题
         $this->setTitle('在线客服');
         $this->setTitle('在线客服');
         $this->setNavHeader('在线客服', true, SITE_MAIN);
         $this->setNavHeader('在线客服', true, SITE_MAIN);
@@ -290,8 +286,7 @@ class HomeController extends AbstractAction
     }
     }
 
 
     //在线客服-具体详情
     //在线客服-具体详情
-    public function onlineServiceDetailAction()
-    {
+    public function onlineServiceDetailAction() {
         $service = array();
         $service = array();
         $cateId = $this->get('cateId', 0);
         $cateId = $this->get('cateId', 0);
         $cateName = $this->get('cateName', '');
         $cateName = $this->get('cateName', '');
@@ -307,16 +302,14 @@ class HomeController extends AbstractAction
     /**
     /**
      * 我的逛
      * 我的逛
      */
      */
-	public function myGuangAction()
-	{
+    public function myGuangAction() {
         echo 'My Guang';
         echo 'My Guang';
     }
     }
 
 
     /**
     /**
      * 意见反馈
      * 意见反馈
      */
      */
-	public function suggestAction()
-	{
+    public function suggestAction() {
         $udid = $this->getUdid();
         $udid = $this->getUdid();
         $page = $this->get('page', 1);
         $page = $this->get('page', 1);
         $limit = $this->get('limit', 30);
         $limit = $this->get('limit', 30);
@@ -353,15 +346,13 @@ class HomeController extends AbstractAction
                     'bad' => false)
                     'bad' => false)
             )
             )
         ));
         ));
-
     }
     }
 
 
     /**
     /**
      * 异步保存意见反馈数据
      * 异步保存意见反馈数据
      */
      */
-	public function savesuggestAction()
-	{
-		if($this->isAjax()) {
+    public function savesuggestAction() {
+        if ($this->isAjax()) {
             $uid = $this->getUid();
             $uid = $this->getUid();
             $content = $this->post('content', '');
             $content = $this->post('content', '');
             $suggest_type = $this->get('suggest_type', 2);
             $suggest_type = $this->get('suggest_type', 2);
@@ -370,13 +361,12 @@ class HomeController extends AbstractAction
 
 
             $this->echoJson($result);
             $this->echoJson($result);
         }
         }
-
     }
     }
 
 
     /**
     /**
      * 会员等级展示页
      * 会员等级展示页
      */
      */
-            public function gradeAction(){
+    public function gradeAction() {
         //设置网站seo信息
         //设置网站seo信息
         $this->setTitle('会员等级');
         $this->setTitle('会员等级');
         //显示网站导航头部信息
         //显示网站导航头部信息
@@ -384,102 +374,64 @@ class HomeController extends AbstractAction
 
 
         $gender = Helpers::getGenderByCookie();
         $gender = Helpers::getGenderByCookie();
         $channel = Helpers::getChannelByCookie();
         $channel = Helpers::getChannelByCookie();
-                $uid = $this -> getUid();
-                $uid = '7566245';//临时测试用
-                $data = GradeModel::getGrade($gender,$channel,$uid);
+        $uid = $this->getUid();
+        $uid = '7566245'; //临时测试用
+        $data = GradeModel::getGrade($gender, $channel, $uid);
         $data['pageFooter'] = true;
         $data['pageFooter'] = true;
-                $this -> _view -> display('vip-grade',$data);
+        $this->_view->display('vip-grade', $data);
     }
     }
+
     /*
     /*
-        *会员特权查看页
+     * 会员特权查看页
      */
      */
-            public function preferentialAction(){
+
+    public function preferentialAction() {
         //设置网站seo信息
         //设置网站seo信息
         $this->setTitle('会员等级');
         $this->setTitle('会员等级');
         //显示网站导航头部信息
         //显示网站导航头部信息
         $this->setNavHeader('会员特权详情');
         $this->setNavHeader('会员特权详情');
 
 
         $channel = Helpers::getChannelByCookie();
         $channel = Helpers::getChannelByCookie();
-                $uid = $this -> getUid();               
-                $data = GradeModel::getPreferential($channel,$uid);
+        $uid = $this->getUid();
+        $data = GradeModel::getPreferential($channel, $uid);
         $data['pageFooter'] = true;
         $data['pageFooter'] = true;
-                $this -> _view -> display('privilege',$data);
+        $this->_view->display('privilege', $data);
     }
     }
 
 
     /*
     /*
-        *我的订单页面
+     * 我的订单页面
      */
      */
-            public function orderAction(){
 
 
-                do{
-                    //判断是不是ajax请求
-//                    if(!$this -> isAjax()){
-//                        break;
-//                    }
-                    //判断参数是否有效
-                    $type = $this -> get('type',1);
-                    $page = $this -> get('page',1);
-                    $limit = $this -> get('limit',10);
+    public function orderAction() {
+        //获取基本参数:type:1=>全部,2=>待付款,3=>待发货,4=>待收货,5=>待评论
+        $type = $this->get('type', 1);
+        $page = $this->get('page', 1);
+        $limit = $this->get('limit', 10);
         $gender = Helpers::getGenderByCookie();
         $gender = Helpers::getGenderByCookie();
-                    $yh_channel = $this -> get('yh_channel',1);
-                    $uid = $this -> getUid();
-                    if(!empty($type) && !is_numeric($type)){
-                        break;
-                    }
-                    //$data = OrderModel::getOrder();
-                    $data = OrderModel::getOrder($type,$page,$limit,$gender,$yh_channel,$uid);
-                    //print_r($data);
-                }
-                while(false);
-                //$this -> _view -> display('order',$data);
+        $yh_channel = $this->get('yh_channel', 1);
+        $uid = $this->getUid();
+        $uid = '7566245'; //测试用
+        //调用模型层getOrder方法获得并处理数据
+        $data = OrderModel::getOrder($type, $page, $limit, $gender, $yh_channel, $uid);
+        //渲染模板
+        $this->_view->display('order', array(
+            'order' => array(
+                'orders' => $data
+            )
+        ));
     }
     }
 
 
-    /**
-     * 订单详情页
+    /*
+     * 我的订单-处理ajax请求页面(切换订单状态)
      */
      */
-    public function orderDetailAction()
-    {
-        $data = array(
-            'name' => '毛毛莉Lydia',
-            'phoneNum' => '18600001133',
-            'address' => '南京市建邺区嘉陵江东街18号国家广告产业园5栋17楼',
-            'orderStatus' => '待收货',
-            'orderNum' => '418358063',
-            'orderTime' => '2014-03-10 17:25:10',
-
-            'unreceived' => true,
-            'logisticsUrl' => '',
-            'logisticsCompany' => '顺丰',
-            'logisticsNum' => '51537443456',
 
 
-            'goods' => array(
-                array(
-                    'id' => 1,
-                    'thumb' => 'http://img11.static.yhbimg.com/goodsimg/2015/11/04/05/01ce2aff32fc3c90584f516167cd526d91.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',
-                    'name' => 'Adidas Originals ZX FLUXM22508',
-                    'color' => '黄',
-                    'size' => '43',
-                    'price' => '699.00',
-                    'count' => '2'
-                ),
-                array(
-                    'id' => 1,
-                    'thumb' => 'http://img10.static.yhbimg.com/goodsimg/2015/11/04/05/0188f1aca49ac478a565ec029b5d2d4a6c.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',
-                    'name' => 'B.Duck浴室玩伴mini浮水鸭',
-                    'gift' => true,
-                    'color' => '黄',
-                    'size' => '43',
-                    'price' => '0.00',
-                    'count' => '1'
-                )
-            ),
+    public function orderAjaxAction() {
 
 
-            'sumPrice' => 799,
-            'salePrice' => 80,
-            'freight' => 5,
-            'yohoCoin' => 5,
-            'price' => 719
-        );
-        $this->_view->display('order-detail', array('orderDetail' => $data, 'orderDetailPage' => true));
+        //判断是不是ajax请求
+        if (!$this->isAjax()) {
+            $this->error();
         }
         }
+        self::orderAction();
+    }
+
 }
 }

@@ -26,7 +26,7 @@ class GradeModel
             }
             }
         }
         }
         //调用接口获取数据
         //调用接口获取数据
-        $data = GradeData::getGradeData($gender,$channel, $uid);        
+        $data = GradeData::getGradeData($gender, $channel, $uid);
         switch (intval($data['grade']['current_vip_level'])) {
         switch (intval($data['grade']['current_vip_level'])) {
             case 0://普通会员
             case 0://普通会员
                 $result['vipGrade']['vip0'] = true;
                 $result['vipGrade']['vip0'] = true;
@@ -45,7 +45,7 @@ class GradeModel
         //今年总消费
         //今年总消费
         $result['vipGrade']['costOfThisYear'] = $data['grade']['current_year_cost'];
         $result['vipGrade']['costOfThisYear'] = $data['grade']['current_year_cost'];
         //升级下一等级会员的进度;
         //升级下一等级会员的进度;
-            $result['vipGrade']['percent'] = 100*(round($data['grade']['current_total_cost'] / $data['grade']['next_need_cost'], 2));
+        $result['vipGrade']['percent'] = 100 * (round($data['grade']['current_total_cost'] / $data['grade']['next_need_cost'], 2));
         //距离升级所需消费金额
         //距离升级所需消费金额
 
 
         if ($data['grade']['current_vip_level'] != 3) {
         if ($data['grade']['current_vip_level'] != 3) {
@@ -57,7 +57,7 @@ class GradeModel
         //$userProfile = GradeData::getUserProfileData($gender,$uid,$channel);
         //$userProfile = GradeData::getUserProfileData($gender,$uid,$channel);
         $result['vipGrade']['name'] = $data['userProfile']['username'];
         $result['vipGrade']['name'] = $data['userProfile']['username'];
         //跳转url(会员特权详情)
         //跳转url(会员特权详情)
-            $result['vipGrade']['allUrl'] = Helpers::url('/Home/preferential',null);
+        $result['vipGrade']['allUrl'] = Helpers::url('/Home/preferential', null);
         //当前vip等级享受的特权
         //当前vip等级享受的特权
         $result['vipGrade']['privilege'] = $data['grade']['enjoy_preferential'];
         $result['vipGrade']['privilege'] = $data['grade']['enjoy_preferential'];
 
 

 <?php
 <?php
 
 
-    namespace home;
+namespace home;
+
+use LibModels\Wap\Home\OrderData;
+use Plugin\Helpers;
+use Configs\CacheConfig;
 
 
-    use LibModels\Wap\Home\OrderData;
 /*
 /*
  * To change this license header, choose License Headers in Project Properties.
  * To change this license header, choose License Headers in Project Properties.
  * To change this template file, choose Tools | Templates
  * To change this template file, choose Tools | Templates
@@ -19,11 +22,100 @@ class OrderModel
     /**
     /**
      * 订单相关数据处理
      * 订单相关数据处理
      */
      */
-    public function getOrder($type = 1,$page = 1,$limit,$gender,$yh_channel,$uid){
+    public function getOrder($type = 1, $page = 1, $limit, $gender, $yh_channel, $uid) {
+        $result = array();
+        if (USE_CACHE) {
+            $key = CacheConfig::KEY_ACTION_HOME_ORDER_ORDER;
+            // 先尝试获取一级缓存(master), 有数据则直接返回.
+            $result = Cache::get($key, 'master');
+            if (!empty($result)) {
+                return $result;
+            }
+        }
+        //调用接口获得数据
+        $data = OrderData::getOrderData($type, $page, $limit, $gender, $yh_channel, $uid);
+        //检查数据返回是否正常,正常则处理数据
+        if ($data['code'] == 200 && isset($data['data'])) {
+            foreach ($data['data']['order_list'] as $key => $vo) {
+                //订单号，支付状态，订单商品数量，订单总价格
+                $result[$key]['orderNum'] = $vo['order_code'];
+                $result[$key]['tradingStatus'] = $vo['status_str'];
+                $result[$key]['count'] = count($vo['order_goods']);
+                $result[$key]['sumCost'] = $vo['amount'] + $vo['shipping_cost'];
+                //订单商品列表数据
+                $result[$key]['goods'] = self::formatOrderGoods($vo['order_goods']);
+                //订单status判断订单处于什么状态。
+                do {
+                    //订单取消状态
+                    if ($vo['is_cancel'] === 'Y') {
+                        $result[$key]['canceled'] = true;
+                        break;
+                    }
+                    //支付方式不是货到付款时，计算订单状态
+                    if ($vo['payment_type'] != 2) {
+                        switch ($vo['status']) {
+                            case 0:
+                                $result[$key]['unpaid'] = true;
+                                break;
+                            case 1 || 2 || 3 || 4 || 5:
+                                $result[$key]['unreceived'] = true;
+                                $resault[$key]['logisticsUrl'] = "暂无logisticsUrl数据";
+                                break;
+                            case 6:
+                                $result[$key]['completed'] = true;
+                                break;
+                            default:
+                                break;
+                        }
+                    } elseif ($vo['payment_type'] == 2) {
+                        //订单为货到付款订单时，订单没有未支付状态
+                        switch ($vo['status']) {
+                            case 0 || 1 || 2 || 3 || 4 || 5:
+                                $result[$key]['unreceived'] = true;
+                                //此处备注，接口没有返回logisticsUrl数据
+                                $resault[$key]['logisticsUrl'] = "备注:暂无logisticsUrl数据";
+                                break;
+                            case 6:
+                                $result[$key]['completed'] = true;
+                                break;
+                            default:
+                                break;
+                        }
+                    }
+                } while (false);
+            }
+        }
 
 
-        $data = OrderData::getOrderData($type,$page,$limit,$gender,$yh_channel,$uid);
+        if (USE_CACHE) {
+            // 接口调用异常时, 不害怕，从我们的二级缓存(slave)里再取数据.
+            if (empty($result)) {
+                $result = Cache::get($key, 'slave');
+            }
+            // 接口调用正常,数据封装完成, 则设置一级(master)和二级(slave)数据缓存
+            else {
+                Cache::set($key, $result);
+            }
+        }
+        return $result;
+    }
 
 
-        return $data;
+    //格式化订单商品
+    static function formatOrderGoods($orderGoods) {
+        $arr = array();
+        foreach ($orderGoods as $key => $vo) {
+            $arr[$key]['thumb'] = Helpers::getImageUrl($vo['goods_image'], 90, 120);
+            $arr[$key]['name'] = $vo['product_name'];
+            $arr[$key]['color'] = $vo['color_name'];
+            $arr[$key]['size'] = $vo['size_name'];
+            $arr[$key]['price'] = $vo['goods_price'];
+            $arr[$key]['count'] = $vo['buy_number'];
+            if ($vo['goods_type'] == 'gift') {
+                $arr[$key]['gift'] = true;
+            } elseif ($vo['goods_type'] == 'price_gift') {
+                $arr[$key]['advanceBuy'] = true;
+            }
+        }
+        return $arr;
     }
     }
 
 
 }
 }