diff --git a/README.md b/README.md index 75974a7..87df8c4 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,6 @@ # personal-formation5 -![截图](./screen.png) \ No newline at end of file +![截图](./screen.png) +![截图](./screen2.png) +![截图](./screen3.png) +![截图](./screen4.png) \ No newline at end of file diff --git a/app.json b/app.json index 3367fff..81c6d85 100644 --- a/app.json +++ b/app.json @@ -1,43 +1,47 @@ { "pages": [ "pages/index/index", - "pages/list/list", + "pages/video/video", - "pages/picture/picture" + "pages/picture/picture", + "pages/guest/guest" ], - - "tabBar": { "color": "#ccc", "selectedColor": "#ff4c91", - "borderStyle":"white", + "borderStyle": "white", "backgroundColor": "#fff", - "list": [{ - "pagePath": "pages/index/index", - "text": "邀请函", - "iconPath": "/images/invite.png", - "selectedIconPath": "/images/invite.png" - },{ - "pagePath": "pages/list/list", - "text": "照片", - "iconPath": "/images/marry.png", - "selectedIconPath": "/images/marry.png" - },{ - "pagePath": "pages/video/video", - "text": "美好时光", - "iconPath": "/images/video.png", - "selectedIconPath": "/images/video.png" - },{ - "pagePath": "pages/picture/picture", - "text": "宾客信息", - "iconPath": "/images/guest.png", - "selectedIconPath": "/images/guest.png" - }] + "list": [ + { + "pagePath": "pages/index/index", + "text": "邀请函", + "iconPath": "/images/invite.png", + "selectedIconPath": "/images/invite.png" + }, + { + "pagePath": "pages/picture/picture", + "text": "照片", + "iconPath": "/images/marry.png", + "selectedIconPath": "/images/marry.png" + }, + { + "pagePath": "pages/video/video", + "text": "美好时光", + "iconPath": "/images/video.png", + "selectedIconPath": "/images/video.png" + }, + { + "pagePath": "pages/guest/guest", + "text": "宾客信息", + "iconPath": "/images/guest.png", + "selectedIconPath": "/images/guest.png" + } + ] }, "window": { - "backgroundTextStyle":"light", + "backgroundTextStyle": "light", "navigationBarBackgroundColor": "#ff4c91", - "navigationBarTextStyle":"white" + "navigationBarTextStyle": "white" }, "style": "v2", "componentFramework": "glass-easel", diff --git a/pages/list/list.js b/pages/guest/guest.js similarity index 96% rename from pages/list/list.js rename to pages/guest/guest.js index caffa07..2eef030 100644 --- a/pages/list/list.js +++ b/pages/guest/guest.js @@ -1,4 +1,4 @@ -// pages/list/list.js +// pages/guest/guest.js Page({ /** diff --git a/pages/list/list.json b/pages/guest/guest.json similarity index 100% rename from pages/list/list.json rename to pages/guest/guest.json diff --git a/pages/guest/guest.wxml b/pages/guest/guest.wxml new file mode 100644 index 0000000..c973598 --- /dev/null +++ b/pages/guest/guest.wxml @@ -0,0 +1,31 @@ + +
+ + + + + + + + + +请选择您的性别: + + + + + + + +请选择你需要的点心: + + 蛋糕 + 甜甜圈 + 巧克力 + + + + + +
+ diff --git a/pages/guest/guest.wxss b/pages/guest/guest.wxss new file mode 100644 index 0000000..677b12d --- /dev/null +++ b/pages/guest/guest.wxss @@ -0,0 +1,50 @@ +/* pages/guest/guest.wxss */ +.bg{ + width: 100vw; + height: 100vh; +} +.content{ + width: 80vw; + position: fixed; + left: 10vw; + bottom: 8vh; +} +.content .input{ + font-size: large; + border: 1rpx solid #ff4c91; + border-radius: 10rpx; + padding: 1.5vh 40rpx; + margin-bottom: 1.5vh; + color: #ff4c91; +} +.content .radio{ + font-size: large; + margin-bottom: 1.5vh; + color: #ff4c91; + display: flex; +} +.content .check{ + font-size: large; + margin-bottom: 1.5vh; + color: #ff4c91; +} +.content checkbox-group{ + margin-top: 1.5vh; + color: #ff4c91; +} +.content checkbox-group checkbox{ + margin-left: 20rpx; +} +.content checkbox-group checkbox:nth-child(1){ + margin-left: 0; +} + +.content button{ + font-size: large; + background: #ff4c91; + color: #fff; +} +.content .phcolor{ + color: #ff4c91; +} + diff --git a/pages/list/list.wxml b/pages/list/list.wxml deleted file mode 100644 index 495bbf7..0000000 --- a/pages/list/list.wxml +++ /dev/null @@ -1,2 +0,0 @@ - -pages/list/list.wxml \ No newline at end of file diff --git a/pages/list/list.wxss b/pages/list/list.wxss deleted file mode 100644 index 601ce69..0000000 --- a/pages/list/list.wxss +++ /dev/null @@ -1 +0,0 @@ -/* pages/list/list.wxss */ \ No newline at end of file diff --git a/pages/picture/picture.wxml b/pages/picture/picture.wxml index 0acf51e..5a3856e 100644 --- a/pages/picture/picture.wxml +++ b/pages/picture/picture.wxml @@ -1,2 +1,15 @@ -pages/picture/picture.wxml \ No newline at end of file + + + + + + + + + + + + + + \ No newline at end of file diff --git a/pages/picture/picture.wxss b/pages/picture/picture.wxss index 5c65212..1522e23 100644 --- a/pages/picture/picture.wxss +++ b/pages/picture/picture.wxss @@ -1 +1,8 @@ -/* pages/picture/picture.wxss */ \ No newline at end of file +/* pages/picture/picture.wxss */ +swiper{ + height: 100vh; +} +image{ + width: 100vh; + height: 100vh; +} \ No newline at end of file diff --git a/pages/video/video.wxml b/pages/video/video.wxml index 4a15b8f..3b725ac 100644 --- a/pages/video/video.wxml +++ b/pages/video/video.wxml @@ -1,2 +1,14 @@ -pages/video/video.wxml \ No newline at end of file + +标题:海边随拍 +拍摄日期:2022-01-01 + + +标题:勿忘初心 +拍摄日期:2022-01-10 + + +标题:十年之约 +拍摄日期:2022-01-20 + + diff --git a/pages/video/video.wxss b/pages/video/video.wxss index 12db901..67a1754 100644 --- a/pages/video/video.wxss +++ b/pages/video/video.wxss @@ -1 +1,22 @@ -/* pages/video/video.wxss */ \ No newline at end of file +/* pages/video/video.wxss */ +.video{ + box-shadow: 0 8rpx 17rpx 0 rgba(7,17 , 27, 0.1); + margin: 10rpx 25rpx; + margin-bottom: 30rpx; + padding: 20rpx; + border-radius: 10rpx; + background: #fff; + +} +.video-title{ + font-size: 35rpx; + color: #333; +} +.video-time{ + font-size: 26rpx; + color: #979797; +} +.video video{ + width: 100%; + margin-top: 20rpx; +} \ No newline at end of file diff --git a/screen2.png b/screen2.png new file mode 100644 index 0000000..1e0a3b7 Binary files /dev/null and b/screen2.png differ diff --git a/screen3.png b/screen3.png new file mode 100644 index 0000000..817cbc1 Binary files /dev/null and b/screen3.png differ diff --git a/screen4.png b/screen4.png new file mode 100644 index 0000000..71f5074 Binary files /dev/null and b/screen4.png differ