From 2faa6546a9f9ddb29f81cbc9770fc25b95703695 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 26 七月 2024 17:02:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
wechat_jiaxuan/pages/store/store.wxml | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/wechat_jiaxuan/pages/store/store.wxml b/wechat_jiaxuan/pages/store/store.wxml
index 4717bd0..13be104 100644
--- a/wechat_jiaxuan/pages/store/store.wxml
+++ b/wechat_jiaxuan/pages/store/store.wxml
@@ -15,24 +15,24 @@
<view class="left">
<view class="title" data-id="{{ item.id }}" bindtap="handleDetail">{{ item.name }}</view>
<view class="address" data-id="{{ item.id }}" bindtap="handleDetail">
- <text wx:if="{{ item.distanceStr }}">{{ item.distanceStr }} | {{ item.address || '' }}</text>
+ <text class="text" wx:if="{{ item.distanceStr }}">{{ item.distanceStr }} | {{ item.address || '' }}</text>
<text wx:else>--</text>
<image src="../../static/icon/arrow_right.png" mode="widthFix"></image>
</view>
</view>
- <view class="right">
- <image data-phone="{{ item.phone }}" bindtap="makePhone" class="phone" src="../../static/icon/phone.png" mode="widthFix"></image>
+ <view wx:if="{{ item.linkPhone }}" class="right">
+ <image data-phone="{{ item.linkPhone }}" bindtap="makePhone" class="phone" src="../../static/icon/phone.png" mode="widthFix"></image>
<view>鐢佃瘽</view>
</view>
</view>
<scroll-view scroll-x style="width: 640rpx">
<view class="user_list">
- <view bindtap="userDetail" data-id="{{ item.iamId }}" class="item" wx:for="{{ item.usersList }}" wx:for-item="user">
+ <view bindtap="userDetail" data-id="{{ user.iamId }}" class="item" wx:for="{{ item.usersList }}" wx:for-item="user">
<view class="info">
- <image class="avatar" src="{{ user.imgurlFull }}" mode="widthFix"></image>
+ <image class="avatar" src="{{ user.imgurlFull ? user.imgurlFull : '../../static/images/default_avatar.png' }}" ></image>
<view class="text">
<view class="name">{{ user.name }}</view>
- <view class="ex" wx:if="{{user.jobDate}}">{{ user.jobDate }}骞寸粡楠�</view>
+ <view class="ex">{{ user.jobDate || 5 }}骞寸粡楠�</view>
</view>
</view>
<view class="btn">鑱旂郴TA</view>
--
Gitblit v1.9.3