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/pages.json b/pages.json index daa3269..0d1555b 100644 --- a/pages.json +++ b/pages.json @@ -4,7 +4,7 @@ "name": "Index", "style": { "navigationBarTitleText": "发现", - "navigationStyle": "custom" + "navigationStyle": "custom" } }, { @@ -27,8 +27,8 @@ "path": "pages/record/index", "name": "Record", "style": { - "navigationBarTitleText": "记录" - // "navigationStyle": "custom" + "navigationBarTitleText": "记录", + "navigationStyle": "custom" } }, { @@ -163,7 +163,8 @@ "path": "pages/auth/auth", "name": "Auth", "style": { - "navigationBarTitleText": "登录" + "navigationBarTitleText": "登录", + "navigationStyle": "custom" } }, { @@ -729,6 +730,14 @@ "navigationBarTitleText": "搜索", "navigationBarBackgroundColor": "#FFFFFF" } + }, + { + "path": "pages/user/files", + "name": "UserFiles", + "style": { + "navigationBarTitleText": "健康档案", + "navigationBarBackgroundColor": "#FFFFFF" + } } ], "tabBar": { @@ -739,12 +748,12 @@ "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_02.png", + "selectedIconPath": "static/tabBar/tabBar_show_02.png", + "pagePath": "pages/store/index", + "text": "好物" }, { "iconPath": "static/tabBar/tabBar_01.png", 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/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/topic/details.vue b/pages/topic/details.vue index 578b4f2..09ca30a 100644 --- a/pages/topic/details.vue +++ b/pages/topic/details.vue @@ -52,7 +52,7 @@ ¥{{ item.price }} - + 查看商品 diff --git a/pages/user/index.vue b/pages/user/index.vue index 9d2bf8c..dabd793 100644 --- a/pages/user/index.vue +++ b/pages/user/index.vue @@ -186,8 +186,13 @@ }, // 个人档案 onFiles(){ - if(this.isLogin()){ - this.$Router.push({name: 'indexFiles'}) + if(this.isLogin()){ + if(!this.userInfo.has_record){ + console.log('未完善资料') + this.$Router.push({name: 'EssentialInfo'}) + return + } + this.$Router.push({name: 'UserFiles'}) } }, // 按钮导航 diff --git a/static/dev/cover.jpg b/static/dev/cover.jpg deleted file mode 100644 index 2863fe2..0000000 Binary files a/static/dev/cover.jpg and /dev/null differ diff --git a/static/dev/img-02.png b/static/dev/img-02.png new file mode 100644 index 0000000..f09aade Binary files /dev/null and b/static/dev/img-02.png differ