diff --git a/src/miniprogram-2/@pages/setting/setting.js b/src/miniprogram-2/@pages/setting/setting.js new file mode 100644 index 0000000..ad98434 --- /dev/null +++ b/src/miniprogram-2/@pages/setting/setting.js @@ -0,0 +1,66 @@ +// @pages/setting/setting.js +Page({ + + /** + * 页面的初始数据 + */ + data: { + + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + + } +}) \ No newline at end of file diff --git a/src/miniprogram-2/@pages/setting/setting.json b/src/miniprogram-2/@pages/setting/setting.json new file mode 100644 index 0000000..8835af0 --- /dev/null +++ b/src/miniprogram-2/@pages/setting/setting.json @@ -0,0 +1,3 @@ +{ + "usingComponents": {} +} \ No newline at end of file diff --git a/src/miniprogram-2/@pages/setting/setting.wxml b/src/miniprogram-2/@pages/setting/setting.wxml new file mode 100644 index 0000000..cbef789 --- /dev/null +++ b/src/miniprogram-2/@pages/setting/setting.wxml @@ -0,0 +1,2 @@ + +@pages/setting/setting.wxml diff --git a/src/miniprogram-2/@pages/setting/setting.wxss b/src/miniprogram-2/@pages/setting/setting.wxss new file mode 100644 index 0000000..bb59598 --- /dev/null +++ b/src/miniprogram-2/@pages/setting/setting.wxss @@ -0,0 +1 @@ +/* @pages/setting/setting.wxss */ \ No newline at end of file diff --git a/src/miniprogram-2/app.json b/src/miniprogram-2/app.json index 9ef1c02..dd98fdb 100644 --- a/src/miniprogram-2/app.json +++ b/src/miniprogram-2/app.json @@ -9,8 +9,9 @@ "pages/match/match", "pages/history/history", "pages/recommend/recommend", - "pages/setting/setting", - "pages/recommend/rec1" + "pages/recommend/rec1", + "pages/recommend/rec2", + "pages/recommend/rec3" ], "window": { "backgroundTextStyle": "light", diff --git a/src/miniprogram-2/pages/images/history.jpg b/src/miniprogram-2/pages/images/history.jpg new file mode 100644 index 0000000..3077bec Binary files /dev/null and b/src/miniprogram-2/pages/images/history.jpg differ diff --git a/src/miniprogram-2/pages/images/main.jpg b/src/miniprogram-2/pages/images/main.jpg new file mode 100644 index 0000000..10063b8 Binary files /dev/null and b/src/miniprogram-2/pages/images/main.jpg differ diff --git a/src/miniprogram-2/pages/images/match.jpg b/src/miniprogram-2/pages/images/match.jpg new file mode 100644 index 0000000..9ddec0f Binary files /dev/null and b/src/miniprogram-2/pages/images/match.jpg differ diff --git a/src/miniprogram-2/pages/images/rec_main_2.jpg b/src/miniprogram-2/pages/images/rec_main_2.jpg new file mode 100644 index 0000000..64cccd3 Binary files /dev/null and b/src/miniprogram-2/pages/images/rec_main_2.jpg differ diff --git a/src/miniprogram-2/pages/images/rec_main_3.jpg b/src/miniprogram-2/pages/images/rec_main_3.jpg new file mode 100644 index 0000000..f1163d9 Binary files /dev/null and b/src/miniprogram-2/pages/images/rec_main_3.jpg differ diff --git a/src/miniprogram-2/pages/images/rec_main_4.jpg b/src/miniprogram-2/pages/images/rec_main_4.jpg new file mode 100644 index 0000000..67422e7 Binary files /dev/null and b/src/miniprogram-2/pages/images/rec_main_4.jpg differ diff --git a/src/miniprogram-2/pages/images/rec_main_5.jpg b/src/miniprogram-2/pages/images/rec_main_5.jpg new file mode 100644 index 0000000..617715b Binary files /dev/null and b/src/miniprogram-2/pages/images/rec_main_5.jpg differ diff --git a/src/miniprogram-2/pages/images/recom.jpg b/src/miniprogram-2/pages/images/recom.jpg new file mode 100644 index 0000000..6aa7412 Binary files /dev/null and b/src/miniprogram-2/pages/images/recom.jpg differ diff --git a/src/miniprogram-2/pages/index/index.js b/src/miniprogram-2/pages/index/index.js index 4825ed6..e1832aa 100644 --- a/src/miniprogram-2/pages/index/index.js +++ b/src/miniprogram-2/pages/index/index.js @@ -64,10 +64,53 @@ Page({ userInfo: e.detail.userInfo, hasUserInfo: true }) + }, + handleImageTap: function(e) { + const index = e.currentTarget.dataset.index; // 获取当前点击的图片的位置 + const isSelected = this.data['isSelected' + index]; // 获取当前点击的图片的选中状态 + let newData = {}; // 定义一个新的数据对象 + if (isSelected) { + newData['isSelected' + index] = false; // 如果当前图片已经被选中，就将它的选中状态设置为 false + } else { + for (let i = 1; i <= 3; i++) { + if (i !== index && this.data['isSelected' + i]) { // 如果有其他图片被选中，则将它的选中状态还原 + newData['isSelected' + i] = false; + wx.navigateTo({ + url: '../match/match' + }) + } + } + newData['isSelected' + index] = true; // 将当前点击的图片的选中状态设置为 true + } + this.setData(newData); // 使用 setData 方法更新页面数据 + // wx.navigateTo({ + // url: '../match/match' + // }) + }, + + + onLoad(options) { + + this.setData({ + imageUrl1: '../images/main.jpg', + selectedImageUrl1: '../images/main.jpg', + imageUrl2: '../images/match.jpg', + selectedImageUrl2: '../images/match.jpg', + imageUrl3: '../images/history.jpg', + selectedImageUrl3: '../images/history.jpg', + imageUrl4: '../images/recom.jpg', + selectedImageUrl4: '../images/recom.jpg', + }) } }) + + +//也可以设置在onShow() + + + // Page({ // /** // * 页面的初始数据 diff --git a/src/miniprogram-2/pages/index/index.wxml b/src/miniprogram-2/pages/index/index.wxml index 3803b56..354e27d 100644 --- a/src/miniprogram-2/pages/index/index.wxml +++ b/src/miniprogram-2/pages/index/index.wxml @@ -20,6 +20,31 @@ {{motto}} + + + + + + + 首页 + + + + + 匹配 + + + + 历史 + + + + 推荐 + + + + + 首页 diff --git a/src/miniprogram-2/pages/index/index.wxss b/src/miniprogram-2/pages/index/index.wxss index 66bbf28..ea0a169 100644 --- a/src/miniprogram-2/pages/index/index.wxss +++ b/src/miniprogram-2/pages/index/index.wxss @@ -42,21 +42,10 @@ } .vv_1{ - line-height: 100rpx; - background-color: #ffffff; - display: flex; - - - } - - - - - .vv{ background-color: #ebebeb; @@ -131,8 +120,41 @@ padding-left: 30rpx; - width: 50rpx; + width: 70rpx; height: 50rpx; -} \ No newline at end of file +} + + + +.menu{ + width: 100%; + height: 140rpx; + background-color: #e0a981; + border-top-left-radius: 70rpx; + border-top-right-radius: 70rpx; + box-shadow: 0px -2px 10px 4px rgba(0, 0, 0,0.05); + display: flex; + align-items: center; + justify-content: space-around; + position: fixed; + bottom: 0; +} +.menu-item{ + display: flex; + flex-direction: column; + font-size: 10px; + text-align: center; + counter-reset: #b2b3b6; + align-items: center; + +} + +.menu-item image{ + +width: 50rpx; +height: 50rpx; +margin-bottom: 10rpx; + +} diff --git a/src/miniprogram-2/pages/recommend/rec1.wxml b/src/miniprogram-2/pages/recommend/rec1.wxml index d1bf9c7..0f10a9d 100644 --- a/src/miniprogram-2/pages/recommend/rec1.wxml +++ b/src/miniprogram-2/pages/recommend/rec1.wxml @@ -2,6 +2,7 @@ + 今天是一期早八通勤眼妆教程～ 3ce新品的这两盘好甜美夏日呀！！温柔低饱和的调调 日常不出错的配色，新手友友也可以轻松驾驭 diff --git a/src/miniprogram-2/pages/recommend/rec2.js b/src/miniprogram-2/pages/recommend/rec2.js new file mode 100644 index 0000000..30ebaf3 --- /dev/null +++ b/src/miniprogram-2/pages/recommend/rec2.js @@ -0,0 +1,66 @@ +// pages/recommend/rec2.js +Page({ + + /** + * 页面的初始数据 + */ + data: { + r21:"../images/recom_1_2.jpg" + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + + } +}) \ No newline at end of file diff --git a/src/miniprogram-2/pages/recommend/rec2.json b/src/miniprogram-2/pages/recommend/rec2.json new file mode 100644 index 0000000..8835af0 --- /dev/null +++ b/src/miniprogram-2/pages/recommend/rec2.json @@ -0,0 +1,3 @@ +{ + "usingComponents": {} +} \ No newline at end of file diff --git a/src/miniprogram-2/pages/recommend/rec2.wxml b/src/miniprogram-2/pages/recommend/rec2.wxml new file mode 100644 index 0000000..d58bc7f --- /dev/null +++ b/src/miniprogram-2/pages/recommend/rec2.wxml @@ -0,0 +1,15 @@ + + + + + + + 妆容小tips +1、眼妆部分整体是裸棕大地色系的，先用浅灰色0大地，上眼消肿。再用橘棕色贴着睫毛根加深上眼脸。 +2、用刀锋刷沾取眼影画眼线，降低眼线存在感同时修饰眼型。 +橘粉底色的珠光色，用手指沾取，点涂在上眼 +脸中间。 +3、腮红用点彩刷沾取第三排中间的颜色，点涂在面中，余粉带过皇头 +4、口红只涂在上下唇内侧，用晕染刷晕染边缘再加深一遍重复晕染，唇峰点上口红用手指晕开！ + + diff --git a/src/miniprogram-2/pages/recommend/rec2.wxss b/src/miniprogram-2/pages/recommend/rec2.wxss new file mode 100644 index 0000000..458837b --- /dev/null +++ b/src/miniprogram-2/pages/recommend/rec2.wxss @@ -0,0 +1 @@ +/* pages/recommend/rec2.wxss */ \ No newline at end of file diff --git a/src/miniprogram-2/pages/recommend/rec3.js b/src/miniprogram-2/pages/recommend/rec3.js new file mode 100644 index 0000000..89633d4 --- /dev/null +++ b/src/miniprogram-2/pages/recommend/rec3.js @@ -0,0 +1,66 @@ +// pages/recommend/rec3.js +Page({ + + /** + * 页面的初始数据 + */ + data: { + r31:"../images/recom_1_3.jpg" + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + + } +}) \ No newline at end of file diff --git a/src/miniprogram-2/pages/recommend/rec3.json b/src/miniprogram-2/pages/recommend/rec3.json new file mode 100644 index 0000000..8835af0 --- /dev/null +++ b/src/miniprogram-2/pages/recommend/rec3.json @@ -0,0 +1,3 @@ +{ + "usingComponents": {} +} \ No newline at end of file diff --git a/src/miniprogram-2/pages/recommend/rec3.wxml b/src/miniprogram-2/pages/recommend/rec3.wxml new file mode 100644 index 0000000..4602ae6 --- /dev/null +++ b/src/miniprogram-2/pages/recommend/rec3.wxml @@ -0,0 +1,10 @@ + + + + + + 妆容小tips +1、唇妆涂的是TF黑金唇镜 22朝露，薄涂是很纯欲的樱花粉，厚涂是气质的玫瑰色。上嘴甜味氛围感拉满，很适合搭配白开水伪素颜淡妆。 +2、妆容统一杏粉色调，眼妆用消肿色简单带过，点彩刷沾取暖调粉色腮红，在面中大面积铺色打造白里透红的妆效 + + diff --git a/src/miniprogram-2/pages/recommend/rec3.wxss b/src/miniprogram-2/pages/recommend/rec3.wxss new file mode 100644 index 0000000..ea7ff9e --- /dev/null +++ b/src/miniprogram-2/pages/recommend/rec3.wxss @@ -0,0 +1 @@ +/* pages/recommend/rec3.wxss */ \ No newline at end of file diff --git a/src/miniprogram-2/pages/recommend/recommend.js b/src/miniprogram-2/pages/recommend/recommend.js index fc46577..5bdd72d 100644 --- a/src/miniprogram-2/pages/recommend/recommend.js +++ b/src/miniprogram-2/pages/recommend/recommend.js @@ -5,13 +5,35 @@ Page({ * 页面的初始数据 */ data: { - rm1:"../images/rec_main_1.jpg" + rm4:"../images/rec_main_4.jpg", + rm5:"../images/rec_main_5.jpg", + indicatorDots: true, + autoplay: true, + interval: 5000, + duration: 2000, + imgUrls: [ + '../images/rec_main_1.jpg', + '../images/rec_main_2.jpg', + '../images/rec_main_3.jpg' + + ] + }, bindrec1ViewTap(){ wx.navigateTo({ url:'/pages/recommend/rec1' }) }, + bindrec2ViewTap(){ + wx.navigateTo({ + url:'/pages/recommend/rec2' + }) + }, + bindrec3ViewTap(){ + wx.navigateTo({ + url:'/pages/recommend/rec3' + }) + }, bindmaiViewTap() { wx.navigateTo({ url: '../main/main' diff --git a/src/miniprogram-2/pages/recommend/recommend.wxml b/src/miniprogram-2/pages/recommend/recommend.wxml index d372443..c6e0d82 100644 --- a/src/miniprogram-2/pages/recommend/recommend.wxml +++ b/src/miniprogram-2/pages/recommend/recommend.wxml @@ -1,8 +1,24 @@ - - + + + + + + + + + 推荐页面 + + + + + + + + diff --git a/src/miniprogram-2/pages/recommend/recommend.wxss b/src/miniprogram-2/pages/recommend/recommend.wxss index 5ff64c0..d86d308 100644 --- a/src/miniprogram-2/pages/recommend/recommend.wxss +++ b/src/miniprogram-2/pages/recommend/recommend.wxss @@ -1 +1,5 @@ -/* pages/recommend/recommend.wxss */ \ No newline at end of file +/* pages/recommend/recommend.wxss */ +swiper{ + width: 100%; + height: calc(100vw*9/16); + } diff --git a/src/miniprogram-2/project.config.json b/src/miniprogram-2/project.config.json index cea5706..200b91c 100644 --- a/src/miniprogram-2/project.config.json +++ b/src/miniprogram-2/project.config.json @@ -38,7 +38,8 @@ "ignore": [], "disablePlugins": [], "outputPath": "" - } + }, + "condition": false }, "compileType": "miniprogram", "libVersion": "2.19.4", diff --git a/src/miniprogram-2/project.private.config.json b/src/miniprogram-2/project.private.config.json index c6a457d..657f0a0 100644 --- a/src/miniprogram-2/project.private.config.json +++ b/src/miniprogram-2/project.private.config.json @@ -1,6 +1,6 @@ { "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html", - "projectname": "BeautyApplet", + "projectname": "miniprogram-2", "setting": { "compileHotReLoad": true }