From 927b7a6470ac9338661f38f8332179a97caf2adc Mon Sep 17 00:00:00 2001 From: qiaomu <3520484422@qq.com> Date: Mon, 9 Sep 2024 15:57:59 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=AF=B9=E5=85=AC=E5=88=9D?= =?UTF-8?q?=E5=A7=8B=E6=93=8D=E4=BD=9C=E5=92=8C=E4=B8=93=E5=8C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/encyclopedia/components/item/index.js | 1 - pages/encyclopedia/components/item/index.json | 3 +- pages/encyclopedia/components/item/index.wxml | 34 +++++----- pages/encyclopedia/index.wxml | 2 +- pages/home/index.js | 2 +- pages/publicTransfer/index.js | 63 ++++++++++++------- pages/rechargeDetail/index.js | 3 +- pages/special/index.js | 3 +- pages/special/index.wxml | 2 +- service/public.js | 20 ++++++ service/recharge.js | 5 ++ utils/system.js | 4 +- 12 files changed, 97 insertions(+), 45 deletions(-) diff --git a/pages/encyclopedia/components/item/index.js b/pages/encyclopedia/components/item/index.js index ac915a0..46a8046 100644 --- a/pages/encyclopedia/components/item/index.js +++ b/pages/encyclopedia/components/item/index.js @@ -30,7 +30,6 @@ Component({ */ methods: { async getData() { - console.log(this.data.page, this.data.id, this.id) const page = this.data.page; const id = this.id; const { code, data, message, total } = await getEncyclopediaList(id, page); diff --git a/pages/encyclopedia/components/item/index.json b/pages/encyclopedia/components/item/index.json index be620b1..ad53950 100644 --- a/pages/encyclopedia/components/item/index.json +++ b/pages/encyclopedia/components/item/index.json @@ -3,7 +3,8 @@ "usingComponents": { "pagination": "/components/pagination/index", "navigator": "/components/navigator/index", - "van-field": "@vant/weapp/field/index" + "van-field": "@vant/weapp/field/index", + "empty": "/components/empty/index" }, "navigationStyle": "custom" } \ No newline at end of file diff --git a/pages/encyclopedia/components/item/index.wxml b/pages/encyclopedia/components/item/index.wxml index 1e33446..e3ba148 100644 --- a/pages/encyclopedia/components/item/index.wxml +++ b/pages/encyclopedia/components/item/index.wxml @@ -1,15 +1,21 @@ - - \ No newline at end of file + + + + + + + + \ No newline at end of file diff --git a/pages/encyclopedia/index.wxml b/pages/encyclopedia/index.wxml index 93d41df..a00ca80 100644 --- a/pages/encyclopedia/index.wxml +++ b/pages/encyclopedia/index.wxml @@ -1,6 +1,6 @@ - + diff --git a/pages/home/index.js b/pages/home/index.js index fa89ba1..c5c6793 100644 --- a/pages/home/index.js +++ b/pages/home/index.js @@ -330,7 +330,7 @@ Page({ case "对公支付": const { user, money, meter, tenement, park } = this.data; wx.navigateTo({ - url: `/pages/publicTransfer/index?money=${money}&meterId=${meter.id}&tenementId=${tenement.id}&tenementName=${tenement.name}`, + url: `/pages/publicTransfer/index?money=${money}&meterId=${meter.id}&tenementId=${tenement.id}&tenementName=${tenement.name}&park=${park.id}`, }) break; default: diff --git a/pages/publicTransfer/index.js b/pages/publicTransfer/index.js index 0ff22e1..bdae1ef 100644 --- a/pages/publicTransfer/index.js +++ b/pages/publicTransfer/index.js @@ -1,7 +1,8 @@ // pages/publicTransfer/index.js import { getMeterDetail, getMeterList, getTenementMeterList } from "../../service/meter"; -import { uploadFile } from "../../service/public"; -import { alertInfo, loadingFunc, getFileName } from "../../utils/index"; +import { createPublicTopUp } from '../../service/recharge' +import { uploadFile, uploadPublicFile } from "../../service/public"; +import { alertInfo, loadingFunc, getFileName, alertSuccess } from "../../utils/index"; import request from '../../utils/request'; const { OK } = request; @@ -19,11 +20,10 @@ Page({ * 生命周期函数--监听页面加载 */ onLoad(options) { - const { money, meterId, tenementId, tenementName } = options; - console.log('money', money, 'meterId', meterId) - this.init({ money, meterId, tenementId, tenementName }); + const { money, meterId, tenementId, tenementName, park } = options; + this.init({ money, meterId, tenementId, tenementName, park }); }, - async init({ money, meterId, tenementId, tenementName }) { + async init({ money, meterId, tenementId, tenementName, park }) { const { code, message, data } = await getMeterDetail({ tenement: tenementId, id: meterId }); if (code !== OK) { alertInfo(message); @@ -34,36 +34,55 @@ Page({ money, tenementName, tenementId, + park + }) + }, + async upload(res) { + const result = await uploadPublicFile(res.tempFiles[0]?.tempFilePath) + if (result.statusCode !== 200) { + alertInfo("上传失败") + return; + } + const data = JSON.parse(result.data) + this.setData({ + fileList: [{ url: data.data, name: getFileName(data.data) }] }) }, onUpload() { - const that = this; wx.chooseMedia({ count: 1, // 可以选择文件的数量 mediaType: ['image'], // 可以选择文件的类型，这里只允许上传文件 sourceType: ['album', 'camera'], success: (res) => { - (loadingFunc(async () => { - const result = await uploadFile(res.tempFiles[0]?.tempFilePath) - console.log('result', result) - if (result.statusCode !== 200) { - alertInfo("上传失败") - return; - } - const data = JSON.parse(result.data) - this.setData({ - fileList: [{ url: data.data, name: getFileName(data.data) }] - }) - }))() + loadingFunc(async () => { + await this.upload(res) + }) } }); }, - handleSubmit() { - const { fileList } = this.data; - if (!fileList.length) { + async handleSubmit() { + const { fileList, meter, money, park, tenementId } = this.data; + if (!fileList?.length) { alertInfo("请上传凭证") return; } + const { code, message } = await createPublicTopUp({ + id: meter.id, + tenement: tenementId, + money: Number(money), + park, + vouch: fileList[0].url + }) + if (code !== OK) { + alertInfo(message) + return; + } + alertSuccess("已提交，待审核") + setTimeout(() => { + wx.redirectTo({ + url: '/pages/home/index', + }) + }, 600) }, handleDelete() { this.setData({ fileList: [] }) diff --git a/pages/rechargeDetail/index.js b/pages/rechargeDetail/index.js index b4be760..c36b4d3 100644 --- a/pages/rechargeDetail/index.js +++ b/pages/rechargeDetail/index.js @@ -42,7 +42,8 @@ Page({ switch (envVersion) { // 开发版 case 'develop': - api = `http://localhost:9001`; + // api = `http://localhost:9001`; + api = `https://zgd.hbhcbn.com/recharge-print-api-test`; // api = `https://zgd.hbhcbn.com/recharge-print-api-test`; break; // 体验版 diff --git a/pages/special/index.js b/pages/special/index.js index 6b17e42..35069e2 100644 --- a/pages/special/index.js +++ b/pages/special/index.js @@ -35,7 +35,8 @@ Page({ const [appId, path] = value.split(",") wx.navigateToMiniProgram({ appId: appId, - path: path + path: path, + envVersion: "trial" }) break; case 1: diff --git a/pages/special/index.wxml b/pages/special/index.wxml index feca8d5..1f0588e 100644 --- a/pages/special/index.wxml +++ b/pages/special/index.wxml @@ -4,7 +4,7 @@ - + diff --git a/service/public.js b/service/public.js index f2dd5eb..54e2045 100644 --- a/service/public.js +++ b/service/public.js @@ -20,4 +20,24 @@ export const uploadFile = (filePath) => { } }) }) +} + +export const uploadPublicFile = (filePath) => { + const { api } = getConfigByEnv(); + return new Promise((resolve, reject) => { + wx.uploadFile({ + filePath: filePath, + name: 'file', + url: `${api}/wx/public/upload`, + header: { + authorization: wx.getStorageSync("token") + }, + success: (res) => { + resolve(res); + }, + fail: (err) => { + reject(err); + } + }) + }) } \ No newline at end of file diff --git a/service/recharge.js b/service/recharge.js index 014cd8a..4643df3 100644 --- a/service/recharge.js +++ b/service/recharge.js @@ -20,4 +20,9 @@ export const getRechargeDetail = async function(rid) { // 退费 export const returnFee = async function(data) { return await POST(`/wx/return`, data); +} + +// 创建对公 +export const createPublicTopUp = async function(data) { + return await POST(`/wx/createPublicTopUp`, data); } \ No newline at end of file diff --git a/utils/system.js b/utils/system.js index c54ae76..c3e0002 100644 --- a/utils/system.js +++ b/utils/system.js @@ -11,11 +11,11 @@ export const getDot = async () => { const { code, message, data } = await getUnReadApproveNumber(); if (data > 0) { wx.showTabBarRedDot({ - index: 1, + index: 2, }) } else { wx.hideTabBarRedDot({ - index: 1, + index: 2, }) } return data;