Merge branch 'yohobuy-shop-dev-4.6-20160606' of http://git.yoho.cn/fe/yohobuy-sh…

…op-fe2 into yohobuy-shop-dev-4.6-20160606

@@ -2,7 +2,7 @@
     <div id="businessIndex">
         <div class="overViewTitle">
             <h3>经营指标</h3>
-            <span>展示当日经营指标数据（15:30更新）</span>
+            <span>展示当日经营指标数据（{{overViewUpdateTime}}更新）</span>
         </div>
 
         <div class="overViewContent" style="margin-left: 200px">
@@ -51,9 +51,10 @@
 
                 <div class="dataModle2">
                     <p>较上周同期</p>
-                    <h2 class="middle" v-show="rankChange == 0"><i>↑</i><b>{{rankChange}}</b>个名次</h2>
                     <h2 class="up" v-show="rankChange > 0"><i>↑</i><b>{{rankChange}}</b>个名次</h2>
+                    <h2 class="middle" v-show="rankChange == 0"><i>--</i><b>{{rankChange}}</b>个名次</h2>
                     <h2 class="down" v-show="rankChange < 0"><i>↓</i><b>{{-rankChange}}</b>个名次</h2>
+                    <h2 v-show="!rankChange">个名次</h2>
                 </div>
             </div>
             <div class="clearfix"></div>
@@ -84,11 +85,12 @@
             return {
                 buyNumbers: '0',
                 orderAmount: '0',
-                rankDate: '',
                 rankNow: '0',
                 rankChange: '0',
                 rankLevel: 5,
+                rankDate: '',
                 listUpdateTime:'',
+                overViewUpdateTime:'',
                 grid:{
                     url:'/report/getOrdersGoodsRptList',
                     columns:[
@@ -137,6 +139,7 @@
                     var rs = response.data;
                     self.buyNumbers = rs.data.buyNumbers;
                     self.orderAmount = rs.data.orderAmount;
+                    self.overViewUpdateTime = rs.data.hour.substring(0,5);
                 }, function (response) {
                     var rs = response.data;
                     console.log(rs.message);

@@ -64,7 +64,7 @@
                     columns: [
                         {
                             name: 'imageUrl', display: '图片', render: function (item) {
-                            return '<img src="' + item.imageUrl + '">'
+                            return item.imageUrl ? '<img src="' + item.imageUrl + '?imageView/0/w/78/h/78">' : "";
                         }
                         },
                         {

@@ -63,7 +63,7 @@
                     columns: [
                         {
                             name: 'imageUrl', display: '图片', render: function (item) {
-                            return '<img src="' + item.imageUrl + '">'
+                            return item.imageUrl ? '<img src="' + item.imageUrl + '?imageView/0/w/78/h/78">' : "";
                         }
                         },
                         {

@@ -58,7 +58,7 @@
                     url:'/report/getStorageOutRptList',
                     columns:[
                         {display:'图片',render(item){
-                            return item.imageUrl?'<img src="'+item.imageUrl+'">':"";
+                            return item.imageUrl?'<img src="'+item.imageUrl+'?imageView/0/w/78/h/78">':"";
                         }},
                         {display:'SKN/SKU',render(item){
                             return '<p>SKN：'+item.productSkn+'</p><p>SKU：'+item.productSku+'</p>';

@@ -58,7 +58,7 @@
                     url:'/report/getStorageInRptList',
                     columns:[
                         {display:'图片',render(item){
-                            return item.imageUrl?'<img src="'+item.imageUrl+'">':"";
+                            return item.imageUrl?'<img src="'+item.imageUrl+'?imageView/0/w/78/h/78">':"";
                         }},
                         {display:'SKN/SKU',render(item){
                             return '<p>SKN：'+item.productSkn+'</p><p>SKU：'+item.productSku+'</p>';

@@ -66,7 +66,7 @@
                     columns: [
                         {
                             display: '图片', render(item){
-                            return item.imageUrl ? '<img src="' + item.imageUrl + '">' : "";
+                            return item.imageUrl ? '<img src="' + item.imageUrl + '?imageView/0/w/78/h/78">' : "";
                         }
                         },
                         {