diff --git a/packageA/pages/my_service2/appment_main.js.rej b/packageA/pages/my_service2/appment_main.js.rej
deleted file mode 100644
index efecfee..0000000
--- a/packageA/pages/my_service2/appment_main.js.rej
+++ /dev/null
@@ -1,10 +0,0 @@
-diff a/packageA/pages/my_service/appment_main.js b/packageA/pages/my_service/appment_main.js	(rejected hunks)
-@@ -647,7 +647,7 @@
-     var project_id = th.data.project_id; //服务项目id
-     getApp().request.promiseGet(url, {
-       data: {
--        storeId: a.stoid,
-+        storeId: th.data.options.storeid,
-         userId: th.data.options.userid,
-         projectId: project_id
-       }
diff --git a/packageA/pages/my_service2/appment_main.wxml.rej b/packageA/pages/my_service2/appment_main.wxml.rej
deleted file mode 100644
index be50729..0000000
--- a/packageA/pages/my_service2/appment_main.wxml.rej
+++ /dev/null
@@ -1,143 +0,0 @@
-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>