appment_main.wxml.rej
5.16 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
diff a/packageA/pages/my_service/appment_main.wxml b/packageA/pages/my_service/appment_main.wxml (rejected hunks)
@@ -17,54 +17,120 @@
<view class="angle">∟</view>
</view>
</view>
+
+
+ <view class="table flex">
+ <view class="left t-c">
+ <view class="td">时间</view>
+ <view class="td">8:00</view>
+ <view class="td">9:00</view>
+ </view>
+ <scroll-view scroll-x class="right" bindscroll="scroll">
+ <view class="flex t-c" bindtap="rect">
+ <view bindtap="rect">
+ <view class="td blue">张三</view>
+ <view class="td" bindtap="print">100</view>
+ <view class="td">200</view>
+ </view>
+ <view>
+ <view class="td blue">张三</view>
+ <view class="td">100</view>
+ <view class="td">200</view>
+ </view>
+ <view>
+ <view class="td blue">张三</view>
+ <view class="td" bindtap="print">100</view>
+ <view class="td">200</view>
+ </view>
+ <view>
+ <view class="td blue">张三</view>
+ <view class="td">100</view>
+ <view class="td">200</view>
+ </view>
+ <view>
+ <view class="td blue">张三</view>
+ <view class="td">100</view>
+ <view class="td">200</view>
+ </view>
+ <view>
+ <view class="td blue">张三</view>
+ <view class="td">100</view>
+ <view class="td">200</view>
+ </view>
+ <view>
+ <view class="td blue">张三</view>
+ <view class="td">100</view>
+ <view class="td">200</view>
+ </view>
+ <view>
+ <view class="td blue">1张三</view>
+ <view class="td">300</view>
+ <view class="td">300</view>
+ </view>
+ </view>
+ </scroll-view>
+ <view class="card">
+ <view class="t-c pd20">
+ <text class="iconfont icon-meirong fs40"></text>
+ <view class="fs24">项目1</view>
+ </view>
+ <view class="t-c pd20">
+ <text class="iconfont icon-meirong fs40"></text>
+ <view class="fs24">项目1</view>
+ </view>
+ </view>
+ </view>
+
+
+
<!-- 选择美容师 -->
- <view class="flex-vertical mabot">
+ <!-- <view class="flex-vertical mabot"> -->
<!-- 门店 -->
- <view class="flex-vertical-between head fs30">
+ <!-- <view class="flex-vertical-between head fs30">
<view>美</view>
<view>容</view>
<view>师</view>
- </view>
+ </view> -->
<!-- 选择美容师 -->
- <view class="rel fs26">
- <view class="flex-vertical-between Cosmetology" bindtap="query_beautician">
+ <!-- <view class="rel fs26"> -->
+ <!-- <view class="flex-vertical-between Cosmetology" bindtap="query_beautician">
<view class="{{beautician_name==''?'color':''}} value ellipsis-1">{{beautician_name==''?'选择美容师':beautician_name}}</view>
<view class="angle">∟</view>
- </view>
+ </view> -->
<!-- 美容师下拉列表 -->
- <view class="beauticians abs" wx:if="{{beautician}}">
+ <!-- <view class="beauticians abs" wx:if="{{beautician}}"> -->
<!-- 到时候要做判断如果是index==循环的最后一个则把下边线去掉:(beaclone去掉的css) -->
- <view class="beautician flex-vertical fs26" wx:for="{{beautician_list}}" bindtap="choice_beautician" data-baaindex="{{key}}" wx:for-index="key">
+ <!-- <view class="beautician flex-vertical fs26" wx:for="{{beautician_list}}" bindtap="choice_beautician" data-baaindex="{{key}}" wx:for-index="key">
<view class="StaffName ellipsis-1">{{item.StaffName}}</view>
</view>
<view>
</view>
- </view>
- </view>
- <view class="flex-center users" bindtap="nav_bea">
+ </view> -->
+ <!-- </view> -->
+ <!-- <view class="flex-center users" bindtap="nav_bea">
<image class="user" src="{{iurl}}/miniapp/images/yyservice/user.png"></image>
- </view>
- </view>
+ </view> -->
+ <!-- </view> -->
<!-- 选择时间 -->
- <view class="flex-vertical mabot">
+ <!-- <view class="flex-vertical mabot"> -->
<!-- 门店 -->
- <view class="head fs30">
+ <!-- <view class="head fs30">
<view>预约时间</view>
- </view>
+ </view> -->
<!-- 选择时间 -->
- <view class="flex-vertical-between fs26 select" data-url="/packageA/pages/my_service/beauty_deta?url={{url}}&StorageId={{StorageId}}&BeauticianID={{beauticianID}}&itemId={{itemId}}&modify=0&projectId={{project_id}}" bindtap="goto">
+ <!-- <view class="flex-vertical-between fs26 select" data-url="/packageA/pages/my_service/beauty_deta?url={{url}}&StorageId={{StorageId}}&BeauticianID={{beauticianID}}&itemId={{itemId}}&modify=0&projectId={{project_id}}" bindtap="goto">
<view class="{{time==''?'color':''}}">{{time==""?'选择时间':time}}</view>
<view class="angle angler">∟</view>
- </view>
- </view>
+ </view> -->
+ <!-- </view> -->
<!-- 备注 -->
- <view class="flex Remarks">
+ <!-- <view class="flex Remarks"> -->
<!-- 门店 -->
- <view class="flex-space-between head fs30">
+ <!-- <view class="flex-space-between head fs30">
<view>备</view>
<view>注</view>
</view>