diff --git a/pages/readingHistory/index.json b/pages/readingHistory/index.json index 1b8b1af..ea7b734 100644 --- a/pages/readingHistory/index.json +++ b/pages/readingHistory/index.json @@ -5,7 +5,8 @@ "van-button": "@vant/weapp/button/index", "van-icon": "@vant/weapp/icon/index", "editModal": "./components/editModal/index", - "pagination": "/components/pagination/index" + "pagination": "/components/pagination/index", + "empty": "/components/empty/index" }, "navigationStyle": "custom" } \ No newline at end of file diff --git a/pages/readingHistory/index.wxml b/pages/readingHistory/index.wxml index 14e38f7..bd48965 100644 --- a/pages/readingHistory/index.wxml +++ b/pages/readingHistory/index.wxml @@ -1,6 +1,5 @@ -{{id}} @@ -41,7 +40,7 @@ - + diff --git a/pages/workBench/index.js b/pages/workBench/index.js index 2b08c44..4b09d20 100644 --- a/pages/workBench/index.js +++ b/pages/workBench/index.js @@ -5,7 +5,7 @@ Page({ * 页面的初始数据 */ data: { - active: 1 + active: 0 }, /** diff --git a/pages/writeReading/components/meterInfo/index.wxss b/pages/writeReading/components/meterInfo/index.wxss index 311201b..6a98381 100644 --- a/pages/writeReading/components/meterInfo/index.wxss +++ b/pages/writeReading/components/meterInfo/index.wxss @@ -30,4 +30,8 @@ display: flex; justify-content: space-between; font-size: 30rpx; +} + +.wrapper > .title { + font-size: 32rpx; } \ No newline at end of file diff --git a/pages/writeReading/components/meterList/index.wxss b/pages/writeReading/components/meterList/index.wxss index 17aa19c..4195376 100644 --- a/pages/writeReading/components/meterList/index.wxss +++ b/pages/writeReading/components/meterList/index.wxss @@ -6,6 +6,7 @@ .title { margin-top: 20rpx; + font-size: 32rpx; } .meterListScrollView { diff --git a/pages/writeReading/components/readingInfo/index.wxml b/pages/writeReading/components/readingInfo/index.wxml index 83ff7f5..68c4a97 100644 --- a/pages/writeReading/components/readingInfo/index.wxml +++ b/pages/writeReading/components/readingInfo/index.wxml @@ -61,9 +61,9 @@ /> - + diff --git a/pages/writeReading/components/readingInfo/index.wxss b/pages/writeReading/components/readingInfo/index.wxss index 7278d2c..5b7f38c 100644 --- a/pages/writeReading/components/readingInfo/index.wxss +++ b/pages/writeReading/components/readingInfo/index.wxss @@ -65,6 +65,7 @@ font-size: 42rpx; font-weight: 800; margin-top: 12rpx; + margin-bottom: 12rpx; } .readingNumber .lastTime { font-size: 32rpx; @@ -87,6 +88,10 @@ flex: 1; } +.currentNumber .title { + margin-bottom: 24rpx; +} + .calc { margin-top: 24rpx; } diff --git a/project.private.config.json b/project.private.config.json index f3e205e..9ce3337 100644 --- a/project.private.config.json +++ b/project.private.config.json @@ -26,7 +26,7 @@ { "name": "pages/writeReading/index", "pathName": "pages/writeReading/index", - "query": "id=PR00117566262804481", + "query": "id=PR00118027286020097", "launchMode": "default", "scene": null },