Merge branch 'develop' into release/1.0

@@ -32,7 +32,7 @@ yoho币        |    /me/mycurrency     |
 意见反馈      |    /me/feedback     | 
 关于我们      |    /me/about     | 
 物流详情      |    /me/logistic?order_code=1609827614  |
-退换货物流详情|    /me/logistic?order_code=1609827614&type=refund|
+退换货物流详情|    /me/logistic?order_code=1609827614&id=3&type=refund|change
 --------------------------------------------------------------------------------
 
 ### order 常亮

@@ -10,7 +10,7 @@ const notLoginTip = '抱歉，您暂未登录！';
 
 const order = {
     orders: (req, res) => {
-        const type = req.query.type;
+        const type = req.query.type || 1;
 
         res.render('order', {
             module: 'me',
@@ -149,7 +149,8 @@ const order = {
         orderModel.getOrderLogisticdate({
             uid: req.user.uid || '',
             type: req.query.type || '',
-            order_code: req.query.orderCode
+            order_code: req.query.orderCode,
+            id: req.query.id
         }).then(result => {
             res.json(result);
         });

@@ -92,6 +92,7 @@ exports.deleteOrder = (orderCode, uid) => {
  * @param {[int]} order_code 订单号
  * @param {[int]} uid 用户uid
  * @param {[string]} type 退换货物流(退货：refund,换货：change)
+ * @param {[int]} id 退换货申请ID(type为refund | change，才有效)
  * @return {[array]}
  */
 exports.getOrderLogisticdate = (params) => {

@@ -28,7 +28,7 @@
     "express-handlebars": "^3.0.0",
     "express-session": "^1.14.0",
     "influxdb-winston": "^1.0.1",
-    "lodash": "^4.14.2",
+    "lodash": "^4.15.0",
     "memcached": "^2.2.1",
     "moment": "^2.14.1",
     "morgan": "^1.7.0",
@@ -39,7 +39,7 @@
     "winston": "^2.2.0",
     "winston-daily-rotate-file": "^1.1.4",
     "yoho-md5": "^2.0.0",
-    "yoho-node-lib": "0.0.38"
+    "yoho-node-lib": "0.0.40"
   },
   "devDependencies": {
     "autoprefixer": "^6.4.0",
@@ -48,7 +48,7 @@
     "babel-plugin-transform-runtime": "^6.12.0",
     "babel-preset-es2015": "^6.13.2",
     "babel-runtime": "^6.11.6",
-    "eslint": "^3.2.2",
+    "eslint": "^3.3.0",
     "eslint-config-yoho": "^1.0.1",
     "eslint-plugin-html": "^1.5.2",
     "extract-text-webpack-plugin": "^1.0.1",
@@ -82,7 +82,7 @@
     "stylelint-processor-html": "^1.0.0",
     "vue": "1.0.26",
     "vue-infinite-scroll": "0.2.3",
-    "vue-lazyload": "^0.4.5",
+    "vue-lazyload": "^0.4.6",
     "vue-loader": "^8.5.3",
     "vue-swipe": "0.2.6",
     "vue-touch": "1.1.0",

@@ -223,7 +223,7 @@ gulp.task('webpack', ['assets'], (done) => {
     const proConfig = Object.assign({}, webpackConfig, {
         vue: {
             postcss: {
-                plugins: postcssPlugin(env.dev),
+                plugins: postcssPlugin(env.pro),
                 options: {
                     parser: require('postcss-scss')
                 }

@@ -158,7 +158,7 @@ const matchHeader = (path, qs, titleMap) => {
 
     if (/\/me\/logistic$/.test(path)) {
         header = titleMap[1];
-        header.title.des = '物流详情';
+        header.title.des = '物流信息';
         return header;
     }
 

@@ -37,7 +37,7 @@ const yoho = {
         if (this.isApp) {
             document.addEventListener('deviceready', callback);
         } else {
-            callback();
+            return callback();
         }
     },
 
@@ -318,7 +318,8 @@ const yoho = {
                 arguments: args
             });
         } else {
-            tip(tipInfo);
+
+            // tip(tipInfo);
         }
     },
 

@@ -51,6 +51,5 @@
     p {
         text-align: center;
         font-size: 24px;
-        font-family: BrownStd Regular;
     }
 }

@@ -3,12 +3,15 @@
     padding-top: 20px;
 
     .coin-total {
-        padding: 35px 0;
+        padding: 40px 0;
         background: white;
         text-align: center;
+        border-top: 1px solid #eee;
+        border-bottom: 1px solid #eee;
 
         p:first-child {
             font-size: 34px;
+            line-height: 40px;
         }
 
         p:nth-child(2) {
@@ -20,6 +23,7 @@
         p:last-child {
             color: #b0b0b0;
             font-size: 28px;
+            line-height: 40px;
         }
     }
 

 .help {
-    overflow: hidden;
-    width: 100%;
-    height: auto;
-    margin-top: 20px;
-
-    ul {
-        display: block;
-        overflow: hidden;
-        margin: 0;
-        padding-left: 0;
-        width: 100%;
-        height: auto;
-
-        li {
-            float: right;
-            overflow: hidden;
-            width: 100%;
-            height: 80px;
-            border-bottom: 1px solid #e0e0e0;
-            color: #444;
-            list-style: none;
-            font-size: 28px;
-            line-height: 84px;
-
-            a:visited {
-                color: #444;
-            }
-
-            .name {
-                float: left;
-                overflow: hidden;
-                padding-left: 5%;
-                width: 90%;
-                height: 100%;
-            }
-
-            .icon {
-                color: #e0e0e0;
-            }
-        }
-    }
-
-    .iconfont {
-        color: #fff;
-    }
-}
-
-.help-detail-page {
-    margin-right: 30px;
-    margin-left: 30px;
+    /* 全部重写 */
 }

 <template>
-    <div class="coin-detail">
+    <div class="coin-detail" v-if="coinList && coinList.length">
         <p>明细列表</p>
         <ul class="coin-detail-list" v-infinite-scroll="getCoinData()" infinite-scroll-disabled="busy" infinite-scroll-distance="10">
             <li v-for="coin in coinList">

@@ -32,7 +32,7 @@
                         <div class="goods-price">
                             <p>&yen;{{product.goodsPrice}}</p>
                             <p>×{{product.buyNumber}}</p>
-                            <p><span class="goods-status">{{product.goodsStatus}}</span></p>
+                            <p v-if="product.goodsStatus"><span class="goods-status">{{product.goodsStatus}}</span></p>
                         </div>
                     </a>
                 </li>

@@ -5,6 +5,12 @@
 </template>
 <style>
     .product-header {
+        &.ghost {
+            .blk-header-title {
+                visibility: hidden;
+            }
+        }
+
         .blk-header-gap {
             display: none;
         }

@@ -90,7 +90,7 @@
                             title: result.shopName,
                             des: shareSubTitle,
                             url: shareUrl,
-                            img: result.shopLogo ? result.shopLogo : '',
+                            img: result.shopLogo ? result.shopLogo.replace(/{width}/g, 120).replace(/{height}/g, 80) : '',
                             isBlkShop: result.isBlkShop,
                             domain: locationQuery.domain,
                             brandName: result.brandName,