diff --git a/apis/interfaces/essentialInfo.js b/apis/interfaces/essentialInfo.js
index 1360b1c..c33dbfd 100644
--- a/apis/interfaces/essentialInfo.js
+++ b/apis/interfaces/essentialInfo.js
@@ -16,7 +16,6 @@ import { request } from '../index'
* @Date: 2022-01-12 11:08:11
*/
const recordsHealth = (data) => {
- console.log(data, 'camsji///////////')
return request({
url: 'health/records',
method: "POST",
diff --git a/components/vueScale/index.vue b/components/vueScale/index.vue
index 71d2931..d646544 100644
--- a/components/vueScale/index.vue
+++ b/components/vueScale/index.vue
@@ -167,7 +167,6 @@ export default {
let scrollLen = (
Number(scrollLeft / (this.maginL + 2)) + this.scrollStart
).toFixed(1);
- console.log(typeof scrollLen);
this.scrollLeftInit =
(scrollLen - this.scrollStart) * (this.maginL + 2);
this.$emit("scroll", scrollLen);
diff --git a/new_file.111 b/new_file.111
deleted file mode 100644
index e69de29..0000000
diff --git a/package-lock.json b/package-lock.json
index 88ca34b..f939534 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -172,6 +172,11 @@
"resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
"integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo="
},
+ "moment": {
+ "version": "2.29.1",
+ "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.1.tgz",
+ "integrity": "sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ=="
+ },
"randombytes": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
@@ -211,4 +216,4 @@
"integrity": "sha512-ETW44IqCgBpVomy520DT5jf8n0zoCac+sxWnn+hMe/CzaSejb/eVw2YToiXYX+Ex/AuHHia28vWTq4goAexFbw=="
}
}
-}
\ No newline at end of file
+}
diff --git a/package.json b/package.json
index d94311f..429be0a 100644
--- a/package.json
+++ b/package.json
@@ -23,4 +23,4 @@
},
"author": "唐明明",
"license": "ISC"
-}
\ No newline at end of file
+}
diff --git a/pages.json b/pages.json
index 68285e0..0d1555b 100644
--- a/pages.json
+++ b/pages.json
@@ -1,779 +1,788 @@
{
- "pages": [{
- "path": "pages/index/index",
- "name": "Index",
- "style": {
- "navigationBarTitleText": "发现",
- "navigationStyle": "custom"
- }
- },
- {
- "path": "pages/index/guide",
- "name": "indexGuide",
- "style": {
- "navigationBarTitleText": "",
- "navigationStyle": "custom"
- }
- },
- {
- "path": "pages/index/search",
- "name": "indexSearch",
- "style": {
- "navigationBarTitleText": "",
- "navigationStyle": "custom"
- }
- },
- {
- "path": "pages/record/index",
- "name": "Record",
- "style": {
- "navigationBarTitleText": "记录",
- "navigationStyle": "custom"
- }
- },
- {
- "path": "pages/record/drink",
- "name": "Drink",
- "style": {
- "navigationBarTitleText": "记录喝水",
- "navigationBarBackgroundColor": "#34CE98",
- "navigationBarTextStyle": "white"
- }
- },
- {
- "path": "pages/record/weight",
- "name": "Weight",
- "style": {
- "navigationBarTitleText": "记录体重",
- "navigationBarBackgroundColor": "#34CE98",
- "navigationBarTextStyle": "white"
- }
- },
- {
- "path": "pages/record/foods",
- "name": "RecordFoods",
- "style": {
- "navigationBarTitleText": "食物记录",
- "navigationBarBackgroundColor": "#34CE98",
- "navigationBarTextStyle": "white"
- }
- },
- {
- "path": "pages/record/addFoods",
- "name": "AddFoods",
- "style": {
- "navigationBarTitleText": "添加食物",
- "navigationBarBackgroundColor": "#34CE98",
- "navigationBarTextStyle": "white"
- }
- },
- {
- "path": "pages/evaluation/list",
- "name": "EvaluationList",
- "style": {
- "navigationBarTitleText": "评测列表",
- "navigationBarBackgroundColor": "#34CE98",
- "navigationBarTextStyle": "white"
- }
- },
- {
- "path": "pages/evaluation/index",
- "name": "Evaluation",
- "style": {
- "navigationBarTitleText": "评测",
- "navigationBarBackgroundColor": "#34CE98",
- "navigationBarTextStyle": "white"
- }
- },
- {
- "path": "pages/evaluation/introduce",
- "name": "EvaluationIntroduce",
- "style": {
- "navigationBarTitleText": "评测题目",
- "navigationBarBackgroundColor": "#34CE98",
- "navigationBarTextStyle": "white"
- }
- },
- {
- "path": "pages/evaluation/result",
- "name": "EvaluationResult",
- "style": {
- "navigationBarTitleText": "评测结果",
- "navigationBarBackgroundColor": "#34CE98",
- "navigationBarTextStyle": "white"
- }
- },
- {
- "path": "pages/vip/foods",
- "name": "VipFoods",
- "style": {
- "navigationBarTitleText": "会员专享食谱",
- "navigationBarBackgroundColor": "#34CE98",
- "navigationBarTextStyle": "white"
- }
- },
- {
- "path": "pages/vip/nutritionHelper",
- "name": "NutritionHelper",
- "style": {
- "navigationBarTitleText": "营养小助手",
- "navigationBarBackgroundColor": "#34CE98",
- "navigationBarTextStyle": "white"
- }
- },
- {
- "path": "pages/essentialInfo/index",
- "name": "EssentialInfo",
- "style": {
- "navigationBarTitleText": "完善信息",
- "navigationBarBackgroundColor": "#34CE98",
- "navigationBarTextStyle": "white"
- }
- },
- {
- "path": "pages/store/index",
- "name": "Store",
- "style": {
- "navigationBarTitleText": "健康生活",
- "enablePullDownRefresh": true,
- "app-plus": {
- "titleNView": {
- "backgroundColor": "#FFFFFF",
- "titleSize": "16",
- "buttons": [{
- "float": "right",
- "text": "\ue603",
- "fontSrc": "/static/iconfont.ttf",
- "color": "#000",
- "fontSize": "20px"
- }]
- }
- }
- }
- },
- {
- "path": "pages/user/index",
- "name": "User",
- "style": {
- "navigationBarTitleText": "我的",
- "navigationStyle": "custom"
- }
- },
- {
- "path": "pages/auth/auth",
- "name": "Auth",
- "style": {
- "navigationBarTitleText": "登录"
- }
- },
- {
- "path": "pages/store/goods",
- "name": "StoreGoods",
- "style": {
- "navigationStyle": "custom",
- "navigationBarTitleText": "详情",
- "app-plus": {
- "titleNView": {
- "backgroundColor": "#FFFFFF",
- "type": "transparent"
- }
- }
- }
- },
- {
- "path": "pages/store/buy",
- "name": "StoreBuy",
- "style": {
- "navigationBarTitleText": "确认订单",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/order/index",
- "name": "Order",
- "style": {
- "navigationBarTitleText": "订单",
- "navigationBarBackgroundColor": "#FFFFFF",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/order/details",
- "name": "OrderDetails",
- "style": {
- "navigationBarTitleText": "订单详情",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/address/index",
- "name": "Address",
- "style": {
- "navigationBarTitleText": "地址"
- }
- },
- {
- "path": "pages/address/edit",
- "name": "AddressEdit",
- "style": {
- "navigationBarTitleText": "编辑",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/pay/pay",
- "style": {
- "navigationBarTitleText": "收银台",
- "navigationBarBackgroundColor": "#FFFFFF"
- }
- },
- {
- "path": "pages/store/buy",
- "name": "StoreBuy",
- "style": {
- "navigationBarTitleText": "确认订单",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/order/index",
- "name": "Order",
- "style": {
- "navigationBarTitleText": "订单",
- "navigationBarBackgroundColor": "#FFFFFF",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/order/details",
- "name": "OrderDetails",
- "style": {
- "navigationBarTitleText": "订单详情",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/address/index",
- "name": "Address",
- "style": {
- "navigationBarTitleText": "收货地址"
- }
- },
- {
- "path": "pages/address/edit",
- "name": "AddressEdit",
- "style": {
- "navigationBarTitleText": "编辑",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/pay/pay",
- "name": "Pay",
- "style": {
- "navigationBarTitleText": "收银台",
- "navigationBarBackgroundColor": "#FFFFFF"
- }
- },
- {
- "path": "pages/store/list",
- "name": "StoreList",
- "style": {
- "navigationBarTitleText": "商品",
- "navigationBarBackgroundColor": "#FFFFFF",
- "enablePullDownRefresh": true
- }
- },
- {
- "path": "pages/store/meals",
- "name": "StoreMeals",
- "style": {
- "navigationBarTitleText": "套餐",
- "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
- }
- },
- {
- "path": "pages/im/index",
- "name": "IM",
- "style": {
- "navigationBarTitleText": "im",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/store/goods",
- "name": "StoreGoods",
- "style": {
- "navigationStyle": "custom",
- "navigationBarTitleText": "详情",
- "app-plus": {
- "titleNView": {
- "backgroundColor": "#FFFFFF",
- "type": "transparent"
- }
- }
- }
- },
- {
- "path": "pages/store/buy",
- "name": "StoreBuy",
- "style": {
- "navigationBarTitleText": "确认订单",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/order/index",
- "name": "Order",
- "style": {
- "navigationBarTitleText": "订单",
- "navigationBarBackgroundColor": "#FFFFFF",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/order/details",
- "name": "OrderDetails",
- "style": {
- "navigationBarTitleText": "订单详情",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/address/index",
- "name": "Address",
- "style": {
- "navigationBarTitleText": "收货地址"
- }
- },
- {
- "path": "pages/address/edit",
- "name": "AddressEdit",
- "style": {
- "navigationBarTitleText": "编辑",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/pay/pay",
- "name": "Pay",
- "style": {
- "navigationBarTitleText": "收银台",
- "navigationBarBackgroundColor": "#FFFFFF"
- }
- },
- {
- "path": "pages/store/list",
- "name": "StoreList",
- "style": {
- "navigationBarTitleText": "商品",
- "navigationBarBackgroundColor": "#FFFFFF",
- "enablePullDownRefresh": true,
- "app-plus": {
- "titleNView": {
- "backgroundColor": "#FFFFFF",
- "titleSize": "16",
- "buttons": [{
- "float": "right",
- "text": "\ue603",
- "fontSrc": "/static/iconfont.ttf",
- "color": "#000",
- "fontSize": "20px"
- }]
- }
- }
- }
- },
- {
- "path": "pages/store/meals",
- "name": "StoreMeals",
- "style": {
- "navigationBarTitleText": "套餐",
- "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
- }
- },
- {
- "path": "pages/notice/index",
- "name": "noticeIndex",
- "style": {
- "navigationBarTitleText": "消息",
- "navigationBarBackgroundColor": "#FFFFFF",
- "enablePullDownRefresh": true
- }
- },
- {
- "path": "pages/notice/list",
- "name": "noticeList",
- "style": {
- "navigationBarTitleText": "消息",
- "navigationBarBackgroundColor": "#FFFFFF",
- "enablePullDownRefresh": true
- }
- },
- {
- "path": "pages/notice/details",
- "name": "noticeDetails",
- "style": {
- "navigationBarTitleText": "消息",
- "navigationBarBackgroundColor": "#FFFFFF",
- "enablePullDownRefresh": true
- }
- },
- {
- "path": "pages/im/index",
- "name": "IM",
- "style": {
- "navigationBarTitleText": "聊聊",
- "navigationBarBackgroundColor": "#FFFFFF",
- "app-plus": {
- "titleNView": {
- "buttons": [{
- "float": "right",
- "text": "\ue605",
- "fontSrc": "/static/iconfont.ttf",
- "color": "#000",
- "fontSize": "20px"
- },
- {
- "float": "left",
- "text": "\ue606",
- "fontSrc": "/static/iconfont.ttf",
- "color": "#000",
- "fontSize": "20px"
- }
- ]
- }
- }
- }
- },
- {
- "path": "pages/im/chum",
- "name": "ImChum",
- "style": {
- "navigationBarTitleText": "好友",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/wallet/add",
- "name": "WalletAdd",
- "style": {
- "navigationBarTitleText": "创建钱包",
- "navigationBarBackgroundColor": "#FFFFFF",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/wallet/create",
- "name": "WalletCreate",
- "style": {
- "navigationBarTitleText": "设置密码",
- "navigationBarBackgroundColor": "#FFFFFF",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/wallet/mnemonic",
- "name": "WalletMnemonic",
- "style": {
- "navigationBarTitleText": "导出助记词",
- "navigationBarBackgroundColor": "#FFFFFF",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/wallet/validation",
- "name": "WalletValidation",
- "style": {
- "navigationBarTitleText": "验证助记词",
- "navigationBarBackgroundColor": "#FFFFFF",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/wallet/property",
- "name": "WalletProperty",
- "style": {
- "navigationBarTitleText": "ZH钱包",
- "navigationBarTextStyle": "white",
- "app-plus": {
- "titleNView": {
- "backgroundImage": "linear-gradient(to right, #34ce98, #22aa98)",
- "type": "transparent",
- "buttons": [{
- "float": "right",
- "text": "\ue607",
- "fontSrc": "/static/iconfont.ttf",
- "color": "#FFF",
- "fontSize": "20px",
- "background": "rgba(0,0,0,0)"
- }],
- "backButton": {
- "background": "rgba(0,0,0,0)"
- }
- }
- }
- }
- },
- {
- "path": "pages/service/index",
- "name": "serviceIndex",
- "style": {
- "navigationBarTitleText": "",
- "navigationStyle": "custom",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/service/index",
- "name": "serviceIndex",
- "style": {
- "navigationBarTitleText": "",
- "navigationStyle": "custom",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/service/details",
- "name": "serviceDetails",
- "style": {
- "navigationBarTitleText": ""
- }
- },
- {
- "path": "pages/wallet/privatekey",
- "name": "WalletPrivatekey",
- "style": {
- "navigationBarTitleText": "钱包私钥",
- "navigationBarBackgroundColor": "#FFFFFF",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/wallet/resetPassword",
- "name": "ResetPassword",
- "style": {
- "navigationBarTitleText": "修改钱包密码",
- "navigationBarBackgroundColor": "#FFFFFF",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/store/search",
- "name": "StoreSearch",
- "style": {
- "navigationBarTitleText": "搜索",
- "navigationBarBackgroundColor": "#FFFFFF"
- }
- }
- ],
- "tabBar": {
- "borderStyle": "white",
- "selectedColor": "#34CE98",
- "list": [{
- "iconPath": "static/tabBar/tabBar_00.png",
- "selectedIconPath": "static/tabBar/tabBar_show_00.png",
- "pagePath": "pages/index/index",
- "text": "健康"
- },
- {
- "iconPath": "static/tabBar/tabBar_01.png",
- "selectedIconPath": "static/tabBar/tabBar_show_01.png",
- "pagePath": "pages/service/index",
- "text": "服务"
- },
- {
- "iconPath": "static/tabBar/tabBar_02.png",
- "selectedIconPath": "static/tabBar/tabBar_show_02.png",
- "pagePath": "pages/store/index",
- "text": "生活"
- },
- {
- "iconPath": "static/tabBar/tabBar_04.png",
- "selectedIconPath": "static/tabBar/tabBar_show_04.png",
- "pagePath": "pages/im/index",
- "text": "聊聊"
- },
- {
- "iconPath": "static/tabBar/tabBar_03.png",
- "selectedIconPath": "static/tabBar/tabBar_show_03.png",
- "pagePath": "pages/user/index",
- "text": "我的"
- }
- ]
- },
- "globalStyle": {
- "navigationBarTextStyle": "black",
- "navigationBarTitleText": "ZH健康",
- "navigationBarBackgroundColor": "#F3F6FB",
- "backgroundColorTop": "#F3F6FB",
- "backgroundColorBottom": "#F3F6FB"
- },
- "easycom": {
- "^u-(.*)": "uview-ui/components/u-$1/u-$1.vue"
- }
+ "pages": [{
+ "path": "pages/index/index",
+ "name": "Index",
+ "style": {
+ "navigationBarTitleText": "发现",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/index/guide",
+ "name": "indexGuide",
+ "style": {
+ "navigationBarTitleText": "",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/index/search",
+ "name": "indexSearch",
+ "style": {
+ "navigationBarTitleText": "",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/record/index",
+ "name": "Record",
+ "style": {
+ "navigationBarTitleText": "记录",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/record/drink",
+ "name": "Drink",
+ "style": {
+ "navigationBarTitleText": "记录喝水",
+ "navigationBarBackgroundColor": "#34CE98",
+ "navigationBarTextStyle": "white"
+ }
+ },
+ {
+ "path": "pages/record/weight",
+ "name": "Weight",
+ "style": {
+ "navigationBarTitleText": "记录体重",
+ "navigationBarBackgroundColor": "#34CE98",
+ "navigationBarTextStyle": "white"
+ }
+ },
+ {
+ "path": "pages/record/foods",
+ "name": "RecordFoods",
+ "style": {
+ "navigationBarTitleText": "食物记录",
+ "navigationBarBackgroundColor": "#34CE98",
+ "navigationBarTextStyle": "white"
+ }
+ },
+ {
+ "path": "pages/record/addFoods",
+ "name": "AddFoods",
+ "style": {
+ "navigationBarTitleText": "添加食物",
+ "navigationBarBackgroundColor": "#34CE98",
+ "navigationBarTextStyle": "white"
+ }
+ },
+ {
+ "path": "pages/evaluation/list",
+ "name": "EvaluationList",
+ "style": {
+ "navigationBarTitleText": "评测列表",
+ "navigationBarBackgroundColor": "#34CE98",
+ "navigationBarTextStyle": "white"
+ }
+ },
+ {
+ "path": "pages/evaluation/index",
+ "name": "Evaluation",
+ "style": {
+ "navigationBarTitleText": "评测",
+ "navigationBarBackgroundColor": "#34CE98",
+ "navigationBarTextStyle": "white"
+ }
+ },
+ {
+ "path": "pages/evaluation/introduce",
+ "name": "EvaluationIntroduce",
+ "style": {
+ "navigationBarTitleText": "评测题目",
+ "navigationBarBackgroundColor": "#34CE98",
+ "navigationBarTextStyle": "white"
+ }
+ },
+ {
+ "path": "pages/evaluation/result",
+ "name": "EvaluationResult",
+ "style": {
+ "navigationBarTitleText": "评测结果",
+ "navigationBarBackgroundColor": "#34CE98",
+ "navigationBarTextStyle": "white"
+ }
+ },
+ {
+ "path": "pages/vip/foods",
+ "name": "VipFoods",
+ "style": {
+ "navigationBarTitleText": "会员专享食谱",
+ "navigationBarBackgroundColor": "#34CE98",
+ "navigationBarTextStyle": "white"
+ }
+ },
+ {
+ "path": "pages/vip/nutritionHelper",
+ "name": "NutritionHelper",
+ "style": {
+ "navigationBarTitleText": "营养小助手",
+ "navigationBarBackgroundColor": "#34CE98",
+ "navigationBarTextStyle": "white"
+ }
+ },
+ {
+ "path": "pages/essentialInfo/index",
+ "name": "EssentialInfo",
+ "style": {
+ "navigationBarTitleText": "完善信息",
+ "navigationBarBackgroundColor": "#34CE98",
+ "navigationBarTextStyle": "white"
+ }
+ },
+ {
+ "path": "pages/store/index",
+ "name": "Store",
+ "style": {
+ "navigationBarTitleText": "健康生活",
+ "enablePullDownRefresh": true,
+ "app-plus": {
+ "titleNView": {
+ "backgroundColor": "#FFFFFF",
+ "titleSize": "16",
+ "buttons": [{
+ "float": "right",
+ "text": "\ue603",
+ "fontSrc": "/static/iconfont.ttf",
+ "color": "#000",
+ "fontSize": "20px"
+ }]
+ }
+ }
+ }
+ },
+ {
+ "path": "pages/user/index",
+ "name": "User",
+ "style": {
+ "navigationBarTitleText": "我的",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/auth/auth",
+ "name": "Auth",
+ "style": {
+ "navigationBarTitleText": "登录",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/store/goods",
+ "name": "StoreGoods",
+ "style": {
+ "navigationStyle": "custom",
+ "navigationBarTitleText": "详情",
+ "app-plus": {
+ "titleNView": {
+ "backgroundColor": "#FFFFFF",
+ "type": "transparent"
+ }
+ }
+ }
+ },
+ {
+ "path": "pages/store/buy",
+ "name": "StoreBuy",
+ "style": {
+ "navigationBarTitleText": "确认订单",
+ "enablePullDownRefresh": false
+ }
+ },
+ {
+ "path": "pages/order/index",
+ "name": "Order",
+ "style": {
+ "navigationBarTitleText": "订单",
+ "navigationBarBackgroundColor": "#FFFFFF",
+ "enablePullDownRefresh": false
+ }
+ },
+ {
+ "path": "pages/order/details",
+ "name": "OrderDetails",
+ "style": {
+ "navigationBarTitleText": "订单详情",
+ "enablePullDownRefresh": false
+ }
+ },
+ {
+ "path": "pages/address/index",
+ "name": "Address",
+ "style": {
+ "navigationBarTitleText": "地址"
+ }
+ },
+ {
+ "path": "pages/address/edit",
+ "name": "AddressEdit",
+ "style": {
+ "navigationBarTitleText": "编辑",
+ "enablePullDownRefresh": false
+ }
+ },
+ {
+ "path": "pages/pay/pay",
+ "style": {
+ "navigationBarTitleText": "收银台",
+ "navigationBarBackgroundColor": "#FFFFFF"
+ }
+ },
+ {
+ "path": "pages/store/buy",
+ "name": "StoreBuy",
+ "style": {
+ "navigationBarTitleText": "确认订单",
+ "enablePullDownRefresh": false
+ }
+ },
+ {
+ "path": "pages/order/index",
+ "name": "Order",
+ "style": {
+ "navigationBarTitleText": "订单",
+ "navigationBarBackgroundColor": "#FFFFFF",
+ "enablePullDownRefresh": false
+ }
+ },
+ {
+ "path": "pages/order/details",
+ "name": "OrderDetails",
+ "style": {
+ "navigationBarTitleText": "订单详情",
+ "enablePullDownRefresh": false
+ }
+ },
+ {
+ "path": "pages/address/index",
+ "name": "Address",
+ "style": {
+ "navigationBarTitleText": "收货地址"
+ }
+ },
+ {
+ "path": "pages/address/edit",
+ "name": "AddressEdit",
+ "style": {
+ "navigationBarTitleText": "编辑",
+ "enablePullDownRefresh": false
+ }
+ },
+ {
+ "path": "pages/pay/pay",
+ "name": "Pay",
+ "style": {
+ "navigationBarTitleText": "收银台",
+ "navigationBarBackgroundColor": "#FFFFFF"
+ }
+ },
+ {
+ "path": "pages/store/list",
+ "name": "StoreList",
+ "style": {
+ "navigationBarTitleText": "商品",
+ "navigationBarBackgroundColor": "#FFFFFF",
+ "enablePullDownRefresh": true
+ }
+ },
+ {
+ "path": "pages/store/meals",
+ "name": "StoreMeals",
+ "style": {
+ "navigationBarTitleText": "套餐",
+ "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
+ }
+ },
+ {
+ "path": "pages/im/index",
+ "name": "IM",
+ "style": {
+ "navigationBarTitleText": "im",
+ "enablePullDownRefresh": false
+ }
+ },
+ {
+ "path": "pages/store/goods",
+ "name": "StoreGoods",
+ "style": {
+ "navigationStyle": "custom",
+ "navigationBarTitleText": "详情",
+ "app-plus": {
+ "titleNView": {
+ "backgroundColor": "#FFFFFF",
+ "type": "transparent"
+ }
+ }
+ }
+ },
+ {
+ "path": "pages/store/buy",
+ "name": "StoreBuy",
+ "style": {
+ "navigationBarTitleText": "确认订单",
+ "enablePullDownRefresh": false
+ }
+ },
+ {
+ "path": "pages/order/index",
+ "name": "Order",
+ "style": {
+ "navigationBarTitleText": "订单",
+ "navigationBarBackgroundColor": "#FFFFFF",
+ "enablePullDownRefresh": false
+ }
+ },
+ {
+ "path": "pages/order/details",
+ "name": "OrderDetails",
+ "style": {
+ "navigationBarTitleText": "订单详情",
+ "enablePullDownRefresh": false
+ }
+ },
+ {
+ "path": "pages/address/index",
+ "name": "Address",
+ "style": {
+ "navigationBarTitleText": "收货地址"
+ }
+ },
+ {
+ "path": "pages/address/edit",
+ "name": "AddressEdit",
+ "style": {
+ "navigationBarTitleText": "编辑",
+ "enablePullDownRefresh": false
+ }
+ },
+ {
+ "path": "pages/pay/pay",
+ "name": "Pay",
+ "style": {
+ "navigationBarTitleText": "收银台",
+ "navigationBarBackgroundColor": "#FFFFFF"
+ }
+ },
+ {
+ "path": "pages/store/list",
+ "name": "StoreList",
+ "style": {
+ "navigationBarTitleText": "商品",
+ "navigationBarBackgroundColor": "#FFFFFF",
+ "enablePullDownRefresh": true,
+ "app-plus": {
+ "titleNView": {
+ "backgroundColor": "#FFFFFF",
+ "titleSize": "16",
+ "buttons": [{
+ "float": "right",
+ "text": "\ue603",
+ "fontSrc": "/static/iconfont.ttf",
+ "color": "#000",
+ "fontSize": "20px"
+ }]
+ }
+ }
+ }
+ },
+ {
+ "path": "pages/store/meals",
+ "name": "StoreMeals",
+ "style": {
+ "navigationBarTitleText": "套餐",
+ "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
+ }
+ },
+ {
+ "path": "pages/notice/index",
+ "name": "noticeIndex",
+ "style": {
+ "navigationBarTitleText": "消息",
+ "navigationBarBackgroundColor": "#FFFFFF",
+ "enablePullDownRefresh": true
+ }
+ },
+ {
+ "path": "pages/notice/list",
+ "name": "noticeList",
+ "style": {
+ "navigationBarTitleText": "消息",
+ "navigationBarBackgroundColor": "#FFFFFF",
+ "enablePullDownRefresh": true
+ }
+ },
+ {
+ "path": "pages/notice/details",
+ "name": "noticeDetails",
+ "style": {
+ "navigationBarTitleText": "消息",
+ "navigationBarBackgroundColor": "#FFFFFF",
+ "enablePullDownRefresh": true
+ }
+ },
+ {
+ "path": "pages/im/index",
+ "name": "IM",
+ "style": {
+ "navigationBarTitleText": "聊聊",
+ "navigationBarBackgroundColor": "#FFFFFF",
+ "app-plus": {
+ "titleNView": {
+ "buttons": [{
+ "float": "right",
+ "text": "\ue605",
+ "fontSrc": "/static/iconfont.ttf",
+ "color": "#000",
+ "fontSize": "20px"
+ },
+ {
+ "float": "left",
+ "text": "\ue606",
+ "fontSrc": "/static/iconfont.ttf",
+ "color": "#000",
+ "fontSize": "20px"
+ }
+ ]
+ }
+ }
+ }
+ },
+ {
+ "path": "pages/im/chum",
+ "name": "ImChum",
+ "style": {
+ "navigationBarTitleText": "好友",
+ "enablePullDownRefresh": false
+ }
+ },
+ {
+ "path": "pages/wallet/add",
+ "name": "WalletAdd",
+ "style": {
+ "navigationBarTitleText": "创建钱包",
+ "navigationBarBackgroundColor": "#FFFFFF",
+ "enablePullDownRefresh": false
+ }
+ },
+ {
+ "path": "pages/wallet/create",
+ "name": "WalletCreate",
+ "style": {
+ "navigationBarTitleText": "设置密码",
+ "navigationBarBackgroundColor": "#FFFFFF",
+ "enablePullDownRefresh": false
+ }
+ },
+ {
+ "path": "pages/wallet/mnemonic",
+ "name": "WalletMnemonic",
+ "style": {
+ "navigationBarTitleText": "导出助记词",
+ "navigationBarBackgroundColor": "#FFFFFF",
+ "enablePullDownRefresh": false
+ }
+ },
+ {
+ "path": "pages/wallet/validation",
+ "name": "WalletValidation",
+ "style": {
+ "navigationBarTitleText": "验证助记词",
+ "navigationBarBackgroundColor": "#FFFFFF",
+ "enablePullDownRefresh": false
+ }
+ },
+ {
+ "path": "pages/wallet/property",
+ "name": "WalletProperty",
+ "style": {
+ "navigationBarTitleText": "ZH钱包",
+ "navigationBarTextStyle": "white",
+ "app-plus": {
+ "titleNView": {
+ "backgroundImage": "linear-gradient(to right, #34ce98, #22aa98)",
+ "type": "transparent",
+ "buttons": [{
+ "float": "right",
+ "text": "\ue607",
+ "fontSrc": "/static/iconfont.ttf",
+ "color": "#FFF",
+ "fontSize": "20px",
+ "background": "rgba(0,0,0,0)"
+ }],
+ "backButton": {
+ "background": "rgba(0,0,0,0)"
+ }
+ }
+ }
+ }
+ },
+ {
+ "path": "pages/service/index",
+ "name": "serviceIndex",
+ "style": {
+ "navigationBarTitleText": "",
+ "navigationStyle": "custom",
+ "enablePullDownRefresh": false
+ }
+ },
+ {
+ "path": "pages/service/index",
+ "name": "serviceIndex",
+ "style": {
+ "navigationBarTitleText": "",
+ "navigationStyle": "custom",
+ "enablePullDownRefresh": false
+ }
+ },
+ {
+ "path": "pages/service/details",
+ "name": "serviceDetails",
+ "style": {
+ "navigationBarTitleText": ""
+ }
+ },
+ {
+ "path": "pages/wallet/privatekey",
+ "name": "WalletPrivatekey",
+ "style": {
+ "navigationBarTitleText": "钱包私钥",
+ "navigationBarBackgroundColor": "#FFFFFF",
+ "enablePullDownRefresh": false
+ }
+ },
+ {
+ "path": "pages/wallet/resetPassword",
+ "name": "ResetPassword",
+ "style": {
+ "navigationBarTitleText": "修改钱包密码",
+ "navigationBarBackgroundColor": "#FFFFFF",
+ "enablePullDownRefresh": false
+ }
+ },
+ {
+ "path": "pages/store/search",
+ "name": "StoreSearch",
+ "style": {
+ "navigationBarTitleText": "搜索",
+ "navigationBarBackgroundColor": "#FFFFFF"
+ }
+ },
+ {
+ "path": "pages/user/files",
+ "name": "UserFiles",
+ "style": {
+ "navigationBarTitleText": "健康档案",
+ "navigationBarBackgroundColor": "#FFFFFF"
+ }
+ }
+ ],
+ "tabBar": {
+ "borderStyle": "white",
+ "selectedColor": "#34CE98",
+ "list": [{
+ "iconPath": "static/tabBar/tabBar_00.png",
+ "selectedIconPath": "static/tabBar/tabBar_show_00.png",
+ "pagePath": "pages/index/index",
+ "text": "健康"
+ },
+ {
+ "iconPath": "static/tabBar/tabBar_02.png",
+ "selectedIconPath": "static/tabBar/tabBar_show_02.png",
+ "pagePath": "pages/store/index",
+ "text": "好物"
+ },
+ {
+ "iconPath": "static/tabBar/tabBar_01.png",
+ "selectedIconPath": "static/tabBar/tabBar_show_01.png",
+ "pagePath": "pages/service/index",
+ "text": "生活"
+ },
+ {
+ "iconPath": "static/tabBar/tabBar_04.png",
+ "selectedIconPath": "static/tabBar/tabBar_show_04.png",
+ "pagePath": "pages/im/index",
+ "text": "聊聊"
+ },
+ {
+ "iconPath": "static/tabBar/tabBar_03.png",
+ "selectedIconPath": "static/tabBar/tabBar_show_03.png",
+ "pagePath": "pages/user/index",
+ "text": "我的"
+ }
+ ]
+ },
+ "globalStyle": {
+ "navigationBarTextStyle": "black",
+ "navigationBarTitleText": "ZH健康",
+ "navigationBarBackgroundColor": "#F3F6FB",
+ "backgroundColorTop": "#F3F6FB",
+ "backgroundColorBottom": "#F3F6FB"
+ },
+ "easycom": {
+ "^u-(.*)": "uview-ui/components/u-$1/u-$1.vue"
+ }
}
diff --git a/pages/essentialInfo/index.vue b/pages/essentialInfo/index.vue
index 7ec611a..2838bc6 100644
--- a/pages/essentialInfo/index.vue
+++ b/pages/essentialInfo/index.vue
@@ -420,7 +420,6 @@ export default {
this.sexShow = false;
this.birthdayShow = true;
this.dateShow = true;
- console.log(this.percentplan1, this.sex);
},
// 年龄-------------确认选择了出生年月日
@@ -667,7 +666,7 @@ export default {
margin-top: $margin * 2;
view {
background-color: rgba($color: $main-color, $alpha: 0.5);
- color: $text-color;
+ color: white;
font-size: $title-size;
font-weight: bold;
padding: $padding * 0.6 $padding * 3;
diff --git a/pages/im/index.vue b/pages/im/index.vue
index 9e8ee58..9140551 100644
--- a/pages/im/index.vue
+++ b/pages/im/index.vue
@@ -44,6 +44,10 @@
+
+
+ 临时记录
+
diff --git a/pages/index/index.vue b/pages/index/index.vue
index f320512..a43271e 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -4,8 +4,8 @@
欢迎使用ZH健康
-
-
+
+
@@ -29,9 +29,13 @@
+
+
+
+
- 话题广场更多分类
+ 话题广场更多
import { index } from '@/apis/interfaces/topic'
+ import userAuth from '@/public/userAuth'
export default {
data() {
return {
@@ -63,6 +68,14 @@
this.topicArr = res.topics
})
},
+ onBtn(name){
+ if(this.$store.state.token === ''){
+ const Auth = new userAuth()
+ Auth.Login()
+ return
+ }
+ this.$Router.push({name})
+ }
}
};
diff --git a/pages/ranking/details.vue b/pages/ranking/details.vue
index a6d20a2..071c3f8 100644
--- a/pages/ranking/details.vue
+++ b/pages/ranking/details.vue
@@ -125,7 +125,7 @@
¥{{ item.price }}
-
+
查看商品
diff --git a/pages/record/foods.vue b/pages/record/foods.vue
index 9f65821..9c45b18 100644
--- a/pages/record/foods.vue
+++ b/pages/record/foods.vue
@@ -141,11 +141,7 @@