diff --git a/components/config/PrivacyAgreementPoup.vue b/components/config/PrivacyAgreementPoup.vue deleted file mode 100644 index 6eda2c6..0000000 --- a/components/config/PrivacyAgreementPoup.vue +++ /dev/null @@ -1,169 +0,0 @@ - - - - - \ No newline at end of file diff --git a/components/home/productSwiper.vue b/components/home/productSwiper.vue index 7c2901a..9132c6c 100644 --- a/components/home/productSwiper.vue +++ b/components/home/productSwiper.vue @@ -44,7 +44,7 @@ - - \ No newline at end of file diff --git a/components/user/productList.vue b/components/user/productList.vue deleted file mode 100644 index ad16f79..0000000 --- a/components/user/productList.vue +++ /dev/null @@ -1,112 +0,0 @@ - - - - - \ No newline at end of file diff --git a/components/userShop/userShopCommission.vue b/components/userShop/userShopCommission.vue deleted file mode 100644 index be66e89..0000000 --- a/components/userShop/userShopCommission.vue +++ /dev/null @@ -1,130 +0,0 @@ - - - - - \ No newline at end of file diff --git a/pages.json b/pages.json index bb0d979..ece21b5 100644 --- a/pages.json +++ b/pages.json @@ -2,32 +2,58 @@ "pages": [{ "path": "pages/index/index", "style": { - "navigationBarTitleText": "" + "navigationBarTitleText": "", + "componentPlaceholder": { + "recommend-swiper": "view", + "health-records-intro": "view", + "achievement-intro": "view", + "team-bg-intro": "view", + "follow-us-intro": "view" + } } }, { "path": "pages/index/report", "style": { "navigationBarTitleText": "", + "componentPlaceholder": { + "report-summary": "view", + "recommend-test": "view", + "report-record-card": "view" + }, "enablePullDownRefresh": true } }, { "path": "pages/index/product", "style": { - "navigationBarTitleText": "" + "navigationBarTitleText": "", + "componentPlaceholder": { + "tab-nutrient": "view", + "tab-detect": "view", + "tab-course": "view" + } } }, { "path": "pages/index/cart", "style": { - "navigationBarTitleText": "" + "navigationBarTitleText": "", + "componentPlaceholder": { + "cart-product-card": "view", + "recommend-product-card": "view" + } } }, { "path": "pages/index/center", "style": { - "navigationBarTitleText": "" + "navigationBarTitleText": "", + "componentPlaceholder": { + "report-card": "view", + "order-card": "view", + "account-card": "view" + } } } ], @@ -52,6 +78,9 @@ { "path": "auth/loginAndRegisterAndForgetPassword" }, + { + "path": "auth/facialVerify" + }, { "path": "report/test/intro" }, @@ -111,23 +140,6 @@ }, { "path": "checkup/checkupReport/index" - }, - - - { - "path": "order/orderDetail" - }, - { - "path": "mine/purse" - }, - { - "path": "mine/runningWater" - }, - { - "path": "mine/help" - }, - { - "path": "mine/promotion" } ] }], diff --git a/pages/index/cart.vue b/pages/index/cart.vue index ff6fcbf..c6fbaa6 100644 --- a/pages/index/cart.vue +++ b/pages/index/cart.vue @@ -40,11 +40,11 @@ @@ -55,11 +55,11 @@ - + > @@ -96,13 +96,13 @@ import mixinsList from '@/mixins/list.js' import tabber from '@/components/base/tabbar.vue' - import productCard from '@/components/cart/productCard.vue' - import recommendProductCard from '@/components/product/productCard.vue' + import cartProductCard from '@/pages_order/cart/productCard.vue' + import recommendProductCard from '@/pages_order/product/productCard.vue' export default { mixins: [mixinsList], components: { - productCard, + cartProductCard, recommendProductCard, tabber, }, @@ -140,7 +140,7 @@ this.list = [ { id: '001', - url: '/pages_order/static/index/recommend-pic.png', + url: '', name: '月度装定制营养包', price: 688, count: 1, @@ -155,7 +155,7 @@ }, { id: '002', - url: '/pages_order/static/index/recommend-pic.png', + url: '', name: '月度装定制营养包', price: 688, count: 1, @@ -170,7 +170,7 @@ }, { id: '003', - url: '/pages_order/static/index/recommend-pic.png', + url: '', name: '月度装定制营养包', price: 688, count: 1, @@ -185,7 +185,7 @@ }, { id: '004', - url: '/pages_order/static/index/recommend-pic.png', + url: '', name: '月度装定制营养包', price: 688, count: 1, @@ -200,7 +200,7 @@ }, { id: '005', - url: '/pages_order/static/index/recommend-pic.png', + url: '', name: '月度装定制营养包', price: 688, count: 1, @@ -230,7 +230,7 @@ this.recommendList = [ { id: '001', - url: '/pages_order/static/index/recommend-pic.png', + url: '', name: '月度装定制营养包', sales: 24770, price: 688.00, @@ -238,7 +238,7 @@ }, { id: '002', - url: '/pages_order/static/index/recommend-pic.png', + url: '', name: '月度装定制营养包', sales: 24770, price: 688.00, @@ -246,7 +246,7 @@ }, { id: '003', - url: '/pages_order/static/index/recommend-pic.png', + url: '', name: '月度装定制营养包', sales: 24770, price: 688.00, @@ -254,7 +254,7 @@ }, { id: '004', - url: '/pages_order/static/index/recommend-pic.png', + url: '', name: '月度装定制营养包', sales: 24770, price: 688.00, diff --git a/pages/index/category.vue b/pages/index/category.vue deleted file mode 100644 index a4a64b0..0000000 --- a/pages/index/category.vue +++ /dev/null @@ -1,191 +0,0 @@ - - - - - \ No newline at end of file diff --git a/pages/index/center copy.vue b/pages/index/center copy.vue deleted file mode 100644 index 0fd684f..0000000 --- a/pages/index/center copy.vue +++ /dev/null @@ -1,353 +0,0 @@ - - - - - \ No newline at end of file diff --git a/pages/index/center.vue b/pages/index/center.vue index d9d485c..012fcd2 100644 --- a/pages/index/center.vue +++ b/pages/index/center.vue @@ -20,9 +20,9 @@ - - - + + + @@ -62,9 +62,9 @@ import { mapState } from 'vuex' import tabber from '@/components/base/tabbar.vue' - import reportCard from '@/components/center/reportCard.vue' - import orderCard from '@/components/center/orderCard.vue' - import accountCard from '@/components/center/accountCard.vue' + import reportCard from '@/pages_order/center/reportCard.vue' + import orderCard from '@/pages_order/center/orderCard.vue' + import accountCard from '@/pages_order/center/accountCard.vue' export default { components: { diff --git a/pages/index/index.vue b/pages/index/index.vue index c585f1b..689a64c 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -10,17 +10,17 @@ - - + + - + - + @@ -29,7 +29,7 @@ 关注我们
参与更多健康活动 - +
@@ -41,13 +41,13 @@ - - diff --git a/pages/index/product.vue b/pages/index/product.vue index 5d85dfb..2385dd3 100644 --- a/pages/index/product.vue +++ b/pages/index/product.vue @@ -29,11 +29,11 @@ - + - + - + @@ -42,9 +42,9 @@ + +> \ No newline at end of file diff --git a/components/cart/productCard.vue b/pages_order/cart/productCard.vue similarity index 100% rename from components/cart/productCard.vue rename to pages_order/cart/productCard.vue diff --git a/components/center/accountCard.vue b/pages_order/center/accountCard.vue similarity index 100% rename from components/center/accountCard.vue rename to pages_order/center/accountCard.vue diff --git a/components/center/orderCard.vue b/pages_order/center/orderCard.vue similarity index 100% rename from components/center/orderCard.vue rename to pages_order/center/orderCard.vue diff --git a/components/center/reportCard.vue b/pages_order/center/reportCard.vue similarity index 100% rename from components/center/reportCard.vue rename to pages_order/center/reportCard.vue diff --git a/components/center/styles/card.scss b/pages_order/center/styles/card.scss similarity index 100% rename from components/center/styles/card.scss rename to pages_order/center/styles/card.scss diff --git a/pages_order/checkup/checkupBook/apply.vue b/pages_order/checkup/checkupBook/apply.vue index a35c186..db855ed 100644 --- a/pages_order/checkup/checkupBook/apply.vue +++ b/pages_order/checkup/checkupBook/apply.vue @@ -459,7 +459,7 @@ const detail = { id: '003', - url: '/pages_order/static/product/detect-8.png', + url: '', title: '孕产妇体检套餐', userName: '周小艺', phone: '15558661691', diff --git a/pages_order/checkup/checkupBook/detail.vue b/pages_order/checkup/checkupBook/detail.vue index 63444f2..5c68455 100644 --- a/pages_order/checkup/checkupBook/detail.vue +++ b/pages_order/checkup/checkupBook/detail.vue @@ -160,7 +160,7 @@ let detail = { id: '003', - url: '/pages_order/static/product/detect-8.png', + url: '', title: '孕产妇体检套餐', userName: '周小艺', phone: '15558661691', diff --git a/pages_order/checkup/checkupRecords.vue b/pages_order/checkup/checkupRecords.vue index 05b45d5..7d71f89 100644 --- a/pages_order/checkup/checkupRecords.vue +++ b/pages_order/checkup/checkupRecords.vue @@ -82,7 +82,7 @@ this.list = [ { id: '001', - url: '/pages_order/static/product/detect-8.png', + url: '', title: '月度装定制营养包', userName: '周小艺', phone: '15558661691', @@ -94,7 +94,7 @@ }, { id: '002', - url: '/pages_order/static/product/detect-8.png', + url: '', title: '青少年体检套餐', userName: '周小艺', phone: '15558661691', @@ -106,7 +106,7 @@ }, { id: '003', - url: '/pages_order/static/product/detect-8.png', + url: '', title: '孕产妇体检套餐', userName: '周小艺', phone: '15558661691', @@ -117,7 +117,7 @@ }, { id: '004', - url: '/pages_order/static/product/detect-8.png', + url: '', title: '青少年体检套餐', userName: '周小艺', phone: '15558661691', @@ -129,7 +129,7 @@ }, { id: '005', - url: '/pages_order/static/product/detect-8.png', + url: '', title: '青少年体检套餐', userName: '周小艺', phone: '15558661691', diff --git a/pages_order/checkup/checkupReport/index.vue b/pages_order/checkup/checkupReport/index.vue index 6821539..a372581 100644 --- a/pages_order/checkup/checkupReport/index.vue +++ b/pages_order/checkup/checkupReport/index.vue @@ -16,12 +16,20 @@
- + + + + + + + + + - + @@ -31,6 +39,8 @@ import reportMainIndexView from './reportMainIndexView.vue' import reportAbnormalView from './reportAbnormalView.vue' import reportCommonView from './reportCommonView.vue' + import reportDetectView from './reportDetectView.vue' + import reportTableView from './reportTableView.vue' export default { components: { @@ -38,6 +48,8 @@ reportMainIndexView, reportAbnormalView, reportCommonView, + reportDetectView, + reportTableView, }, data() { return { @@ -115,6 +127,78 @@ desc: '建议进一步监测;常规测甲状腺功能全套,甲状腺。', }, ], + commonlist: [ + { + id: '001', + label: '血小板', + value: '5.2', + standrad: '125~350×10^9/L', + status: 1, + }, + { + id: '002', + label: '血红蛋白', + value: '4.8', + standrad: '110 ~ 150g/L', + status: 1, + }, + { + id: '003', + label: '白细胞', + value: '3.0', + standrad: '3.9-6.1mmol/L', + status: 1, + }, + { + id: '004', + label: '转氨酶', + value: '7.0', + standrad: '3.9-6.1mmol/L', + status: 1, + }, + { + id: '005', + label: '胆红素', + value: '17', + standrad: '3.9-6.1mmol/L', + status: 1, + }, + { + id: '006', + label: '白蛋白', + value: '15', + standrad: '3.9-6.1mmol/L', + status: 1, + }, + { + id: '007', + label: '肌酐', + value: '4', + standrad: '3.9-6.1mmol/L', + status: 1, + }, + { + id: '008', + label: '尿酸', + value: '556', + standrad: '3.9-6.1mmol/L', + status: 0, + }, + { + id: '009', + label: '血压', + value: '23', + standrad: '3.9-6.1mmol/L', + status: 0, + }, + { + id: '010', + label: '甘油三酯', + value: '56', + standrad: '3.9-6.1mmol/L', + status: 0, + }, + ], chronicFoodAllergyList: [ { id: '001', @@ -271,6 +355,80 @@ { id: '009', label: '心理', value: 78 }, { id: '010', label: '心理', value: 100 }, ], + tableList: [ + { + id: '001', + name: '慢性食物过敏', + significance: '评估个体对特定食物的免疫反应,主要检测IgG抗体水平。了解个体对不同食物的免疫反应程度,以帮助识别可能引起不适症状的食物,并指导个体的饮食调整和管理策略。辅助诊断和管理相关的消化问题和炎症疾病。', + sampling: '指尖血', + weight: 5, + done: 1, + }, + { + id: '002', + name: '肠道菌群基因测序', + significance: '评估和分析个体肠道内微生物的组成和功能,以了解肠道健康状况和相关疾病的风险。以制定个性化的益生菌+ 营养策略和有害菌应对方案。', + sampling: '指尖血', + weight: 5, + done: 1, + }, + { + id: '003', + name: '营养与毒性元素', + significance: '评估和分析个体肠道内微生物的组成和功能,以了解肠道健康状况和相关疾病的风险。以制定个性化的益生菌+ 营养策略和有害菌应对方案。', + sampling: '指尖血', + weight: 5, + done: 1, + }, + { + id: '004', + name: '精准基因', + significance: '评估和分析个体肠道内微生物的组成和功能,以了解肠道健康状况和相关疾病的风险。以制定个性化的益生菌+ 营养策略和有害菌应对方案。', + sampling: '指尖血', + weight: 5, + done: 1, + }, + { + id: '005', + name: '新陈代谢', + significance: '评估和分析个体肠道内微生物的组成和功能,以了解肠道健康状况和相关疾病的风险。以制定个性化的益生菌+ 营养策略和有害菌应对方案。', + sampling: '指尖血', + weight: 5, + done: 1, + }, + { + id: '006', + name: '女性荷尔蒙&抗缪', + significance: '评估和分析个体肠道内微生物的组成和功能,以了解肠道健康状况和相关疾病的风险。以制定个性化的益生菌+ 营养策略和有害菌应对方案。', + sampling: '指尖血', + weight: 5, + done: 1, + }, + { + id: '007', + name: '环境荷尔蒙', + significance: '评估和分析个体肠道内微生物的组成和功能,以了解肠道健康状况和相关疾病的风险。以制定个性化的益生菌+ 营养策略和有害菌应对方案。', + sampling: '指尖血', + weight: 5, + done: 1, + }, + { + id: '008', + name: '抗压力荷尔蒙评估', + significance: '评估和分析个体肠道内微生物的组成和功能,以了解肠道健康状况和相关疾病的风险。以制定个性化的益生菌+ 营养策略和有害菌应对方案。', + sampling: '指尖血', + weight: 5, + done: 1, + }, + { + id: '009', + name: '慢病风险', + significance: '评估和分析个体肠道内微生物的组成和功能,以了解肠道健康状况和相关疾病的风险。以制定个性化的益生菌+ 营养策略和有害菌应对方案。', + sampling: '指尖血', + weight: 5, + done: 1, + }, + ], } console.log('detail', this.detail) diff --git a/pages_order/checkup/checkupReport/reportCommonView.vue b/pages_order/checkup/checkupReport/reportCommonView.vue index 5b6975d..139868d 100644 --- a/pages_order/checkup/checkupReport/reportCommonView.vue +++ b/pages_order/checkup/checkupReport/reportCommonView.vue @@ -1,239 +1,42 @@ \ No newline at end of file diff --git a/pages_order/checkup/checkupReport/reportDetectView.vue b/pages_order/checkup/checkupReport/reportDetectView.vue new file mode 100644 index 0000000..4ea8168 --- /dev/null +++ b/pages_order/checkup/checkupReport/reportDetectView.vue @@ -0,0 +1,153 @@ + + + + + \ No newline at end of file diff --git a/pages_order/checkup/checkupReport/reportTableView.vue b/pages_order/checkup/checkupReport/reportTableView.vue new file mode 100644 index 0000000..f498ec1 --- /dev/null +++ b/pages_order/checkup/checkupReport/reportTableView.vue @@ -0,0 +1,130 @@ + + + + + \ No newline at end of file diff --git a/pages_order/checkup/checkupReport/style.scss b/pages_order/checkup/checkupReport/style.scss index 8caca51..9b8fd17 100644 --- a/pages_order/checkup/checkupReport/style.scss +++ b/pages_order/checkup/checkupReport/style.scss @@ -1,5 +1,91 @@ + .card.card-detect { + padding: 32rpx 24rpx; + background-image: linear-gradient(#F2EDFF, #FCFEFE); + border: 8rpx solid #F9F7FF; + border-radius: 64rpx; + + .card-header { + .title { + padding: 6rpx 14rpx; + display: inline-flex; + font-family: PingFang SC; + font-weight: 400; + font-size: 28rpx; + line-height: 1.5; + color: #252545; + border: 2rpx solid #252545; + border-radius: 30rpx; + } + } + + .section { + margin-top: 40rpx; + + &-header { + font-family: PingFang SC; + line-height: 1.4; + color: #252545; + + .title { + font-weight: 600; + font-size: 32rpx; + } + + .desc { + font-weight: 400; + font-size: 24rpx; + } + } + + &-content { + margin-top: 32rpx; + } + } + + .index { + display: grid; + grid-template-columns: repeat(2, 1fr); + gap: 32rpx; + + &-item { + font-family: PingFang SC; + font-weight: 400; + line-height: 1.4; + + .top { + justify-content: space-between; + } + + .main { + justify-content: flex-start; + column-gap: 12rpx; + + font-size: 24rpx; + color: #8B8B8B; + } + + .label { + font-size: 30rpx; + color: #000000; + } + + .value { + font-weight: 400; + font-size: 28rpx; + color: #000000; + } + + .desc { + font-size: 22rpx; + line-height: 1.6; + color: #989898; + } + } + } + } + .tag { padding: 6rpx 16rpx; font-family: PingFang SC; diff --git a/pages_order/checkup/checkupServicePopup.vue b/pages_order/checkup/checkupServicePopup.vue index ed5477a..7d82db1 100644 --- a/pages_order/checkup/checkupServicePopup.vue +++ b/pages_order/checkup/checkupServicePopup.vue @@ -4,7 +4,8 @@ 添加客服微信 - + + diff --git a/components/home/achievementIntro.vue b/pages_order/home/achievementIntro.vue similarity index 93% rename from components/home/achievementIntro.vue rename to pages_order/home/achievementIntro.vue index 4bb2ced..4609650 100644 --- a/components/home/achievementIntro.vue +++ b/pages_order/home/achievementIntro.vue @@ -14,7 +14,8 @@ 我们携手营养学博士、医学博士以及人工智能算法工程师,组建了一支顶尖的专业团队。 - + + 团队依托先进的AI智能算法、世界领先的检测手段与设备,充分考量用户个人的独特性,参考国人的生活方式、地域差异以及饮食习惯。
为每一位客户建立个人专属健康档案,并量身定制个性化的健康管理方案。 @@ -32,7 +33,8 @@ 合作实验室以ISO 15189为标准建立质量管理体系, 保证实验室的有效且可靠的运营。 - + +
diff --git a/components/home/followUsIntro.vue b/pages_order/home/followUsIntro.vue similarity index 100% rename from components/home/followUsIntro.vue rename to pages_order/home/followUsIntro.vue diff --git a/components/home/healthRecordsIntro.vue b/pages_order/home/healthRecordsIntro.vue similarity index 98% rename from components/home/healthRecordsIntro.vue rename to pages_order/home/healthRecordsIntro.vue index e964793..ca694b0 100644 --- a/components/home/healthRecordsIntro.vue +++ b/pages_order/home/healthRecordsIntro.vue @@ -48,7 +48,7 @@ - - \ No newline at end of file diff --git a/pages_order/mine/promotion.vue b/pages_order/mine/promotion.vue deleted file mode 100644 index 53cf18a..0000000 --- a/pages_order/mine/promotion.vue +++ /dev/null @@ -1,283 +0,0 @@ - - - - - \ No newline at end of file diff --git a/pages_order/mine/purse.vue b/pages_order/mine/purse.vue deleted file mode 100644 index fe7dd19..0000000 --- a/pages_order/mine/purse.vue +++ /dev/null @@ -1,109 +0,0 @@ - - - - - \ No newline at end of file diff --git a/pages_order/mine/runningWater.vue b/pages_order/mine/runningWater.vue deleted file mode 100644 index a14a621..0000000 --- a/pages_order/mine/runningWater.vue +++ /dev/null @@ -1,88 +0,0 @@ - - - - - diff --git a/components/product/productCard.vue b/pages_order/product/productCard.vue similarity index 100% rename from components/product/productCard.vue rename to pages_order/product/productCard.vue diff --git a/components/product/styles/tab.scss b/pages_order/product/styles/tab.scss similarity index 100% rename from components/product/styles/tab.scss rename to pages_order/product/styles/tab.scss diff --git a/components/product/courseLiveCard.vue b/pages_order/product/tabCourse/courseLiveCard.vue similarity index 100% rename from components/product/courseLiveCard.vue rename to pages_order/product/tabCourse/courseLiveCard.vue diff --git a/components/product/courseRecommendView.vue b/pages_order/product/tabCourse/courseRecommendView.vue similarity index 89% rename from components/product/courseRecommendView.vue rename to pages_order/product/tabCourse/courseRecommendView.vue index d16344f..35f6c81 100644 --- a/components/product/courseRecommendView.vue +++ b/pages_order/product/tabCourse/courseRecommendView.vue @@ -41,7 +41,7 @@ \ No newline at end of file diff --git a/components/product/detectCustomView.vue b/pages_order/product/tabDetect/detectCustomView.vue similarity index 85% rename from components/product/detectCustomView.vue rename to pages_order/product/tabDetect/detectCustomView.vue index 80880ea..17dd386 100644 --- a/components/product/detectCustomView.vue +++ b/pages_order/product/tabDetect/detectCustomView.vue @@ -11,7 +11,7 @@ \ No newline at end of file diff --git a/components/product/tabNutrient.vue b/pages_order/product/tabNutrient/index.vue similarity index 95% rename from components/product/tabNutrient.vue rename to pages_order/product/tabNutrient/index.vue index fc97ea6..f331ea7 100644 --- a/components/product/tabNutrient.vue +++ b/pages_order/product/tabNutrient/index.vue @@ -47,7 +47,7 @@ \ No newline at end of file diff --git a/components/product/nutrientCustomView.vue b/pages_order/product/tabNutrient/nutrientCustomView.vue similarity index 98% rename from components/product/nutrientCustomView.vue rename to pages_order/product/tabNutrient/nutrientCustomView.vue index 29a1757..402d637 100644 --- a/components/product/nutrientCustomView.vue +++ b/pages_order/product/tabNutrient/nutrientCustomView.vue @@ -65,7 +65,7 @@