|
|
@@ -45,44 +45,44 @@
|
|
|
<view>{{dataset.willillStateName}}</view>
|
|
|
</view>
|
|
|
<view class="row">
|
|
|
- <span class="col" wx:if="{{dataset.height}}" style="display:flex">
|
|
|
- <text style="color:#8C8C8C">身高:</text>
|
|
|
- <text>{{dataset.height}}cm</text>
|
|
|
- </span>
|
|
|
- <span class="col" wx:if="{{dataset.weight}}">
|
|
|
+ <view class="col" wx:if="{{dataset.height}}" style="display:flex">
|
|
|
+ <view style="color:#8C8C8C">身高:</view>
|
|
|
+ <view>{{dataset.height}}cm</view>
|
|
|
+ </view>
|
|
|
+ <view class="col" wx:if="{{dataset.weight}}" style="display:flex">
|
|
|
<text style="color:#8C8C8C">体重:</text>
|
|
|
<text>{{dataset.weight}}kg</text>
|
|
|
- </span>
|
|
|
+ </view>
|
|
|
</view>
|
|
|
<view class="row">
|
|
|
- <span class="col" wx:if="{{dictionary.label($dictionaries, 'sys_yes_no', dataset.drinkState)}}">
|
|
|
+ <view class="col" wx:if="{{dictionary.label($dictionaries, 'sys_yes_no', dataset.drinkState)}}" style="display:flex">
|
|
|
<text style="color:#8C8C8C">饮酒:</text>
|
|
|
<text>{{dictionary.label($dictionaries, 'sys_yes_no', dataset.drinkState)}}</text>
|
|
|
- </span>
|
|
|
- <span class="col" wx:if="{{dictionary.label($dictionaries, 'sys_yes_no', dataset.smokeState)}}">
|
|
|
+ </view>
|
|
|
+ <view class="col" wx:if="{{dictionary.label($dictionaries, 'sys_yes_no', dataset.smokeState)}}" style="display:flex">
|
|
|
<text style="color:#8C8C8C">抽烟:</text>
|
|
|
<text>{{dictionary.label($dictionaries, 'sys_yes_no', dataset.smokeState)}}</text>
|
|
|
- </span>
|
|
|
+ </view>
|
|
|
</view>
|
|
|
- <span class="row">
|
|
|
+ <view class="row" style="display:flex">
|
|
|
<text style="color:#8C8C8C">喜好口味:</text>
|
|
|
<t-tag t-class="tag" variant="outline" wx:for="{{hobbyFlavor}}" wx:key="*this">
|
|
|
{{dictionary.label($dictionaries, 'hobby_flavor', item)}}
|
|
|
</t-tag>
|
|
|
<t-tag variant="outline" wx:if="{{!hobbyFlavor.length}}">无</t-tag>
|
|
|
- </span>
|
|
|
- <span class="row">
|
|
|
+ </view>
|
|
|
+ <view class="row" style="display:flex">
|
|
|
<text style="color:#8C8C8C">食物过敏:</text>
|
|
|
<t-tag t-class="tag" variant="outline" wx:for="{{foodAllergy}}" wx:key="*this">
|
|
|
{{dictionary.label($dictionaries, 'food_allergy', item)}}
|
|
|
</t-tag>
|
|
|
<t-tag variant="outline" wx:if="{{!foodAllergy.length}}">无</t-tag>
|
|
|
- </span>
|
|
|
- <span class="row">
|
|
|
+ </view>
|
|
|
+ <view class="row">
|
|
|
<text class="text-item" wx:if="{{dataset.willillDegreeName}}">{{dataset.willillDegreeName}}</text>
|
|
|
<text class="text-item" wx:if="{{dataset.willillSocialName}}">{{dataset.willillSocialName}}</text>
|
|
|
<text class="text-item" wx:if="{{dataset.willillFunctionName}}">{{dataset.willillFunctionName}}</text>
|
|
|
- </span>
|
|
|
+ </view>
|
|
|
</view>
|
|
|
</view>
|
|
|
|