From 1bb3d6dddb1c81a6498700771e873864f9c7e166 Mon Sep 17 00:00:00 2001 From: qiaomu <3520484422@qq.com> Date: Tue, 29 Oct 2024 15:25:42 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=85=E5=80=BC=E8=AE=B0=E5=BD=95=E6=9F=A5?= =?UTF-8?q?=E7=9C=8B=E5=87=AD=E8=AF=81=EF=BC=8C=E6=A3=80=E6=9F=A5=E4=BA=8C?= =?UTF-8?q?=E7=BB=B4=E7=A0=81=E5=92=8C=E4=B8=8A=E4=BC=A0=E5=87=AD=E8=AF=81?= =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=8C=E9=A6=96=E9=A1=B5=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E5=95=86=E6=88=B7=E5=88=97=E8=A1=A8=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/apply/index.js | 2 ++ pages/handleLogin/index.js | 1 + pages/home/index.js | 24 ++++++++++++++++++------ pages/publicTransfer/index.js | 1 + pages/publicTransfer/index.wxml | 6 ++++-- pages/qrCode/index.js | 1 + pages/rechargeDetail/index.js | 11 +++++++++-- pages/rechargeDetail/index.json | 1 + pages/rechargeDetail/index.wxml | 19 +++++++++++++++++++ service/user.js | 5 +++-- 10 files changed, 59 insertions(+), 12 deletions(-) diff --git a/pages/apply/index.js b/pages/apply/index.js index 81e0ed0..fac3b0e 100644 --- a/pages/apply/index.js +++ b/pages/apply/index.js @@ -20,7 +20,9 @@ Page({ */ onLoad(options) { const querys = decodeURIComponent(options.scene) + console.log('querys', querys) const id = querys.slice(querys.indexOf("=") + 1) + console.log("id", id) this.getInfo(id); }, async getInfo(id) { diff --git a/pages/handleLogin/index.js b/pages/handleLogin/index.js index 2ac8d9c..42d0a09 100644 --- a/pages/handleLogin/index.js +++ b/pages/handleLogin/index.js @@ -97,6 +97,7 @@ Page({ wx.scanCode({ scanType: "qrCode", success: ({ path }) => { + console.log('path', path) wx.navigateTo({ url: '/' + path, }) diff --git a/pages/home/index.js b/pages/home/index.js index dff0f20..11fa741 100644 --- a/pages/home/index.js +++ b/pages/home/index.js @@ -193,7 +193,7 @@ Page({ // const oldValue = value; wx.setStorageSync('tenement', newVal) that.getMeters(newVal); - that.setUser(); + that.setUser(newVal.id); value = newVal; } }); @@ -260,8 +260,8 @@ Page({ url: '/childPackage/pages/electricQuery/index', }) }, - async setUser() { - const result = await getUserInfo(); + async setUser(id) { + const result = await getUserInfo(id); if (result.code !== OK) { const user = wx.getStorageSync('user') this.setData({ user: user }) @@ -292,14 +292,26 @@ Page({ const updateDatas = {} if (!park || !park.id) { const storagePark = wx.getStorageSync('park') - updateDatas.park = storagePark || firstPark + if (data.find(item => item.id !== storagePark.id)) { + updateDatas.park = firstPark + } else { + updateDatas.park = storagePark + } } if (!tenement || !tenement.id) { const storageTenement = wx.getStorageSync('tenement') if (!park || !park.id) { - updateDatas.tenement = storageTenement || firstPark.tenements?.[0] + if (firstPark.tenements?.find(item => item.id !== storageTenement.id)) { + updateDatas.tenement = firstPark.tenements?.[0] + } else { + updateDatas.tenement = storageTenement + } } else { - updateDatas.tenement = storageTenement || park.tenements?.[0]; + if (park.tenements?.find(item => item.id !== storageTenement.id)) { + updateDatas.tenement = park.tenements?.[0] + } else { + updateDatas.tenement = storageTenement + } } } updateDatas.all = data; diff --git a/pages/publicTransfer/index.js b/pages/publicTransfer/index.js index 8bcb5b2..9c2367d 100644 --- a/pages/publicTransfer/index.js +++ b/pages/publicTransfer/index.js @@ -41,6 +41,7 @@ Page({ async upload(res) { const result = await uploadPublicFile(res.tempFiles[0]?.tempFilePath) + console.log('upload result', result) if (result.statusCode !== 200) { alertInfo("上传失败") return; diff --git a/pages/publicTransfer/index.wxml b/pages/publicTransfer/index.wxml index 9be0a4f..0ad182d 100644 --- a/pages/publicTransfer/index.wxml +++ b/pages/publicTransfer/index.wxml @@ -28,8 +28,10 @@ - 请使用对公账号向以下账号汇款 - 复制 + + 请使用对公账号向以下账号汇款，并将付款成功截图上传至充值凭证。 + + 复制 河北华昌宝能售电有限公司 建行新石北路支行 diff --git a/pages/qrCode/index.js b/pages/qrCode/index.js index 022c893..257fc68 100644 --- a/pages/qrCode/index.js +++ b/pages/qrCode/index.js @@ -40,6 +40,7 @@ Page({ }, async getCode() { const tenement = wx.getStorageSync('tenement'); + console.log("tenement", tenement) const { code, message, data } = await getWxCode(tenement.id) if (code !== OK) { alertInfo(message) diff --git a/pages/rechargeDetail/index.js b/pages/rechargeDetail/index.js index 3a58b2c..f2625f5 100644 --- a/pages/rechargeDetail/index.js +++ b/pages/rechargeDetail/index.js @@ -1,6 +1,6 @@ // pages/rechargeDetail/index.js import { getRechargeDetail } from "../../service/recharge"; -import { alertError, alertInfo, loadingFunc } from "../../utils/index"; +import { alertError, alertInfo, loadingFunc, getFileName } from "../../utils/index"; import { getRechargeOperateType, getRechargeOperateWay } from "../../utils/data"; import request from "../../utils/request" const { OK } = request @@ -29,7 +29,14 @@ Page({ return; } this.setData({ - detail: { ...data, way: getRechargeOperateWay(data.way), type: getRechargeOperateType(data.type) } + detail: { + ...data, + way: getRechargeOperateWay(data.way), + type: getRechargeOperateType(data.type), + fileList: data?.images ? [{ + url: data.images, name: getFileName(data.images) + }] : [] + } }) }, record() { diff --git a/pages/rechargeDetail/index.json b/pages/rechargeDetail/index.json index 42e60d9..c2a876c 100644 --- a/pages/rechargeDetail/index.json +++ b/pages/rechargeDetail/index.json @@ -2,6 +2,7 @@ "usingComponents": { "navigator": "/components/navigator/index", "van-field": "@vant/weapp/field/index", + "van-uploader": "@vant/weapp/uploader/index", "van-button": "@vant/weapp/button/index" }, "navigationStyle": "custom" diff --git a/pages/rechargeDetail/index.wxml b/pages/rechargeDetail/index.wxml index f640c5a..e054c66 100644 --- a/pages/rechargeDetail/index.wxml +++ b/pages/rechargeDetail/index.wxml @@ -114,6 +114,25 @@ border="{{ false }}" wx:if="{{detail.orderStatus === 2}}" /> + + + + + + + diff --git a/service/user.js b/service/user.js index 675b25e..f0145c5 100644 --- a/service/user.js +++ b/service/user.js @@ -13,6 +13,7 @@ export const userValidate = async function(data) { // 获取用户邀请二维码 export const getWxCode = async function(id) { + console.log("id", id) return await GET(`/wx/getWxCode?id=${id}`); } @@ -32,8 +33,8 @@ export const removeUser = async function(uid, tid) { } // 获取用户最新信息 -export const getUserInfo = async function() { - return await GET('/wx/getUserInfo'); +export const getUserInfo = async function(id) { + return await GET('/wx/getUserInfo?tenement=' + id); } // 非管理员重新提交申请