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