From 39613118a5bae23c45498c4f5a939e83595f99f5 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 16 七月 2024 16:05:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
wechat_jiaxuan/pages/mine/mine.wxml | 25 +++++++++++++++++++------
1 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/wechat_jiaxuan/pages/mine/mine.wxml b/wechat_jiaxuan/pages/mine/mine.wxml
index 36c8460..10b13f2 100644
--- a/wechat_jiaxuan/pages/mine/mine.wxml
+++ b/wechat_jiaxuan/pages/mine/mine.wxml
@@ -1,14 +1,22 @@
<view class="container">
<view class="navbar" style="padding-top: {{ clientTop }}px;height: {{clientHeight + clientTop}}px;">鎴戠殑瀹�</view>
+ <image class="mine_bg" src="{{ MINE_BG }}" mode="widthFix"></image>
<view class="userinfo">
- <image class="avatar" src=""></image>
+ <image class="avatar" src="{{ imgurlFull ? imgurlFull : '../../static/images/default_avatar.png' }}"></image>
<view class="content">
<view class="header">
- <view class="name">鑻忕伩</view>
+ <view class="name">{{ member.nickname }}</view>
<view data-index="3" bindtap="changePath" class="edit">缂栬緫</view>
</view>
- <view class="addr">鍚堣偉鑾茶姳灏忓尯</view>
- <view class="detail">120m虏 锝�3瀹�1鍘�1鍘�1鍗�</view>
+ <view class="addr">{{ member.district || '' }}</view>
+ <view class="detail">
+ <text wx:if="{{member.housearea}}">{{ member.housearea }}m虏锝�</text>
+ <text class="item" wx:if="{{ houseType.val1 }}">{{ houseType.val1 }}瀹�</text>
+ <text class="item" wx:if="{{ houseType.val2 }}">{{ houseType.val2 }}鍘�</text>
+ <text class="item" wx:if="{{ houseType.val3 }}">{{ houseType.val3 }}鍘�</text>
+ <text class="item" wx:if="{{ houseType.val4 }}">{{ houseType.val4 }}鍗�</text>
+ <text class="item" wx:if="{{ houseType.val5 }}">{{ houseType.val5 }}闃�</text>
+ </view>
</view>
</view>
<view class="main_content">
@@ -27,14 +35,19 @@
</view>
</view>
<view class="func_list">
- <view class="line">
+ <view class="line" data-index="4" bindtap="changePath">
<view class="name">鍛樺伐缁戝畾</view>
<image class="icon" src="../../static/icon/mine_ic_ar.png" mode="widthFix"></image>
</view>
- <view class="line">
+ <view class="line" data-index="5" bindtap="changePath">
<view class="name">鏇村璁剧疆</view>
<image class="icon" src="../../static/icon/mine_ic_ar.png" mode="widthFix"></image>
</view>
</view>
</view>
+ <view class="liucheng">
+ <view class="h1">鏈嶅姟娴佺▼</view>
+ <view class="h2">涓撴敞鍘ㄦ埧 鏇存噦鐢熸椿</view>
+ <image class="img" src="{{ IMG_LIUCHENG }}" mode="widthFix"></image>
+ </view>
</view>
\ No newline at end of file
--
Gitblit v1.9.3