diff --git a/pages/main/main.js b/pages/main/main.js index 23ffcc4..08daa49 100644 --- a/pages/main/main.js +++ b/pages/main/main.js @@ -53,7 +53,7 @@ function setOption(chart, xdata, ydata) { }, axisLabel: { rotate: 40, - formatter: function(a, b) { + formatter: function (a, b) { return a } }, @@ -232,7 +232,7 @@ function getTabletListVerify() { }; Page({ data: { - token:'', + token: '', currentIndex: 0, userInfo: {}, recordMoney: 0, @@ -287,10 +287,15 @@ Page({ // icon: 'iconfont icon-wuliu', // id: 8 // } - + { + text: '预约服务', + icon: 'iconfont icon-lingquanzhongxin', + id: 9 + }, + ], amountMoney: '', - djZmoney:'', + djZmoney: '', writeOffMoney: '', getFullYear: new Date().getFullYear(), getMonth: new Date().getMonth() + 1, @@ -307,9 +312,9 @@ Page({ ecScatter: { lazyLoad: true }, - djArr:[], - djMoney:[], - count:'' + djArr: [], + djMoney: [], + count: '' }, //获取商户信息 getUserInfo() { @@ -355,7 +360,7 @@ Page({ }) }) }, - onPullDownRefresh: function() { + onPullDownRefresh: function () { let that = this; // that.getUnverifiedAmountOnDate() // that.getVerifiedAmountOnDate(); @@ -386,7 +391,7 @@ Page({ this.getUserInfo().then(res => { this.setData({ userInfo: res, - userInfoLoadIf:true + userInfoLoadIf: true }) app.globalData.merchant = res; tt.setNavigationBarTitle({ @@ -398,7 +403,7 @@ Page({ /** * gotolook */ - gotobill: function(e) { + gotobill: function (e) { console.log(e) let owe = e.currentTarget.dataset.data.owe; let status = e.currentTarget.dataset.data.status; @@ -505,14 +510,18 @@ Page({ tt.navigateTo({ url: '/pages/marktingsettlement/marktingsettlement', }) - }else if(id==7){//用户发卷 + } else if (id == 7) { //用户发卷 tt.navigateTo({ url: '/pages/sendDiscounts/sendDiscounts', }) - } else if (id == 8) {//商品配送 + } else if (id == 8) { //商品配送 tt.navigateTo({ url: '/pages/delivery/delivery', }) + } else if (id == 9) { //服务预约 + tt.navigateTo({ + url: '/pages/marktingsettlement/marktingsettlement', + }) } }, toTran(e) { @@ -545,7 +554,7 @@ Page({ currentIndex: 0 }) }, - getpaybill: function() { + getpaybill: function () { let that = this; that.getUserInfo().then(res => { Http.postRequest(config.api.listBillOweAndWaitPay, app.globalData.token, '', { @@ -565,22 +574,22 @@ Page({ }) that.setData({ billList: res.data, - djArr : res.data.filter(item => item.status == 2), + djArr: res.data.filter(item => item.status == 2), }) that.data.djMoney = that.data.djArr.map(item => parseInt(item.owe / 100)) let money = 0 that.data.djMoney.filter(function (item, index) { money += item; - }) + }) that.setData({ - djZmoney: changeNum.changePeoNumber(money) + djZmoney: changeNum.changePeoNumber(money) }) } }) }) }, - - getTabletListVerify: function() { + + getTabletListVerify: function () { let that = this; getTabletListVerify() .then(res => { @@ -602,7 +611,7 @@ Page({ /** * 交易 */ - getTabletListOrder: function() { + getTabletListOrder: function () { let that = this; getTabletListOrder() .then(res => { @@ -684,7 +693,7 @@ Page({ url: `/pages/record/list/index`, }) }, - + // checkuserstatus() { // let _this = this; // HttpBasics.get({ @@ -701,5 +710,4 @@ Page({ // }); // }, -}) - +}) \ No newline at end of file