diff --git a/doc/~$匹配用例描述及顺序图.docx b/doc/~$匹配用例描述及顺序图.docx deleted file mode 100644 index 4d1415e..0000000 Binary files a/doc/~$匹配用例描述及顺序图.docx and /dev/null differ diff --git a/doc/美妆匹配用例描述及顺序图.docx b/doc/美妆匹配用例描述及顺序图.docx deleted file mode 100644 index 7e8eb03..0000000 Binary files a/doc/美妆匹配用例描述及顺序图.docx and /dev/null differ diff --git a/doc/设计模型_美妆匹配软件系统_郑培萱.docx b/doc/设计模型_美妆匹配软件系统_郑培萱.docx new file mode 100644 index 0000000..665c938 Binary files /dev/null and b/doc/设计模型_美妆匹配软件系统_郑培萱.docx differ diff --git a/doc/需求模型_美妆匹配软件系统_郑培萱_.docx b/doc/需求模型_美妆匹配软件系统_郑培萱_.docx new file mode 100644 index 0000000..7f2616a Binary files /dev/null and b/doc/需求模型_美妆匹配软件系统_郑培萱_.docx differ diff --git a/other/软件模型.docx b/other/软件模型.docx new file mode 100644 index 0000000..a3cd960 Binary files /dev/null and b/other/软件模型.docx differ diff --git a/src/miniprogram-2/.eslintrc.js b/src/miniprogram-2/.eslintrc.js new file mode 100644 index 0000000..115cc02 --- /dev/null +++ b/src/miniprogram-2/.eslintrc.js @@ -0,0 +1,31 @@ +/* + * Eslint config file + * Documentation: https://eslint.org/docs/user-guide/configuring/ + * Install the Eslint extension before using this feature. + */ +module.exports = { + env: { + es6: true, + browser: true, + node: true, + }, + ecmaFeatures: { + modules: true, + }, + parserOptions: { + ecmaVersion: 2018, + sourceType: 'module', + }, + globals: { + wx: true, + App: true, + Page: true, + getCurrentPages: true, + getApp: true, + Component: true, + requirePlugin: true, + requireMiniProgram: true, + }, + // extends: 'eslint:recommended', + rules: {}, +} diff --git a/src/miniprogram-2/app.js b/src/miniprogram-2/app.js new file mode 100644 index 0000000..1ed57c4 --- /dev/null +++ b/src/miniprogram-2/app.js @@ -0,0 +1,19 @@ +// app.js +App({ + onLaunch() { + // 展示本地存储能力 + const logs = wx.getStorageSync('logs') || [] + logs.unshift(Date.now()) + wx.setStorageSync('logs', logs) + + // 登录 + wx.login({ + success: res => { + // 发送 res.code 到后台换取 openId, sessionKey, unionId + } + }) + }, + globalData: { + userInfo: null + } +}) diff --git a/src/miniprogram-2/app.json b/src/miniprogram-2/app.json new file mode 100644 index 0000000..04755aa --- /dev/null +++ b/src/miniprogram-2/app.json @@ -0,0 +1,68 @@ +{ + "@json": ".json配置文件，对项目进行不同级别的配置", + "@appjson": "对项目全局配置", + "@page": "新增页面", + "pages": [ + "pages/index/index", + "pages/logs/logs", + "pages/main/main", + "pages/match/match", + "pages/history/history", + "pages/recommend/recommend", + "pages/recommend/rec1", + "pages/recommend/rec2", + "pages/recommend/rec3", + "pages/match/photo" + ], + "window": { + "backgroundTextStyle": "light", + "navigationBarBackgroundColor": "#fff", + "navigationBarTitleText": "Weixin", + "navigationBarTextStyle": "black" + }, + "style": "v2", + "sitemapLocation": "sitemap.json", + "tabBar": { + "list": [ + { + "pagePath": "pages/main/main", + "text": "首页", + "iconPath": "pages/images/home.png", + "selectedIconPath": "pages/images/home_selected.png", + "color": "" + }, + { + "pagePath": "pages/match/match", + "text": "妆容", + "iconPath": "pages/images/match.png", + "selectedIconPath": "pages/images/match_selected.png" + }, + { + "pagePath": "pages/history/history", + "text": "历史", + "iconPath": "pages/images/history.png", + "selectedIconPath": "pages/images/history_selected.png" + }, + { + "pagePath": "pages/recommend/recommend", + "text": "教程", + "iconPath": "pages/images/learn.png", + "selectedIconPath": "pages/images/learn_selected.png" + } + ] + }, + "permission": { + "scope.userLocation": { + "desc": "你的位置信息将用于小程序位置接口的效果展示" + }, + "scope.userInfo": { + "desc": "你的个人信息将用于小程序个性化推荐" + }, + "scope.album": { + "desc": "你的相册将用于小程序图片上传" + }, + "scope.camera":{ + "desc":"你的相机将用于小程序拍照" + } + } +} \ No newline at end of file diff --git a/src/miniprogram-2/app.wxss b/src/miniprogram-2/app.wxss new file mode 100644 index 0000000..06c6fc9 --- /dev/null +++ b/src/miniprogram-2/app.wxss @@ -0,0 +1,10 @@ +/**app.wxss**/ +.container { + height: 100%; + display: flex; + flex-direction: column; + align-items: center; + justify-content: space-between; + padding: 200rpx 0; + box-sizing: border-box; +} diff --git a/src/miniprogram-2/pages/history/history.js b/src/miniprogram-2/pages/history/history.js new file mode 100644 index 0000000..07294fd --- /dev/null +++ b/src/miniprogram-2/pages/history/history.js @@ -0,0 +1,152 @@ +// pages/history/history.js +//document.write("Hello world!");//输出一句话 +//代码块 +// { + //undifined 已声明未赋值的变量 + //alert("hello!");//弹窗显示 + // var a = 123,b="123";//变量 + // a.toString(); + // a += ""; + // Number(a); //NaN + // parseInt(a); //=>str + // console.log(a === b) ; //全等于包含类型等于 ；!==全不等 + /* var today = 1;*/ + // switch(today){ + // case 1:console.log("1");break; + // case 2:console.log("2");break; + // default:console.log("error"); + // } + /*label名字*/ + // outer:for(var i=0;i<3;i++){ + // for(var j=0;j<2;j++){ + // if(j==1 && i==1){ + // break outer; + // } + // console.log("i="+i); + // console.log("j="+j); + // } + // } + //创建对象 +// var person={ +// name:"name", +// age:20, +// eat:function(){ +// alert("hi"); +// this; //window + +// } +// }; +// function eat(){ //函数调用形式 +// var name="he"; +// console.log(this.name);//this=>window（根目录） +// } +// eat() +// var cat={ //对象调用形式 +// age:18, +// sing:function(){ +// console.log(this.age); //调用者 +// } +// } +// function Person(name,age){ //构造函数 +// this.name=name; +// this.age=age; +// this.sayName=function(){ +// console.log("he"); +// } +// } +// var person1 = new Person("a",18); //用new来创建对象 +// console.log(person1); +// // delete person.age; +// for(var key in person){ +// var val = person[key];//循环体内只能用此方法读， +// //.key会处理成['key']，显示没有定义这个值 +// console.log(key+":"+val); +// } +// } +// var fun = function(){//匿名函数 +// console.log("he"); +// } +Page({ + + /** + * 页面的初始数据 + */ + data: { + + }, + bindmaiViewTap() { + wx.redirectTo({ + url: '../main/main' + }) + }, + bindhisViewTap(){ + wx.redirectTo({ + url: '../history/history' + }) + }, + bindrecViewTap(){ + wx.redirectTo({ + url: '../recommend/recommend' + }) + }, + bindmacViewTap(){ + wx.redirectTo({ + url: '../match/match' + }) + }, + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + + } +}) \ No newline at end of file diff --git a/src/miniprogram-2/pages/history/history.json b/src/miniprogram-2/pages/history/history.json new file mode 100644 index 0000000..8835af0 --- /dev/null +++ b/src/miniprogram-2/pages/history/history.json @@ -0,0 +1,3 @@ +{ + "usingComponents": {} +} \ No newline at end of file diff --git a/src/miniprogram-2/pages/history/history.wxml b/src/miniprogram-2/pages/history/history.wxml new file mode 100644 index 0000000..6f3006b --- /dev/null +++ b/src/miniprogram-2/pages/history/history.wxml @@ -0,0 +1,21 @@ + + + + + + + +pages/history/history.wxml \ No newline at end of file diff --git a/src/miniprogram-2/pages/history/history.wxss b/src/miniprogram-2/pages/history/history.wxss new file mode 100644 index 0000000..e3b28f6 --- /dev/null +++ b/src/miniprogram-2/pages/history/history.wxss @@ -0,0 +1 @@ +/* pages/history/history.wxss */ \ No newline at end of file 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/history.png b/src/miniprogram-2/pages/images/history.png new file mode 100644 index 0000000..7d37a2b Binary files /dev/null and b/src/miniprogram-2/pages/images/history.png differ diff --git a/src/miniprogram-2/pages/images/history_selected.png b/src/miniprogram-2/pages/images/history_selected.png new file mode 100644 index 0000000..00d7a16 Binary files /dev/null and b/src/miniprogram-2/pages/images/history_selected.png differ diff --git a/src/miniprogram-2/pages/images/home.png b/src/miniprogram-2/pages/images/home.png new file mode 100644 index 0000000..4c1f9c7 Binary files /dev/null and b/src/miniprogram-2/pages/images/home.png differ diff --git a/src/miniprogram-2/pages/images/home_selected.png b/src/miniprogram-2/pages/images/home_selected.png new file mode 100644 index 0000000..8eea8b2 Binary files /dev/null and b/src/miniprogram-2/pages/images/home_selected.png differ diff --git a/src/miniprogram-2/pages/images/learn.png b/src/miniprogram-2/pages/images/learn.png new file mode 100644 index 0000000..0d4915b Binary files /dev/null and b/src/miniprogram-2/pages/images/learn.png differ diff --git a/src/miniprogram-2/pages/images/learn_selected.png b/src/miniprogram-2/pages/images/learn_selected.png new file mode 100644 index 0000000..9093e84 Binary files /dev/null and b/src/miniprogram-2/pages/images/learn_selected.png 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/match.png b/src/miniprogram-2/pages/images/match.png new file mode 100644 index 0000000..e3ecf25 Binary files /dev/null and b/src/miniprogram-2/pages/images/match.png differ diff --git a/src/miniprogram-2/pages/images/match_selected.png b/src/miniprogram-2/pages/images/match_selected.png new file mode 100644 index 0000000..01ebe96 Binary files /dev/null and b/src/miniprogram-2/pages/images/match_selected.png differ diff --git a/src/miniprogram-2/pages/images/rec_main_1.jpg b/src/miniprogram-2/pages/images/rec_main_1.jpg new file mode 100644 index 0000000..13b990b Binary files /dev/null and b/src/miniprogram-2/pages/images/rec_main_1.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..74626a5 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..36396f2 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..2ef6201 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..89c24b8 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/images/recom_1_1.jpg b/src/miniprogram-2/pages/images/recom_1_1.jpg new file mode 100644 index 0000000..d48824f Binary files /dev/null and b/src/miniprogram-2/pages/images/recom_1_1.jpg differ diff --git a/src/miniprogram-2/pages/images/recom_1_2.jpg b/src/miniprogram-2/pages/images/recom_1_2.jpg new file mode 100644 index 0000000..e3a1278 Binary files /dev/null and b/src/miniprogram-2/pages/images/recom_1_2.jpg differ diff --git a/src/miniprogram-2/pages/images/recom_1_3.jpg b/src/miniprogram-2/pages/images/recom_1_3.jpg new file mode 100644 index 0000000..53f237c Binary files /dev/null and b/src/miniprogram-2/pages/images/recom_1_3.jpg differ diff --git a/src/miniprogram-2/pages/images/wxtp.jpg b/src/miniprogram-2/pages/images/wxtp.jpg new file mode 100644 index 0000000..7c9be36 Binary files /dev/null and b/src/miniprogram-2/pages/images/wxtp.jpg differ diff --git a/src/miniprogram-2/pages/images/微信图片_202310120951551.jpg b/src/miniprogram-2/pages/images/微信图片_202310120951551.jpg new file mode 100644 index 0000000..494848d Binary files /dev/null and b/src/miniprogram-2/pages/images/微信图片_202310120951551.jpg differ diff --git a/src/miniprogram-2/pages/images/微信图片_20231012095820.jpg b/src/miniprogram-2/pages/images/微信图片_20231012095820.jpg new file mode 100644 index 0000000..1cccab7 Binary files /dev/null and b/src/miniprogram-2/pages/images/微信图片_20231012095820.jpg differ diff --git a/src/miniprogram-2/pages/images/微信图片_20231012095821.jpg b/src/miniprogram-2/pages/images/微信图片_20231012095821.jpg new file mode 100644 index 0000000..ed0d51b Binary files /dev/null and b/src/miniprogram-2/pages/images/微信图片_20231012095821.jpg differ diff --git a/src/miniprogram-2/pages/images/微信图片_202310120958211.jpg b/src/miniprogram-2/pages/images/微信图片_202310120958211.jpg new file mode 100644 index 0000000..e2289e4 Binary files /dev/null and b/src/miniprogram-2/pages/images/微信图片_202310120958211.jpg differ diff --git a/src/miniprogram-2/pages/index/index.js b/src/miniprogram-2/pages/index/index.js new file mode 100644 index 0000000..83ee6da --- /dev/null +++ b/src/miniprogram-2/pages/index/index.js @@ -0,0 +1,107 @@ +// index.js +// 获取应用实例 +const app = getApp() + +Page({ + data: { + motto: '欢迎进入', + userInfo: {}, + hasUserInfo: false, + canIUse: wx.canIUse('button.open-type.getUserInfo'), + canIUseGetUserProfile: false, + canIUseOpenData: wx.canIUse('open-data.type.userAvatarUrl') && wx.canIUse('open-data.type.userNickName'), // 如需尝试获取用户信息可改为false + isSelected:0 + }, + // 事件处理函数 + bindViewTap() { + wx.navigateTo({ + url: '../logs/logs' + }) + }, + bindmaiViewTap() { + wx.switchTab({ + url: '../main/main' + }) + }, + bindhisViewTap(){ + wx.redirectTo({ + url: '../history/history' + }) + }, + bindrecViewTap(){ + wx.switchTab({ + url: '../recommend/recommend' + }) + }, + bindmacViewTap(){ + wx.redirectTo({ + url: '../match/match' + }) + }, + onLoad() { + if (wx.getUserProfile) { + this.setData({ + canIUseGetUserProfile: true + }) + } + }, + getUserProfile(e) { + // 推荐使用wx.getUserProfile获取用户信息，开发者每次通过该接口获取用户个人信息均需用户确认，开发者妥善保管用户快速填写的头像昵称，避免重复弹窗 + wx.getUserProfile({ + desc: '展示用户信息', // 声明获取用户个人信息后的用途，后续会展示在弹窗中，请谨慎填写 + success: (res) => { + console.log(res) + this.setData({ + userInfo: res.userInfo, + hasUserInfo: true + }) + } + }) + }, + getUserInfo(e) { + // 不推荐使用getUserInfo获取用户信息，预计自2021年4月13日起，getUserInfo将不再弹出弹窗，并直接返回匿名的用户个人信息 + console.log(e) + this.setData({ + 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', + }) + } +}) diff --git a/src/miniprogram-2/pages/index/index.json b/src/miniprogram-2/pages/index/index.json new file mode 100644 index 0000000..86c6472 --- /dev/null +++ b/src/miniprogram-2/pages/index/index.json @@ -0,0 +1,4 @@ +{ + "@indexjson":"与appjson相同部分会覆盖", + "usingComponents": {} +} \ No newline at end of file diff --git a/src/miniprogram-2/pages/index/index.wxml b/src/miniprogram-2/pages/index/index.wxml new file mode 100644 index 0000000..3839001 --- /dev/null +++ b/src/miniprogram-2/pages/index/index.wxml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + 请使用1.4.4及以上版本基础库 + + + + {{userInfo.nickName}} + + + + {{motto}} + + + + + + diff --git a/src/miniprogram-2/pages/index/index.wxss b/src/miniprogram-2/pages/index/index.wxss new file mode 100644 index 0000000..8864a7c --- /dev/null +++ b/src/miniprogram-2/pages/index/index.wxss @@ -0,0 +1,59 @@ +/**index.wxss**/ +.userinfo { + display: flex; + flex-direction: column; + align-items: center; + color: #aaa; +} + +.userinfo-avatar { + overflow: hidden; + width: 128rpx; + height: 128rpx; + margin: 20rpx; + border-radius: 50%; +} + +.usermotto { + margin-top: 200px; +} + + +.menu{ + width: 100%; + height: 140rpx; + background-color: #ddcfc3; + 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: 90rpx; +height: 90rpx; +margin-bottom: 10rpx; + +} + +/* .navi{ + display: flex; + bottom: 0; +} +.flex-wrp{ + flex-direction: row; +} */ \ No newline at end of file diff --git a/src/miniprogram-2/pages/logs/logs.js b/src/miniprogram-2/pages/logs/logs.js new file mode 100644 index 0000000..85f6aac --- /dev/null +++ b/src/miniprogram-2/pages/logs/logs.js @@ -0,0 +1,18 @@ +// logs.js +const util = require('../../utils/util.js') + +Page({ + data: { + logs: [] + }, + onLoad() { + this.setData({ + logs: (wx.getStorageSync('logs') || []).map(log => { + return { + date: util.formatTime(new Date(log)), + timeStamp: log + } + }) + }) + } +}) diff --git a/src/miniprogram-2/pages/logs/logs.json b/src/miniprogram-2/pages/logs/logs.json new file mode 100644 index 0000000..3ee76c1 --- /dev/null +++ b/src/miniprogram-2/pages/logs/logs.json @@ -0,0 +1,4 @@ +{ + "navigationBarTitleText": "查看启动日志", + "usingComponents": {} +} \ No newline at end of file diff --git a/src/miniprogram-2/pages/logs/logs.wxml b/src/miniprogram-2/pages/logs/logs.wxml new file mode 100644 index 0000000..1e7c073 --- /dev/null +++ b/src/miniprogram-2/pages/logs/logs.wxml @@ -0,0 +1,7 @@ + + + + {{index + 1}}. {{log.date}} + + {{index}} + diff --git a/src/miniprogram-2/pages/logs/logs.wxss b/src/miniprogram-2/pages/logs/logs.wxss new file mode 100644 index 0000000..94d4b88 --- /dev/null +++ b/src/miniprogram-2/pages/logs/logs.wxss @@ -0,0 +1,8 @@ +.log-list { + display: flex; + flex-direction: column; + padding: 40rpx; +} +.log-item { + margin: 10rpx; +} diff --git a/src/miniprogram-2/pages/main/main.js b/src/miniprogram-2/pages/main/main.js new file mode 100644 index 0000000..8b82de4 --- /dev/null +++ b/src/miniprogram-2/pages/main/main.js @@ -0,0 +1,102 @@ +// pages/main/main.js +Page({ + + /** + * 页面的初始数据 + */ + data: { + nowData:"", + r11:"../images/recom_1_1.jpg" + }, + date:function(){ + var now=new Date(); + var Y=now.getFullYear(); + var M=now.getMonth()+1; + var D=now.getDate(); + var nowDate= Date(Y+"//"+M+"//"+D+"//"); + console.log(nowDate); + return nowDate; + }, + bindrec1ViewTap(){ + wx.navigateTo({ + url:'../recommend/rec1' + }) + }, + bindmaiViewTap() { + wx.redirectTo({ + url: '../main/main' + }) + }, + bindhisViewTap(){ + wx.redirectTo({ + url: '../history/history' + }) + }, + bindrecViewTap(){ + wx.redirectTo({ + url: '../recommend/recommend' + }) + }, + bindmacViewTap(){ + wx.redirectTo({ + url: '../match/match' + }) + }, + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + this.setData({ + nowData:this.date() + }) + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + this.date(); + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + + } +}) \ No newline at end of file diff --git a/src/miniprogram-2/pages/main/main.json b/src/miniprogram-2/pages/main/main.json new file mode 100644 index 0000000..8835af0 --- /dev/null +++ b/src/miniprogram-2/pages/main/main.json @@ -0,0 +1,3 @@ +{ + "usingComponents": {} +} \ No newline at end of file diff --git a/src/miniprogram-2/pages/main/main.wxml b/src/miniprogram-2/pages/main/main.wxml new file mode 100644 index 0000000..6a9df0d --- /dev/null +++ b/src/miniprogram-2/pages/main/main.wxml @@ -0,0 +1,14 @@ + + + + + {{filter.day(1621409888000)}} + + {{date()}} + 选择一个妆容开始美好的一天吧！ + + + + + + \ No newline at end of file diff --git a/src/miniprogram-2/pages/main/main.wxss b/src/miniprogram-2/pages/main/main.wxss new file mode 100644 index 0000000..052ece1 --- /dev/null +++ b/src/miniprogram-2/pages/main/main.wxss @@ -0,0 +1,4 @@ +/* pages/main/main.wxss */ +.home{ + +} \ No newline at end of file diff --git a/src/miniprogram-2/pages/match/match.js b/src/miniprogram-2/pages/match/match.js new file mode 100644 index 0000000..a056385 --- /dev/null +++ b/src/miniprogram-2/pages/match/match.js @@ -0,0 +1,193 @@ +// pages/match/match.js +Page({ + + /** + * 页面的初始数据 + */ + data: { + phopath:"../match/photo", + // imgList:"", + src:"" + }, + //跳转photo + bindphoViewTap(){ + wx.navigateTo({ + url:'../match/photo' + }) + }, + bindmaiViewTap() { + wx.redirectTo({ + url: '../main/main' + }) + }, + bindhisViewTap(){ + wx.redirectTo({ + url: '../history/history' + }) + }, + bindrecViewTap(){ + wx.redirectTo({ + url: '../recommend/recommend' + }) + }, + bindmacViewTap(){ + wx.redirectTo({ + url: '../match/match' + }) + }, + //选择图片获取方式 + tipwindow(){ + var _this=this; + wx.showActionSheet({ + itemList: ['从手机相册选择', '拍照'], + success: function(res) { + let sourceType=""; + if(res.tapIndex==0){ + sourceType="album"; + _this.img_w_show(sourceType); + } + else if(res.tapIndex==1){ + _this.sccamera(); + // _this.bindphoViewTap(); + // sourceType="camera"; + // _this.img_w_show(sourceType); + } + console.log(res.tapIndex) + }, + fail: function(res) { + console.log(res.errMsg) + } + }) + }, + //chooseMedia选图 + img_w_show(sourceType){ + var _this=this; + wx.chooseMedia({ + count: 1, // 默认9 + mediaType:['image'],//仅照片 + //sizeType: ['original', 'compressed'], // 指定原图or压缩图 + sourceType: [sourceType], // 来源是相册or相机 + //camera:['front'],//前置相机 + success: function (res) { + // 返回选定照片的本地文件路径列表，tempFilePath可以作为img标签的src属性显示图片 + console.log(res); + var tempFilePaths = res.tempFiles['0']['tempFilePath']; + _this.setData({ + src: (tempFilePaths?tempFilePaths:"") + //无法赋值-路径获取问题 + }) + // console.log("src:"+_this.data.src); + wx.setStorageSync('imgFilePath', _this.data.src);//存入缓存,实现数据转移 + wx.pageScrollTo({//滚动到目标位置 + scrollTop: 1200, + duration:300 + }) + } + }) + }, + //权限、拍照 + sccamera(){ + wx.authorize({ + scope: 'scope.camera', + success () { + //用户允许授权，进行下一步操作 + const cameraContext = wx.createCameraContext();//获取相机上下文？ + wx.pageScrollTo({//滚动到目标位置 + scrollTop: 700, + duration:300 + }) + + // cameraContext.takePhoto({//获取照片 + // quality: 'high', + // success: (res) => { + // // 将照片保存到本地 + // wx.saveImageToPhotosAlbum({ + // filePath: res.tempImagePath, + // success: (res) => { + // wx.showToast({ + // title: '保存成功' + // }); + // }, + // error(e){ + // console.log(e.detail); + // } + // }) + // } + + // }) + } + }) + }, + //相机组件camera拍照 + takePhoto() { + var _this=this; + const ctx = wx.createCameraContext() + ctx.takePhoto({ + quality: 'high', + success: (res) => { + this.setData({ + src: res.tempImagePath + }) + wx.setStorageSync('imgFilePath', _this.data.src); + } + }) + }, + error(e) { + console.log(e.detail) + }, + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + + } +}) \ No newline at end of file diff --git a/src/miniprogram-2/pages/match/match.json b/src/miniprogram-2/pages/match/match.json new file mode 100644 index 0000000..8835af0 --- /dev/null +++ b/src/miniprogram-2/pages/match/match.json @@ -0,0 +1,3 @@ +{ + "usingComponents": {} +} \ No newline at end of file diff --git a/src/miniprogram-2/pages/match/match.wxml b/src/miniprogram-2/pages/match/match.wxml new file mode 100644 index 0000000..9b9706a --- /dev/null +++ b/src/miniprogram-2/pages/match/match.wxml @@ -0,0 +1,17 @@ + + + + 点击开始拍照 + + + + + + + 预览 + + + + + diff --git a/src/miniprogram-2/pages/match/match.wxss b/src/miniprogram-2/pages/match/match.wxss new file mode 100644 index 0000000..4d081e6 --- /dev/null +++ b/src/miniprogram-2/pages/match/match.wxss @@ -0,0 +1,23 @@ +/* pages/match/match.wxss */ +.match_main{ + width:auto; + height: auto; + background-color: #ddcfc3; +} +.choose_way{ + width:100%; + height:400px; + background-color: #ddcfc3; + text-align: center; + padding-top: 200px; +} +.match_display{ + width:auto; + height:100px; + background-color: #ddcfc3; + text-align: center; + padding-top: 50px; +} +.match_sure{ + text-align: center; +} \ No newline at end of file diff --git a/src/miniprogram-2/pages/match/photo.js b/src/miniprogram-2/pages/match/photo.js new file mode 100644 index 0000000..41f53e5 --- /dev/null +++ b/src/miniprogram-2/pages/match/photo.js @@ -0,0 +1,75 @@ +// pages/match/photo.js +Page({ + + /** + * 页面的初始数据 + */ + data: { + imgFilePath:"", + src:"" + }, + + /** + * 生命周期函数--监听页面加载 + * 获取match的照片缓存？ + */ + onLoad(options) { + var img = wx.getStorageSync('imgFilePath'); + var that = this; + that.setData({ + imgFilePath: img + }) + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { + + }, + + /** + * 生命周期函数--监听页面显示 + * 获取日期给history？ + */ + onShow() { + const history = wx.getStorageSync('history') || [] + history.unshift(Date.now()) + wx.setStorageSync('history', history) + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + + } +}) \ No newline at end of file diff --git a/src/miniprogram-2/pages/match/photo.json b/src/miniprogram-2/pages/match/photo.json new file mode 100644 index 0000000..8835af0 --- /dev/null +++ b/src/miniprogram-2/pages/match/photo.json @@ -0,0 +1,3 @@ +{ + "usingComponents": {} +} \ No newline at end of file diff --git a/src/miniprogram-2/pages/match/photo.wxml b/src/miniprogram-2/pages/match/photo.wxml new file mode 100644 index 0000000..b1ee2ba --- /dev/null +++ b/src/miniprogram-2/pages/match/photo.wxml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/src/miniprogram-2/pages/match/photo.wxss b/src/miniprogram-2/pages/match/photo.wxss new file mode 100644 index 0000000..f361089 --- /dev/null +++ b/src/miniprogram-2/pages/match/photo.wxss @@ -0,0 +1 @@ +/* pages/match/photo.wxss */ \ No newline at end of file diff --git a/src/miniprogram-2/pages/recommend/rec1.js b/src/miniprogram-2/pages/recommend/rec1.js new file mode 100644 index 0000000..751818e --- /dev/null +++ b/src/miniprogram-2/pages/recommend/rec1.js @@ -0,0 +1,68 @@ +// pages/recommend/rec1.js +Page({ + + /** + * 页面的初始数据 + */ + data: { + r11:"../images/recom_1_1.jpg", + r12:"../images/recom_1_2.jpg", + r13:"../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/rec1.json b/src/miniprogram-2/pages/recommend/rec1.json new file mode 100644 index 0000000..8835af0 --- /dev/null +++ b/src/miniprogram-2/pages/recommend/rec1.json @@ -0,0 +1,3 @@ +{ + "usingComponents": {} +} \ No newline at end of file diff --git a/src/miniprogram-2/pages/recommend/rec1.wxml b/src/miniprogram-2/pages/recommend/rec1.wxml new file mode 100644 index 0000000..64b9cfd --- /dev/null +++ b/src/miniprogram-2/pages/recommend/rec1.wxml @@ -0,0 +1,17 @@ + + + + + 黄黑皮低饱和清冷妆这么高级！ + +    这种低饱和妆容真的很有感觉！ + +🌟大面积的腮红是重点（灰粉色会更自然） + +眼妆往细长狐狸眼的方向靠 +卧蚕也要画细长 眼妆浅色大面积晕染出上扬的形状就OK +真的很有感觉！黄黑皮姐妹速速学起来！ +#黄黑皮 #黄黑皮妆容 #妆容分享 #今日妆容 #清冷感妆容 + + + diff --git a/src/miniprogram-2/pages/recommend/rec1.wxss b/src/miniprogram-2/pages/recommend/rec1.wxss new file mode 100644 index 0000000..7f371d8 --- /dev/null +++ b/src/miniprogram-2/pages/recommend/rec1.wxss @@ -0,0 +1,46 @@ +/* pages/recommend/rec1.wxss */ +.container{ + +} +.rec1{ + +} + +.text { + /* 字体大小 */ + font-size: 20px; + /* 字体颜色 */ + color: black; + /* 字体风格-粗细 */ + font-weight: bold; + /*段落排版--首字缩进*/ +text-indent: 2em; +/*段落排版--行间距（行高）*/ +line-height: 1.5em; +/*段落排版--中文字间距*/ +letter-spacing: 1px; +/*字母间距*/ +word-spacing: 4px; +/*文字对齐 right 、left 、center */ +text-align: left; + +} +.text2 { + /* 字体大小 */ + font-size: 15px; + /* 字体颜色 */ + color: black; + /* 字体风格-粗细 */ + /*font-weight: bold;*/ + /*段落排版--首字缩进*/ + text-indent: 2em; + /*段落排版--行间距（行高）*/ + line-height: 1.5em; + /*段落排版--中文字间距*/ + letter-spacing: 1px; + /*字母间距*/ + word-spacing: 4px; + /*文字对齐 right 、left 、center */ + text-align: left; + +} \ No newline at end of file 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..2feacaa --- /dev/null +++ b/src/miniprogram-2/pages/recommend/rec2.wxml @@ -0,0 +1,22 @@ + + + + + 美拉德是我的舒适区🍁 + + 秋日当然不能少了棕色系啦！ + 美拉德火是有道理的～ + 真的太好出片了 + 妆容整体就是棕色调为主 + 口红选择了MAC新出的热吻棒 + 这三只颜色和秋冬适配度太高了 + #67狂野棕：冷冽裸茶棕 美区辣妹属性大开 + #69痴情咖：复古焦糖棕 爆浆太妃糖 内里都是惊喜 + #79任性莓：甜熟浆果迸发热辣莓色 灰调复古感 时髦爆棚 + 质地很特别 上嘴迅速成膜不拔干 + 很爱这种不显唇纹的哑光感吃饭也不用担心掉色严重 + 24小时在线 谁能不爱呢 + #MAC热吻棒 #笔记灵感 #美式复古 #热吻吧显眼包 #美拉德 + + + diff --git a/src/miniprogram-2/pages/recommend/rec2.wxss b/src/miniprogram-2/pages/recommend/rec2.wxss new file mode 100644 index 0000000..1689cf2 --- /dev/null +++ b/src/miniprogram-2/pages/recommend/rec2.wxss @@ -0,0 +1,45 @@ +/* pages/recommend/rec2.wxss */ +.container{ + +} +.rec2{ + +} +.text { + /* 字体大小 */ + font-size: 20px; + /* 字体颜色 */ + color: black; + /* 字体风格-粗细 */ + font-weight: bold; + /*段落排版--首字缩进*/ +text-indent: 2em; +/*段落排版--行间距（行高）*/ +line-height: 1.5em; +/*段落排版--中文字间距*/ +letter-spacing: 1px; +/*字母间距*/ +word-spacing: 4px; +/*文字对齐 right 、left 、center */ +text-align: left; + +} +.text2 { + /* 字体大小 */ + font-size: 15px; + /* 字体颜色 */ + color: black; + /* 字体风格-粗细 */ + /*font-weight: bold;*/ + /*段落排版--首字缩进*/ + text-indent: 2em; + /*段落排版--行间距（行高）*/ + line-height: 1.5em; + /*段落排版--中文字间距*/ + letter-spacing: 1px; + /*字母间距*/ + word-spacing: 4px; + /*文字对齐 right 、left 、center */ + text-align: left; + +} \ 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..265b089 --- /dev/null +++ b/src/miniprogram-2/pages/recommend/rec3.wxml @@ -0,0 +1,10 @@ + + + + + 新中式｜水是眼波横 + +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..44be33d --- /dev/null +++ b/src/miniprogram-2/pages/recommend/rec3.wxss @@ -0,0 +1,39 @@ +/* pages/recommend/rec3.wxss */ +.text { + /* 字体大小 */ + font-size: 20px; + /* 字体颜色 */ + color: black; + /* 字体风格-粗细 */ + font-weight: bold; + /*段落排版--首字缩进*/ +text-indent: 2em; +/*段落排版--行间距（行高）*/ +line-height: 1.5em; +/*段落排版--中文字间距*/ +letter-spacing: 1px; +/*字母间距*/ +word-spacing: 4px; +/*文字对齐 right 、left 、center */ +text-align: left; + +} +.text2 { + /* 字体大小 */ + font-size: 15px; + /* 字体颜色 */ + color: black; + /* 字体风格-粗细 */ + /*font-weight: bold;*/ + /*段落排版--首字缩进*/ + text-indent: 2em; + /*段落排版--行间距（行高）*/ + line-height: 1.5em; + /*段落排版--中文字间距*/ + letter-spacing: 1px; + /*字母间距*/ + word-spacing: 4px; + /*文字对齐 right 、left 、center */ + text-align: left; + +} \ No newline at end of file diff --git a/src/miniprogram-2/pages/recommend/recommend.js b/src/miniprogram-2/pages/recommend/recommend.js new file mode 100644 index 0000000..b778eb7 --- /dev/null +++ b/src/miniprogram-2/pages/recommend/recommend.js @@ -0,0 +1,112 @@ +// pages/recommend/recommend.js +Page({ + + /** + * 页面的初始数据 + */ + data: { + 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.redirectTo({ + url: '../main/main' + }) + }, + bindhisViewTap(){ + wx.redirectTo({ + url: '../history/history' + }) + }, + bindrecViewTap(){ + wx.redirectTo({ + url: '../recommend/recommend' + }) + }, + bindmacViewTap(){ + wx.redirectTo({ + url: '../match/match' + }) + }, + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + + } +}) \ No newline at end of file diff --git a/src/miniprogram-2/pages/recommend/recommend.json b/src/miniprogram-2/pages/recommend/recommend.json new file mode 100644 index 0000000..8835af0 --- /dev/null +++ b/src/miniprogram-2/pages/recommend/recommend.json @@ -0,0 +1,3 @@ +{ + "usingComponents": {} +} \ No newline at end of file diff --git a/src/miniprogram-2/pages/recommend/recommend.wxml b/src/miniprogram-2/pages/recommend/recommend.wxml new file mode 100644 index 0000000..66f092c --- /dev/null +++ b/src/miniprogram-2/pages/recommend/recommend.wxml @@ -0,0 +1,24 @@ + + + + + + + + + + + + 推荐页面 + + + + + + + + + + + \ No newline at end of file diff --git a/src/miniprogram-2/pages/recommend/recommend.wxss b/src/miniprogram-2/pages/recommend/recommend.wxss new file mode 100644 index 0000000..75c06fd --- /dev/null +++ b/src/miniprogram-2/pages/recommend/recommend.wxss @@ -0,0 +1,7 @@ +/* pages/recommend/recommend.wxss */ + +swiper{ + width: 100%; + /* height: calc(100vw*9/16); */ + height: 350px; + } diff --git a/src/miniprogram-2/pages/setting/setting.js b/src/miniprogram-2/pages/setting/setting.js new file mode 100644 index 0000000..885d159 --- /dev/null +++ b/src/miniprogram-2/pages/setting/setting.js @@ -0,0 +1,134 @@ +// pages/setting/setting.js +Page({ + /** + * 页面的初始数据 + */ + data: { + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + } +}) + + +// pages/index/setting/setting.js +const util = require('../../../utils/util.js') +Page({ + /** + * 页面的初始数据 + */ + data: { + info:["头像","名称","收货地址","当前版本","关于"], + tx:"", + name:"", + currentDate:util.formatTime(new Date(), '-', false), + phone:"" + }, + bindDateChange: function (e) { + console.log(e.detail.value) + this.setData({ + currentDate:e.detail.value + }) }, + chooseAddress() { + wx.chooseAddress({ + success (res) { + console.log(res.userName) + } + }) + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (options) { + var useInfo = wx.getStorageSync('userInfo') + var that = this; + that.setData({ + tx:useInfo.avatarUrl, + name:useInfo.nickName,}) + }, + about(){ + wx.navigateTo({ + url: '/pages/index/setting/about/about', + }) + }, + houtai(){ + wx.navigateTo({ + url: '', + }) + }, + version(){ + wx.showToast({ + title: '当前已是最新版本~', + }) + }, + logout:function() { + wx.removeStorage({ + key: 'userInfo', + success (res) { + wx.showModal({ + title: '提示', + content: '真的要退出了吗', + cancelText:'我骗你的', + confirmText:'是的没错', + confirmColor:'#000000', + cancelColor:'#576b95', + success (res) { + if (res.confirm) { + wx.reLaunch({ + url: '/pages/index/index', + }) + } else if (res.cancel) { + console.log('用户点击取消') + } + } + }) + } + }) + } +}) \ 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..e78c658 --- /dev/null +++ b/src/miniprogram-2/pages/setting/setting.wxml @@ -0,0 +1,93 @@ + +pages/setting/setting.wxml + + + + + 头像 + + + + + + + + + +昵称 + + {{name}} + + + + + + + +手机号 + + 198****5052 + + + + + +生日 + + + + + + {{currentDate}} + + + + + + + + + + + +收货地址 + + >> + + + + + + + +当前版本 + + v1.0 + + + + + + + +关于 + + >> + + + + + + + +后台登录入口 + + >> + + + + + + + + \ No newline at end of file diff --git a/src/miniprogram-2/pages/setting/setting.wxss b/src/miniprogram-2/pages/setting/setting.wxss new file mode 100644 index 0000000..ea0bfc7 --- /dev/null +++ b/src/miniprogram-2/pages/setting/setting.wxss @@ -0,0 +1,49 @@ +/* pages/setting/setting.wxss */ + +button{ + background-color:rgb(255, 26, 26); + border: none; + color: white; + padding: 15px 32px; + text-align: center; + text-decoration: none; + display:block; + margin:60rpx auto; + font-size: 16px; +} +.hr{ + height: 1rpx; + background-color: rgb(202, 202, 202); +} +.info{ + display: flex; + flex-direction: column; + font-size: 30rpx; + margin-left: 30rpx; + margin-top: 10rpx; +} +.info_more1{ + display:flex; + justify-content: space-between; + padding-bottom: 20rpx; + padding-top: 20rpx; +} +.info_more{ + display:flex; + justify-content: space-between; + padding-bottom: 30rpx; + padding-top: 30rpx; +} +.tx{ + width: 100rpx; + height: 100rpx; + border-radius: 50%; + margin-right: 10rpx; +} +.icon{ + padding-right: 30rpx; + color: rgb(167, 164, 164); +} +.tx1{ + padding-top: 30rpx; +} \ No newline at end of file diff --git a/src/miniprogram-2/project.config.json b/src/miniprogram-2/project.config.json new file mode 100644 index 0000000..200b91c --- /dev/null +++ b/src/miniprogram-2/project.config.json @@ -0,0 +1,54 @@ +{ + "description": "项目配置文件，个性化配置", + "packOptions": { + "ignore": [], + "include": [] + }, + "@setting": "编译相关的配置", + "setting": { + "bundle": false, + "userConfirmedBundleSwitch": false, + "urlCheck": true, + "scopeDataCheck": false, + "coverView": true, + "es6": true, + "postcss": true, + "compileHotReLoad": false, + "lazyloadPlaceholderEnable": false, + "preloadBackgroundData": false, + "minified": true, + "autoAudits": false, + "newFeature": false, + "uglifyFileName": false, + "uploadWithSourceMap": true, + "useIsolateContext": true, + "nodeModules": false, + "enhance": true, + "useMultiFrameRuntime": true, + "useApiHook": true, + "useApiHostProcess": true, + "showShadowRootInWxmlPanel": true, + "packNpmManually": false, + "enableEngineNative": false, + "packNpmRelationList": [], + "minifyWXSS": true, + "showES6CompileOption": false, + "minifyWXML": true, + "babelSetting": { + "ignore": [], + "disablePlugins": [], + "outputPath": "" + }, + "condition": false + }, + "compileType": "miniprogram", + "libVersion": "2.19.4", + "@appid": "更换自己的id号", + "appid": "wxa651e940bcc5eead", + "projectname": "miniprogram-92", + "condition": {}, + "editorSetting": { + "tabIndent": "auto", + "tabSize": 2 + } +} \ No newline at end of file diff --git a/src/miniprogram-2/project.private.config.json b/src/miniprogram-2/project.private.config.json new file mode 100644 index 0000000..657f0a0 --- /dev/null +++ b/src/miniprogram-2/project.private.config.json @@ -0,0 +1,7 @@ +{ + "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html", + "projectname": "miniprogram-2", + "setting": { + "compileHotReLoad": true + } +} \ No newline at end of file diff --git a/src/miniprogram-2/sitemap.json b/src/miniprogram-2/sitemap.json new file mode 100644 index 0000000..ca02add --- /dev/null +++ b/src/miniprogram-2/sitemap.json @@ -0,0 +1,7 @@ +{ + "desc": "关于本文件的更多信息，请参考文档 https://developers.weixin.qq.com/miniprogram/dev/framework/sitemap.html", + "rules": [{ + "action": "allow", + "page": "*" + }] +} \ No newline at end of file diff --git a/src/miniprogram-2/utils/util.js b/src/miniprogram-2/utils/util.js new file mode 100644 index 0000000..764bc2c --- /dev/null +++ b/src/miniprogram-2/utils/util.js @@ -0,0 +1,19 @@ +const formatTime = date => { + const year = date.getFullYear() + const month = date.getMonth() + 1 + const day = date.getDate() + const hour = date.getHours() + const minute = date.getMinutes() + const second = date.getSeconds() + + return `${[year, month, day].map(formatNumber).join('/')} ${[hour, minute, second].map(formatNumber).join(':')}` +} + +const formatNumber = n => { + n = n.toString() + return n[1] ? n : `0${n}` +} + +module.exports = { + formatTime +}