diff --git a/childPackage/pages/electricQuery/index.js b/childPackage/pages/electricQuery/index.js index d7b7937..71cbb18 100644 --- a/childPackage/pages/electricQuery/index.js +++ b/childPackage/pages/electricQuery/index.js @@ -193,7 +193,6 @@ Page({ }) }, async onChangePage(e) { - console.log('e', e) const page = e.detail.currentIndex; const that = this; this.setData({ @@ -284,7 +283,6 @@ Page({ }); break; case "day": - console.log('day') this.setData({ yearMonthDay: time, yearMonthDayStamp: new Date(time).getTime(), diff --git a/components/pagination/index.js b/components/pagination/index.js index b17976b..a0c8853 100644 --- a/components/pagination/index.js +++ b/components/pagination/index.js @@ -90,7 +90,6 @@ Component({ }, //更改页码点击事件 onChangePage: function (e) { - //console.log("更改页码事件:",e); this.setData({ pageMask: false, index: e.currentTarget.dataset.index //点击的页数 diff --git a/pages/encyclopedia/components/item/index.js b/pages/encyclopedia/components/item/index.js index 7e0a260..24eebb6 100644 --- a/pages/encyclopedia/components/item/index.js +++ b/pages/encyclopedia/components/item/index.js @@ -44,7 +44,6 @@ Component({ }) }, jumpToDetail(e) { - console.log('e', e) wx.navigateTo({ url: `/pages/encyclopediaDetail/index?id=${e.currentTarget.dataset.data.id}`, }) diff --git a/pages/login/index.js b/pages/login/index.js index cef9e84..7477f51 100644 --- a/pages/login/index.js +++ b/pages/login/index.js @@ -65,7 +65,6 @@ Page({ }, getPhoneNumber(e) { const { errno, code: phoneCode } = e.detail; - console.log('e', e) switch(errno) { case 103: alertInfo("已拒绝"); diff --git a/pages/publicTransfer/index.js b/pages/publicTransfer/index.js index 89fb273..64a9de5 100644 --- a/pages/publicTransfer/index.js +++ b/pages/publicTransfer/index.js @@ -61,7 +61,6 @@ Page({ alertInfo("文件不能大于1M") return; } - // console.log('res', res) loadingFunc(async () => { await this.upload(res) }) @@ -93,7 +92,9 @@ Page({ confirmButtonText: "联系客服", cancelButtonText: "关闭" }).then(() => { - + wx.switchTab({ + url: '/pages/home/index', + }) }).catch(() => { wx.redirectTo({ url: '/pages/rechargeRecord/index', diff --git a/pages/rechargeDetail/index.js b/pages/rechargeDetail/index.js index c36b4d3..1b5df17 100644 --- a/pages/rechargeDetail/index.js +++ b/pages/rechargeDetail/index.js @@ -33,9 +33,18 @@ Page({ }) }, record() { + const { detail } = this.data; + if (detail.orderStatus === 1) { + alertInfo("审核中的充值不能开收据") + return; + } + if (detail.orderStatus === 2) { + alertInfo("已退回的充值不能开收据") + return; + } const handleDownload = () => { return new Promise((resolve, rej) => { - const { detail } = this.data; + const result = wx.getAccountInfoSync(); const { envVersion } = result.miniProgram; let api = "" @@ -55,11 +64,9 @@ Page({ api = `https://zgd.hbhcbn.com/recharge-print-api`; break; } - console.log("api", `${api}/${detail.id}`) wx.downloadFile({ url: `${api}/${detail.id}`, success: (res) => { - console.log('res', res) if (res.statusCode === 200) { if (!res.tempFilePath) { alertError("获取文件失败")