From dbe16b4deebe3d1b7c2508ead8d4fea5b40a1b59 Mon Sep 17 00:00:00 2001 From: zmj <1493694146@qq.com> Date: Mon, 22 Jan 2024 19:25:40 +0800 Subject: [PATCH] a --- config/app.js | 4 +- pages.json | 2 +- pages/oaHome/FirstOrderLog.vue | 168 +++++++++++++++++++++++++++++---- pages/oaHome/accountLog.vue | 4 + pages/oaHome/oaHome.vue | 6 +- 5 files changed, 162 insertions(+), 22 deletions(-) diff --git a/config/app.js b/config/app.js index c0cc5d3..df36642 100644 --- a/config/app.js +++ b/config/app.js @@ -19,8 +19,8 @@ switch (env) { httpApiTwo = 'https://preview-logistics.lihaink.cn' //预上线 break; case 'local': - httpApi = 'http://192.168.1.25:8083' //预上线 - httpApiThree = 'http://192.168.1.25:8083' //预上线 + httpApi = 'http://192.168.1.23:8083' //预上线 + httpApiThree = 'http://192.168.1.23:8083' //预上线 httpApiTwo = 'https://ceshi-logistics.lihaink.cn' //测试环境 break; default: diff --git a/pages.json b/pages.json index e2400e8..45996c1 100644 --- a/pages.json +++ b/pages.json @@ -26,7 +26,7 @@ "style": { "navigationBarTitleText": "首笔消费金额", "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#0122C7", + "navigationBarBackgroundColor": "#2B63E3", "navigationBarTextStyle": "white" } }, diff --git a/pages/oaHome/FirstOrderLog.vue b/pages/oaHome/FirstOrderLog.vue index d737a38..eabc9c3 100644 --- a/pages/oaHome/FirstOrderLog.vue +++ b/pages/oaHome/FirstOrderLog.vue @@ -1,6 +1,5 @@ @@ -23,20 +82,33 @@ flag: false, status: "", page_no: 0, - page_size: 20 + page_size: 20, + money: "", + show: true, + list: [], } }, methods: { async getFirstOrderLogList() { let res = await getFirstOrderLog() - console.log(res) - this.orderList = res.data + // for (let key in res.data.lists) { + // this.orderList.push(res.data.lists[key]) + // } + this.orderList = res.data.lists + console.log(this.orderList) + // res.data.lists.forEach(item => { + // console.log(item) + // }) } }, - mounted() { + onLoad(option) { this.getFirstOrderLogList() - }, + this.money = Number(option.money) + // setTimeout(() => { + // this.show = true + // }, 3000) + } // onReachBottom() { // if (this.flag) return // let { @@ -63,17 +135,81 @@ \ No newline at end of file diff --git a/pages/oaHome/accountLog.vue b/pages/oaHome/accountLog.vue index 8658743..d828190 100644 --- a/pages/oaHome/accountLog.vue +++ b/pages/oaHome/accountLog.vue @@ -102,6 +102,10 @@