diff --git a/commons/js/config.js b/commons/js/config.js index 7f08e1f..cdc5d11 100644 --- a/commons/js/config.js +++ b/commons/js/config.js @@ -68,6 +68,12 @@ api = { appXzStat: "app/xz/stat", //获取电话统计数据 appCity: "app/city", //获取系统配置城市 + materialHome: "material/home", //素材首页 + materialHomeTopic: "material/home/topic", //生成专题 + materialTopic: "material/topic", //专题首页 + materialHomeQrcode: "material/home/qrcode", //获取二维码 + + } diff --git a/commons/js/utils/apiQuery.js b/commons/js/utils/apiQuery.js index 14873c7..16046c5 100644 --- a/commons/js/utils/apiQuery.js +++ b/commons/js/utils/apiQuery.js @@ -446,4 +446,32 @@ apiQuery.getAppCity = function(params){ }) } +//素材首页 +apiQuery.getMaterialHome = function(params){ + return new Promise(function (resolve, reject) { + HttpRequest(false, Config.api.materialHome, 2, params, "GET", resolve, reject) + }) +} + +//生成专题 +apiQuery.putMaterialHomeTopic = function (params) { + return new Promise(function (resolve, reject) { + HttpRequest(false, Config.api.materialHomeTopic, 2, params, "PUT", resolve, reject) + }) +} + +//专题首页 +apiQuery.getMaterialTopic = function(params){ + return new Promise(function (resolve, reject) { + HttpRequest(false, Config.api.materialTopic, 2, params, "GET", resolve, reject) + }) +} + +//获取二维码 +apiQuery.getMaterialHomeQrcode = function(params){ + return new Promise(function (resolve, reject) { + HttpRequest(false, Config.api.materialHomeQrcode, 2, params, "GET", resolve, reject) + }) +} + export default apiQuery; \ No newline at end of file diff --git a/pages/distribute/material/index.js b/pages/distribute/material/index.js index 9be7c80..1d40ca8 100644 --- a/pages/distribute/material/index.js +++ b/pages/distribute/material/index.js @@ -27,13 +27,6 @@ Page({ }) } - //获取用户信息 - _.apiQuery.getUserInfo().then(res => { - this.setData({ - userInfo: res - }) - }) - this.getContentSubCmsTabs() }, diff --git a/pages/distribute/statistics/index.js b/pages/distribute/statistics/index.js index a404b9c..aa6c27f 100644 --- a/pages/distribute/statistics/index.js +++ b/pages/distribute/statistics/index.js @@ -106,11 +106,11 @@ Page({ "top":"bottom", "data":["浏览","客户","订单"] }, - "grid":{"top":"10%","left":"2%","right":"20%","bottom":"15%","containLabel":true}, + "grid":{"top":"10%","left":"2%","right":"5%","bottom":"15%","containLabel":true}, "xAxis":{ "type":"category", "boundaryGap":false, - "data":["1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月",] + "data":["1","2","3","4","5","6","7","8","9","10","11","12",] }, "yAxis":{"type":"value"}, "series":[