diff --git a/api/member.js b/api/member.js index 58dd7fc..9ff6717 100644 --- a/api/member.js +++ b/api/member.js @@ -29,9 +29,14 @@ export const getUserInfo = (data) => { return http({ method: 'POST', url: '/api/my/userInfo', - data: data, - header:{ - token:'014de5283d2930af6481ede591afd087' - } + data: data + }) +} + +export const updateUserInfo = (data) => { + return http({ + method: 'POST', + url: '/api/my/updateUserInfo', + data: data }) } \ No newline at end of file diff --git a/components/IndexCard.vue b/components/IndexCard.vue index 176fc6a..8bd62df 100644 --- a/components/IndexCard.vue +++ b/components/IndexCard.vue @@ -18,9 +18,8 @@ - - - + + @@ -97,10 +96,14 @@ const priceColor = computed(() => { return props.isRising ? "#00C853" : "#FF1744"; }); -// 计算图表背景色 -const chartBgColor = computed(() => { - return props.isRising ? "#E8F5E8" : "#FFEBEE"; +const timeChart = computed(() => { + return props.isRising ? "/static/marketSituation-image/upTimeChart.png" : "/static/marketSituation-image/downTimeChart.png"; }); + +// 计算图表背景色 +// const chartBgColor = computed(() => { +// return props.isRising ? "#E8F5E8" : "#FFEBEE"; +// }); diff --git a/components/h-loading.vue b/components/h-loading.vue new file mode 100644 index 0000000..8bf1873 --- /dev/null +++ b/components/h-loading.vue @@ -0,0 +1,54 @@ + + + + + + + diff --git a/package.json b/package.json index 14c932c..6bf25b1 100644 --- a/package.json +++ b/package.json @@ -1,4 +1,8 @@ { + "scripts": { + "dev:h5": "cross-env NODE_OPTIONS=\"--max-old-space-size=4096\" uni build --watch", + "build:h5": "cross-env NODE_OPTIONS=\"--max-old-space-size=4096\" uni build" + }, "dependencies": { "@dcloudio/uni-ui": "^1.5.11", "@element-plus/icons-vue": "^2.3.2", @@ -8,5 +12,8 @@ "pinia": "^3.0.3", "pinia-plugin-persistedstate": "^4.5.0", "vue-i18n": "^9.14.5" + }, + "devDependencies": { + "cross-env": "^7.0.3" } } diff --git a/pages/home/member.vue b/pages/home/member.vue index 3c02820..2ea2bb9 100644 --- a/pages/home/member.vue +++ b/pages/home/member.vue @@ -1,317 +1,367 @@ \ No newline at end of file diff --git a/pages/marketSituation/globalIndex.vue b/pages/marketSituation/globalIndex.vue index 43e573e..40fff44 100644 --- a/pages/marketSituation/globalIndex.vue +++ b/pages/marketSituation/globalIndex.vue @@ -2,6 +2,8 @@