fe / yohobuy-shop-fe2 · Commits

Go to a project

Authored by 姜敏
Commit b9392a8c2f04f309a1e27b98b7e72f050741c400 2 parents 032efaea 2e6ae5a1

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
Inline Side-by-side
Showing 6 changed files with 11 additions and 8 deletions
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 <div id="businessIndex"> 2 <div id="businessIndex">
3 <div class="overViewTitle"> 3 <div class="overViewTitle">
4 <h3>经营指标</h3> 4 <h3>经营指标</h3>
5 - <span>展示当日经营指标数据（15:30更新）</span> 5 + <span>展示当日经营指标数据（{{overViewUpdateTime}}更新）</span>
6 </div> 6 </div>
7 7
8 <div class="overViewContent" style="margin-left: 200px"> 8 <div class="overViewContent" style="margin-left: 200px">
@@ -51,9 +51,10 @@ @@ -51,9 +51,10 @@
51 51
52 <div class="dataModle2"> 52 <div class="dataModle2">
53 <p>较上周同期</p> 53 <p>较上周同期</p>
54 - <h2 class="middle" v-show="rankChange == 0"><i>↑</i><b>{{rankChange}}</b>个名次</h2>  
55 <h2 class="up" v-show="rankChange > 0"><i>↑</i><b>{{rankChange}}</b>个名次</h2> 54 <h2 class="up" v-show="rankChange > 0"><i>↑</i><b>{{rankChange}}</b>个名次</h2>
  55 + <h2 class="middle" v-show="rankChange == 0"><i>--</i><b>{{rankChange}}</b>个名次</h2>
56 <h2 class="down" v-show="rankChange < 0"><i>↓</i><b>{{-rankChange}}</b>个名次</h2> 56 <h2 class="down" v-show="rankChange < 0"><i>↓</i><b>{{-rankChange}}</b>个名次</h2>
  57 + <h2 v-show="!rankChange">个名次</h2>
57 </div> 58 </div>
58 </div> 59 </div>
59 <div class="clearfix"></div> 60 <div class="clearfix"></div>
@@ -84,11 +85,12 @@ @@ -84,11 +85,12 @@
84 return { 85 return {
85 buyNumbers: '0', 86 buyNumbers: '0',
86 orderAmount: '0', 87 orderAmount: '0',
87 - rankDate: '',  
88 rankNow: '0', 88 rankNow: '0',
89 rankChange: '0', 89 rankChange: '0',
90 rankLevel: 5, 90 rankLevel: 5,
  91 + rankDate: '',
91 listUpdateTime:'', 92 listUpdateTime:'',
  93 + overViewUpdateTime:'',
92 grid:{ 94 grid:{
93 url:'/report/getOrdersGoodsRptList', 95 url:'/report/getOrdersGoodsRptList',
94 columns:[ 96 columns:[
@@ -137,6 +139,7 @@ @@ -137,6 +139,7 @@
137 var rs = response.data; 139 var rs = response.data;
138 self.buyNumbers = rs.data.buyNumbers; 140 self.buyNumbers = rs.data.buyNumbers;
139 self.orderAmount = rs.data.orderAmount; 141 self.orderAmount = rs.data.orderAmount;
  142 + self.overViewUpdateTime = rs.data.hour.substring(0,5);
140 }, function (response) { 143 }, function (response) {
141 var rs = response.data; 144 var rs = response.data;
142 console.log(rs.message); 145 console.log(rs.message);
@@ -64,7 +64,7 @@ @@ -64,7 +64,7 @@
64 columns: [ 64 columns: [
65 { 65 {
66 name: 'imageUrl', display: '图片', render: function (item) { 66 name: 'imageUrl', display: '图片', render: function (item) {
67 - return '<img src="' + item.imageUrl + '">' 67 + return item.imageUrl ? '<img src="' + item.imageUrl + '?imageView/0/w/78/h/78">' : "";
68 } 68 }
69 }, 69 },
70 { 70 {
@@ -63,7 +63,7 @@ @@ -63,7 +63,7 @@
63 columns: [ 63 columns: [
64 { 64 {
65 name: 'imageUrl', display: '图片', render: function (item) { 65 name: 'imageUrl', display: '图片', render: function (item) {
66 - return '<img src="' + item.imageUrl + '">' 66 + return item.imageUrl ? '<img src="' + item.imageUrl + '?imageView/0/w/78/h/78">' : "";
67 } 67 }
68 }, 68 },
69 { 69 {
@@ -58,7 +58,7 @@ @@ -58,7 +58,7 @@
58 url:'/report/getStorageOutRptList', 58 url:'/report/getStorageOutRptList',
59 columns:[ 59 columns:[
60 {display:'图片',render(item){ 60 {display:'图片',render(item){
61 - return item.imageUrl?'<img src="'+item.imageUrl+'">':""; 61 + return item.imageUrl?'<img src="'+item.imageUrl+'?imageView/0/w/78/h/78">':"";
62 }}, 62 }},
63 {display:'SKN/SKU',render(item){ 63 {display:'SKN/SKU',render(item){
64 return '<p>SKN：'+item.productSkn+'</p><p>SKU：'+item.productSku+'</p>'; 64 return '<p>SKN：'+item.productSkn+'</p><p>SKU：'+item.productSku+'</p>';
@@ -58,7 +58,7 @@ @@ -58,7 +58,7 @@
58 url:'/report/getStorageInRptList', 58 url:'/report/getStorageInRptList',
59 columns:[ 59 columns:[
60 {display:'图片',render(item){ 60 {display:'图片',render(item){
61 - return item.imageUrl?'<img src="'+item.imageUrl+'">':""; 61 + return item.imageUrl?'<img src="'+item.imageUrl+'?imageView/0/w/78/h/78">':"";
62 }}, 62 }},
63 {display:'SKN/SKU',render(item){ 63 {display:'SKN/SKU',render(item){
64 return '<p>SKN：'+item.productSkn+'</p><p>SKU：'+item.productSku+'</p>'; 64 return '<p>SKN：'+item.productSkn+'</p><p>SKU：'+item.productSku+'</p>';
@@ -66,7 +66,7 @@ @@ -66,7 +66,7 @@
66 columns: [ 66 columns: [
67 { 67 {
68 display: '图片', render(item){ 68 display: '图片', render(item){
69 - return item.imageUrl ? '<img src="' + item.imageUrl + '">' : ""; 69 + return item.imageUrl ? '<img src="' + item.imageUrl + '?imageView/0/w/78/h/78">' : "";
70 } 70 }
71 }, 71 },
72 { 72 {