diff --git a/api/donor/donor.js b/api/donor/donor.js index 1eb47fd..f915e96 100644 --- a/api/donor/donor.js +++ b/api/donor/donor.js @@ -1,4 +1,5 @@ -import { get, post } from '@/utils/request' +import { get } from "@/utils/request"; +import request from "../../utils/request"; /** * 获取捐款记录列表 @@ -16,5 +17,16 @@ import { get, post } from '@/utils/request' * @returns {Promise} 返回捐款记录列表 */ export function getDonorList(params) { - return get('/app/donor/listDonor', params) + return get("/app/donor/listDonor", params); +} + +export function getUserDonorList(params) { + return request({ + url: "/app/donor/userDonor", + params: { + ...params, + orderByColumn: "createTime", // 排序字段 + isAsc: "desc", // 降序排列 + }, + }); } diff --git a/api/pray/pray.js b/api/pray/pray.js index 61a9977..862e9eb 100644 --- a/api/pray/pray.js +++ b/api/pray/pray.js @@ -1,4 +1,4 @@ -import request from '@/utils/request' +import request from "@/utils/request"; /** * 提交祈福 @@ -11,39 +11,31 @@ import request from '@/utils/request' */ export function submitPrayer(data) { return request({ - url: '/app/pray', - method: 'POST', + url: "/app/pray", + method: "POST", data: { - name: String(data.name || ''), - type: String(data.type || ''), - isOthers: String(data.isOthers || ''), - content: String(data.content || ''), + name: String(data.name || ""), + type: String(data.type || ""), + isOthers: String(data.isOthers || ""), + content: String(data.content || ""), }, - }) + }); } /** - * 获取祈福列表(如果需要的话) + * 获取用户祈福列表 * @param {Object} params 查询参数 * @returns {Promise} API响应 */ -export function getPrayerList(params = {}) { +export function getUserPrayerList(params) { return request({ - url: '/app/pray/list', - method: 'GET', - params: params, - }) -} + url: "/app/pray", + method: "GET", + params: { + ...params, -/** - * 获取祈福详情(如果需要的话) - * @param {string} id 祈福ID - * @returns {Promise} API响应 - */ -export function getPrayerDetail(id) { - return request({ - url: '/app/pray/detail', - method: 'GET', - params: { id: id }, - }) + orderByColumn: "pray_time", // 排序字段 + isAsc: "desc", // 降序排列 + }, + }); } diff --git a/pages.json b/pages.json index 0cac534..74a5fb8 100644 --- a/pages.json +++ b/pages.json @@ -202,6 +202,18 @@ "navigationStyle": "custom" } }, + { + "path": "pages/personalCenter/myDonationList", + "style": { + "navigationStyle": "custom" + } + }, + { + "path": "pages/personalCenter/myPrayRecordList", + "style": { + "navigationStyle": "custom" + } + }, { "path": "pages/pieChart/pieChart", "style": { diff --git a/pages/personalCenter/myDonationList.vue b/pages/personalCenter/myDonationList.vue new file mode 100644 index 0000000..d8db863 --- /dev/null +++ b/pages/personalCenter/myDonationList.vue @@ -0,0 +1,283 @@ + + + + + diff --git a/pages/personalCenter/myPrayRecordList.vue b/pages/personalCenter/myPrayRecordList.vue new file mode 100644 index 0000000..a1c8abd --- /dev/null +++ b/pages/personalCenter/myPrayRecordList.vue @@ -0,0 +1,331 @@ + + + + + diff --git a/pages/personalCenter/personalCenter.vue b/pages/personalCenter/personalCenter.vue index 1e51c95..7e93b2c 100644 --- a/pages/personalCenter/personalCenter.vue +++ b/pages/personalCenter/personalCenter.vue @@ -73,12 +73,12 @@ export default { { title: "捐赠历史记录", icon: CommonEnum.MY_DONOR, - path: "/pages/personalCenter/donationHistory", + path: "/pages/personalCenter/myDonationList", }, { title: "祈福记录", icon: CommonEnum.MY_PRAY, - path: "/pages/personalCenter/prayerRecords", + path: "/pages/personalCenter/myPrayRecordList", }, { title: "牌位录入", diff --git a/utils/request.js b/utils/request.js index 94a7b68..cd72abc 100644 --- a/utils/request.js +++ b/utils/request.js @@ -14,23 +14,23 @@ const ENV_CONFIG = { // 获取当前环境配置 const getCurrentConfig = () => { - try { - const { envVersion } = wx.getAccountInfoSync().miniProgram; - console.log("当前环境:", envVersion); - const envConfig = ENV_CONFIG[envVersion] || ENV_CONFIG.release; - // 确保配置对象包含所有必要属性 - return { - baseUrl: envConfig.baseUrl, - appId: envConfig.appId || 1, // 确保appId有默认值 - }; - } catch (error) { - console.warn("获取环境失败,默认使用正式环境:", error); - const fallbackConfig = ENV_CONFIG.release; - return { - baseUrl: fallbackConfig.baseUrl, - appId: fallbackConfig.appId || 1, // 确保appId有默认值 - }; - } + // try { + // // const { envVersion } = wx.getAccountInfoSync().miniProgram; + // // console.log("当前环境:", envVersion); + // const envConfig = ENV_CONFIG[envVersion] || ENV_CONFIG.release; + // // 确保配置对象包含所有必要属性 + // return { + // baseUrl: envConfig.baseUrl, + // appId: envConfig.appId || 1, // 确保appId有默认值 + // }; + // } catch (error) { + // console.warn("获取环境失败,默认使用正式环境:", error); + const fallbackConfig = ENV_CONFIG.release; + return { + baseUrl: fallbackConfig.baseUrl, + appId: fallbackConfig.appId || 1, // 确保appId有默认值 + }; + // } }; const config = getCurrentConfig();