diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..a70bc78 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +/unpackage +/node_modules diff --git a/ZhHealth-APP(22.1.14).zip b/ZhHealth-APP(22.1.14).zip new file mode 100644 index 0000000..917594a Binary files /dev/null and b/ZhHealth-APP(22.1.14).zip differ diff --git a/apis/index.js b/apis/index.js index 9401cc2..f38d316 100644 --- a/apis/index.js +++ b/apis/index.js @@ -10,7 +10,7 @@ import router from '../router' // 基础配置 const config = { - apiUrl : 'https://oapi.lianshang.vip/api/', // 正式环境 + apiUrl : 'http://api.zh.shangkelian.cn/api/', // 正式环境 timeout : 60000 } diff --git a/apis/interfaces/address.js b/apis/interfaces/address.js new file mode 100644 index 0000000..783a14a --- /dev/null +++ b/apis/interfaces/address.js @@ -0,0 +1,65 @@ +/** + * Web唐明明 + * 匆匆数载恍如梦,岁月迢迢华发增。 + * 碌碌无为枉半生,一朝惊醒万事空。 + * moduleName: 地址管理 + */ + +import { request } from '../index' + +// 地址列表 +const list = () =>{ + return request({ + url: 'mall/addresses' + }) +} + +// 添加地址 +const add = data => { + return request({ + url: 'mall/addresses', + method: 'POST', + data + }) +} + +// 收货地址详情 +const info = id => { + return request({ + url: 'mall/addresses/' + id + }) +} + +// 修改收货地址 +const edit = (id, data) => { + return request({ + url: 'mall/addresses/' + id, + method: 'PUT', + data + }) +} + +// 删除收货地址 +const del = id => { + return request({ + url: 'mall/addresses/' + id, + method: 'DELETE' + }) +} + +// 获取省市区 +const addresses = data => { + return request({ + url: 'mall/addresses/create', + data + }) +} + +export { + list, + add, + info, + edit, + del, + addresses +} diff --git a/apis/interfaces/auth.js b/apis/interfaces/auth.js index 602a490..39ab591 100644 --- a/apis/interfaces/auth.js +++ b/apis/interfaces/auth.js @@ -27,7 +27,6 @@ const getSms = (data) =>{ } // 用户隐私,用户服务协议 - const secretService = (name) =>{ return request({ url: "articles/agreement/"+name @@ -43,7 +42,6 @@ const keyAuth = (data) => { }, true) } - export { smsAuth, getSms, diff --git a/apis/interfaces/drink.js b/apis/interfaces/drink.js new file mode 100644 index 0000000..4d2128a --- /dev/null +++ b/apis/interfaces/drink.js @@ -0,0 +1,42 @@ +/* + * @Description:饮水记录模块 + * @Author: Aimee·Zhang + * @Date: 2022-01-12 11:07:06 + * @LastEditors: Aimee·Zhang + * @LastEditTime: 2022-01-12 15:57:48 + */ +import { request } from '../index' +/** + * @description:饮水记录首页 + */ +const waters = () => { + return request({ + url: 'health/waters', + }) +} +/** + * @description:设定喝水目标 + * @Date: 2022-01-12 15:33:39 + */ +const setWaters = (data) => { + return request({ + url: 'health/waters', + method: 'POST', + data: data + }) +} +/** + * @description:喝水 + * @Date: 2022-01-12 12:56:00 + */ +const drinkWater = () => { + return request({ + url: 'health/waters/drink', + method: 'POST', + }) +} +export { + waters, + setWaters, + drinkWater +} diff --git a/apis/interfaces/essentialInfo.js b/apis/interfaces/essentialInfo.js new file mode 100644 index 0000000..1360b1c --- /dev/null +++ b/apis/interfaces/essentialInfo.js @@ -0,0 +1,55 @@ + +/* + * @Description:创建档案模块 + * @Author: Aimee·Zhang + * @Date: 2022-01-12 13:27:31 + * @LastEditors: Aimee·Zhang + * @LastEditTime: 2022-01-12 14:32:11 + */ + +import { request } from '../index' +/** + * @description:新建健康档案 + * @params {age,sex,height,weight,exercise,goal_weight,days} + * @return {*} + * @method {post} + * @Date: 2022-01-12 11:08:11 + */ +const recordsHealth = (data) => { + console.log(data, 'camsji///////////') + return request({ + url: 'health/records', + method: "POST", + data: data + }) +} + +/** + * @description:编辑健康档案前置 + * @params {id}档案id + * @return {} + * @method {get} + * @Date: 2022-01-12 13:39:56 + */ +const editHealthBefore = (id) => { + return request({ + url: `health/records/${id}/edit` + }) +} +/** + * @description:修改健康档案 + * @params {record_id:档案id,data:参数} + * @return {*} + * @Date: 2022-01-12 13:49:29 + */ +const editHealth = (record_id, data) => { + return request({ + url: `health/records/${record_id}`, + method: "PUT", + date: data + }) +} + +export { + recordsHealth +} diff --git a/apis/interfaces/evaluation.js b/apis/interfaces/evaluation.js new file mode 100644 index 0000000..8f100a3 --- /dev/null +++ b/apis/interfaces/evaluation.js @@ -0,0 +1,74 @@ +/* + * @Description: + * @Author: Aimee·Zhang + * @Date: 2022-01-13 13:17:14 + * @LastEditors: Aimee·Zhang + * @LastEditTime: 2022-01-14 08:38:02 + */ +/** + * @description:健康测评模块接口 + * @params {*} + * @return {*} + * @Date: 2022-01-13 13:17:33 + */ +import { request } from '../index' +/** + * @description:健康测评接口 + */ +const evaluations = () => { + return request({ + url: 'evaluations' + }) +} +/** + * @description:测试介绍页面 + * @Date: 2022-01-13 15:04:47 + */ +const evaluationsInfo = (evaluation_id) => { + return request({ + url: `evaluations/${evaluation_id}` + }) +} + +/** + * @description:试题列表 + * @Date: 2022-01-13 15:12:31 + */ + +const evaluationsQuestion = (evaluation_id, page) => { + return request({ + url: `evaluations/${evaluation_id}/questions`, + data: { + page: page + } + }) +} +/** + * @description:提交答案 + * @Date: 2022-01-13 16:06:26 + */ +const evaluationsAnswers = (data) => { + console.log(data) + return request({ + url: `evaluations/${data.id}/answers`, + data: data, + method: 'POST' + }) +} +/** + * @description:获取测评结果 + * @Date: 2022-01-13 16:28:02 + */ +const evaluationsAnswersInfo = (id) => { + return request({ + url: `evaluations/${id}/result`, + }) +} + +export { + evaluations, + evaluationsInfo, + evaluationsQuestion, + evaluationsAnswers, + evaluationsAnswersInfo +} diff --git a/apis/interfaces/foods.js b/apis/interfaces/foods.js new file mode 100644 index 0000000..85ee623 --- /dev/null +++ b/apis/interfaces/foods.js @@ -0,0 +1,88 @@ +/* + * @Description:vip健康食谱 + * @Author: Aimee·Zhang + * @Date: 2022-01-12 17:48:28 + * @LastEditors: Aimee·Zhang + * @LastEditTime: 2022-01-14 09:16:28 + */ +import { request } from '../index' +/** + * @description:称量体重模块首页 + */ +const positions = (page) => { + return request({ + url: 'health/recipe/positions', + data: { page: page } + }) +} +/** + * @description:饮食和运动首页信息 + * @params {日期} + * @method {get} + * @Date: 2022-01-13 08:55:04 + */ +const plans = (date) => { + return request({ + url: 'health/plans', + data: { + date: date + } + }) +} + +/** + * @description:食品列表可翻页 + * @params {食品名称} + * @return {} + * @Date: 2022-01-13 09:37:26 + */ + +const healthFoods = (data) => { + return request({ + url: 'health/foods', + data: data + }) +} + +/** + * @description:添加食物 + * @Date: 2022-01-13 10:57:52 + */ +const addHealthFoods = (data) => { + return request({ + url: 'health/intakes', + method: 'POST', + data: data + }) +} + +/** + * @description:编辑食品 + * @Date: 2022-01-13 11:37:37 + */ +const editHealthFoods = (data) => { + return request({ + url: `health/intakes/${data.intake_id}`, + method: 'PUT', + data: data + }) +} +/** + * @description:删除添加食品 + * @Date: 2022-01-14 09:15:38 + */ +const delHealthFoods = (intake_id) => { + return request({ + url: `health/intakes/${intake_id}`, + method: 'DELETE' + }) +} + +export { + positions, + plans, + healthFoods, + addHealthFoods, + editHealthFoods, + delHealthFoods +} diff --git a/apis/interfaces/health.js b/apis/interfaces/health.js new file mode 100644 index 0000000..de4fd87 --- /dev/null +++ b/apis/interfaces/health.js @@ -0,0 +1,25 @@ + +/* + * @Description:健康记录模块 + * @Author: Aimee·Zhang + * @Date: 2022-01-12 10:11:43 + * @LastEditors: Aimee·Zhang + * @LastEditTime: 2022-01-13 08:56:03 + */ + +import { request } from '../index' +/** + * @description:记录首页 + * @params {null} + * @return {} + * @Date: 2022-01-12 10:17:21 + */ +const logs = () => { + return request({ + url: 'health/logs', + }) +} + +export { + logs +} 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/order.js b/apis/interfaces/order.js index 69cbda1..aae3318 100644 --- a/apis/interfaces/order.js +++ b/apis/interfaces/order.js @@ -5,9 +5,7 @@ * moduleName: 订单 */ -import { - request -} from '../index' +import { request } from '../index' export { diff --git a/apis/interfaces/pay.js b/apis/interfaces/pay.js new file mode 100644 index 0000000..fded39d --- /dev/null +++ b/apis/interfaces/pay.js @@ -0,0 +1,33 @@ +/** + * Web唐明明 + * 匆匆数载恍如梦,岁月迢迢华发增。 + * 碌碌无为枉半生,一朝惊醒万事空。 + * moduleName: 支付 + */ + +import { request } from '../index' + +const wxPAY = (orderNo) => { + console.log(orderNo) + return request({ + url: 'mall/pay/' + orderNo + '/wechat', + data: { + type: 'app' + } + }) +} + +const alPAY = (orderNo) => { + console.log(orderNo) + return request({ + url: 'mall/pay/' + orderNo + '/alipay', + data: { + type: 'app' + } + }) +} + +export { + wxPAY, + alPAY +} 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/apis/interfaces/store.js b/apis/interfaces/store.js new file mode 100644 index 0000000..9ba9cfb --- /dev/null +++ b/apis/interfaces/store.js @@ -0,0 +1,75 @@ +/** + * Web唐明明 + * 匆匆数载恍如梦,岁月迢迢华发增。 + * 碌碌无为枉半生,一朝惊醒万事空。 + * moduleName: 商城 + */ + +import { request } from '../index' + +// 商城 +const mall = () =>{ + return request({ + url: 'mall' + }) +} + +// 商品详情 +const goods = id => { + return request({ + url: 'mall/goods/' + id + }) +} + +// 套餐列表 +const meals = (id, categoryId) => { + return request({ + url: 'mall/meals/' + id, + data: { + category_id: categoryId + } + }) +} + +// 商品列表 +const lists = data => { + console.log(data) + return request({ + url: 'mall/goods', + data + }) +} + +// 确认订单 +const buy = data => { + return request({ + url: 'mall/buy/goods', + data + }) +} + +// 商品下单 +const verify = data => { + return request({ + url: 'mall/buy/goods', + method: 'POST', + data + }) +} + +// 商城二级分类 +const classify = id => { + return request({ + url: 'mall/categories/' + id + '/children' + }) +} + +export { + mall, + goods, + meals, + lists, + buy, + verify, + classify +} diff --git a/apis/interfaces/user.js b/apis/interfaces/user.js new file mode 100644 index 0000000..da02903 --- /dev/null +++ b/apis/interfaces/user.js @@ -0,0 +1,19 @@ +/** + * Web唐明明 + * 匆匆数载恍如梦,岁月迢迢华发增。 + * 碌碌无为枉半生,一朝惊醒万事空。 + * moduleName: 用户 + */ + +import { request } from '../index' + +// 用户 +const info = () =>{ + return request({ + url: 'user/info' + }) +} + +export { + info +} diff --git a/apis/interfaces/weight.js b/apis/interfaces/weight.js new file mode 100644 index 0000000..7a97283 --- /dev/null +++ b/apis/interfaces/weight.js @@ -0,0 +1,32 @@ +/* + * @Description:称体重模块 + * @Author: Aimee·Zhang + * @Date: 2022-01-12 16:24:28 + * @LastEditors: Aimee·Zhang + * @LastEditTime: 2022-01-12 17:13:45 + */ +import { request } from '../index' +/** + * @description:称量体重模块首页 + */ +const weights = (page) => { + return request({ + url: 'health/weights', + data: { page: page } + }) +} +/** + * @description:记录体重 + * @Date: 2022-01-12 16:46:19 + */ +const addWeight = (data) => { + return request({ + url: 'health/weights', + method: 'POST', + data: data + }) +} +export { + weights, + addWeight +} diff --git a/components/addGoods/index.vue b/components/add-goods-template/add-goods-template.vue similarity index 85% rename from components/addGoods/index.vue rename to components/add-goods-template/add-goods-template.vue index 05dcc29..5315411 100644 --- a/components/addGoods/index.vue +++ b/components/add-goods-template/add-goods-template.vue @@ -13,18 +13,34 @@ 取消 - 新增食物 + {{title}} 确认 + + + - 0千卡0克 + {{total}}千卡{{Number(inputValue.join("")) || '0.0'}}克 {{inputValue.join("") || '0.0'}} { @@ -261,6 +297,15 @@ export default { this.animationData1 = this.animation1.export(); this.animationData2 = this.animation2.export(); }, + // 删除这条数据 + delThis(item) { + this.$emit("delThis"); + }, + // 跳转到食品详情 + tabGoodsInfo(e) { + console.log("父组件监听到了子组件的商品详情页面", e); + this.$emit("tabGoodsInfo", { title: e[0].name, id: e[0].food_id }); + }, }, }; @@ -352,7 +397,12 @@ export default { .addGoods { // min-height: 40vh; position: relative; - + .goodsList { + padding: $padding; + } + .delThis { + padding: $padding; + } .add-btn { padding: $padding; display: flex; diff --git a/components/foods/index.vue b/components/foods/index.vue index 93b1cda..94fefd1 100644 --- a/components/foods/index.vue +++ b/components/foods/index.vue @@ -4,49 +4,49 @@ * @Author: Aimee·Zhang * @Date: 2022-01-11 12:08:34 * @LastEditors: Aimee·Zhang - * @LastEditTime: 2022-01-11 15:41:47 + * @LastEditTime: 2022-01-13 11:19:06 -->