diff --git a/miniprogram/pages/index/index.wxml b/miniprogram/pages/index/index.wxml index 2e9a617..27da0bc 100644 --- a/miniprogram/pages/index/index.wxml +++ b/miniprogram/pages/index/index.wxml @@ -17,7 +17,7 @@ {{times.formatDate(item.date) || "-"}} | {{item.oppositeCompany}} {{item.type=='finance_type_income'?'+':item.type=='finance_type_expenditure'?'-':''}}{{item.amount}} - + 删除 diff --git a/miniprogram/pages/login/login.scss b/miniprogram/pages/login/login.scss index 808cb05..c4c27bb 100644 --- a/miniprogram/pages/login/login.scss +++ b/miniprogram/pages/login/login.scss @@ -21,6 +21,7 @@ position: absolute; left: 0; top: 0; + z-index: -1; } .avatar_login { margin-left: 64rpx; @@ -33,6 +34,11 @@ --td-button-primary-text-color: #ffffff; } } + .nickname { + margin-left: 24rpx; + color: #ffffff; + font-size: x-large; + } } .vip-card { position: absolute; diff --git a/miniprogram/pages/login/login.ts b/miniprogram/pages/login/login.ts index 272b752..e550e1f 100644 --- a/miniprogram/pages/login/login.ts +++ b/miniprogram/pages/login/login.ts @@ -8,6 +8,7 @@ Page({ */ data: { authToken: null, + user: null, }, loginWithWeChat(e: any) { @@ -20,6 +21,9 @@ Page({ setToken(response.token); getInfo(response.token).then((resp: any) => { getApp().globalData.permissions = resp.permissions; + this.setData({ + user: resp.user, + }); }); }); }, @@ -38,6 +42,14 @@ Page({ this.setData({ authToken, }); + if (authToken) { + getInfo(authToken).then((resp: any) => { + const { user } = resp; + this.setData({ + user, + }); + }); + } }, /** diff --git a/miniprogram/pages/login/login.wxml b/miniprogram/pages/login/login.wxml index 33caa13..4051f76 100644 --- a/miniprogram/pages/login/login.wxml +++ b/miniprogram/pages/login/login.wxml @@ -8,6 +8,7 @@ + {{user.nickname}} 中科九章管理层 diff --git a/miniprogram/pages/stock/stock.json b/miniprogram/pages/stock/stock.json index 68c61df..f73d14c 100644 --- a/miniprogram/pages/stock/stock.json +++ b/miniprogram/pages/stock/stock.json @@ -1,6 +1,7 @@ { "usingComponents": { "t-fab": "tdesign-miniprogram/fab/fab", + "t-sticky": "tdesign-miniprogram/sticky/sticky", "statistics-card": "/components/statistics-card" }, "enablePullDownRefresh": true diff --git a/miniprogram/pages/stock/stock.scss b/miniprogram/pages/stock/stock.scss index b489d3f..1f03153 100644 --- a/miniprogram/pages/stock/stock.scss +++ b/miniprogram/pages/stock/stock.scss @@ -5,10 +5,12 @@ page { padding-top: 32rpx; } -.stock-tabs { +.stock-stick { margin: 16rpx 32rpx 0; - border-radius: 18rpx; - overflow: hidden; + .stock-tabs { + border-radius: 18rpx; + overflow: hidden; + } } .stock-list { padding: 16rpx 0 32rpx; diff --git a/miniprogram/pages/stock/stock.wxml b/miniprogram/pages/stock/stock.wxml index 96e3c48..65ce1a7 100644 --- a/miniprogram/pages/stock/stock.wxml +++ b/miniprogram/pages/stock/stock.wxml @@ -4,13 +4,15 @@ - - - - - - - + + + + + + + + +