Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
commit
eaabfaed9b
@ -425,8 +425,7 @@
|
||||
"enablePullDownRefresh": false,
|
||||
"onReachBottom": true
|
||||
}
|
||||
},
|
||||
{
|
||||
}, {
|
||||
"path": "myevaluation/myevaluation",
|
||||
"style": {
|
||||
"navigationBarTitleText": "我的评价",
|
||||
|
||||
@ -43,7 +43,7 @@
|
||||
<view class="" v-else>
|
||||
<image src="../../static/pageC/oneimage.png" mode="" v-if="Number(dataone.val)<4.4"></image>
|
||||
<image src="../../static/pageC/twoimage.png" mode=""
|
||||
v-if="Number(dataone.val)>4.4&&Number(dataone.val)<=10"></image>
|
||||
v-if="Number(dataone.val)>=4.4&&Number(dataone.val)<=10"></image>
|
||||
<image src="../../static/pageC/threeimage.png" mode="" v-if="Number(dataone.val)>10"></image>
|
||||
</view>
|
||||
<view class="title">
|
||||
@ -247,7 +247,7 @@
|
||||
</view>
|
||||
<view class="titletexts" v-else>
|
||||
<view class="time">
|
||||
{{dataone.date}}
|
||||
{{datafour.date}}
|
||||
</view>
|
||||
<view class="bmi">
|
||||
<image src="../../static/pageC/bmi1.png" mode="" v-if="Number(datafour.val)<18.5"></image>
|
||||
@ -278,7 +278,7 @@
|
||||
</view>
|
||||
<view class="titletexts" v-else>
|
||||
<view class="time">
|
||||
{{dataone.date}}
|
||||
{{datafive.date}}
|
||||
</view>
|
||||
<image src="../../static/pageC/xueyangone.png" mode="" v-if="Number(datafive.val)<95"></image>
|
||||
<image src="../../static/pageC/xueyangtwo.png" mode="" v-if="Number(datafive.val)>=95"></image>
|
||||
@ -303,7 +303,7 @@
|
||||
</view>
|
||||
<view class="titletexts" v-else>
|
||||
<view class="time">
|
||||
{{dataone.date}}
|
||||
{{datasix.date}}
|
||||
</view>
|
||||
<image src="../../static/pageC/oneimage.png" mode="" v-if="Number(datasix.val)<60"></image>
|
||||
<image src="../../static/pageC/twoimage.png" mode=""
|
||||
@ -330,7 +330,7 @@
|
||||
</view>
|
||||
<view class="titletexts" v-else>
|
||||
<view class="time">
|
||||
{{dataone.date}}
|
||||
{{dataseven.date}}
|
||||
</view>
|
||||
<image src="../../static/pageC/oneimage.png" mode="" v-if="Number(dataseven.val)<36"></image>
|
||||
<image src="../../static/pageC/twoimage.png" mode=""
|
||||
|
||||
Loading…
Reference in New Issue
Block a user