diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json index 582561b..a97fd25 100644 --- a/.hbuilderx/launch.json +++ b/.hbuilderx/launch.json @@ -10,6 +10,10 @@ { "launchtype" : "local" }, + "h5" : + { + "launchtype" : "local" + }, "type" : "uniCloud" } ] diff --git a/apis/interfaces/menu.js b/apis/interfaces/menu.js new file mode 100644 index 0000000..15d307c --- /dev/null +++ b/apis/interfaces/menu.js @@ -0,0 +1,44 @@ +/** + * Web唐明明 + * 匆匆数载恍如梦,岁月迢迢华发增。 + * 碌碌无为枉半生,一朝惊醒万事空。 + * moduleName: 签到 + */ + +import { request } from '../index' + +// 首页 +const index = () =>{ + return request({ + url: 'health/recipes' + }) +} + +// 分类 +const categories = () =>{ + return request({ + url: 'health/recipe/categories' + }) +} + +// 分类-列表 +const queue = (data) =>{ + return request({ + url: 'health/recipe/lists', + data:data + }) +} + +// 详情 +const menuDet = (recipe) =>{ + return request({ + url: 'health/recipes/' + recipe + }) +} + +export { + index, + categories, + queue, + menuDet +} diff --git a/apis/interfaces/ranking.js b/apis/interfaces/ranking.js new file mode 100644 index 0000000..dbba97e --- /dev/null +++ b/apis/interfaces/ranking.js @@ -0,0 +1,29 @@ +/** + * Web唐明明 + * 匆匆数载恍如梦,岁月迢迢华发增。 + * 碌碌无为枉半生,一朝惊醒万事空。 + * moduleName: 食物排行 + */ + +import { request } from '../index' + +// 食物分类 +const categories = (data) =>{ + return request({ + url: 'health/foods/categories', + data: data + }) +} + +// 食物排行 +const foods = (data) =>{ + return request({ + url: 'health/foods', + data: data + }) +} + +export { + categories, + foods +} diff --git a/apis/interfaces/sign.js b/apis/interfaces/sign.js new file mode 100644 index 0000000..58684dc --- /dev/null +++ b/apis/interfaces/sign.js @@ -0,0 +1,19 @@ +/** + * Web唐明明 + * 匆匆数载恍如梦,岁月迢迢华发增。 + * 碌碌无为枉半生,一朝惊醒万事空。 + * moduleName: 签到 + */ + +import { request } from '../index' + +// 日历 +const date = () =>{ + return request({ + url: 'user/sign' + }) +} + +export { + date +} diff --git a/package-lock.json b/package-lock.json index 25e690b..ed33bf0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,19 +8,14 @@ "integrity": "sha512-GkrrZ0LX0vn9R5k6RKEi0Ez3Q3e2vUpjXQ8Z6/K/d28KudI9ajqgt8WEjQFlG5EPm1K6uTArN8LlqmZTEixDUA==" }, "uni-simple-router": { - "version": "2.0.7", - "resolved": "https://registry.npmjs.org/uni-simple-router/-/uni-simple-router-2.0.7.tgz", - "integrity": "sha512-8FKv5dw7Eoonm0gkO8udprrxzin0fNUI0+AvIphFkFRH5ZmP5ZWJ2pvnWzb2NiiqQSECTSU5VSB7HhvOSwD5eA==" + "version": "2.0.8-beta.3", + "resolved": "https://registry.npmjs.org/uni-simple-router/-/uni-simple-router-2.0.8-beta.3.tgz", + "integrity": "sha512-Aiw9O7TzATZ0BH9e6p0hJsVy8K1lYjf3P9QMmskNqJaOh9jltCaurrw/dJZ7xUMGVu/K3XP1MxOotBAUjsiUZg==" }, "uview-ui": { "version": "2.0.19", "resolved": "https://registry.npmjs.org/uview-ui/-/uview-ui-2.0.19.tgz", "integrity": "sha512-ddZiaP7R9wsUxMzAuhuXgh5OswgCm2lKuulTqjnRXFr0uUWsgL1iBifU3GbOwpwP0LtTHKJOo9rYv1LP0WXmzA==" - }, - "vuex": { - "version": "3.6.2", - "resolved": "https://registry.npmjs.org/vuex/-/vuex-3.6.2.tgz", - "integrity": "sha512-ETW44IqCgBpVomy520DT5jf8n0zoCac+sxWnn+hMe/CzaSejb/eVw2YToiXYX+Ex/AuHHia28vWTq4goAexFbw==" } } } diff --git a/pages.json b/pages.json index fcdfb4c..48cf772 100644 --- a/pages.json +++ b/pages.json @@ -119,6 +119,78 @@ "navigationBarBackgroundColor": "#FFFFFF", "enablePullDownRefresh": true } + }, { + "path": "pages/sign/index", + "name": "signIndex", + "style": { + "navigationBarTitleText": "每日签到", + "navigationBarBackgroundColor": "#FFFFFF", + "enablePullDownRefresh": true + } + }, { + "path": "pages/menu/index", + "name": "menuIndex", + "style": { + "navigationBarTitleText": "食谱推荐", + "navigationBarBackgroundColor": "#FFFFFF", + "enablePullDownRefresh": true + } + }, { + "path": "pages/menu/classify", + "name": "menuClassify", + "style": { + "navigationBarTitleText": "食谱推荐", + "navigationBarBackgroundColor": "#FFFFFF", + "enablePullDownRefresh": true + } + }, { + "path": "pages/menu/details", + "name": "menuDetails", + "style": { + "navigationBarTitleText": "食谱详情", + "navigationBarBackgroundColor": "#FFFFFF", + "enablePullDownRefresh": true + } + }, { + "path": "pages/topic/index", + "name": "topicIndex", + "style": { + "navigationBarTitleText": "话题广场", + "navigationBarBackgroundColor": "#FFFFFF", + "enablePullDownRefresh": true + } + }, { + "path": "pages/topic/details", + "name": "topicDetails", + "style": { + "navigationBarTitleText": "", + "navigationBarBackgroundColor": "#FFFFFF", + "enablePullDownRefresh": true + } + }, { + "path": "pages/ranking/index", + "name": "rankingIndex", + "style": { + "navigationBarTitleText": "食物排行", + "navigationBarBackgroundColor": "#FFFFFF", + "enablePullDownRefresh": true + } + }, { + "path": "pages/ranking/list", + "name": "rankingList", + "style": { + "navigationBarTitleText": "食物榜单", + "navigationBarBackgroundColor": "#FFFFFF", + "enablePullDownRefresh": true + } + }, { + "path": "pages/ranking/details", + "name": "rankingDetails", + "style": { + "navigationBarTitleText": "食物详情", + "navigationBarBackgroundColor": "#FFFFFF", + "enablePullDownRefresh": true + } }], "tabBar": { "borderStyle": "white", diff --git a/pages/index/index.vue b/pages/index/index.vue index d18edf2..9cdc1ea 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -4,7 +4,7 @@ 欢迎使用ZH健康 - + @@ -17,9 +17,9 @@ - + - 精选推荐 + 精选推荐查看更多 @@ -31,39 +31,11 @@ - 话题广场 - - - 坚持做瑜伽可以减肥吗 - - 阅读100 - 赞100 - - - - - 有没有减肥秘诀/减肥偏方/减肥窍门 - - 阅读100 - 赞100 - - - - - 只需2招迅速变出小蛮腰 - - 阅读100 - 赞100 - - - - - 有效方便的减肥方法有哪些 - - 阅读100 - 赞100 - - + 话题广场查看更多 + @@ -89,7 +61,32 @@ export default { describe: "健身搭配食用更佳", color : "fbeed3", thumb : 'https://cdn.uviewui.com/uview/goods/1.jpg' - }] + }], + topicArr: [{ + id: 1, + title: '坚持做瑜伽可以减肥吗', + read: '100', + praise: '100', + cover: 'http://up.boohee.cn/house/u/mboohee/img/others/7.2.jpg' + },{ + id: 2, + title: '有没有减肥秘诀/减肥偏方/减肥窍门', + read: '100', + praise: '100', + cover: 'http://up.boohee.cn/house/u/mboohee/img/others/yundong1.jpg' + },{ + id: 3, + title: '只需2招迅速变出小蛮腰', + read: '100', + praise: '100', + cover: 'http://up.boohee.cn/house/u/mboohee/img/others/yundong2.jpg' + },{ + id: 3, + title: '有效方便的减肥方法有哪些', + read: '100', + praise: '100', + cover: 'http://up.boohee.cn/house/u/mboohee/img/others/jian.jpg' + }] }; }, onLoad() {}, @@ -209,41 +206,17 @@ export default { // 话题广场 .new-box { margin: $margin; + position: relative; .title { font-weight: bold; font-size: $title-size + 4; } - .new-item { - position: relative; - margin-top: $margin - 10; - background: #f5fdfa; - border-radius: $radius; - padding: $padding ($padding * 2 + 200rpx) $padding $padding; - .new-cover { - position: absolute; - right: $padding; - top: $padding; - width: 200rpx; - height: 150rpx; - border-radius: $radius; - } - .new-title { - font-size: $title-size; - line-height: 45rpx; - min-height: 100rpx; - margin-bottom: 10px; - font-weight: bold; - color: $text-color; - } - .new-tool { - color: $text-gray; - font-size: $title-size-sm; - line-height: 40rpx; - text { - margin-right: $margin/2; - } - } - } + .more { + position: absolute; + right: 0; + top: 0; + color: $text-gray; + } } // 卡片 diff --git a/pages/menu/classify.vue b/pages/menu/classify.vue new file mode 100644 index 0000000..5611823 --- /dev/null +++ b/pages/menu/classify.vue @@ -0,0 +1,68 @@ + + + + + diff --git a/pages/menu/details.vue b/pages/menu/details.vue new file mode 100644 index 0000000..8b5d7fc --- /dev/null +++ b/pages/menu/details.vue @@ -0,0 +1,149 @@ + + + + + diff --git a/pages/menu/index.vue b/pages/menu/index.vue new file mode 100644 index 0000000..a2a440f --- /dev/null +++ b/pages/menu/index.vue @@ -0,0 +1,82 @@ + + + + + + diff --git a/pages/ranking/details.vue b/pages/ranking/details.vue new file mode 100644 index 0000000..5f08d3c --- /dev/null +++ b/pages/ranking/details.vue @@ -0,0 +1,321 @@ + + + + + diff --git a/pages/ranking/index.vue b/pages/ranking/index.vue new file mode 100644 index 0000000..f3d9554 --- /dev/null +++ b/pages/ranking/index.vue @@ -0,0 +1,120 @@ + + + + + diff --git a/pages/ranking/list.vue b/pages/ranking/list.vue new file mode 100644 index 0000000..d73032c --- /dev/null +++ b/pages/ranking/list.vue @@ -0,0 +1,73 @@ + + + + + diff --git a/pages/sign/index.vue b/pages/sign/index.vue new file mode 100644 index 0000000..533d247 --- /dev/null +++ b/pages/sign/index.vue @@ -0,0 +1,182 @@ + + + + + diff --git a/pages/topic/details.vue b/pages/topic/details.vue new file mode 100644 index 0000000..a34807d --- /dev/null +++ b/pages/topic/details.vue @@ -0,0 +1,151 @@ + + + + + diff --git a/pages/topic/index.vue b/pages/topic/index.vue new file mode 100644 index 0000000..808f4cc --- /dev/null +++ b/pages/topic/index.vue @@ -0,0 +1,108 @@ + + + + + diff --git a/static/find/default_img.png b/static/find/default_img.png new file mode 100644 index 0000000..0874e87 Binary files /dev/null and b/static/find/default_img.png differ diff --git a/static/find/menu_0.jpg b/static/find/menu_0.jpg new file mode 100644 index 0000000..9a3ee9e Binary files /dev/null and b/static/find/menu_0.jpg differ diff --git a/static/find/menu_1.jpg b/static/find/menu_1.jpg new file mode 100644 index 0000000..ae21c6b Binary files /dev/null and b/static/find/menu_1.jpg differ diff --git a/static/find/menu_2.jpg b/static/find/menu_2.jpg new file mode 100644 index 0000000..cfd6396 Binary files /dev/null and b/static/find/menu_2.jpg differ diff --git a/static/find/menu_more.png b/static/find/menu_more.png new file mode 100644 index 0000000..1608962 Binary files /dev/null and b/static/find/menu_more.png differ diff --git a/static/find/ranking_img.png b/static/find/ranking_img.png new file mode 100644 index 0000000..782a494 Binary files /dev/null and b/static/find/ranking_img.png differ diff --git a/static/find/sign.png b/static/find/sign.png new file mode 100644 index 0000000..ec6202f Binary files /dev/null and b/static/find/sign.png differ diff --git a/static/find/sign_active.png b/static/find/sign_active.png new file mode 100644 index 0000000..68bbe29 Binary files /dev/null and b/static/find/sign_active.png differ diff --git a/static/find/sign_img.png b/static/find/sign_img.png new file mode 100644 index 0000000..ba16454 Binary files /dev/null and b/static/find/sign_img.png differ diff --git a/uni_modules/oct-menu/changelog.md b/uni_modules/oct-menu/changelog.md new file mode 100644 index 0000000..e69de29 diff --git a/uni_modules/oct-menu/components/oct-menu/oct-menu.vue b/uni_modules/oct-menu/components/oct-menu/oct-menu.vue new file mode 100644 index 0000000..aa20acb --- /dev/null +++ b/uni_modules/oct-menu/components/oct-menu/oct-menu.vue @@ -0,0 +1,115 @@ + + + diff --git a/uni_modules/oct-menu/package.json b/uni_modules/oct-menu/package.json new file mode 100644 index 0000000..daedf71 --- /dev/null +++ b/uni_modules/oct-menu/package.json @@ -0,0 +1,80 @@ +{ + "id": "oct-menu", + "displayName": "oct-menu", + "version": "1.0.0", + "description": "oct-menu", + "keywords": [ + "oct-menu" +], + "repository": "", + "engines": { + "HBuilderX": "^3.1.0" + }, + "dcloudext": { + "category": [ + "前端组件", + "通用组件" + ], + "sale": { + "regular": { + "price": "0.00" + }, + "sourcecode": { + "price": "0.00" + } + }, + "contact": { + "qq": "" + }, + "declaration": { + "ads": "", + "data": "", + "permissions": "" + }, + "npmurl": "" + }, + "uni_modules": { + "dependencies": [], + "encrypt": [], + "platforms": { + "cloud": { + "tcb": "u", + "aliyun": "u" + }, + "client": { + "Vue": { + "vue2": "u", + "vue3": "u" + }, + "App": { + "app-vue": "u", + "app-nvue": "u" + }, + "H5-mobile": { + "Safari": "u", + "Android Browser": "u", + "微信浏览器(Android)": "u", + "QQ浏览器(Android)": "u" + }, + "H5-pc": { + "Chrome": "u", + "IE": "u", + "Edge": "u", + "Firefox": "u", + "Safari": "u" + }, + "小程序": { + "微信": "u", + "阿里": "u", + "百度": "u", + "字节跳动": "u", + "QQ": "u" + }, + "快应用": { + "华为": "u", + "联盟": "u" + } + } + } + } +} \ No newline at end of file diff --git a/uni_modules/oct-menu/readme.md b/uni_modules/oct-menu/readme.md new file mode 100644 index 0000000..d21a4a3 --- /dev/null +++ b/uni_modules/oct-menu/readme.md @@ -0,0 +1 @@ +# oct-menu \ No newline at end of file diff --git a/uni_modules/oct-topic/changelog.md b/uni_modules/oct-topic/changelog.md new file mode 100644 index 0000000..e69de29 diff --git a/uni_modules/oct-topic/components/oct-topic/oct-topic.vue b/uni_modules/oct-topic/components/oct-topic/oct-topic.vue new file mode 100644 index 0000000..bdfdb5a --- /dev/null +++ b/uni_modules/oct-topic/components/oct-topic/oct-topic.vue @@ -0,0 +1,63 @@ + + + + + diff --git a/uni_modules/oct-topic/package.json b/uni_modules/oct-topic/package.json new file mode 100644 index 0000000..9d4eb62 --- /dev/null +++ b/uni_modules/oct-topic/package.json @@ -0,0 +1,80 @@ +{ + "id": "oct-topic", + "displayName": "oct-topic", + "version": "1.0.0", + "description": "oct-topic", + "keywords": [ + "oct-topic" +], + "repository": "", + "engines": { + "HBuilderX": "^3.1.0" + }, + "dcloudext": { + "category": [ + "前端组件", + "通用组件" + ], + "sale": { + "regular": { + "price": "0.00" + }, + "sourcecode": { + "price": "0.00" + } + }, + "contact": { + "qq": "" + }, + "declaration": { + "ads": "", + "data": "", + "permissions": "" + }, + "npmurl": "" + }, + "uni_modules": { + "dependencies": [], + "encrypt": [], + "platforms": { + "cloud": { + "tcb": "u", + "aliyun": "u" + }, + "client": { + "Vue": { + "vue2": "u", + "vue3": "u" + }, + "App": { + "app-vue": "u", + "app-nvue": "u" + }, + "H5-mobile": { + "Safari": "u", + "Android Browser": "u", + "微信浏览器(Android)": "u", + "QQ浏览器(Android)": "u" + }, + "H5-pc": { + "Chrome": "u", + "IE": "u", + "Edge": "u", + "Firefox": "u", + "Safari": "u" + }, + "小程序": { + "微信": "u", + "阿里": "u", + "百度": "u", + "字节跳动": "u", + "QQ": "u" + }, + "快应用": { + "华为": "u", + "联盟": "u" + } + } + } + } +} \ No newline at end of file diff --git a/uni_modules/oct-topic/readme.md b/uni_modules/oct-topic/readme.md new file mode 100644 index 0000000..23c80e6 --- /dev/null +++ b/uni_modules/oct-topic/readme.md @@ -0,0 +1 @@ +# oct-topic \ No newline at end of file