From 4b6fcb8940f8f1f35fbdb9e3d8f875a9bf66318e Mon Sep 17 00:00:00 2001
From: 边少东 <2879594283@qq.com>
Date: Fri, 16 Sep 2022 09:00:33 +0800
Subject: [PATCH] feat:部分静态页面调整
---
app.json | 12 ++++++------
app.wxss | 14 +++++++-------
img/answer/1.png | Bin 0 -> 2578 bytes
img/answer/2.png | Bin 0 -> 2967 bytes
img/answer/3.png | Bin 0 -> 3357 bytes
img/answer/add.png | Bin 0 -> 13040 bytes
img/answer/back.png | Bin 0 -> 1655 bytes
img/answer/bck.png | Bin 0 -> 103087 bytes
img/answer/bj.png | Bin 0 -> 4177 bytes
img/answer/blue_bck.png | Bin 0 -> 60760 bytes
img/answer/blue_bck1.png | Bin 0 -> 69550 bytes
img/answer/dkjl.png | Bin 0 -> 1186 bytes
img/answer/english.png | Bin 0 -> 5208 bytes
img/answer/math.png | Bin 0 -> 6664 bytes
img/answer/red_rank.png | Bin 0 -> 182230 bytes
img/answer/sp.png | Bin 0 -> 853 bytes
img/answer/sp1.png | Bin 0 -> 4426 bytes
img/answer/succ.png | Bin 0 -> 64064 bytes
img/answer/tp.png | Bin 0 -> 1065 bytes
img/answer/tp1.png | Bin 0 -> 3913 bytes
img/answer/user.png | Bin 0 -> 3066 bytes
img/answer/yp.png | Bin 0 -> 1149 bytes
img/answer/yp1.png | Bin 0 -> 4457 bytes
img/answer/zdy.png | Bin 0 -> 3017 bytes
package-lock.json | 21 +++------------------
pages/index/index.js | 67 +++++++++++++++++++++++++++++--------------------------------------
pages/index/index.json | 5 ++++-
pages/index/index.wxml | 82 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------
pages/index/index.wxss | 193 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
pages/index/newPunch/newPunch.js | 12 ++++++++++++
pages/index/newPunch/newPunch.json | 9 +++++++--
pages/index/newPunch/newPunch.wxml | 88 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------
pages/index/newPunch/newPunch.wxss | 81 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
pages/index/rank/rank.js | 5 +++++
pages/index/rank/rank.json | 2 +-
pages/index/rank/rank.wxml | 36 +++++++++++++++++++++++++++++++-----
pages/index/rank/rank.wxss | 83 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
pages/mine/index.wxml | 28 +++++++++++++++++++++-------
pages/mine/index.wxss | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
pages/mine/record/record.js | 12 ++++--------
pages/mine/record/record.json | 6 ++++--
pages/mine/record/record.wxml | 65 ++++++++++++++++++++++++++++++++++++++++++++++++-----------------
pages/mine/record/record.wxss | 108 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
43 files changed, 852 insertions(+), 136 deletions(-)
create mode 100644 img/answer/1.png
create mode 100644 img/answer/2.png
create mode 100644 img/answer/3.png
create mode 100644 img/answer/add.png
create mode 100644 img/answer/back.png
create mode 100644 img/answer/bck.png
create mode 100644 img/answer/bj.png
create mode 100644 img/answer/blue_bck.png
create mode 100644 img/answer/blue_bck1.png
create mode 100644 img/answer/dkjl.png
create mode 100644 img/answer/english.png
create mode 100644 img/answer/math.png
create mode 100644 img/answer/red_rank.png
create mode 100644 img/answer/sp.png
create mode 100644 img/answer/sp1.png
create mode 100644 img/answer/succ.png
create mode 100644 img/answer/tp.png
create mode 100644 img/answer/tp1.png
create mode 100644 img/answer/user.png
create mode 100644 img/answer/yp.png
create mode 100644 img/answer/yp1.png
create mode 100644 img/answer/zdy.png
diff --git a/app.json b/app.json
index 3c02d55..b2a9897 100644
--- a/app.json
+++ b/app.json
@@ -1,21 +1,21 @@
{
"pages": [
- "pages/index/index",
- "pages/index/rank/rank",
+ "pages/index/index",
+ "pages/mine/record/record",
+ "pages/mine/index",
+ "pages/index/rank/rank",
+ "pages/index/newPunch/newPunch",
"pages/index/achievement/achievement",
"pages/index/punchDetail/punchDetail",
- "pages/index/newPunch/newPunch",
"pages/login/codeLogin/codeLogin",
"pages/login/protocol/protocol",
"pages/login/policy/policy",
- "pages/mine/index",
- "pages/mine/record/record",
"pages/webview/webview"
],
"window": {
"backgroundTextStyle": "dark",
"navigationBarBackgroundColor": "#fff",
- "navigationBarTitleText": "计划管家",
+ "navigationBarTitleText": "打卡管理",
"navigationBarTextStyle": "black"
},
"tabBar": {
diff --git a/app.wxss b/app.wxss
index 0fdfe64..8ee14af 100644
--- a/app.wxss
+++ b/app.wxss
@@ -1,9 +1,9 @@
-/* @import "/miniprogram_npm/@vant/weapp/common/index.wxss"; */
-page{
+@import "/miniprogram_npm/@vant/weapp/common/index.wxss";
+/* page{
background: #fff;
-}
+} */
/* 二级页面顶部统一返回按钮,位置可能需要根据机型调整 */
-.navigation_back{
+/* .navigation_back{
width: 80rpx;
height: 80rpx;
border: 1px solid rgb(255, 207, 105);
@@ -14,9 +14,9 @@ page{
display: flex;
align-items: center;
justify-content: center;
-}
+} */
/* 临时文件,设计稿图 */
-.temporary{
+/* .temporary{
width: 100%;
position: absolute;
top: 0;
@@ -25,4 +25,4 @@ page{
.temporary_box{
border: 1px solid rgb(255, 207, 105);
z-index: 98;
-}
\ No newline at end of file
+} */
\ No newline at end of file
diff --git a/img/answer/1.png b/img/answer/1.png
new file mode 100644
index 0000000..c30ac91
Binary files /dev/null and b/img/answer/1.png differ
diff --git a/img/answer/2.png b/img/answer/2.png
new file mode 100644
index 0000000..f876211
Binary files /dev/null and b/img/answer/2.png differ
diff --git a/img/answer/3.png b/img/answer/3.png
new file mode 100644
index 0000000..3082c4c
Binary files /dev/null and b/img/answer/3.png differ
diff --git a/img/answer/add.png b/img/answer/add.png
new file mode 100644
index 0000000..067fb4d
Binary files /dev/null and b/img/answer/add.png differ
diff --git a/img/answer/back.png b/img/answer/back.png
new file mode 100644
index 0000000..48126e1
Binary files /dev/null and b/img/answer/back.png differ
diff --git a/img/answer/bck.png b/img/answer/bck.png
new file mode 100644
index 0000000..795d7c0
Binary files /dev/null and b/img/answer/bck.png differ
diff --git a/img/answer/bj.png b/img/answer/bj.png
new file mode 100644
index 0000000..f9ac799
Binary files /dev/null and b/img/answer/bj.png differ
diff --git a/img/answer/blue_bck.png b/img/answer/blue_bck.png
new file mode 100644
index 0000000..f753119
Binary files /dev/null and b/img/answer/blue_bck.png differ
diff --git a/img/answer/blue_bck1.png b/img/answer/blue_bck1.png
new file mode 100644
index 0000000..d87d963
Binary files /dev/null and b/img/answer/blue_bck1.png differ
diff --git a/img/answer/dkjl.png b/img/answer/dkjl.png
new file mode 100644
index 0000000..6a95faa
Binary files /dev/null and b/img/answer/dkjl.png differ
diff --git a/img/answer/english.png b/img/answer/english.png
new file mode 100644
index 0000000..89f63fe
Binary files /dev/null and b/img/answer/english.png differ
diff --git a/img/answer/math.png b/img/answer/math.png
new file mode 100644
index 0000000..bd0d49f
Binary files /dev/null and b/img/answer/math.png differ
diff --git a/img/answer/red_rank.png b/img/answer/red_rank.png
new file mode 100644
index 0000000..4e36ef3
Binary files /dev/null and b/img/answer/red_rank.png differ
diff --git a/img/answer/sp.png b/img/answer/sp.png
new file mode 100644
index 0000000..433fbf2
Binary files /dev/null and b/img/answer/sp.png differ
diff --git a/img/answer/sp1.png b/img/answer/sp1.png
new file mode 100644
index 0000000..1897dfb
Binary files /dev/null and b/img/answer/sp1.png differ
diff --git a/img/answer/succ.png b/img/answer/succ.png
new file mode 100644
index 0000000..b465aab
Binary files /dev/null and b/img/answer/succ.png differ
diff --git a/img/answer/tp.png b/img/answer/tp.png
new file mode 100644
index 0000000..af3b1d9
Binary files /dev/null and b/img/answer/tp.png differ
diff --git a/img/answer/tp1.png b/img/answer/tp1.png
new file mode 100644
index 0000000..273a2fc
Binary files /dev/null and b/img/answer/tp1.png differ
diff --git a/img/answer/user.png b/img/answer/user.png
new file mode 100644
index 0000000..6fc082d
Binary files /dev/null and b/img/answer/user.png differ
diff --git a/img/answer/yp.png b/img/answer/yp.png
new file mode 100644
index 0000000..c865a73
Binary files /dev/null and b/img/answer/yp.png differ
diff --git a/img/answer/yp1.png b/img/answer/yp1.png
new file mode 100644
index 0000000..2bbb62c
Binary files /dev/null and b/img/answer/yp1.png differ
diff --git a/img/answer/zdy.png b/img/answer/zdy.png
new file mode 100644
index 0000000..1132319
Binary files /dev/null and b/img/answer/zdy.png differ
diff --git a/package-lock.json b/package-lock.json
index 3ef21d8..27928ac 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,23 +1,8 @@
{
- "name": "sxhClockIn",
- "version": "2.0.0",
- "lockfileVersion": 2,
+ "name": "sxh_clock_in",
+ "version": "1.0.0",
+ "lockfileVersion": 1,
"requires": true,
- "packages": {
- "": {
- "name": "sxhClockIn",
- "version": "2.0.0",
- "license": "ISC",
- "dependencies": {
- "@vant/weapp": "^1.10.5"
- }
- },
- "node_modules/@vant/weapp": {
- "version": "1.10.5",
- "resolved": "https://registry.npmmirror.com/@vant/weapp/-/weapp-1.10.5.tgz",
- "integrity": "sha512-bAHp9r0ZiRsOqPOLzQHI/ZvkAlXzol1/TFhM70MyghuxkzJTjcDUd8RIfLkCN3c1MCK/PfBGw2an8/afygftCg=="
- }
- },
"dependencies": {
"@vant/weapp": {
"version": "1.10.5",
diff --git a/pages/index/index.js b/pages/index/index.js
index 0cc9351..33aecc3 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -4,63 +4,54 @@ import request from '../../api/request.js'
Page({
data: {
- showAdd: false, //新建打卡
- tabindex: 1,
+ active: 1,
+ showAdd: false,
+ tempList: [
+ {name:'自定义模板',url: '/img/answer/zdy.png'},
+ {name:'英语模板',url: '/img/answer/english.png'},
+ {name:'数学模板',url: '/img/answer/math.png'},
+ ]
// bannerList: [], // 轮播图
},
- /**
- * 生命周期函数--监听页面加载
- */
- onLoad: function (options) {
- // this.getBannerList() //获取banner
- },
- onShow:function (options) {
+ checkTabs(e) {
+ let index = e.currentTarget.dataset.index
this.setData({
- showAdd:false
- })
- },
- // 排行榜
- handleRank(){
- wx.navigateTo({
- url: '/pages/index/rank/rank',
- })
- },
- handleTab1() {
- this.setData({
- tabindex: 1
- })
+ active: index
+ }) //修改参数
},
- handleTab2() {
- this.setData({
- tabindex: 2
- })
- },
- handleAdd() {
+ //打卡
+ toShow(e) {
this.setData({
showAdd: true
})
},
+ //关闭
closeAdd() {
this.setData({
showAdd: false
})
},
- // 打卡成果
- handleAchievement(){
+ //查看排行榜
+ toRank() {
wx.navigateTo({
- url: '/pages/index/achievement/achievement',
+ url: `../index/rank/rank`
})
},
- // 去打卡
- handleDetail(){
+ //选择模板
+ toPunch() {
wx.navigateTo({
- url: '/pages/index/punchDetail/punchDetail',
+ url: `../index/newPunch/newPunch`
})
},
- // 自定义模板
- handleNewPunch(){
- wx.navigateTo({
- url: '/pages/index/newPunch/newPunch',
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad: function (options) {
+ // this.getBannerList() //获取banner
+ },
+ onShow: function (options) {
+ this.setData({
+ showAdd: false
})
},
// 获取banner图
diff --git a/pages/index/index.json b/pages/index/index.json
index 1e25e3c..26034cf 100644
--- a/pages/index/index.json
+++ b/pages/index/index.json
@@ -1,6 +1,9 @@
{
"usingComponents": {
- "van-popup": "@vant/weapp/popup/index"
+ "van-popup": "@vant/weapp/popup/index",
+ "van-tab": "@vant/weapp/tab/index",
+ "van-tabs": "@vant/weapp/tabs/index",
+ "van-progress": "@vant/weapp/progress/index"
},
"navigationBarTextStyle": "black",
"navigationStyle": "custom"
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 7858405..055a9b7 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -1,21 +1,67 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+ 立即查看
+
+ 我的打卡
+ 我创建的
+
+
+
+
+
+
+
+
+
+ 英语单词每日打卡
+ 我发布于09-09 08:21
+
+
+ 每日20个英文单词背诵
+ 已坚持打卡
+ 1/50 天
+
+
+
+
+
+ 打卡频次:
+ 每天
+
+
+ 打卡要求:
+ 需填写单词个数
+
+
+ 其他:
+ 不允许补卡
+
+
+
+ 打卡成果
+
+ 去打卡
+
+
+
+
+
+
+
+
+
+
+ 选择模板
+
+
+
+ {{value.name}}
+
+
+
-
\ No newline at end of file
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index e69de29..a578680 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -0,0 +1,193 @@
+.bck {
+ position: absolute;
+ top: 0;
+ left: 0;
+ width: 100%;
+ height: 250px;
+ z-index: -1;
+ background-size: 100% 100%;
+}
+
+.box {
+ padding: 100px 7vw 0;
+ box-sizing: border-box;
+}
+
+.title_name {
+ font-size: 7vw;
+ font-weight: bold;
+ letter-spacing: 1.5vw;
+ color: #fff;
+ margin-bottom: 20px;
+}
+
+.title_view {
+ height: 20px;
+ font-size: 4.8vw;
+ letter-spacing: 0.5vw;
+ color: #fff;
+ opacity: 0.7;
+}
+
+.tabs_css {
+ margin: 30px 0;
+ display: flex;
+}
+
+.tabs_item {
+ margin-right: 20px;
+ font-size: 4.3vw;
+ color: #fff;
+}
+
+.check {}
+
+.no_check {
+ opacity: 0.6;
+}
+
+/**/
+.white_box {
+ width: 100vw;
+ min-height: 650px;
+ /* background-color: rebeccapurple; */
+ background-color: #F5F6FA;
+ border-top-left-radius: 8vw;
+ border-top-right-radius: 8vw;
+ padding: 10vw 5vw;
+ box-sizing: border-box;
+}
+
+.card {
+ width: 90vw;
+ height: 390px;
+ background-color: #fff;
+ border-radius: 8vw;
+ padding: 8vw 7vw;
+ box-sizing: border-box;
+ box-shadow: 1px 1px 1px 1px rgb(196, 196, 196);
+}
+
+.card_title {
+ display: flex;
+}
+
+.title_L {
+ flex-shrink: 0;
+ width: 50px;
+ height: 50px;
+ margin-right: 15px;
+}
+
+.title_pic {
+ width: 100%;
+ height: 100%;
+}
+
+.title_R {
+ height: 50px;
+ display: flex;
+ align-content: space-between;
+ flex-wrap: wrap;
+ font-size: 4.6vw;
+}
+
+.grey_font {
+ width: 100%;
+ color: #999;
+ font-size: 3.8vw;
+}
+
+.day_font {
+ margin: 20px 0 20px;
+ letter-spacing: 0.2vw;
+ font-size: 4vw;
+}
+
+.day_font2 {
+ margin: 20px 0;
+ letter-spacing: 0.2vw;
+ font-size: 3.8vw;
+}
+
+.day_font2_large {
+ font-size: 5.5vw;
+ font-weight: bold;
+}
+
+.flex_font {
+ font-size: 3.5vw;
+ margin: 20px 0;
+ display: flex;
+}
+
+.grey_flex {
+ width: 80px;
+ color: #999;
+}
+
+.grey_line {
+ width: 100%;
+ height: 1px;
+ background-color: #E5E5E5;
+}
+
+.blue_line {
+ width: 1px;
+ height: 20px;
+ background-color: #EAEAEA;
+}
+
+.blue_font {
+ display: flex;
+ justify-content: space-around;
+ margin-top: 20px;
+ font-size: 4.1vw;
+ color: #4C92F9;
+}
+
+.blue_tip {
+ position: fixed;
+ bottom: 40px;
+ right: 3vw;
+}
+
+.img_tip {
+ width: 70px;
+ height: 70px;
+}
+
+.pop_card {
+ padding: 5vw;
+ box-sizing: border-box;
+}
+
+.pop_title {
+ font-size: 4.8vw;
+ font-weight: bold;
+ letter-spacing: 1px;
+ margin-bottom: 30px;
+}
+
+.tem_box {
+ display: flex;
+ flex-wrap: wrap;
+}
+
+.tem_item {
+ width: 23vw;
+ height: 170px;
+ text-align: center;
+ margin: 0 3vw 30px;
+}
+
+.tem_pic {
+ width: 23vw;
+ height: 120px;
+ border-radius: 10px;
+}
+
+.tem_font {
+ font-size: 3.9vw;
+ margin-top: 10px;
+}
\ No newline at end of file
diff --git a/pages/index/newPunch/newPunch.js b/pages/index/newPunch/newPunch.js
index f06fce9..6ce0edf 100644
--- a/pages/index/newPunch/newPunch.js
+++ b/pages/index/newPunch/newPunch.js
@@ -5,8 +5,20 @@ Page({
* 页面的初始数据
*/
data: {
+ form: {
+ biaoti: '',
+ message: '',
+ checked: true
+ }
},
+ //输入
+ onfieldChange() {
+ },
+ //开关
+ onswitchChange({detail }) {
+ this.setData({ 'form.checked': detail });
+ },
/**
* 生命周期函数--监听页面加载
*/
diff --git a/pages/index/newPunch/newPunch.json b/pages/index/newPunch/newPunch.json
index e15d6dd..f3debcf 100644
--- a/pages/index/newPunch/newPunch.json
+++ b/pages/index/newPunch/newPunch.json
@@ -1,6 +1,11 @@
{
"usingComponents": {
- "van-icon": "@vant/weapp/icon/index"
+ "van-icon": "@vant/weapp/icon/index",
+ "van-cell-group": "@vant/weapp/cell-group/index",
+ "van-field": "@vant/weapp/field/index",
+ "van-cell": "@vant/weapp/cell/index",
+ "van-switch": "@vant/weapp/switch/index",
+ "van-button": "@vant/weapp/button/index"
},
- "navigationStyle": "custom"
+ "navigationBarTitleText": "自定义打卡"
}
\ No newline at end of file
diff --git a/pages/index/newPunch/newPunch.wxml b/pages/index/newPunch/newPunch.wxml
index 1680602..a22c8c5 100644
--- a/pages/index/newPunch/newPunch.wxml
+++ b/pages/index/newPunch/newPunch.wxml
@@ -1,11 +1,87 @@
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 需要提交数据
+
+
+
+
+
+
+
+
+
+
+
+ 允许补卡
+
+
+
+
+
+ 开启后,在打卡周期内,学生家长可对未打卡的任务进行补卡。
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 学生如缺卡达到一定条件,将会提醒家长
+
+
+
+
+
+
+
+
+ 创建打卡
+
\ No newline at end of file
diff --git a/pages/index/newPunch/newPunch.wxss b/pages/index/newPunch/newPunch.wxss
index 3eaf729..41408ad 100644
--- a/pages/index/newPunch/newPunch.wxss
+++ b/pages/index/newPunch/newPunch.wxss
@@ -1 +1,82 @@
/* pages/index/newPunch/newPunch.wxss */
+.punch_detail {
+ position: absolute;
+ width: 100vw;
+ min-height: 100vh;
+ background-color: #F5F6FA;
+}
+
+.title_card {
+ margin: 15px 0;
+}
+
+.grey_line {
+ width: 80vw;
+ height: 1px;
+}
+
+.box_card {
+ width: 100vw;
+ min-height: 120px;
+ background-color: #fff;
+}
+
+.tip_card {
+ padding: 20px;
+ box-sizing: border-box;
+ display: flex;
+ background-color: #fff;
+}
+
+.tip_item {
+ width: 70px;
+ height: 30px;
+ margin-right: 5vw;
+}
+
+.pic {
+ width: 100%;
+ height: 100%;
+}
+
+.white_card {
+ width: 100vw;
+ background-color: #fff;
+ padding: 20px 15px;
+ box-sizing: border-box;
+ display: flex;
+ justify-content: space-between;
+}
+
+.bold_font {
+ font-weight: bold;
+}
+
+.white_card_nopadding {
+ width: 100vw;
+ background-color: #fff;
+ font-weight: bold;
+ height: 60px;
+ padding-top: 11px;
+ box-sizing: border-box;
+}
+
+.sm_grey_font {
+ padding: 15px 0 15px 20px;
+ box-sizing: border-box;
+ font-size: 12px;
+ color: #999;
+}
+
+.clearance {
+ width: 100vw;
+ height: 20px;
+}
+
+.btn {
+ width: 100vw;
+ height: 80px;
+ background-color: #fff;
+ padding: 20px 30px 80px;
+ box-sizing: border-box;
+}
\ No newline at end of file
diff --git a/pages/index/rank/rank.js b/pages/index/rank/rank.js
index f161f14..3c048a1 100644
--- a/pages/index/rank/rank.js
+++ b/pages/index/rank/rank.js
@@ -5,6 +5,11 @@ Page({
* 页面的初始数据
*/
data: {
+ rankList: [
+ {name: '小米',num: 20},
+ {name: '杰瑞',num: 110},
+ {name: '王小明',num: 75},
+ ]
},
/**
diff --git a/pages/index/rank/rank.json b/pages/index/rank/rank.json
index e15d6dd..1a9f6ec 100644
--- a/pages/index/rank/rank.json
+++ b/pages/index/rank/rank.json
@@ -2,5 +2,5 @@
"usingComponents": {
"van-icon": "@vant/weapp/icon/index"
},
- "navigationStyle": "custom"
+ "navigationBarTitleText": "排行榜"
}
\ No newline at end of file
diff --git a/pages/index/rank/rank.wxml b/pages/index/rank/rank.wxml
index 7b5daac..b7b48f8 100644
--- a/pages/index/rank/rank.wxml
+++ b/pages/index/rank/rank.wxml
@@ -1,9 +1,35 @@
-
-
-
-
+
+ 更新时间:2022-03-12
+
+
+
+
+ 陈浩然
+
+ 已坚持12天
+ 34次
+
+
+
+ 排名
+ 姓名
+
+ 打卡数
-
+
+
+
+
+
+ {{index + 1}}
+ {{value.name}}
+
+
+ 已坚持52天
+ 120
+
+
+
\ No newline at end of file
diff --git a/pages/index/rank/rank.wxss b/pages/index/rank/rank.wxss
index 964d586..f9457da 100644
--- a/pages/index/rank/rank.wxss
+++ b/pages/index/rank/rank.wxss
@@ -1 +1,84 @@
/* pages/index/rank/rank.wxss */
+.rank {
+ position: absolute;
+ width: 100vw;
+ min-height: 100vh;
+ background-size: 100% 100%;
+ padding: 0 5vw;
+ box-sizing: border-box;
+}
+.rank_time {
+ font-size: 4.4vw;
+ color: #fff;
+ opacity: 0.8;
+ margin-top: 105px;
+ margin-left: 2vw;
+}
+.white_box{
+ width: 90vw;
+ min-height: 70vh;
+ margin-top: 40px;
+ background-color: #fff;
+ border-radius: 4vw;
+ padding: 7vw 5vw;
+ box-sizing: border-box;
+}
+.title_box {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ font-size: 3.9vw;
+ font-weight: bold;
+ padding: 30px 5vw;
+ box-sizing: border-box;
+ border-radius: 5vw;
+ box-shadow: 1px 1px 1px 1px rgb(207, 206, 206);
+}
+.title_pic {
+ display: flex;
+ align-items: center;
+}
+.pic {
+ width: 25px;
+ height: 25px;
+ border-radius: 25px;
+ margin-right: 7px;
+}
+.red_title {
+ color: #FD676A;
+}
+.grey_title {
+ margin: 30px 0;
+ font-size: 4.5vw;
+ color: #999;
+ display: flex;
+ justify-content: space-between;
+}
+.table_L{
+ width: 28vw;
+ display: flex;
+ justify-content: space-between;
+}
+
+.table_item {
+ margin: 20px 0;
+ font-size: 4vw;
+ color: #333;
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+}
+.table_R {
+ width: 45vw;
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+}
+.grey_R {
+ color:#999;
+ font-size: 3.9vw;
+}
+.tem_pic {
+ width: 22px;
+ height: 28px;
+}
\ No newline at end of file
diff --git a/pages/mine/index.wxml b/pages/mine/index.wxml
index 28d20e6..8c2ce90 100644
--- a/pages/mine/index.wxml
+++ b/pages/mine/index.wxml
@@ -1,8 +1,22 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+ 陈浩然
+ 绍兴市高级中学.20级
+
+
+
+
+
+ 打卡记录
+
+
+
+
+ 退出登录
+
+
diff --git a/pages/mine/index.wxss b/pages/mine/index.wxss
index e69de29..3a0569e 100644
--- a/pages/mine/index.wxss
+++ b/pages/mine/index.wxss
@@ -0,0 +1,59 @@
+ .mine {
+ position: absolute;
+ width: 100vw;
+ min-height: 40vh;
+ background-size: 100% 100%;
+ padding: 140px 5vw 0;
+ box-sizing: border-box;
+ }
+ .title {
+ display: flex;
+ }
+ .pic {
+ width: 60px;
+ height: 60px;
+ border-radius: 60px;
+ }
+ .title_box {
+ margin-left: 20px;
+ display: flex;
+ align-content: space-between;
+ flex-wrap: wrap;
+ padding: 4px 0;
+ box-sizing: border-box;
+ }
+ .title_name {
+ font-size: 18px;
+ font-weight: bold;
+ }
+ .grey_title {
+ width: 100%;
+ font-size: 14px;
+ color: #999;
+ }
+ .flex_card {
+ display: flex;
+ justify-content: space-between;
+ padding: 20px 50px;
+ box-sizing: border-box;
+ box-shadow: 1px 1px 1px 1px rgb(224, 224, 224);
+ margin: 40px 0;
+ background-color: #fff;
+ border-radius: 20px;
+ }
+ .card_item {
+ text-align: center;
+ }
+ .card_pic {
+ width: 30px;
+ height: 30px;
+}
+.item_font {
+ margin-top: 10px;
+ color:#5A6694
+ }
+ .grey_line {
+ width: 1px ;
+ height: 60px;
+ background-color: #999;
+ }
\ No newline at end of file
diff --git a/pages/mine/record/record.js b/pages/mine/record/record.js
index eb5d7f7..1ad9dd7 100644
--- a/pages/mine/record/record.js
+++ b/pages/mine/record/record.js
@@ -5,7 +5,7 @@ Page({
* 页面的初始数据
*/
data: {
- tabindex: 1
+ tabindex: 0
},
/**
@@ -14,14 +14,10 @@ Page({
onLoad(options) {
},
- handleTab1() {
+ //切换
+ handleTab(e) {
this.setData({
- tabindex: 1
- })
- },
- handleTab2() {
- this.setData({
- tabindex: 2
+ tabindex: e.detail.index
})
},
// 打卡成果
diff --git a/pages/mine/record/record.json b/pages/mine/record/record.json
index e15d6dd..ca2b312 100644
--- a/pages/mine/record/record.json
+++ b/pages/mine/record/record.json
@@ -1,6 +1,8 @@
{
"usingComponents": {
- "van-icon": "@vant/weapp/icon/index"
+ "van-icon": "@vant/weapp/icon/index",
+ "van-tab": "@vant/weapp/tab/index",
+ "van-tabs": "@vant/weapp/tabs/index"
},
- "navigationStyle": "custom"
+ "navigationBarTitleText":"打卡记录"
}
\ No newline at end of file
diff --git a/pages/mine/record/record.wxml b/pages/mine/record/record.wxml
index e37988d..9a3175a 100644
--- a/pages/mine/record/record.wxml
+++ b/pages/mine/record/record.wxml
@@ -1,20 +1,51 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+ 进行中打卡
+
+
+
+
+
+
+ 英语单词每日打卡
+ 我发布于09-09 08:21
+
+
+ 每日20个英文单词背诵
+ 已坚持打卡
+ 1/50 天
+
+
+
+
+
+ 打卡频次:
+ 每天
+
+
+ 打卡要求:
+ 需填写单词个数
+
+
+ 其他:
+ 不允许补卡
+
+
+
+ 我的成果
+
+ 去打卡
+
+
+ 打卡成果
+
+
+
\ No newline at end of file
diff --git a/pages/mine/record/record.wxss b/pages/mine/record/record.wxss
index 00acfe8..91b8f3f 100644
--- a/pages/mine/record/record.wxss
+++ b/pages/mine/record/record.wxss
@@ -1 +1,109 @@
/* pages/index/record/record.wxss */
+.punch_detail {
+ position: absolute;
+ width: 100vw;
+ height: 100vh;
+ background-color: #F5F6FA;
+}
+
+.bck {
+ padding: 20px 4vw;
+ box-sizing: border-box;
+}
+
+.grey_font {
+ color: #999;
+ font-size: 14px;
+ margin-bottom: 15px;
+}
+
+/**/
+
+.card {
+ width: 92vw;
+ height: 360px;
+ background-color: #fff;
+ border-radius: 8vw;
+ padding: 8vw;
+ box-sizing: border-box;
+ box-shadow: 1px 1px 1px 1px rgb(228, 228, 228);
+}
+
+.card_title {
+ display: flex;
+}
+
+.title_L {
+ flex-shrink: 0;
+ width: 50px;
+ height: 50px;
+ margin-right: 15px;
+}
+
+.title_pic {
+ width: 100%;
+ height: 100%;
+}
+
+.title_R {
+ height: 65px;
+ display: flex;
+ align-content: space-between;
+ flex-wrap: wrap;
+ font-size: 4.6vw;
+}
+
+.grey_font {
+ width: 100%;
+ color: #999;
+ font-size: 3.8vw;
+}
+
+.day_font {
+ margin: 10px 0 20px;
+ letter-spacing: 0.2vw;
+ font-size: 4vw;
+}
+
+.day_font2 {
+ margin: 20px 0;
+ letter-spacing: 0.2vw;
+ font-size: 3.8vw;
+}
+
+.day_font2_large {
+ font-size: 5.5vw;
+ font-weight: bold;
+}
+
+.flex_font {
+ font-size: 3.5vw;
+ margin: 20px 0;
+ display: flex;
+}
+
+.grey_flex {
+ width: 80px;
+ color: #999;
+}
+
+.grey_line {
+ width: 100%;
+ height: 1px;
+ background-color: #EAEAEA;
+}
+
+.blue_font {
+ display: flex;
+ justify-content: space-around;
+ margin-top: 20px;
+ font-size: 4.1vw;
+ color: #458EF8;
+ font-weight: 540;
+}
+
+.blue_line {
+ width: 1px;
+ height: 20px;
+ background-color: #EAEAEA;
+}
\ No newline at end of file
--
libgit2 0.21.0