Authored by xuhongyun

Merge branch 'gray' into test

@@ -51,7 +51,7 @@ @@ -51,7 +51,7 @@
51 listUpdateTime: '--:--', 51 listUpdateTime: '--:--',
52 overViewUpdateTime: '--:--', 52 overViewUpdateTime: '--:--',
53 grid:{ 53 grid:{
54 - url:'/report/getOrdersGoodsRptList', 54 + url:'/oldshops/report/getOrdersGoodsRptList',
55 columns:[ 55 columns:[
56 {display:'图片',render(item){ 56 {display:'图片',render(item){
57 return item.imageUrl?'<img src="'+item.imageUrl+'?imageView/0/w/78/h/78">':""; 57 return item.imageUrl?'<img src="'+item.imageUrl+'?imageView/0/w/78/h/78">':"";
@@ -91,7 +91,7 @@ @@ -91,7 +91,7 @@
91 //获取店铺的经营指标:一个自然日内有效订单商品件数、有效订单商品金额 91 //获取店铺的经营指标:一个自然日内有效订单商品件数、有效订单商品金额
92 fetchData1: function() { 92 fetchData1: function() {
93 var self = this; 93 var self = this;
94 - this.$http.post("/report/getShopBusinessOverview", { 94 + this.$http.post("/oldshops/report/getShopBusinessOverview", {
95 dateId: util.dateFormat(new Date(),"YYYYMMdd") 95 dateId: util.dateFormat(new Date(),"YYYYMMdd")
96 }).then(function (response) { 96 }).then(function (response) {
97 var rs = response.data; 97 var rs = response.data;
@@ -108,7 +108,7 @@ @@ -108,7 +108,7 @@
108 day.setDate(day.getDate()-1); //前一天 108 day.setDate(day.getDate()-1); //前一天
109 self.rankDate = util.dateFormat(day, "MM月dd日"); 109 self.rankDate = util.dateFormat(day, "MM月dd日");
110 110
111 - this.$http.post("/report/getShopBrandRank", { 111 + this.$http.post("/oldshops/report/getShopBrandRank", {
112 dateId: util.dateFormat(day,"YYYYMMdd") 112 dateId: util.dateFormat(day,"YYYYMMdd")
113 }).then(function (response) { 113 }).then(function (response) {
114 var rs = response.data; 114 var rs = response.data;
@@ -63,7 +63,7 @@ @@ -63,7 +63,7 @@
63 sortList: [] 63 sortList: []
64 }, 64 },
65 grid: { 65 grid: {
66 - url: '/report/getReturnGoodsRptList', 66 + url: '/oldshops/report/getReturnGoodsRptList',
67 columns: [ 67 columns: [
68 { 68 {
69 name: 'imageUrl', display: '图片', render: function (item) { 69 name: 'imageUrl', display: '图片', render: function (item) {
@@ -62,7 +62,7 @@ @@ -62,7 +62,7 @@
62 sortList: [] 62 sortList: []
63 }, 63 },
64 grid: { 64 grid: {
65 - url: '/report/getOrdersGoodsRptList', 65 + url: '/oldshops/report/getOrdersGoodsRptList',
66 columns: [ 66 columns: [
67 { 67 {
68 name: 'imageUrl', display: '图片', render: function (item) { 68 name: 'imageUrl', display: '图片', render: function (item) {
@@ -55,7 +55,7 @@ @@ -55,7 +55,7 @@
55 {name:"请退出库总金额(元)",value:"0"} 55 {name:"请退出库总金额(元)",value:"0"}
56 ], 56 ],
57 grid:{ 57 grid:{
58 - url:'/report/getStorageOutRptList', 58 + url:'/oldshops/report/getStorageOutRptList',
59 columns:[ 59 columns:[
60 {display:'图片',render(item){ 60 {display:'图片',render(item){
61 return item.imageUrl?'<img src="'+item.imageUrl+'?imageView/0/w/78/h/78">':""; 61 return item.imageUrl?'<img src="'+item.imageUrl+'?imageView/0/w/78/h/78">':"";
@@ -55,7 +55,7 @@ @@ -55,7 +55,7 @@
55 {name:"发货入库总金额(元)",value:"0"} 55 {name:"发货入库总金额(元)",value:"0"}
56 ], 56 ],
57 grid:{ 57 grid:{
58 - url:'/report/getStorageInRptList', 58 + url:'/oldshops/report/getStorageInRptList',
59 columns:[ 59 columns:[
60 {display:'图片',render(item){ 60 {display:'图片',render(item){
61 return item.imageUrl?'<img src="'+item.imageUrl+'?imageView/0/w/78/h/78">':""; 61 return item.imageUrl?'<img src="'+item.imageUrl+'?imageView/0/w/78/h/78">':"";
@@ -64,7 +64,7 @@ @@ -64,7 +64,7 @@
64 sortList: [] 64 sortList: []
65 }, 65 },
66 grid: { 66 grid: {
67 - url: '/bigdata/getStorageStatisticsList', 67 + url: '/oldshops/bigdata/getStorageStatisticsList',
68 columns: [ 68 columns: [
69 { 69 {
70 display: '图片', render(item){ 70 display: '图片', render(item){
@@ -120,7 +120,7 @@ @@ -120,7 +120,7 @@
120 }, 120 },
121 121
122 fetchAllSortList(){ 122 fetchAllSortList(){
123 - this.$http.post("/product/class/queryAllProductSortList").then(function (response) { 123 + this.$http.post("/oldshops/product/class/queryAllProductSortList").then(function (response) {
124 var rs = response.data; 124 var rs = response.data;
125 this.levelContent.$set(0,rs.data); 125 this.levelContent.$set(0,rs.data);
126 }, function (response) { 126 }, function (response) {
@@ -202,13 +202,13 @@ tabTree.prototype= { @@ -202,13 +202,13 @@ tabTree.prototype= {
202 if (p.status) { 202 if (p.status) {
203 url = '/sale/product/queryPSNotTreeWhenLevelAndStatus'; 203 url = '/sale/product/queryPSNotTreeWhenLevelAndStatus';
204 } else { 204 } else {
205 - url = '/product/class/queryAllProductSortList'; 205 + url = '/oldshops/product/class/queryAllProductSortList';
206 } 206 }
207 } else { 207 } else {
208 if (p.status) { 208 if (p.status) {
209 url = '/sale/product/queryPSListByParentIdWhenStatus'; 209 url = '/sale/product/queryPSListByParentIdWhenStatus';
210 } else { 210 } else {
211 - url = '/product/class/queryProductSortList'; 211 + url = '/oldshops/product/class/queryProductSortList';
212 } 212 }
213 213
214 } 214 }