From 0556e2bfdf6e9424ef6ef12abe08fc9d7b44cf1b Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Sat, 16 Jan 2021 08:54:05 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/jyyforjava/hive-xcx
---
pages/yuyue/choseService.wxml | 41 +++++++++++++++++++++++++++--------------
1 files changed, 27 insertions(+), 14 deletions(-)
diff --git a/pages/yuyue/choseService.wxml b/pages/yuyue/choseService.wxml
index 77c80c6..98d3f4d 100644
--- a/pages/yuyue/choseService.wxml
+++ b/pages/yuyue/choseService.wxml
@@ -1,34 +1,47 @@
-<scroll-view class="top" scroll-x>
-
-
+<!--
<block wx:for="{{cates}}" wx:key >
<view class="cate-item active" wx:if="{{index==cateIndex}}" >{{item.attrName}}</view>
<view class="cate-item " wx:if="{{index!=cateIndex}}" bindtap="chooseCate" data-index="{{index}}" >{{item.attrName}}</view>
</block>
-
-</scroll-view>
+-->
<scroll-view scroll-y >
-
- <view class="service-wrap" wx:for="{{serviceList}}" wx:key bindtap="chooseService"
- data-index="{{index}}" >
+ <block >
+ <view class="cate-item " >已购套餐/项目</view>
+</block>
+<view wx:for="{{composeProj}}" wx:for-item="tc" >
+ <view class="service-wrap" wx:for="{{tc.proj}}" wx:key bindtap="chooseService"
+ data-pro="{{item}}" >
<view class="inner-wrap">
<view class="content-wrap" >
- <image mode="aspectFit" src="{{item.imgMobile}}"></image>
<view class="m-info" >
- <view class="title">{{item.title}}</view>
- <!-- <view class="price">￥{{item.price}}</view> -->
+ <view class="title">{{item.name}}</view>
</view>
<view class="s-info">
- <text class="s-time">约{{item.serviceTime}}分钟</text>
+ <text class="s-time">约{{item.timeLength}}分钟</text>
<text class="iconfont iconright"></text>
</view>
</view>
</view>
- </view>
+</view>
+</view>
+<view class="service-wrap" wx:for="{{proj}}" wx:key bindtap="chooseService"
+ data-pro="{{item}}" >
+ <view class="inner-wrap">
+ <view class="content-wrap" >
+ <view class="m-info" >
+ <view class="title">{{item.name}}</view>
+ </view>
+ <view class="s-info">
+ <text class="s-time">约{{item.timeLength}}分钟</text>
+ <text class="iconfont iconright"></text>
+ </view>
+ </view>
+ </view>
+</view>
-
+
</scroll-view>
\ No newline at end of file
--
Gitblit v1.9.1