From bf99ae66d14857dfcd97dc6ccb8e82a38d3bd75f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 19 七月 2024 09:05:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
wechat_jiaxuan/pages/store/store.wxml | 45 ++++++++++++---------------------------------
1 files changed, 12 insertions(+), 33 deletions(-)
diff --git a/wechat_jiaxuan/pages/store/store.wxml b/wechat_jiaxuan/pages/store/store.wxml
index d9cb5c6..7fe1ed4 100644
--- a/wechat_jiaxuan/pages/store/store.wxml
+++ b/wechat_jiaxuan/pages/store/store.wxml
@@ -1,8 +1,8 @@
<view>
<view class="app_header">
<image class="location" src="../../static/icon/location.png" mode="widthFix"></image>
- <view bindtap="selAddress" class="add">{{ 111 }}闃垮ぇ浣垮ぇ璧涚殑闃垮ぇ浣垮ぇ璧涚殑闃垮ぇ浣垮ぇ璧涚殑闃垮ぇ浣垮ぇ璧涚殑</view>
- <view class="right">
+ <view class="add">{{ address }}</view>
+ <view bindtap="selAddress" class="right">
<image src="../../static/icon/ic_dingwei@2x.png" mode="widthFix"></image>
<text class="primary">閲嶆柊瀹氫綅</text>
</view>
@@ -10,50 +10,29 @@
<view class="main_content">
<view class="app_title">AI涓烘偍鎺ㄨ崘浠ヤ笅闂ㄥ簵锛�</view>
<view class="shops">
- <view class="shop">
+ <view class="shop" wx:for="{{ shopList }}">
<view class="header">
<view class="left">
- <view class="title">title</view>
- <view class="address">
- <text>1</text>
+ <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 wx:else>--</text>
<image src="../../static/icon/arrow_right.png" mode="widthFix"></image>
</view>
</view>
<view class="right">
- <image class="phone" src="../../static/icon/phone.png" mode="widthFix"></image>
+ <image data-phone="{{ item.phone }}" 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 class="item">
+ <view class="item" wx:for="{{ item.usersList }}" wx:for-item="user">
<view class="info">
- <image class="avatar" src="" mode="widthFix"></image>
+ <image class="avatar" src="{{ user.imgurlFull }}" mode="widthFix"></image>
<view class="text">
- <view class="name">name</view>
- <view class="ex">5骞寸粡楠�</view>
- </view>
- </view>
- <view class="btn">鑱旂郴TA</view>
- </view>
- <view class="item">
- <view class="info">
- <image class="avatar" src="" mode="widthFix"></image>
- <view class="text">
- <view class="name">name</view>
- <view class="ex">5骞寸粡楠�</view>
- </view>
- </view>
- <view class="btn">鑱旂郴TA</view>
- </view>
- <view class="item">
- <view class="info">
- <image class="avatar" src="" mode="widthFix"></image>
- <view class="text">
- <view class="name">name</view>
- <view class="ex">5骞寸粡楠�</view>
+ <view class="name">{{ user.name }}</view>
+ <view class="ex" wx:if="{{user.jobDate}}">{{ user.jobDate }}骞寸粡楠�</view>
</view>
</view>
<view class="btn">鑱旂郴TA</view>
--
Gitblit v1.9.3