diff --git a/App.vue b/App.vue index c63ad94..d0da787 100644 --- a/App.vue +++ b/App.vue @@ -69,7 +69,15 @@ flex-direction: row; justify-content: flex-end; } - +.flex-r{ + display: flex; + flex-direction: row; + align-items: center; +} +.flex-col{ + display: flex; + flex-direction: column; +} .text-white{ color:#fff; } diff --git a/components/common/header.vue b/components/common/header.vue index 741ad7b..95d1c40 100644 --- a/components/common/header.vue +++ b/components/common/header.vue @@ -8,7 +8,10 @@ - {{title}} + + + + {{title}} @@ -39,6 +42,10 @@ type:Boolean, default:false }, + isMid:{ + type:Boolean, + default:false + }, title:{ type:String, default:'' diff --git a/main.js b/main.js index ca6205d..39ce42c 100644 --- a/main.js +++ b/main.js @@ -6,6 +6,7 @@ let i18nConfig = { messages } +window.wx = {} // #ifndef VUE3 import Vue from 'vue' import VueI18n from 'vue-i18n' diff --git a/package-lock.json b/package-lock.json index 2b4a0a2..a5c1f2c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -111,6 +111,15 @@ "gopd": "^1.2.0" } }, + "echarts": { + "version": "5.6.0", + "resolved": "https://registry.npmmirror.com/echarts/-/echarts-5.6.0.tgz", + "integrity": "sha512-oTbVTsXfKuEhxftHqL5xprgLoc0k7uScAwtryCgWF6hPYFLRwOUHiFmHGCBKP5NPFNkDVopOieyUqYGH8Fa3kA==", + "requires": { + "tslib": "2.3.0", + "zrender": "5.6.1" + } + }, "es-define-property": { "version": "1.0.1", "resolved": "https://registry.npmmirror.com/es-define-property/-/es-define-property-1.0.1.tgz", @@ -293,6 +302,19 @@ "object-inspect": "^1.13.3", "side-channel-map": "^1.0.1" } + }, + "tslib": { + "version": "2.3.0", + "resolved": "https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz", + "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==" + }, + "zrender": { + "version": "5.6.1", + "resolved": "https://registry.npmmirror.com/zrender/-/zrender-5.6.1.tgz", + "integrity": "sha512-OFXkDJKcrlx5su2XbzJvj/34Q3m6PvyCZkVPHGYpcCJ52ek4U/ymZyfuV1nKE23AyBJ51E/6Yr0mhZ7xGTO4ag==", + "requires": { + "tslib": "2.3.0" + } } } } diff --git a/package.json b/package.json index a2ee879..70d43bf 100644 --- a/package.json +++ b/package.json @@ -77,6 +77,7 @@ "axios-adapter-uniapp": "^0.1.4", "axios-miniprogram-adapter": "^0.3.4", "crypto-js": "^4.2.0", + "echarts": "^5.1.2", "dayjs": "^1.11.13", "qs": "^6.14.0" } diff --git a/pages.json b/pages.json index e5808f0..edc7cb2 100644 --- a/pages.json +++ b/pages.json @@ -47,6 +47,12 @@ "navigationStyle": "custom" } }, + { + "path": "pages/user/finance", + "style": { + "navigationStyle": "custom" + } + }, { "path": "pages/contract/check", "style": { diff --git a/pages/mine/mine.vue b/pages/mine/mine.vue index ab0bae0..fca2361 100644 --- a/pages/mine/mine.vue +++ b/pages/mine/mine.vue @@ -303,7 +303,7 @@ export default { id: 12, title: "财务", url: '/static/mine/tool_cw.png', - path: "/pages/finance/finance", + path: "/pages/user/finance", }, { id: 11, title: "股东行权", diff --git a/pages/user/finance.vue b/pages/user/finance.vue new file mode 100644 index 0000000..b10cd3d --- /dev/null +++ b/pages/user/finance.vue @@ -0,0 +1,260 @@ + + + + +