From 89288a96ea7b33767ee1e50ffe4960d767be5e9d Mon Sep 17 00:00:00 2001
From: cclu <1106109051@qq.com>
Date: Fri, 2 Aug 2024 20:19:32 +0800
Subject: [PATCH] update
---
App.vue | 6 +-
pages.json | 2 +-
pages/settlementApproval/index.vue | 583 +++++++++++-------
.../images/settlementApproval/bottomArrow.png | Bin 0 -> 384 bytes
static/images/settlementApproval/filter.png | Bin 0 -> 837 bytes
static/images/settlementApproval/pageBg.png | Bin 0 -> 120913 bytes
.../images/settlementApproval/serviceIcon.png | Bin 0 -> 4665 bytes
store/store.js | 6 +-
8 files changed, 368 insertions(+), 229 deletions(-)
create mode 100644 static/images/settlementApproval/bottomArrow.png
create mode 100644 static/images/settlementApproval/filter.png
create mode 100644 static/images/settlementApproval/pageBg.png
create mode 100644 static/images/settlementApproval/serviceIcon.png
diff --git a/App.vue b/App.vue
index c22e9b6..77aa792 100644
--- a/App.vue
+++ b/App.vue
@@ -16,7 +16,7 @@
...mapActions(['memberLogin','getLoginCode']),
...mapMutations(['setVisitChannels']),
},
- onLaunch: function(options) {
+ onLaunch: async function(options) {
uni.getSystemInfo({
success: function(e) {
// #ifndef MP
@@ -43,9 +43,9 @@
let _this = this
console.log('app',this.user.WeChat_MiniProToken)
if (this.user.WeChat_MiniProToken) {
- this.memberLogin() // 获取用户数据
+ await this.memberLogin() // 获取用户数据
} else {
- this.getLoginCode()
+ await this.getLoginCode()
}
this.setVisitChannels(options.scene)
diff --git a/pages.json b/pages.json
index 17cc2dd..1abd2de 100644
--- a/pages.json
+++ b/pages.json
@@ -93,7 +93,7 @@
"style":
{
"enablePullDownRefresh": true,
- "navigationBarTitleText": "结算审批"
+ "navigationStyle": "custom"
}
},
{
diff --git a/pages/settlementApproval/index.vue b/pages/settlementApproval/index.vue
index fc5d611..9adb486 100644
--- a/pages/settlementApproval/index.vue
+++ b/pages/settlementApproval/index.vue
@@ -1,87 +1,124 @@
-
-
-
+
+
+
+