TmOct5/ZhHealth
1
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

Merge branch 'master' of https://git.yuzhankeji.cn/TmOct5/ZhHealth

Browse Source
This commit is contained in:
张冬雪
2022-01-14 13:54:15 +08:00
parent 263f8d3caa 37c67ecd4a
commit e7d4e15459
15 changed files with 834 additions and 800 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pages/essentialInfo/index.vue
View File

@@ -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;

4
pages/im/index.vue
View File

@@ -44,6 +44,10 @@
</view>
</view>
</view>
<view @click="$Router.push({name: 'Record'})">
临时记录
</view>
</block>
</view>
</template>

19
pages/index/index.vue
View File

@@ -4,8 +4,8 @@
<view class="status-main">
<view class="helloe">欢迎使用ZH健康</view>
<view class="btns">
<view class="btns-item" @click="$Router.push({name: 'signIndex'})"><image src="@/static/icon/sign-icon.gif" mode="widthFix"></image></view>
<view class="btns-item show" @click="$Router.push({name: 'noticeIndex'})"><uni-icons custom-prefix="iconfont" type="icon-pinglun" size="25"></uni-icons></view>
<view class="btns-item" @click="onBtn('signIndex')"><image src="@/static/icon/sign-icon.gif" mode="widthFix"></image></view>
<view class="btns-item show" @click="onBtn('noticeIndex')"><uni-icons custom-prefix="iconfont" type="icon-pinglun" size="25"></uni-icons></view>
</view>
</view>
</view>
@@ -29,9 +29,13 @@
</view>
</view>
</u-scroll-list>
<!-- 排行榜 -->
<view class="img-card" @click="onBtn('Record')">
<image src="@/static/dev/img-02.png" mode="widthFix"></image>
</view>
<!-- 话题广场 -->
<view class="new-box">
<view class="title">话题广场</view><view class="more" @click="$Router.push({name: 'topicIndex'})">更多分类</view>
<view class="title">话题广场</view><view class="more" @click="$Router.push({name: 'topicIndex'})">更多</view>
<oct-topic
:lists="topicArr"
@onTopic="$Router.push({ name: 'topicDetails', params: {id: $event.topic_id }})"
@@ -44,6 +48,7 @@
<script>
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})
}
}
};
</script>

2
pages/ranking/details.vue
View File

@@ -125,7 +125,7 @@
￥{{ item.price }}
</view>
</view>
<view class="item-btn">
<view class="item-btn" @click="$Router.push({ name: 'StoreGoods', params: {id: item.goods_id}})">
查看商品
</view>
</view>

6
pages/record/foods.vue
View File

@@ -141,11 +141,7 @@
<script>
import arprogress from "@/components/ar-circle-progress/index.vue";
import goodsList from "@/components/foods";
import {
plans,
editHealthFoods,
delHealthFoods,
} from "@/apis/interfaces/foods.js";
import { plans, editHealthFoods, delHealthFoods } from "@/apis/interfaces/foods.js";
import moment from "moment";
import addFoods from "@/components/add-goods-template/add-goods-template";
export default {

2
pages/topic/details.vue
View File

@@ -52,7 +52,7 @@
￥{{ item.price }}
</view>
</view>
<view class="item-btn">
<view class="item-btn" @click="$Router.push({ name: 'StoreGoods', params: {id: item.goods_id}})">
查看商品
</view>
</view>

24
pages/user/index.vue
View File

@@ -37,16 +37,16 @@
<view class="btn" @click="openVip">开通</view>
</view>
<!-- 健康数据 -->
<view class="health-flex">
<view class="health-flex" v-if="userInfo.has_record">
<view class="health-flex-item">
<view class="title">
体脂率
<image class="icon" src="@/static/user/icon_04.png" mode="widthFix"></image>
</view>
<view class="num">
22<text>%</text>
{{userInfo.record.fat.fat}}<text>%</text>
</view>
<view class="hith">处于正常范围</view>
<view class="hith">{{userInfo.record.fat.text}}</view>
</view>
<view class="health-flex-item">
<view class="title">
@@ -54,9 +54,9 @@
<image class="icon" src="@/static/user/icon_05.png" mode="widthFix"></image>
</view>
<view class="num">
78.0<text>KG</text>
{{userInfo.record.weight.weight}}<text>KG</text>
</view>
<view class="hith">你上周减少1.2kg</view>
<view class="hith">{{userInfo.record.weight.text}}</view>
</view>
</view>
<!-- 订单 -->
@@ -135,6 +135,7 @@
getInfo(){
if(this.$store.state.token === '') return
info().then(res => {
console.log(res)
uni.setNavigationBarTitle({
title: res.nickname
})
@@ -185,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'})
}
},
// 按钮导航
@@ -206,6 +212,10 @@
},
// 退出登录
logOut(){
this.userInfo = {
nickname: "",
avatar : ""
}
this.$store.commit('setToken', '')
}
}