隐藏食谱,新增运动消耗
This commit is contained in:
parent
a392d198cd
commit
44106d6bd1
4
App.vue
4
App.vue
|
|
@ -82,7 +82,7 @@
|
||||||
})
|
})
|
||||||
}, 500);
|
}, 500);
|
||||||
}
|
}
|
||||||
|
// #ifdef APP-PLUS||APP
|
||||||
that.$store.commit('changePhoneInfo', {
|
that.$store.commit('changePhoneInfo', {
|
||||||
versionUrl: res.data
|
versionUrl: res.data
|
||||||
})
|
})
|
||||||
|
|
@ -112,7 +112,7 @@
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
// #endif
|
||||||
}).catch(error => {
|
}).catch(error => {
|
||||||
// console.error('Error fetching data:', error);
|
// console.error('Error fetching data:', error);
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -315,5 +315,6 @@
|
||||||
"msgFail": "فشل القياس",
|
"msgFail": "فشل القياس",
|
||||||
"msgResetData": "جارٍ إعادة تعيين البيانات",
|
"msgResetData": "جارٍ إعادة تعيين البيانات",
|
||||||
"FatFailure":"فشل قياس دهون الجسم، هل تريد حفظ نتيجة هذا القياس؟",
|
"FatFailure":"فشل قياس دهون الجسم، هل تريد حفظ نتيجة هذا القياس؟",
|
||||||
"waive":"تخلي"
|
"waive":"تخلي",
|
||||||
|
"expendKcal":"الاستهلاك الرياضي"
|
||||||
}
|
}
|
||||||
|
|
@ -315,5 +315,6 @@
|
||||||
"msgFail": "Messung fehlgeschlagen",
|
"msgFail": "Messung fehlgeschlagen",
|
||||||
"msgResetData": "Daten werden zurückgesetzt",
|
"msgResetData": "Daten werden zurückgesetzt",
|
||||||
"FatFailure": "Körperfettmessung fehlgeschlagen, möchten Sie dieses Messergebnis speichern?",
|
"FatFailure": "Körperfettmessung fehlgeschlagen, möchten Sie dieses Messergebnis speichern?",
|
||||||
"waive": "Verzichten"
|
"waive": "Verzichten",
|
||||||
|
"expendKcal":"Sportverbrauch"
|
||||||
}
|
}
|
||||||
|
|
@ -632,6 +632,7 @@
|
||||||
|
|
||||||
"FatFailure": "Body fat measurement failed, save this result?",
|
"FatFailure": "Body fat measurement failed, save this result?",
|
||||||
|
|
||||||
"waive": "Discard"
|
"waive": "Discard",
|
||||||
|
"expendKcal":"Energy expenditure during exercise"
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
@ -315,5 +315,6 @@
|
||||||
"msgFail": "Medición fallida",
|
"msgFail": "Medición fallida",
|
||||||
"msgResetData": "Reiniciando datos",
|
"msgResetData": "Reiniciando datos",
|
||||||
"FatFailure": "Medición de grasa corporal fallida, ¿deseas guardar este resultado?",
|
"FatFailure": "Medición de grasa corporal fallida, ¿deseas guardar este resultado?",
|
||||||
"waive": "Descartar"
|
"waive": "Descartar",
|
||||||
|
"expendKcal":"Consumo de energía durante el ejercicio"
|
||||||
}
|
}
|
||||||
|
|
@ -315,5 +315,6 @@
|
||||||
"msgFail": "Échec de la mesure",
|
"msgFail": "Échec de la mesure",
|
||||||
"msgResetData": "Réinitialisation des données en cours",
|
"msgResetData": "Réinitialisation des données en cours",
|
||||||
"FatFailure": "Échec de la mesure de la masse grasse, voulez-vous sauvegarder ce résultat ?",
|
"FatFailure": "Échec de la mesure de la masse grasse, voulez-vous sauvegarder ce résultat ?",
|
||||||
"waive": "Abandonner"
|
"waive": "Abandonner",
|
||||||
|
"expendKcal":"Consommation d'énergie par l'exercice physique"
|
||||||
}
|
}
|
||||||
|
|
@ -632,6 +632,7 @@
|
||||||
|
|
||||||
"FatFailure": "体脂肪測定に失敗しました。今回の測定結果を保存しますか?",
|
"FatFailure": "体脂肪測定に失敗しました。今回の測定結果を保存しますか?",
|
||||||
|
|
||||||
"waive": "破棄"
|
"waive": "破棄",
|
||||||
|
"expendKcal":"運動による消費"
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
@ -315,5 +315,6 @@
|
||||||
"msgFail": "측정 실패",
|
"msgFail": "측정 실패",
|
||||||
"msgResetData": "데이터 재설정 중",
|
"msgResetData": "데이터 재설정 중",
|
||||||
"FatFailure": "체지방 측정 실패, 이번 측정 결과를 저장하시겠습니까?",
|
"FatFailure": "체지방 측정 실패, 이번 측정 결과를 저장하시겠습니까?",
|
||||||
"waive": "포기"
|
"waive": "포기",
|
||||||
|
"expendKcal":"운동으로 소모되는 에너지"
|
||||||
}
|
}
|
||||||
|
|
@ -315,5 +315,6 @@
|
||||||
"msgFail": "Falha na medição",
|
"msgFail": "Falha na medição",
|
||||||
"msgResetData": "Reiniciando dados",
|
"msgResetData": "Reiniciando dados",
|
||||||
"FatFailure": "Falha na medição de gordura corporal, salvar este resultado?",
|
"FatFailure": "Falha na medição de gordura corporal, salvar este resultado?",
|
||||||
"waive": "Desistir"
|
"waive": "Desistir",
|
||||||
|
"expendKcal":"Consumo de energia durante o exercício"
|
||||||
}
|
}
|
||||||
|
|
@ -315,5 +315,6 @@
|
||||||
"msgFail": "Ошибка измерения",
|
"msgFail": "Ошибка измерения",
|
||||||
"msgResetData": "Идет сброс данных",
|
"msgResetData": "Идет сброс данных",
|
||||||
"FatFailure":"Ошибка измерения жира. Сохранить этот результат измерения?",
|
"FatFailure":"Ошибка измерения жира. Сохранить этот результат измерения?",
|
||||||
"waive":"Отменить"
|
"waive":"Отменить",
|
||||||
|
"expendKcal":"Физическая активность"
|
||||||
}
|
}
|
||||||
|
|
@ -316,5 +316,6 @@
|
||||||
"msgFail": "测量失败",
|
"msgFail": "测量失败",
|
||||||
"msgResetData": "数据重置中",
|
"msgResetData": "数据重置中",
|
||||||
"FatFailure":"体脂测量失败,是否保存本次测量结果?",
|
"FatFailure":"体脂测量失败,是否保存本次测量结果?",
|
||||||
"waive":"放弃"
|
"waive":"放弃",
|
||||||
|
"expendKcal":"运动消耗"
|
||||||
}
|
}
|
||||||
|
|
@ -47,9 +47,6 @@
|
||||||
<view class="unit">Kcal</view>
|
<view class="unit">Kcal</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="mubiao">
|
|
||||||
{{$t("target")}}:<text>{{foodInfo.nutrients_four[0].suggestion}}</text>kcal
|
|
||||||
</view>
|
|
||||||
</view>
|
</view>
|
||||||
<view class="right">
|
<view class="right">
|
||||||
<view class="item" v-for="(ite,ind) in foodInfo.nutrients_four.slice(1)">
|
<view class="item" v-for="(ite,ind) in foodInfo.nutrients_four.slice(1)">
|
||||||
|
|
@ -72,6 +69,14 @@
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
<view class="bottom">
|
||||||
|
<view class="mubiao">
|
||||||
|
{{$t("expendKcal")}}:<text class="bold">{{foodInfo.exercise_kcal}}</text>kcal
|
||||||
|
</view>
|
||||||
|
<view class="mubiao">
|
||||||
|
{{$t("target")}}:<text class="bold">{{foodInfo.nutrients_four[0].suggestion}}</text>kcal
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<!-- 早午晚餐 -->
|
<!-- 早午晚餐 -->
|
||||||
<view class="foodtools">
|
<view class="foodtools">
|
||||||
|
|
@ -107,7 +112,7 @@
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<!-- 营养分析 -->
|
<!-- 营养分析 -->
|
||||||
<view class="fenxi box_shadow" @click="navTo('/Food/count/everyDay?page=count')">
|
<view class="fenxi" @click="navTo('/Food/count/everyDay?page=count')">
|
||||||
<image src="/static/fenxi.png"></image>
|
<image src="/static/fenxi.png"></image>
|
||||||
{{$t("titleeveryDay")}}
|
{{$t("titleeveryDay")}}
|
||||||
</view>
|
</view>
|
||||||
|
|
@ -527,8 +532,22 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.bottom {
|
||||||
|
width: 100%;
|
||||||
|
height: auto;
|
||||||
|
display: flex;
|
||||||
|
justify-content: space-between;
|
||||||
|
margin-top: 10px;
|
||||||
|
font-size: 28rpx;
|
||||||
|
|
||||||
|
text {
|
||||||
|
color: $maincolor;
|
||||||
|
margin: 0 5px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
.charts-box {
|
.charts-box {
|
||||||
width: 250rpx;
|
width: 270rpx;
|
||||||
height: 250rpx;
|
height: 270rpx;
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|
@ -54,6 +54,7 @@
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
<!-- #ifdef APP-PLUS||APP -->
|
||||||
<view class="list" @click="navTo('/body/my/about')">
|
<view class="list" @click="navTo('/body/my/about')">
|
||||||
<view class="item border-bottom">
|
<view class="item border-bottom">
|
||||||
<view class="left">
|
<view class="left">
|
||||||
|
|
@ -64,6 +65,7 @@
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
<!-- #endif -->
|
||||||
<view class="list">
|
<view class="list">
|
||||||
<view class="item border-bottom">
|
<view class="item border-bottom">
|
||||||
<view class="left">
|
<view class="left">
|
||||||
|
|
|
||||||
|
|
@ -54,15 +54,15 @@
|
||||||
.left {
|
.left {
|
||||||
float: left;
|
float: left;
|
||||||
width: 270rpx;
|
width: 270rpx;
|
||||||
height: 300rpx;
|
height: 280rpx;
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
|
|
||||||
.chart-wrap {
|
.chart-wrap {
|
||||||
position: relative;
|
position: relative;
|
||||||
width: 260rpx;
|
width: 270rpx;
|
||||||
height: 260rpx;
|
height: 270rpx;
|
||||||
// margin-top: -10rpx;
|
// margin-top: -10rpx;
|
||||||
margin-left: 0px;
|
margin-left: 0px;
|
||||||
display: flex;
|
display: flex;
|
||||||
|
|
@ -70,8 +70,8 @@
|
||||||
|
|
||||||
.center {
|
.center {
|
||||||
border: none;
|
border: none;
|
||||||
width: 255rpx;
|
width: 260rpx;
|
||||||
height: 210rpx;
|
height: 230rpx;
|
||||||
position: absolute;
|
position: absolute;
|
||||||
top: 25rpx;
|
top: 25rpx;
|
||||||
display: flex;
|
display: flex;
|
||||||
|
|
@ -87,20 +87,14 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.mubiao {
|
|
||||||
width: 100%;
|
|
||||||
margin-top: 0rpx;
|
|
||||||
text-align: center;
|
|
||||||
font-size: 26rpx;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.right {
|
.right {
|
||||||
width: calc(100% - 290rpx);
|
width: calc(100% - 300rpx);
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
float: left;
|
float: left;
|
||||||
height: 300rpx;
|
height: 280rpx;
|
||||||
margin-left: 20rpx;
|
margin-left: 20rpx;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
|
|
||||||
|
|
@ -136,6 +130,13 @@
|
||||||
width: 100%;
|
width: 100%;
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
|
|
||||||
|
.name{
|
||||||
|
width: 50%;
|
||||||
|
overflow: hidden;
|
||||||
|
text-overflow: ellipsis;
|
||||||
|
white-space: nowrap;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.right-info-bottom {
|
.right-info-bottom {
|
||||||
|
|
@ -159,11 +160,12 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
// 添加食谱
|
// 添加食谱
|
||||||
.addFood {
|
.addFood {
|
||||||
|
|
||||||
|
|
||||||
.title,
|
.title,
|
||||||
.textarea {
|
.textarea {
|
||||||
width: calc(100% - 40rpx);
|
width: calc(100% - 40rpx);
|
||||||
|
|
@ -512,7 +514,7 @@
|
||||||
color: $maincolor;
|
color: $maincolor;
|
||||||
background: #fff;
|
background: #fff;
|
||||||
border-radius: 10px;
|
border-radius: 10px;
|
||||||
margin: 0 20rpx 20rpx;
|
margin: 30rpx 20rpx 20rpx;
|
||||||
height: 45px;
|
height: 45px;
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content: center;
|
justify-content: center;
|
||||||
|
|
|
||||||
|
|
@ -66,6 +66,7 @@ export default new Vuex.Store({
|
||||||
date: "",
|
date: "",
|
||||||
details: {},
|
details: {},
|
||||||
list: [],
|
list: [],
|
||||||
|
exercise_kcal: "",
|
||||||
remaining_kcal: "",
|
remaining_kcal: "",
|
||||||
nutrients_four: [],
|
nutrients_four: [],
|
||||||
trace_elements_all_day: []
|
trace_elements_all_day: []
|
||||||
|
|
|
||||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
|
@ -188,39 +188,6 @@ var _default = {
|
||||||
});
|
});
|
||||||
}, 500);
|
}, 500);
|
||||||
}
|
}
|
||||||
that.$store.commit('changePhoneInfo', {
|
|
||||||
versionUrl: res.data
|
|
||||||
});
|
|
||||||
var versionPK = that.$tools.compareVersions(SystemVersion, res.data.version);
|
|
||||||
if (versionPK == -1) {
|
|
||||||
// 版本1小于版本2
|
|
||||||
return uni.showModal({
|
|
||||||
title: that.$t('newVersion'),
|
|
||||||
content: that.$t('newVersion') + res.data.version + that.$t('IsUpdate'),
|
|
||||||
cancelText: that.$t("btnSancellation"),
|
|
||||||
//取消按钮文字
|
|
||||||
confirmText: that.$t("btnConfirm"),
|
|
||||||
//确认按钮文字
|
|
||||||
success: function success(modalRes) {
|
|
||||||
if (modalRes.confirm) {
|
|
||||||
//确定更新
|
|
||||||
if (platform === 'android') {
|
|
||||||
//安卓更新
|
|
||||||
uni.navigateTo({
|
|
||||||
url: "/body/my/about"
|
|
||||||
});
|
|
||||||
} else {
|
|
||||||
//ios跳转
|
|
||||||
plus.runtime.launchApplication({
|
|
||||||
action: res.data.ios_address
|
|
||||||
});
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
that.$tools.msg(that.$t('UpdateProgram'));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}).catch(function (error) {
|
}).catch(function (error) {
|
||||||
// console.error('Error fetching data:', error);
|
// console.error('Error fetching data:', error);
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -727,23 +727,23 @@
|
||||||
.jishiqi .left {
|
.jishiqi .left {
|
||||||
float: left;
|
float: left;
|
||||||
width: 270rpx;
|
width: 270rpx;
|
||||||
height: 300rpx;
|
height: 280rpx;
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
}
|
}
|
||||||
.jishiqi .left .chart-wrap {
|
.jishiqi .left .chart-wrap {
|
||||||
position: relative;
|
position: relative;
|
||||||
width: 260rpx;
|
width: 270rpx;
|
||||||
height: 260rpx;
|
height: 270rpx;
|
||||||
margin-left: 0px;
|
margin-left: 0px;
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-wrap: wrap;
|
flex-wrap: wrap;
|
||||||
}
|
}
|
||||||
.jishiqi .left .chart-wrap .center {
|
.jishiqi .left .chart-wrap .center {
|
||||||
border: none;
|
border: none;
|
||||||
width: 255rpx;
|
width: 260rpx;
|
||||||
height: 210rpx;
|
height: 230rpx;
|
||||||
position: absolute;
|
position: absolute;
|
||||||
top: 25rpx;
|
top: 25rpx;
|
||||||
display: flex;
|
display: flex;
|
||||||
|
|
@ -756,18 +756,12 @@
|
||||||
font-size: 16px;
|
font-size: 16px;
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
}
|
}
|
||||||
.jishiqi .left .mubiao {
|
|
||||||
width: 100%;
|
|
||||||
margin-top: 0rpx;
|
|
||||||
text-align: center;
|
|
||||||
font-size: 26rpx;
|
|
||||||
}
|
|
||||||
.jishiqi .right {
|
.jishiqi .right {
|
||||||
width: calc(100% - 290rpx);
|
width: calc(100% - 300rpx);
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
float: left;
|
float: left;
|
||||||
height: 300rpx;
|
height: 280rpx;
|
||||||
margin-left: 20rpx;
|
margin-left: 20rpx;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
}
|
}
|
||||||
|
|
@ -802,6 +796,12 @@
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
}
|
}
|
||||||
|
.jishiqi .right .item .right-info .right-info-top .name {
|
||||||
|
width: 50%;
|
||||||
|
overflow: hidden;
|
||||||
|
text-overflow: ellipsis;
|
||||||
|
white-space: nowrap;
|
||||||
|
}
|
||||||
.jishiqi .right .item .right-info .right-info-bottom {
|
.jishiqi .right .item .right-info .right-info-bottom {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
height: 8px;
|
height: 8px;
|
||||||
|
|
@ -1117,7 +1117,7 @@
|
||||||
color: #54d87c;
|
color: #54d87c;
|
||||||
background: #fff;
|
background: #fff;
|
||||||
border-radius: 10px;
|
border-radius: 10px;
|
||||||
margin: 0 20rpx 20rpx;
|
margin: 30rpx 20rpx 20rpx;
|
||||||
height: 45px;
|
height: 45px;
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content: center;
|
justify-content: center;
|
||||||
|
|
|
||||||
File diff suppressed because one or more lines are too long
|
|
@ -146,37 +146,39 @@ var render = function () {
|
||||||
!!_vm.token && _vm.user.aud_id != "" ? _vm.foodInfo.list.length : null
|
!!_vm.token && _vm.user.aud_id != "" ? _vm.foodInfo.list.length : null
|
||||||
var m4 =
|
var m4 =
|
||||||
!!_vm.token && _vm.user.aud_id != "" && g0 ? _vm.$t("countIntake") : null
|
!!_vm.token && _vm.user.aud_id != "" && g0 ? _vm.$t("countIntake") : null
|
||||||
var m5 = !!_vm.token && _vm.user.aud_id != "" && g0 ? _vm.$t("target") : null
|
|
||||||
var l0 =
|
var l0 =
|
||||||
!!_vm.token && _vm.user.aud_id != ""
|
!!_vm.token && _vm.user.aud_id != ""
|
||||||
? _vm.foodInfo.nutrients_four.slice(1)
|
? _vm.foodInfo.nutrients_four.slice(1)
|
||||||
: null
|
: null
|
||||||
|
var m5 = !!_vm.token && _vm.user.aud_id != "" ? _vm.$t("expendKcal") : null
|
||||||
|
var m6 = !!_vm.token && _vm.user.aud_id != "" ? _vm.$t("target") : null
|
||||||
var l1 =
|
var l1 =
|
||||||
!!_vm.token && _vm.user.aud_id != ""
|
!!_vm.token && _vm.user.aud_id != ""
|
||||||
? _vm.__map(_vm.foodInfo.list, function (item, index) {
|
? _vm.__map(_vm.foodInfo.list, function (item, index) {
|
||||||
var $orig = _vm.__get_orig(item)
|
var $orig = _vm.__get_orig(item)
|
||||||
var m6 = _vm.$t("titleEveryMeal")
|
var m7 = _vm.$t("titleEveryMeal")
|
||||||
var m7 = _vm.$t("countAddFood")
|
var m8 = _vm.$t("countAddFood")
|
||||||
return {
|
return {
|
||||||
$orig: $orig,
|
$orig: $orig,
|
||||||
m6: m6,
|
|
||||||
m7: m7,
|
m7: m7,
|
||||||
|
m8: m8,
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
: null
|
: null
|
||||||
var m8 = !!_vm.token && _vm.user.aud_id != "" ? _vm.$t("titleeveryDay") : null
|
var m9 = !!_vm.token && _vm.user.aud_id != "" ? _vm.$t("titleeveryDay") : null
|
||||||
var m9 = !!_vm.token && !(_vm.user.aud_id != "") ? _vm.$t("msgAddUser") : null
|
|
||||||
var m10 =
|
var m10 =
|
||||||
|
!!_vm.token && !(_vm.user.aud_id != "") ? _vm.$t("msgAddUser") : null
|
||||||
|
var m11 =
|
||||||
!!_vm.token && !(_vm.user.aud_id != "")
|
!!_vm.token && !(_vm.user.aud_id != "")
|
||||||
? _vm.$t("ImproveInformation")
|
? _vm.$t("ImproveInformation")
|
||||||
: null
|
: null
|
||||||
var m11 = _vm.drawerVisible ? _vm.$t("CaloriesAndnutrients") : null
|
var m12 = _vm.drawerVisible ? _vm.$t("CaloriesAndnutrients") : null
|
||||||
var l2 =
|
var l2 =
|
||||||
_vm.drawerVisible && _vm.activeFoodDetail.nutrients_four
|
_vm.drawerVisible && _vm.activeFoodDetail.nutrients_four
|
||||||
? _vm.activeFoodDetail.nutrients_four.slice(1)
|
? _vm.activeFoodDetail.nutrients_four.slice(1)
|
||||||
: null
|
: null
|
||||||
var m12 = _vm.drawerVisible ? _vm.$t("Nutrients") : null
|
var m13 = _vm.drawerVisible ? _vm.$t("Nutrients") : null
|
||||||
var m13 = _vm.drawerVisible ? _vm.$t("Content") : null
|
var m14 = _vm.drawerVisible ? _vm.$t("Content") : null
|
||||||
var g1 = _vm.configInfo.bannerFoot.length
|
var g1 = _vm.configInfo.bannerFoot.length
|
||||||
if (!_vm._isMounted) {
|
if (!_vm._isMounted) {
|
||||||
_vm.e0 = function ($event, ite) {
|
_vm.e0 = function ($event, ite) {
|
||||||
|
|
@ -197,16 +199,17 @@ var render = function () {
|
||||||
m3: m3,
|
m3: m3,
|
||||||
g0: g0,
|
g0: g0,
|
||||||
m4: m4,
|
m4: m4,
|
||||||
m5: m5,
|
|
||||||
l0: l0,
|
l0: l0,
|
||||||
|
m5: m5,
|
||||||
|
m6: m6,
|
||||||
l1: l1,
|
l1: l1,
|
||||||
m8: m8,
|
|
||||||
m9: m9,
|
m9: m9,
|
||||||
m10: m10,
|
m10: m10,
|
||||||
m11: m11,
|
m11: m11,
|
||||||
l2: l2,
|
|
||||||
m12: m12,
|
m12: m12,
|
||||||
|
l2: l2,
|
||||||
m13: m13,
|
m13: m13,
|
||||||
|
m14: m14,
|
||||||
g1: g1,
|
g1: g1,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
|
||||||
File diff suppressed because one or more lines are too long
|
|
@ -123,8 +123,20 @@
|
||||||
margin-top: 20rpx;
|
margin-top: 20rpx;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
}
|
}
|
||||||
|
.bottom.data-v-378efeb4 {
|
||||||
|
width: 100%;
|
||||||
|
height: auto;
|
||||||
|
display: flex;
|
||||||
|
justify-content: space-between;
|
||||||
|
margin-top: 10px;
|
||||||
|
font-size: 28rpx;
|
||||||
|
}
|
||||||
|
.bottom text.data-v-378efeb4 {
|
||||||
|
color: #54d87c;
|
||||||
|
margin: 0 5px;
|
||||||
|
}
|
||||||
.charts-box.data-v-378efeb4 {
|
.charts-box.data-v-378efeb4 {
|
||||||
width: 250rpx;
|
width: 270rpx;
|
||||||
height: 250rpx;
|
height: 270rpx;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -129,9 +129,8 @@ var render = function () {
|
||||||
var m1 = _vm.$t("titleManage")
|
var m1 = _vm.$t("titleManage")
|
||||||
var m2 = _vm.$t("measuringRecord")
|
var m2 = _vm.$t("measuringRecord")
|
||||||
var m3 = _vm.$t("titleHistory")
|
var m3 = _vm.$t("titleHistory")
|
||||||
var m4 = _vm.$t("titleAboutUs")
|
var m4 = _vm.$t("titleLanguage")
|
||||||
var m5 = _vm.$t("titleLanguage")
|
var m5 = _vm.token ? _vm.$t("btnLogOut") : null
|
||||||
var m6 = _vm.token ? _vm.$t("btnLogOut") : null
|
|
||||||
_vm.$mp.data = Object.assign(
|
_vm.$mp.data = Object.assign(
|
||||||
{},
|
{},
|
||||||
{
|
{
|
||||||
|
|
@ -142,7 +141,6 @@ var render = function () {
|
||||||
m3: m3,
|
m3: m3,
|
||||||
m4: m4,
|
m4: m4,
|
||||||
m5: m5,
|
m5: m5,
|
||||||
m6: m6,
|
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
<view class="content data-v-0ac7a6b2"><block wx:if="{{token}}"><view data-event-opts="{{[['tap',[['navTo',['/body/setting/setting']]]]]}}" class="top data-v-0ac7a6b2" bindtap="__e"><view class="headimg data-v-0ac7a6b2"><image class="image data-v-0ac7a6b2" src="{{user.head_pic}}"></image><view class="size20 bold data-v-0ac7a6b2">{{user.nickname}}</view></view><text class="t-icon t-icon-arrow-right-bold data-v-0ac7a6b2"></text></view></block><block wx:else><view data-event-opts="{{[['tap',[['handleLogin',['$event']]]]]}}" class="top top2 data-v-0ac7a6b2" bindtap="__e">{{''+$root.m0+''}}</view></block><view class="wxlist borderRadius data-v-0ac7a6b2"><view data-event-opts="{{[['tap',[['navTo',['/body/my/manage']]]]]}}" class="list data-v-0ac7a6b2" bindtap="__e"><view class="item border-bottom data-v-0ac7a6b2"><view class="left data-v-0ac7a6b2"><view class="name data-v-0ac7a6b2">{{$root.m1}}</view></view><view class="right data-v-0ac7a6b2"><uni-icons vue-id="4e2db094-1" type="right" class="data-v-0ac7a6b2" bind:__l="__l"></uni-icons></view></view></view><view data-event-opts="{{[['tap',[['navTo',['/body/history/history']]]]]}}" class="list data-v-0ac7a6b2" bindtap="__e"><view class="item border-bottom data-v-0ac7a6b2"><view class="left data-v-0ac7a6b2"><view class="name data-v-0ac7a6b2">{{$root.m2}}</view></view><view class="right data-v-0ac7a6b2"><uni-icons vue-id="4e2db094-2" type="right" class="data-v-0ac7a6b2" bind:__l="__l"></uni-icons></view></view></view><view data-event-opts="{{[['tap',[['navTo',['/Food/me/record']]]]]}}" class="list data-v-0ac7a6b2" bindtap="__e"><view class="item border-bottom data-v-0ac7a6b2"><view class="left data-v-0ac7a6b2"><view class="name data-v-0ac7a6b2">{{$root.m3}}</view></view><view class="right data-v-0ac7a6b2"><uni-icons vue-id="4e2db094-3" type="right" class="data-v-0ac7a6b2" bind:__l="__l"></uni-icons></view></view></view><view data-event-opts="{{[['tap',[['navTo',['/body/my/about']]]]]}}" class="list data-v-0ac7a6b2" bindtap="__e"><view class="item border-bottom data-v-0ac7a6b2"><view class="left data-v-0ac7a6b2"><view class="name data-v-0ac7a6b2">{{$root.m4}}</view></view><view class="right data-v-0ac7a6b2"><uni-icons vue-id="4e2db094-4" type="right" class="data-v-0ac7a6b2" bind:__l="__l"></uni-icons></view></view></view><view class="list data-v-0ac7a6b2"><view class="item border-bottom data-v-0ac7a6b2"><view class="left data-v-0ac7a6b2"><view class="name data-v-0ac7a6b2">{{$root.m5}}</view></view><view class="right data-v-0ac7a6b2"><picker mode="selector" range="{{languageList}}" range-key="name" value="{{levelInd}}" data-event-opts="{{[['change',[['changeClickLanguage',['$event']]]]]}}" bindchange="__e" class="data-v-0ac7a6b2"><view class="data-v-0ac7a6b2">{{''+languageList[levelInd].name+''}}<uni-icons vue-id="4e2db094-5" type="right" class="data-v-0ac7a6b2" bind:__l="__l"></uni-icons></view></picker></view></view></view><block wx:for="{{CooperationUrl}}" wx:for-item="ite" wx:for-index="ind" wx:key="ind"><view class="list data-v-0ac7a6b2"><view data-event-opts="{{[['tap',[['navTo',['/body/webview/webview?url='+ite.url]]]]]}}" class="item border-bottom data-v-0ac7a6b2" bindtap="__e"><view class="left data-v-0ac7a6b2"><view class="name data-v-0ac7a6b2">{{ite.title}}</view></view><view class="right data-v-0ac7a6b2"><uni-icons vue-id="{{'4e2db094-6-'+ind}}" type="right" class="data-v-0ac7a6b2" bind:__l="__l"></uni-icons></view></view></view></block></view><block wx:if="{{token}}"><view data-event-opts="{{[['tap',[['handleOutLogin',['$event']]]]]}}" class="btn mb-15 data-v-0ac7a6b2" bindtap="__e">{{$root.m6}}</view></block></view>
|
<view class="content data-v-0ac7a6b2"><block wx:if="{{token}}"><view data-event-opts="{{[['tap',[['navTo',['/body/setting/setting']]]]]}}" class="top data-v-0ac7a6b2" bindtap="__e"><view class="headimg data-v-0ac7a6b2"><image class="image data-v-0ac7a6b2" src="{{user.head_pic}}"></image><view class="size20 bold data-v-0ac7a6b2">{{user.nickname}}</view></view><text class="t-icon t-icon-arrow-right-bold data-v-0ac7a6b2"></text></view></block><block wx:else><view data-event-opts="{{[['tap',[['handleLogin',['$event']]]]]}}" class="top top2 data-v-0ac7a6b2" bindtap="__e">{{''+$root.m0+''}}</view></block><view class="wxlist borderRadius data-v-0ac7a6b2"><view data-event-opts="{{[['tap',[['navTo',['/body/my/manage']]]]]}}" class="list data-v-0ac7a6b2" bindtap="__e"><view class="item border-bottom data-v-0ac7a6b2"><view class="left data-v-0ac7a6b2"><view class="name data-v-0ac7a6b2">{{$root.m1}}</view></view><view class="right data-v-0ac7a6b2"><uni-icons vue-id="4e2db094-1" type="right" class="data-v-0ac7a6b2" bind:__l="__l"></uni-icons></view></view></view><view data-event-opts="{{[['tap',[['navTo',['/body/history/history']]]]]}}" class="list data-v-0ac7a6b2" bindtap="__e"><view class="item border-bottom data-v-0ac7a6b2"><view class="left data-v-0ac7a6b2"><view class="name data-v-0ac7a6b2">{{$root.m2}}</view></view><view class="right data-v-0ac7a6b2"><uni-icons vue-id="4e2db094-2" type="right" class="data-v-0ac7a6b2" bind:__l="__l"></uni-icons></view></view></view><view data-event-opts="{{[['tap',[['navTo',['/Food/me/record']]]]]}}" class="list data-v-0ac7a6b2" bindtap="__e"><view class="item border-bottom data-v-0ac7a6b2"><view class="left data-v-0ac7a6b2"><view class="name data-v-0ac7a6b2">{{$root.m3}}</view></view><view class="right data-v-0ac7a6b2"><uni-icons vue-id="4e2db094-3" type="right" class="data-v-0ac7a6b2" bind:__l="__l"></uni-icons></view></view></view><view class="list data-v-0ac7a6b2"><view class="item border-bottom data-v-0ac7a6b2"><view class="left data-v-0ac7a6b2"><view class="name data-v-0ac7a6b2">{{$root.m4}}</view></view><view class="right data-v-0ac7a6b2"><picker mode="selector" range="{{languageList}}" range-key="name" value="{{levelInd}}" data-event-opts="{{[['change',[['changeClickLanguage',['$event']]]]]}}" bindchange="__e" class="data-v-0ac7a6b2"><view class="data-v-0ac7a6b2">{{''+languageList[levelInd].name+''}}<uni-icons vue-id="4e2db094-4" type="right" class="data-v-0ac7a6b2" bind:__l="__l"></uni-icons></view></picker></view></view></view><block wx:for="{{CooperationUrl}}" wx:for-item="ite" wx:for-index="ind" wx:key="ind"><view class="list data-v-0ac7a6b2"><view data-event-opts="{{[['tap',[['navTo',['/body/webview/webview?url='+ite.url]]]]]}}" class="item border-bottom data-v-0ac7a6b2" bindtap="__e"><view class="left data-v-0ac7a6b2"><view class="name data-v-0ac7a6b2">{{ite.title}}</view></view><view class="right data-v-0ac7a6b2"><uni-icons vue-id="{{'4e2db094-5-'+ind}}" type="right" class="data-v-0ac7a6b2" bind:__l="__l"></uni-icons></view></view></view></block></view><block wx:if="{{token}}"><view data-event-opts="{{[['tap',[['handleOutLogin',['$event']]]]]}}" class="btn mb-15 data-v-0ac7a6b2" bindtap="__e">{{$root.m5}}</view></block></view>
|
||||||
Loading…
Reference in New Issue