Merge branch 'qa' into 'master'

Qa See merge request !665

Merge branch 'qa' into 'master'
Qa See merge request !665
后端研发-苏明海
2 parents 127b964d 3cfd79b4
Showing 78 changed files with 4321 additions and 873 deletions
app.wxss
components/diy_searchbox/diy_searchbox.js
components/diy_searchbox/diy_searchbox.wxml
components/diy_searchbox/diy_searchbox.wxss
packageA/images/1.jpg
packageA/images/cloud.jpg
packageA/images/index/tuangou-pic.jpg
packageA/images/liveStreamDetails/circle.jpg
packageA/images/liveStreamDetails/cover.jpg
packageA/images/liveStreamDetails/friend.jpg
packageA/images/liveStreamDetails/goods.jpg
packageA/images/liveStreamDetails/home.jpg
packageA/images/liveStreamDetails/playbill.jpg
packageA/images/liveStreamDetails/save.jpg
packageA/images/liveStreamDetails/share.jpg
packageA/images/qywx.png
packageA/images/wx.png
packageA/images/wx2.png
packageA/pages/activity_share/activity_share.js
packageA/pages/activity_share/activity_share.wxml
@@ -671,9 +671,9 @@ background: #ffe3e2;
 /* 图标字体(ty) */
 @font-face {
   font-family: 'iconfont';  /* Project id 2054717 */
-  src: url('//at.alicdn.com/t/font_2054717_f0lv6m3iryg.woff2?t=1621240949872') format('woff2'),
-       url('//at.alicdn.com/t/font_2054717_f0lv6m3iryg.woff?t=1621240949872') format('woff'),
-       url('//at.alicdn.com/t/font_2054717_f0lv6m3iryg.ttf?t=1621240949872') format('truetype');
+  src: url('//at.alicdn.com/t/font_2054717_vx6pr6zmhth.woff2?t=1623117016358') format('woff2'),
+       url('//at.alicdn.com/t/font_2054717_vx6pr6zmhth.woff?t=1623117016358') format('woff'),
+       url('//at.alicdn.com/t/font_2054717_vx6pr6zmhth.ttf?t=1623117016358') format('truetype');
 }
  
 .iconfont {
@@ -684,6 +684,10 @@ background: #ffe3e2;
   -moz-osx-font-smoothing: grayscale;
 }
  
+.icon-plyy:before {
+  content: "\e729";
+}
+
 .icon-sandian:before {
   content: "\e665";
 }
@@ -19,6 +19,8 @@ Component({
 	inputShowed:1,
 	inputval:'在店铺内搜索',
 	keyword:'',
+	
+	searchRecord: [],
   },
   ready: function() {
 	var th=this;  
@@ -27,7 +29,27 @@ Component({
 		if(e.hot_keywords)
 		   th.setData({keyword:e.hot_keywords});
 	})
+	
+	var arr=wx.getStorageSync('searchRecord') || [] //若无存储则为空
+	
+	this.setData({
+	  searchRecord: arr
+	});
+	
+  },
+  
+  
+  pageLifetimes:{
+    //要处理一下，游客登录后的界面的变化,主要还该是改变会员
+    show: function () {
+	   var th=this;
+	   var arr=wx.getStorageSync('searchRecord') || [] //若无存储则为空	
+       this.setData({
+         searchRecord: arr,inputval:'',first:1,is_his:0
+       });
+    }
   },
+  
   methods: {
     //智能跳转
     go_url:function (e) {
@@ -41,13 +63,23 @@ Component({
 		  return false;
 	  }			
 	  this.setData({first:0,inputShowed:1,inputval:''});
-	},	
+	   
+	},		
+	inputFocus:function(){	
+		if(this.data.is_init) return false;
+		this.setData({is_his:1,})
+	},
  
-	onblur:function(){
-		var val=this.data.inputval;
-		if(val==''){
-			this.setData({first:1,});
-		}
+	onblur:function(){		
+		var th=this;
+		setTimeout(function(){
+			if(th.data.click_sear) return false;
+			var val=th.data.inputval;
+			if(val==''){
+				th.setData({first:1,});
+			}
+			th.setData({is_his:0,})
+		},300)	
 	},	
 	set_input:function(e){
 		var val=e.detail.value;
@@ -56,7 +88,23 @@ Component({
 	sear:function(){
 		var url="/pages/goods/search/search?s_key="+this.data.inputval;
 		getApp().goto(url);
-	}
+	},
+	
+	del_his:function(){
+		this.setData({
+		  searchRecord: []
+		});		
+		wx.setStorage({ key: 'searchRecord', data:[]});
+	},
+	
+	sear_key:function(e){
+		this.data.click_sear=1;
+		var str=e.currentTarget.dataset.item;	
+		var url="/pages/goods/search/search?s_key="+str;
+		this.data.click_sear=0;
+		getApp().goto(url);
+		
+	},
  
   }
 })
 \ No newline at end of file
 <!--pages/diy_ss/diy_ss.wxml-->
+ <!-- wx:if="{{object.style==1}}" -->
+ <!-- first -->
 <block wx:if="{{object.style==1}}">
-	<view class='ss' >
+	<view class='ss' style="position: relative;">
 		<view bindtap='click_sear'  class="s1_gk_a1" wx:if="{{first}}">
 		   <view class='s_ge'>
 			   <image src='{{imghost}}/miniapp/images/search.png'></image>
@@ -11,35 +13,69 @@
 		<view   class="s1_gk_a1" wx:else>
 		   <view class='s_ge flex'>
 			   <image class="find_img" src='{{imghost}}/miniapp/images/search.png' bindtap='sear'></image>
-		       <input id="find_inp" class="find_inp" value=""
-				   bindconfirm="sear"  bindinput='set_input' focus="{{inputShowed}}" bindblur="onblur" /> 
+				 <input id="find_inp" class="find_inp" value="{{inputval}}" bindfocus="inputFocus" 
+					 bindconfirm="sear"  bindinput='set_input' focus="{{inputShowed}}" bindblur="onblur" />
 		   </view>
+			 <view class="his_str his_str1" wx:if="{{searchRecord.length>0}}">
+				<block wx:for="{{searchRecord}}"> 
+			 	   <view class="item" bindtap="sear_key" data-item="{{item}}" >{{item}}</view>
+				</block>		 	
+			 	<view wx:if="{{searchRecord.length>0}}" class="clear" bindtap="del_his">清除</view>
+			 </view>
 		</view>		
+		
+			
 	</view>
 </block>
  
 <block wx:if="{{object.style==2}}">
-<view style='background-color:{{object.top_bgcolor}}; display: flex; align-items: center; justify-content: space-around; height: 100rpx;' >
-    <view class='s2_left'>
-        <navigator open-type="switchTab" url="/pages/goods/categoryList/categoryList" class="s1_gk_a1">
-        <image src='{{imghost}}/miniapp/images/model/nav.png' style="margin:0;position: relative;left: 6rpx"></image>
-        </navigator>
-    </view>
-    <view class='s2_cen' style='background-color:{{object.inner_bgcolor}}'>
-        <navigator wx:if="{{first}}" bindtap='click_sear' class="s1_gk_a2 flex" style='height: 100%;color:{{object.word_color?object.word_color:"#fff"}}'>
-           <text class="iconfont icon-search" style="font-size: 40rpx;"></text>
-           <text>在店铺内搜索</text>
-        </navigator>
-		<navigator wx:else class="s1_gk_a2 flex" style='height: 100%;color:{{object.word_color?object.word_color:"#fff"}}'>			 
-			  <text style="font-size: 40rpx;" class="iconfont icon-search" bindtap='sear'></text>
-		      <input  id="find_inp" class="find_inp2" value="" 
-						   bindconfirm="sear"  bindinput='set_input' focus="{{inputShowed}}"  /> 
-		 </navigator>
-    </view>
-    <view class='s2_right'>
-        <navigator open-type="switchTab"  url="/pages/cart/cart/cart" class="s1_gk_a1">
-        <image src='{{imghost}}/miniapp/images/model/car.png' style="margin:0;;"></image>
-        </navigator>
-    </view>
+<view style="position: relative;">
+	<view style='background-color:{{object.top_bgcolor}}; display: flex; align-items: center; justify-content: space-around;padding:16rpx 0;'>
+	    <view class='s2_left'>
+	        <navigator open-type="switchTab" url="/pages/goods/categoryList/categoryList" class="s1_gk_a1">
+	        <image src='{{imghost}}/miniapp/images/model/nav.png' style="margin:0;position: relative;left: 6rpx"></image>
+	        </navigator>
+	    </view>
+	    <view class='s2_cen' style='background-color:{{object.inner_bgcolor}}'>
+	        <navigator wx:if="{{first}}" bindtap='click_sear' class="s1_gk_a2 flex" style='height: 100%;color:{{object.word_color?object.word_color:"#fff"}}'>
+	           <text class="iconfont icon-search" style="font-size: 40rpx;"></text>
+	           <text>在店铺内搜索</text>
+	        </navigator>
+			<view wx:else class="s1_gk_a2" style='color:{{object.word_color?object.word_color:"#fff"}}'>
+					<!-- <view class="pr"> -->
+						<view class="flex ali-c">
+							<text style="font-size: 40rpx;" class="iconfont icon-search" bindtap='sear'></text>
+							<input  id="find_inp" class="find_inp2" value="{{inputval}}"  bindblur="onblur" bindfocus="inputFocus"
+									   bindconfirm="sear"  bindinput='set_input' focus="{{inputShowed}}"/>
+						</view>
+						<view class="his_str his_str2" wx:if="{{searchRecord.length>0 && is_his}}">
+							<block wx:for="{{searchRecord}}">
+							   <view class="item" bindtap="sear_key" data-item="{{item}}">{{item}}</view>
+							</block>		 	
+							<view wx:if="{{searchRecord.length>0}}" class="clear" bindtap="del_his">清除</view>
+						</view>
+						<!-- wx:if="{{inputShowed}}" -->
+						
+				  <!-- </view> -->
+					
+			   
+			 </view>
+	    </view>
+	    <view class='s2_right'>
+	        <navigator open-type="switchTab"  url="/pages/cart/cart/cart" class="s1_gk_a1">
+	        <image src='{{imghost}}/miniapp/images/model/car.png' style="margin:0;;"></image>
+	        </navigator>
+	    </view>
+			
+			
+		
+		<!-- <view class="his_str" style="bottom: -190rpx;" wx:if="{{inputShowed}}">
+			<view>历史搜索</view>
+			<view>2121</view>
+			<view>2121</view>
+			<view>2121</view>
+		</view> -->
+	</view>
 </view>
+
 </block>
 \ No newline at end of file
@@ -42,7 +42,7 @@
  
 .s2_cen{
     width: 80%;
-    height: 70rpx;
+    /* height: 70rpx; */
     color: #fff;
     text-align: left;
     font-size: 28rpx;
@@ -108,3 +108,53 @@
 .icon-search:before {
   content: "\e7b3";
 }
+
+
+.his_str {
+	position: absolute;
+	width: 600rpx;
+	top: 74rpx;
+	z-index: 999;
+	color: black;
+	background-color: white;
+	border: 2rpx solid #f0f0f0;
+	box-sizing: border-box;
+	border-radius: 0 0 12rpx 12rpx;
+}
+
+.his_str.his_str1 {
+	width: 708rpx;
+}
+
+.his_str1.his_str {
+	top: 96rpx;
+}
+
+.pr {
+	position: relative;
+}
+
+.ali-c {
+	align-items: center;
+}
+
+.item {
+	padding: 0 20rpx;
+	line-height: 70rpx; 
+	text-align: left;
+	border-bottom: 2rpx solid #f6f6f6;
+}
+
+
+.clear {
+	text-align: right;
+	padding: 0 20rpx;
+	line-height: 70rpx;
+	color: #FF5B5A;
+	font-size: 26rpx;
+}
+
+/* .w100 {
+	width: 100%;
+	box-sizing: border-box;
+} */
 \ No newline at end of file
@@ -923,24 +923,29 @@ Page({
 		var item=this.data.list[index];
 		this.setData({share_hidden:0,hui_active:item});
  
+		
+		
 		var com = this.selectComponent("#share_button"); //组件的id
 		com.set_type(1); 
 	},
 	//---点击分享商品---  
-	share_good:function(e){	
-		
+	share_good:function(e){			
 		//--先判断会员状态--
 		var user_info = getApp().globalData.userInfo;
 		if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
 		  //getApp().my_warnning("请先登录",0,this);
 		  wx.navigateTo({ url: '/pages/togoin/togoin', })
 		  return false;
-		}
-		
+		}		
 		var index=e.currentTarget.dataset.index;
 		var item=this.data.list[index];
-		this.setData({share_hidden:0,share_good:item});			
-		 
+		//如果是搭配购
+		if(item.main_goods_id){
+			item.goods_id=item.main_goods_id;
+			item.goods_name=item.main_goods_name;
+		}
+		
+		this.setData({share_hidden:0,share_good:item});				 
 		var com = this.selectComponent("#share_button"); //组件的id
 		com.set_type(0); 
 	},
@@ -98,7 +98,9 @@
 							</view>
 							<view class="flex-equality pdt20" wx:else>
 								<view bindtap="showPopup" data-index="{{index}}" class="btn-container" ><text class="btn-share">活动详情</text></view>
-								<view bindtap="share_index" data-index="{{index}}" class="btn-container"><text class="btn-share w164">分享</text></view>
+								
+								<view wx:if="{{currentIndex2==1}}" bindtap="share_good" data-index="{{index}}" class="btn-container"><text class="btn-share w164">分享</text></view>
+								<view wx:else bindtap="share_index" data-index="{{index}}" class="btn-container"><text class="btn-share w164">分享</text></view>
 							</view>
 						</view>
 					</view>
+// packageA//pages/choujiang/choujiang.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  }
+})
 \ No newline at end of file
+{
+  "usingComponents": {}
+}
 \ No newline at end of file
+<!--index.wxml-->
+<view class="container">
+	<view>
+		<image src=""></image>
+	</view>
+  停止位置:<input value='{{luckPosition}}' style="width:100%;text-align:center" bindinput='input' type='number'></input>
+	<view class='frame_view'>
+		<view class='frame_row'>
+		<image class='frame_item' style='opacity:{{color[0]}}' src='{{images[0]}}'></image>
+		<image class='frame_item' style='opacity:{{color[1]}}' src='{{images[1]}}'></image>
+		<image class='frame_item' style='opacity:{{color[2]}}' src='{{images[2]}}'></image>
+		</view>
+
+		<view class='frame_row'>
+		<image class='frame_item' style='opacity:{{color[7]}}' src='{{images[7]}}'></image>
+		<image class='frame_item' src='{{btnconfirm}}' bindtap='{{clickLuck}}'></image>
+		<image class='frame_item' style='opacity:{{color[3]}}' src='{{images[3]}}'></image>
+		</view>
+
+		<view class='frame_row'>
+		<image class='frame_item' style='opacity:{{color[6]}}' src='{{images[6]}}'></image>
+		<image class='frame_item' style='opacity:{{color[5]}}' src='{{images[5]}}'></image>
+		<image class='frame_item' style='opacity:{{color[4]}}' src='{{images[4]}}'></image>
+		</view>
+</view>
+</view>
+/* packageA//pages/choujiang/choujiang.wxss */
 \ No newline at end of file
-// packageA//pages/distribution/main/main.js
-const app =  getApp();
-let self = null;
-
-Page({
-
-  /**
-   * 页面的初始数据
-   */
-  data: {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad: function (options) {
-	  self = this;//保存全局指针
-
-		app.isLogin().then(function(data) {//进入页面前已经授权登录成功
-			self.setData({
-				userInfo: data,
-			});
-		});
-		
-  },
-
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow: function () {
-		console.log('onshow');
-		let url = '/api/weshop/users/distribut/getMoney';
-		if(app.globalData.userInfo) {
-			if(!this.data.isLogin) {
-				this.setData({
-					userInfo: app.globalData.userInfo,
-					imghost: app.globalData.setting.imghost,
-					isLogin: true,
-				});
-				
-				// 请求数据
-				app.request.get(url + '/' + this.data.userInfo.store_id + '/' + this.data.userInfo.user_id, {
-				  success: function(res) {
-						console.log('success~~`', self.data.userInfo);
-					  if(res.data.code == 0){
-		
-							self.setData({
-								data: res.data.data,
-							});
-
-						} else {
-							// if(!res.data.data.is_distribut) {//如果不是分销商:0不是，1是
-								
-								app.request.promiseGet('/api/weshop/users/distribut/getIsDistribut', {
-									data: {
-										storeId: self.data.userInfo.store_id,
-										userId: self.data.userInfo.user_id,
-										first_leader: self.data.userInfo.first_leader,
-									},
-									isShowLoading: true,
-								}).then(function(res) {
-									console.log('!!!===>', res);
-									self.setData({
-										fenxiao: res.data.data,
-									});
-								});
-								
-							// };
-						};
-				  },
-
-				});
-				
-			
-			};
-		};
-		
-		
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload: function () {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh: function () {
-
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom: function () {
-
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage: function () {
-
-  },
-	
-	/**
-	 * 点击跳转
-	 */
-	goto(e) {
-		let url = '';
-		if(e.target.dataset.url) {
-			url = e.target.dataset.url;
-		} else {
-			url = e.currentTarget.dataset.url;
-		}
-		console.log(url);
-		app.goto(url);
-	},
-	
-
-	
-	/**
-	 * 获取输入框
-	 */
-	getInput(e) {
-		this.setData({
-			inputValue: e.detail.value,
-		});
-	},
-	
-	
-	/**
-	 * 验证
-	 */
-	verify(e) {
-		let pass = e.target.dataset.pass;
-		let mobile = 0;
-		if(this.data.inputValue) {
-			mobile = this.data.inputValue;
-			if(!pass) {
-				app.request.put('/api/weshop/users/distribut/updateUserRecommender', {
-				  data: {
-				    storeId: self.data.userInfo.store_id,
-				    userId: self.data.userInfo.user_id,
-				    mobile: mobile,
-				  },
-				  success: function (res) {
-						if(res.code = -1) {
-							wx.showToast({
-							  title: res.data.msg,
-							  icon: 'none',
-							  duration: 2000
-							});
-						};
-				    console.log('!!!===>', res);
- 
-						if(res.data.msg == '绑定上下级关系成功！') {
-							app.request.promiseGet('/api/weshop/users/distribut/getIsDistribut', {
-								data: {
-									storeId: self.data.userInfo.store_id,
-									userId: self.data.userInfo.user_id,
-									first_leader: self.data.userInfo.first_leader,
-								},
-								isShowLoading: true,
-							}).then(function(res) {
-								console.log('!!!===>', res);
-								self.setData({
-									fenxiao: res.data.data,
-								});
-							});
-						};
-						
-				  }
-				});
-				
-			}
-		} else {
-			wx.showToast({
-			  title: '手机号码不能为空',
-			  icon: 'none',
-			  duration: 2000
-			});
-		};
-		
-	},
-})
 \ No newline at end of file
-{
-  "usingComponents": {},
-	"navigationBarTitleText": "我的分销",
-	"enablePullDownRefresh": false
-}
 \ No newline at end of file
-<wxs src="../../../../utils/filter.wxs" module="filter"></wxs>
-<view class="main">
-	<!-- 头像 -->
-	<view class="avatar-container t-c pdv40">
-		<view class="pdb20">
-			<image class="avatar" src="{{userInfo.head_pic}}"/>
-		</view>
-		<view class="fs26"><text class="nickname">{{filter.show_default(userInfo.nickname)}}</text></view>
-	</view>
-	<!-- 金额 -->
-	<view>
-		<view class="flex ai-center jc_sb pd2622 bdb arrow-r" bindtap="goto">
-			<view><text class="iconfont icon-jine pdr10 ctb"></text>可提现金额</view>
-			<view class="ctb money" data-url="/pages/user/member/menber">{{filter.show_default(data.liudong_money)}}</view>
-		</view>
-		
-		<view class="flex jc_sa t-c">
-			<view class="pd20 f1">
-				<view class="money fs40">{{filter.show_default(data.today_money)}}</view>
-				<view class="fs24 pdt10 cb">今日收入</view>
-			</view>
-			<view class="pd20 f1">
-				<view class="money fs40">{{filter.show_default(data.sales_volume)}}</view>
-				<view class="fs24 pdt10 cb">总销售额</view>
-			</view>
-			<view class="pd20 f1">
-				<view class="money fs40">{{filter.show_default(data.distribut_money)}}</view>
-				<view class="fs24 pdt10 cb">累计佣金</view>
-			</view>
-		</view>
-	</view>
-	<!-- 商品 -->
-	<view class="flex t-c mgv20 fs30" bindtap="goto">
-		<view class="f1 pd20 line" data-url="/packageA/pages/distribution/goods/goods?index=0"><text class="iconfont icon-shangjia pdr10 cf79"></text>上架商品</view>
-		<view class="f1 pd20" data-url="/packageA/pages/distribution/goods/goods?index=1"><text class="iconfont icon-xiajia pdr10 c29f"></text>下架商品</view>
-	</view>
-	<!-- 图标列表 -->
-	<view class="flex wrap pdv20">
-		<view class="pd20 t-c w25" bindtap="goto" data-url="/packageA/pages/distribution/order/order">
-			<view class="circle bgBlue"><text class="iconfont icon-order fs40"></text></view>
-			<view class="fs24 pdt10">分销订单</view>
-		</view>
-		<view class="pd20 t-c w25" bindtap="goto" data-url="/packageA/pages/distribution/rank/rank">
-			<view class="circle bgRed"><text class="iconfont icon-paihangbang fs40"></text></view>
-			<view class="fs24 pdt10">分销排行</view>
-		</view>
-		<view class="pd20 t-c w25" bindtap="goto" data-url="/packageA/pages/distribution/myteam/myteam">
-			<view class="circle bgPink"><text class="iconfont icon-tuandui fs40"></text></view>
-			<view class="fs24 pdt10">我的团队</view>
-		</view>
-		<view class="pd20 t-c w25" bindtap="goto" data-url="/packageA/pages/distribution/commision/commision">
-			<view class="circle bgRed"><text class="iconfont icon-yongjin fs40"></text></view>
-			<view class="fs24 pdt10">佣金明细</view>
-		</view>
-		<view class="pd20 t-c w25" bindtap="goto" data-url="/packageA/pages/distribution/card/card">
-			<view class="circle bgPurple"><text class="iconfont icon-mingpian fs40"></text></view>
-			<view class="fs24 pdt10">我的名片</view>
-		</view>
-		<view class="pd20 t-c w25">
-			<view class="circle bgYellow" bindtap="goto" data-url="/pages/user/index/index"><text class="iconfont icon-huiyuan fs40"></text></view>
-			<view class="fs24 pdt10">会员中心</view>
-		</view>
-		<view class="pd20 t-c w25" bindtap="goto" data-url="/packageA/pages/distribution/shop/shop">
-			<view class="circle bgBlue"><text class="iconfont icon-shop fs40"></text></view>
-			<view class="fs24 pdt10">我的小店</view>
-		</view>
-		<view class="pd20 t-c w25" bindtap="goto" data-url="/packageA/pages/distribution/rookie/rookie">
-			<view class="circle bgGreen"><text class="iconfont icon-xinshouyindao fs40"></text></view>
-			<view class="fs24 pdt10">新手必看</view>
-		</view>
-	</view>
-	<!-- 分销商验证 -->
-	<!-- <view class="popup" wx:if="{{!1}}"> -->
-	<view class="popup" wx:if="{{!data.is_distribut}}">
-		<view class="t-c pd20 title">分销规则说明<text class="iconfont icon-close" bindtap="goto" data-url="/pages/user/index/index"></text></view>
-		<!-- <view class="t-c pd20 title">分销规则说明</view> -->
-		<view wx:if="{{fenxiao}}">
-			<block wx:for="{{fenxiao}}">
-				<view class="item" wx:if="{{item.type == 1}}">
-					<view class="left f1">
-						<view class="icon-container"><text class="iconfont icon-huiyuan1"></text></view>
-						<view>仅限PLUS卡({{item.conditonRemark}})的会员, <text class="c-red" bindtap="goto" data-url="/pages/user/cardinfo/cardinfo">立即升级</text></view>
-					</view>
-					<text class="iconfont {{item.pass ? 'icon-yes c-red':'icon-yuanquan c-c7'}}"></text>
-				</view>
-				<view class="item" wx:if="{{item.type == 2}}">
-					<view class="left f1">
-						<view class="icon-container"><text class="iconfont icon-renzheng"></text></view>
-						<view class="flex ali-c">
-							<input class="bg-f0 pdh10 input" type="number" value="{{item.inviter ? item.inviter:''}}" placeholder="请输入推荐人手机号码" disabled="{{item.pass}}" bindinput="getInput"/>
-							<view class="verify" wx:if="{{!item.pass}}" bindtap="verify" data-pass="{{item.pass}}">验证</view>
-						</view>
-					</view>
-					<text class="iconfont {{item.pass ? 'icon-yes c-red':'icon-yuanquan c-c7'}}"></text>
-				</view>
-				<view class="item" wx:if="{{item.type == 3}}">
-					<view class="left f1">
-						<view class="icon-container"><text class="iconfont icon-gouwu"></text></view>
-						<text>{{item.conditonRemark}}</text>
-					</view>
-					<text class="iconfont {{item.pass ? 'icon-yes c-red':'icon-yuanquan c-c7'}}"></text>
-				</view>
-			</block>
-			<view class="item" data-url="1">
-				<view class="left f1">
-					<view class="icon-container"><text class="iconfont icon-yongjin"></text></view>
-					<text>成功成为分销商,分享商品给好友即可获得相应收益</text>
-				</view>
-			</view>
-			
-		</view>
-		<view class="t-c pd20 fs30 bdt co-red bold" bindtap="goto" data-url="/pages/index/index/index">去购买</view>
-		<!-- <view class="t-c pd20 fs30 bdt co-red bold">确定</view> -->
-	</view>
-	<!-- 遮罩 -->
-	<!-- <view class="mask" wx:if="{{!1}}"></view> -->
-	<view class="mask" wx:if="{{!data.is_distribut}}"></view>
-</view>
-
-page {
-	background-color: #f4f4f4;
-}
-
-.main > view {
-	background-color: white;
-}
-
-.avatar-container {
-	padding-top: 60rpx;
-	padding-bottom: 60rpx;
-	background: url(https://mshopimg.yolipai.net/miniapp/images/user_index_powder.jpg) no-repeat 100% 100%;
-	/* background-size: 100%; */
-}
-
-.avatar {
-	width: 160rpx;
-	height: 160rpx;
-	border-radius: 50%;
-	background-color: #eee;
-}
-
-.nickname {
-	display: inline-block;
-	background-color: rgba(0,0,0,.5);
-	padding: 4rpx 20rpx;
-	color: white;
-	border-radius: 24rpx;
-}
-
-.pd2622 {
-	padding: 20rpx 60rpx 20rpx 20rpx;
-}
-
-.money::before {
-	content: '￥';
-	font-size: 24rpx;
-}
-
-/* .bdb {
-	border-bottom: 2rpx solid #f8f8f8;
-} */
-
-.arrow-r {
-	/* display: relative; */
-}
-
-.arrow-r::after {
-	font-family: iconfont;
-	content: '\e61f';
-	position: absolute;
-	right: 20rpx;
-	color: #ddd;
-}
-.line {
-	position: relative;
-}
-.line::after {
-	content: '';
-	position: absolute;
-	right: 0;
-	background-color: #f8f8f8;
-	width: 2rpx;
-	height: 30rpx;
-	top: 50%;
-	transform: translateY(-50%);
-}
-
-.circle {
-	width: 80rpx;
-	height: 80rpx;
-	line-height: 80rpx;
-	border-radius: 50%;
-	color: white;
-	margin: 0 auto;
-	background-color: red;
-}
-
-.fs40 {
-  font-size: 40rpx;
-}
-
-
-.bgBlue {
-	background-image: linear-gradient(to top, #48c6ef 0%, #6f86d6 100%);
-}
-.bgPink {
-	background-image: linear-gradient(to right, #b8cbb8 0%, #b8cbb8 0%, #b465da 0%, #cf6cc9 33%, #ee609c 66%, #ee609c 100%);
-}
-.bgRed {
-	background-image: linear-gradient(to right, #f78ca0 0%, #f9748f 19%, #fd868c 60%, #fe9a8b 100%);
-}
-.bgYellow {
-	background-image: linear-gradient(120deg, #f6d365 0%, #fda085 100%);
-}
-.bgGreen {
-	background-image: linear-gradient(120deg, #d4fc79 0%, #96e6a1 100%);
-}
-.bgPurple {
-	background-image: linear-gradient(to top, #9795f0 0%, #fbc8d4 100%);
-}
-
-.mask {
-	position: fixed;
-	top: 0;
-	left: 0;
-	width: 100%;
-	height: 100%;
-	background-color: rgba(0,0,0,.5) !important;
-}
-
-.popup {
-	position: fixed;
-	z-index: 1;
-	top: 50%;
-	left: 50%;
-	transform: translate(-50%, -50%);
-	width: 90%;
-	border-radius: 12rpx;
-	overflow: hidden;
-}
-
-.icon-container {
-	border-radius: 50%;
-	background-color: #FCEA0D;
-	width: 50rpx;
-	line-height: 50rpx;
-	height: 50rpx;
-	text-align: center;
-	font-size: 28rpx !important;
-	margin-right: 10rpx;
-	flex-shrink: 0;
-}
-
-.item {
-	padding: 20rpx;
-	display: flex;
-	align-items: center;
-	font-size: 26rpx;
-	position: relative;
-}
-
-.title {
-	background-image: linear-gradient( 135deg, #FF6768 10%, #EA5455 100%);
-	color: white;
-	font-size: 28rpx;
-	position: relative;
-}
-
-.icon-close {
-	position: absolute;
-	right: 20rpx;
-	color: white;
-}
-
-.verify {
-	color: white;
-	background-color: #FF6768;
-	padding: 0 20rpx;
-	border-radius: 6rpx;
-	display: flex;
-	align-items: center;
-	margin-left: 10rpx;
-}
-
-.input {
-	border-radius: 6rpx;
-	height: 50rpx;
-}
-
-.item ~ .item .left::before {
-	content: '';
-	position: absolute;
-	left: 45rpx;
-	top: -45rpx;
-	width: 2rpx;
-	height: 100%;
-	background: linear-gradient(to bottom, #eee, #eee 8rpx, transparent 8rpx, transparent);
-	background-size: 100% 16rpx;
-	z-index: -1;
-}
-
-.left {
-	display: flex;
-	align-items: center;
-	padding-right: 20rpx;
-}
-
-
-/*checkbox 整体大小  */
-checkbox {
-  /* width: 240rpx;
-  height: 90rpx; */
-}
-/*checkbox 选项框大小  */
-checkbox .wx-checkbox-input {
-  width: 34rpx;
-  height: 34rpx;
-	border-radius: 50%;
-	
-}
-/*checkbox选中后样式  */
-checkbox .wx-checkbox-input.wx-checkbox-input-checked {
-  background-color: #FF6768;
-	border-color: #FF6768;
-	/* color: white; */
-}
-/*checkbox选中后图标样式  */
-checkbox .wx-checkbox-input.wx-checkbox-input-checked::before {
-  width: 34rpx;
-  height: 34rpx;
-  line-height: 34rpx;
-  text-align: center;
-  font-size: 24rpx;
-  color: #fff;
-  background: transparent;
-  transform: translate(-50%, -50%) scale(1);
-  -webkit-transform: translate(-50%, -50%) scale(1);
-}
-
-.item:not(:last-of-type) {
-	display: flex;
-	justify-content: space-between;
-}
-
-
@@ -86,7 +86,10 @@
  
             </view> 
  
-     
+            <view class="bz_view flex ai-center bdt16" wx:if="{{store_config}}" style="line-height: 36rpx">
+          <image class="bzfu_img" src="{{iurl}}/miniapp/images/bzfu_w.png"></image>
+          <view class="bz-content">{{store_config.service_bz}}</view>
+        </view>
         <!-- 图文详情 -->
         <view>
            <view class="tuwen_title">
@@ -10,7 +10,7 @@ var t = require(&quot;../../../utils/util&quot;),
   o = s.globalData.setting,
   os = o;
 var regeneratorRuntime = require('../../../utils/runtime.js');
-
+1
 Page({
   /**
    * 页面的初始数据
+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
+       }
@@ -4,7 +4,6 @@ var e = getApp(),
   t = e.request,
   d = e.globalData;
 Page({
-
   /**
    * 页面的初始数据
    */
+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 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>
+var e = getApp(),
+  a = e.globalData.setting,
+  os = a,
+  t = e.request,
+  d = e.globalData;
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    inurl: a.url, //接口网址
+    iurl: a.imghost,
+    url: "", //选择选择时间后返回的页面
+    defimgurl: "/miniapp/images/no-head.jpg",
+    seekTime: "", //当前服务预约选择的时间
+    time_list: [], //可预约时间
+    name: "", //美容师姓名
+    comment: "", //美容师评价
+    aweeks: [], //七天的预约时间
+    head_img: "", //美容师头像
+    time:['08:00','08:30', '09:00', '09:30', '10:00', '10:30', '11:00', '11:30', '12:00', '12:30', '13:00', '13:30', '14:00','14:30', '15:00',  '15:30', '16:00', '16:30', '17:00','17:30', '18:00','18:30', '19:00', '19:30', '20:00',  '20:30', '21:00', '21:30', '22:00','22:30'],
+    weeks: [], //星期几数组
+    time_index: -1, //选择预约时间下标
+    date_id: 0, //选择日期的id
+    beautician_id: "", //美容师id
+    itemId: "", //服务id
+    number: "", //预约单号
+    modify: 0, //是否是修改时间
+    iscos: 0, //是否是从美容师列表过来的
+    hours: "", //获取当前时分秒
+    projectId: "", //项目id
+    StaffName: "", //美容师名称
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function(options) {
+    var th = this;
+    var myDate = new Date();
+    var minutes = myDate.getMinutes(); //获取当前分钟数(0-59)
+    var hours = myDate.getHours() + ":" + minutes; //获取当前小时数(0-23)
+    var beautician_id = options.BeauticianID;
+    var storageId = options.StorageId;
+	
+	
+    th.setData({
+			options,
+			storeid: options.storeid,
+      beautician_id: beautician_id,
+      itemId: options.itemId,
+      modify: options.modify,
+      hours: hours,
+      projectId: options.projectId,
+	    storageId: storageId,
+    });
+		
+    if (options.url != undefined) {
+      th.setData({
+        url: options.url
+      })
+    }
+    if (options.number != undefined) {
+      th.setData({
+        number: options.number
+      })
+    }
+    if (options.iscos != undefined) {
+      th.setData({
+        iscos: options.iscos
+      })
+    }
+    if (options.StaffName!=undefined){
+      th.setData({
+        StaffName: options.StaffName
+      })
+    }
+    th.query_beatea(th.query_aweek);  
+  },
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function() {
+    var th = this;
+    //获取当前时间
+    var myDate = new Date();
+    // var date = myDate.getHours(); //获取当前小时数(0-23);
+    let str = myDate.toTimeString(); //"10:55:24 GMT+0800 (中国标准时间)"
+    let date = str.substring(0, 8); //  '10:55:24'
+    th.setData({
+      hours: date
+    });
+  },
+
+  //图片失败，默认图片
+  bind_bnerr1: function(e) {
+    var _errImg = e.target.dataset.errorimg;
+    var _Img = e.target.dataset.img;
+    if (_Img != undefined) {
+      var _errObj = {};
+      _errObj[_errImg] = "/miniapp/images/no-head.jpg";
+      this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;
+    }
+  },
+  //选择服务日期
+  check_date: function(e) {
+    var th = this;
+    var id = e.currentTarget.dataset.dateid;
+    var date_id = th.data.date_id;
+    var seekTime = th.data.aweeks[id].time;
+    if (id != date_id) {
+      th.setData({
+        date_id: id,
+        seekTime: seekTime
+      })
+      th.query_date();
+    }
+  },
+  //获取美容师信息
+  query_beatea: function(func) {
+    var th = this;
+    var url = "/api/weshop/marketing/reservation/staff/get"; //接口路径
+    var beautician_id = th.data.beautician_id;
+    getApp().request.promiseGet(url, {
+      data: {
+        beauticianId: beautician_id,
+        storeId: a.stoid,
+      }
+    }).then(res => {
+      if (res.data.code == 0) {
+        var data = res.data.data;
+		var ob={
+          name: data.StaffName,
+          comment: data.Remark1,
+          head_img: data.PhotoUrl
+        };		
+		if(!th.data.storageId){
+			ob.storageId=data.StorageId;
+		}			
+        th.setData(ob);
+		func();
+      } else {
+        getApp().my_warnning(res.data.msg, 0, th);
+      }
+    })
+  },
+  //返回上个页面
+  navigateBack: function() {
+    var th = this;
+    var modify = th.data.modify; //是否是更改时间
+    var seekTime = th.data.seekTime; //选择的日期
+    var time_list = th.data.time_list;
+    var time_index = th.data.time_index;
+    if (time_index == -1) {
+      getApp().my_warnning("请选择预约时间", 0, th);
+      return false;
+    }
+    var date_id = th.data.date_id;
+    var date = th.data.aweeks[date_id].time;
+    var time = date + " " + time_list[time_index] + ":00";
+    if (modify == 1) {
+      var json = {
+        "arrangeTime": time,
+        "number": th.data.number,
+        "remark": "更改预约时间",
+        "states": 0,
+        "storeId": a.stoid,
+        "isxz": 1
+      };
+      var data = JSON.stringify(json);
+      var url = th.data.inurl + "/api/weshop/marketing/reservation/reservation/update"; //预约接口地址
+      wx.request({
+        url: url,
+        data: data,
+        method: 'put',
+        header: {
+          'content-type': 'application/json'
+        }, // 设置请求的 header
+        success: function(res) {
+          if (res.data.code == 0) {
+            getApp().my_warnning(res.data.data, 1, th);
+            setTimeout(function() {
+              wx.navigateBack({
+                //返回
+                delta: 1
+              })
+            }, 1000);
+          } else {
+            getApp().my_warnning(res.data.msg, 0, th);
+          }
+        }
+      })
+    } else {
+      var pages = getCurrentPages(); //当前页面
+      var iscos = th.data.iscos;
+      var delta = 1;
+      if (Number(iscos) == 1) {
+        delta = delta + Number(iscos); //返回哪个页面
+        var prevPage = pages[pages.length - 2 - Number(iscos)]; //上一页面
+        prevPage.setData({
+          //直接给上一个页面赋值
+          time: time,
+          beautician_name: th.data.StaffName,
+          beauticianID: th.data.beautician_id,
+					storageId: th.data.storageId,
+        });
+        wx.navigateBack({
+          //返回
+          delta: 2
+        })
+      } else {
+        var prevPage = pages[pages.length - 2]; //上一页面
+        prevPage.setData({
+          //直接给上一个页面赋值
+          time: time,
+					storageId: th.data.storageId,
+        });
+        wx.navigateBack({
+          //返回
+          delta: 1
+        })
+      }
+    }
+  },
+  //选择时间
+  Selection_time: function(e) {
+    var th = this;
+    var index = e.currentTarget.dataset.index;
+    var time_index = th.data.time_index;
+    if (index == time_index) {
+      return false;
+    } else {
+      th.setData({
+        time_index: index
+      })
+    }
+  },
+  //查询七天预约时间
+  query_aweek: function() {
+    var th = this;
+    var beautician_id = th.data.beautician_id; //美容师id
+	var storageId=th.data.storageId;
+		
+    var itemId = th.data.itemId; //服务id
+    var projectId = th.data.projectId; //项目id
+    var url = "/api/weshop/marketing/reservation/staff/seven/time/listnew"; //接口地址
+    getApp().request.promiseGet(url, {
+      data: {
+        projectId: projectId,
+        beauticianId: beautician_id,
+        serviceId: itemId,
+        storeId: a.stoid,
+				storageId:storageId
+      }
+    }).then(res => {
+      if (res.data.code == 0) {
+        var data = res.data.data;
+        var arr = [];
+        for (var i in data) {
+          var em = {
+            "time": i,
+            "val": data[i]
+          };
+          arr.push(em);
+        }
+        arr.sort(th.sort_arr);
+        var weeks = ["今天", "明天", "后天"];
+        var week = "";
+        for (var i = 3; i < arr.length; i++) {
+          var date = new Date(arr[i].time);
+          if (date.getDay() == 0) week = "周日"
+          if (date.getDay() == 1) week = "周一"
+          if (date.getDay() == 2) week = "周二"
+          if (date.getDay() == 3) week = "周三"
+          if (date.getDay() == 4) week = "周四"
+          if (date.getDay() == 5) week = "周五"
+          if (date.getDay() == 6) week = "周六"
+          weeks[i] = week;
+        }
+        th.setData({
+          aweeks: arr,
+          weeks: weeks
+        })
+        th.query_date();
+
+      } else {
+        getApp().my_warnning(res.data.msg, 0, th);
+      }
+    })
+
+  },
+
+  query_date: function() {
+    var th = this;
+    var projectId = th.data.projectId;
+    var date_id = th.data.date_id; //日期下标
+    var SeekTime = th.data.aweeks[date_id].time;
+    var val = th.data.aweeks[date_id].val;
+
+    var url = "/api/weshop/marketing/reservation/staff/time/listnew";
+    getApp().request.promiseGet(url, {
+      data: {
+        projectId: projectId,
+        staffId: th.data.beautician_id,
+		storageId:th.data.storageId,
+        serviceId: th.data.itemId,
+        seekTime: SeekTime,
+        storeId: a.stoid,
+      }
+    }).then(res => {
+      if (res.data.code == 0) {
+        var hours = th.data.hours;
+        var time_list = res.data.data;
+        var time = th.data.time;
+        var date_id = th
+        var new_time = [];
+        var date = th.data.hours.substring(0,2);
+
+        //不等于空就是有可以预约的时间
+        if (time_list != null) {
+          if (res.data.data && res.data.data[0]!= undefined) {
+            if (res.data.data[0].GroupHour && res.data.data[0].GroupHour.length > 11) {
+              getApp().my_warnning(res.data.data[0].GroupHour, 0, th);
+            }
+          }
+          //循环固定和可预约的时间
+          for (var i = 0; i < time.length; i++) {
+            for (var ii = 0; ii < time_list.length; ii++) {
+              //判断固定的时间和可以预约的时间
+              if (time[i] == time_list[ii].begintime.substring(0, 5)) {
+                var date_id = th.data.date_id;
+                if (date > time_list[ii].begintime.substring(0, 2) && date_id == 0) {
+                  new_time[i] = "";
+                  break;
+                }else{
+                  new_time[i] = time_list[ii].begintime.substring(0, 5);
+                  break;
+                }
+              } else {
+                new_time[i] = "";
+              }
+            }
+          }
+        }else{
+          for(var i = 0 ;i<time.length;i++){
+            new_time[i]="";
+          }
+        }
+        th.setData({
+          time_list: new_time,
+        })
+      } else {
+        getApp().my_warnning(res.data.msg, 0, th);
+      }
+    })
+
+  },
+  //更改预约时间
+  change_time: function() {
+    var th = this;
+    var seekTime = th.data.seekTime; //选择的日期
+    var time_list = th.data.time_list;
+    var time_index = th.data.time_index;
+    var time = time_list[time_index];
+    var number = th.data.number; //预约单号
+    var json = {
+      "arrangeTime": seekTime + " " + time,
+      "number": number,
+      "remark": "更改预约时间",
+      "states": 0,
+      "storeId": a.stoid,
+      "isxz": 1
+    };
+    var data = JSON.stringify(json);
+    var url = th.data.inurl + "/api/weshop/marketing/reservation/reservation/update"; //预约接口地址
+    wx.request({
+      url: url,
+      data: data,
+      method: 'put',
+      header: {
+        'content-type': 'application/json'
+      }, // 设置请求的 header
+      success: function(res) {
+        if (res.data.code == 0) {
+          getApp().my_warnning("更改成功", 0, th);
+        } else {
+          getApp().my_warnning(res.data.msg, 0, th);
+        }
+      }
+    })
+  },
+  //预览头像
+  previewImage: function(e) {
+    var th = this;
+    var current = e.currentTarget.dataset.src;
+    wx.previewImage({
+      current: current, // 当前显示图片的http链接  
+      urls: [th.data.head_img] // 需要预览的图片http链接列表  
+    })
+  },
+
+  sort_arr: function(a, b) {
+    a = a['time'];
+    b = b['time'];
+    if (a < b) {
+      return -1;
+    }
+    if (a > b) {
+      return 1;
+    }
+    return 0;
+  },
+  
+  check_is_in_arr:function(val,pdata) {
+          if(!val || !pdata) return false;
+          for(var i in pdata){
+              if(pdata[i].begintime.indexOf(val)!=-1){
+                  return true;
+              }
+          }
+          return false;
+   }
+
+
+
+})
 \ No newline at end of file
+{
+  "navigationBarTitleText": "美容师详情",
+  "usingComponents": {
+    "warn": "/components/long_warn/long_warn"
+  }
+}
 \ No newline at end of file
+<view class="container">
+  <view class="backcolor"></view>
+
+  <view class="comments">
+    <!-- 个人信息 -->
+    <view class="Personal">
+
+      <view class="name fs36 ellipsis-1">{{name}}</view>
+
+      <view class="ellipsis-4" style="width:100%">
+        <view style="overflow:hidden;">
+          <image class="head" src="{{head_img==''?iurl+defimgurl:head_img}}" data-errorimg="{{head_img}}" binderror="bind_bnerr1" data-img="{{head_img}}" data-src="{{head_img}}"></image>
+          <view class="introduce fs26">
+            <block wx:if="{{comment!=''}}">
+              {{comment}}
+            </block>
+            <block wx:else>
+              暂无介绍
+            </block>
+          </view>
+          <view style="clear:both"></view>
+        </view>
+      </view>
+
+    </view>
+
+    <view>
+      <view class="fs36" style="margin-bottom:35rpx;">服务预约</view>
+      <scroll-view class="scroll-h fs26 " scroll-x>
+        <view class="rel" wx:for="{{aweeks}}" style="display: inline-block;">
+          <block wx:if="{{aweeks[index].val!=''}}">
+            <view class="scroll-item-h bd {{index==date_id?'chbd':''}}" bindtap="check_date" data-dateid="{{index}}">
+              <view>{{weeks[index]}}</view>
+              <view>{{item.time}}</view>
+            </view>
+          </block>
+          <block wx:else>
+            <view class="scroll-item-h bd {{index==date_id?'chbd':''}}" bindtap="check_date" data-dateid="{{index}}">
+              <view>{{weeks[index]}}(约满)</view>
+              <view>{{item.time}}</view>
+            </view>
+          </block>
+        </view>
+
+      </scroll-view>
+
+      <!-- 选择时间 -->
+      <view class="Times">
+
+        <view class="flex-center" wx:for="{{time}}" style="display:inline-block;" wx:for-index="key" wx:for-item="it">
+          <block wx:if="{{it==time_list[key]}}">
+            <view class="Time flex-center {{time_index==key?'chTime':''}}" bindtap="Selection_time" data-index="{{key}}">
+              <view>
+                <view class="fs26">{{it}}</view>
+              </view>
+            </view>
+          </block>
+          <block wx:else>
+            <view class="Time flex-center nochTime">
+              <view>
+                <view class="fs26">{{it}}</view>
+              </view>
+            </view>
+          </block>
+        </view>
+        <view class="choice flex-center fs32" bindtap="navigateBack">
+          <view>确定选择</view>
+        </view>
+
+      </view>
+
+    </view>
+
+  </view>
+
+</view>
+<warn id="warn"></warn>
 \ No newline at end of file
+.container {
+  border-top: 7rpx solid rgb(245, 245, 245);
+}
+
+.backcolor {
+  position: absolute;
+  top: 0rpx;
+  left: 0rpx;
+  z-index: 0;
+  width: 100%;
+  height: 270rpx;
+  background-color: rgb(214, 1, 33);
+  
+}
+
+.comments {
+  position: absolute;
+  top: 45rpx;
+  left: 0rpx;
+  z-index: 1;
+  padding: 0rpx 23rpx;
+}
+
+.name {
+  font-weight: bold;
+  float: left;
+  width: 250rpx;
+}
+
+.head {
+  width: 130rpx;
+  height: 130rpx;
+  border-radius: 50%;
+  float: right;
+  margin: 0rpx 15rpx;
+  /* border: 2rpx solid red; */
+}
+
+.introduce {
+  margin-top: 90rpx;
+  text-indent: 2em;
+  color: rgb(102, 102, 102);
+}
+
+.Personal {
+  width: 640rpx;
+  height: 300rpx;
+  background-color: rgb(255, 255, 255);
+  border-radius: 5rpx;
+  box-shadow: 0rpx 2rpx 2rpx 2rpx rgb(250, 228, 230);
+  margin-bottom: 65rpx;
+  padding-top: 40rpx;
+  padding-left: 35rpx;
+  padding-right: 35rpx;
+}
+
+.choice {
+  height: 70rpx;
+  background-color: rgb(214, 1, 33);
+  color: rgb(255, 255, 255);
+  margin-top: 30rpx;
+}
+
+.scroll-h {
+  white-space: nowrap;
+  width: 704rpx;
+  overflow: visible;
+  height: 125rpx;
+  color: transparent;
+}
+
+.scroll-item-h {
+  display: inline-block;
+  width: 172rpx;
+  text-align: center;
+  overflow: visible;
+  height: 70rpx;
+  padding: 15rpx 0rpx;
+}
+::-webkit-scrollbar{
+    width: 0;
+    height: 0;
+    color: transparent;
+}
+.box {
+  width: 0px;
+  height: 0px;
+  margin-left: 15rpx;
+  border-top: 21rpx solid transparent;
+  border-right: 21rpx solid transparent;
+  border-left: 21rpx solid transparent;
+  display: inline-block;
+  transform: rotate(180deg);
+  border-bottom: 21rpx solid rgb(214, 1, 33);
+}
+
+.bd {
+  /* border: 2rpx solid rgb(238, 238, 238); */
+  background-color: rgb(255, 255, 255);
+  color: rgb(20, 20, 20);
+}
+
+.chbd {
+  border: 2rpx solid rgb(214, 1, 33);
+  background-color: rgb(214, 1, 33);
+  color: rgb(255, 255, 255);
+}
+
+.Times {
+  background-color: rgb(238, 243, 247);
+  margin-bottom: 30rpx;
+  padding:34rpx 27rpx;
+}
+
+.Time {
+  border: 2rpx solid rgb(238, 238, 238);
+  width: 160rpx;
+  height: 70rpx;
+  background-color: rgb(255, 255, 255);
+  text-align: center;
+  padding-top: 15rpx;
+  padding-bottom: 15rpx;
+}
+.chTime{
+  border-color: rgb(214, 1, 33);
+}
+.nochTime{
+  color: rgb(174,177,177);
+  background-color: rgb(250,250,250);
+}
+.abs {
+  left: 55rpx;
+  bottom: -39rpx;
+}
+var e = getApp(),
+  a = e.globalData.setting,
+  os = a,
+  t = e.request,
+  d = e.globalData;
+	
+	
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    defimgurl: "/miniapp/images/no-head.jpg",
+    iurl: a.imghost,
+    cosmetology_list: [], //美容师列表
+    is_cosmetology_read: 0, //是否有读过美容师接口,该属性用在没有美容师列表的排版
+    curpage: 1, //当前分页数
+    pageSize: 10, //页大小
+    total: 0, //总数量
+    ismore: 0, //是否加载完毕
+    itemId: 0, //服务id,
+    storageId: 0, //线下门店id
+    projectId:"",//项目id
+  },
+	
+  onReachBottom: function() {
+    var th = this;
+    if (this.data.total <= th.data.pageSize) return;
+    if (this.data.ismore) return;
+    wx.showLoading({
+      title: '加载中...',
+    })
+    th.query_cology();
+  },
+	
+	
+  query_cology: function() {
+    var th = this;
+    var url = "/api/weshop/marketing/reservation/staff/pagenew";
+    var itemId = th.data.itemId; //服务id
+    var storageId = th.data.storageId;
+    getApp().request.promiseGet(url, {
+      data: {
+        storeId: a.stoid,
+        userId: th.data.options.userid,
+        serviceId: itemId,
+        storageId: storageId,
+        page: th.data.curpage,
+        pageSize: th.data.pageSize
+      }
+    }).then(res => {
+      wx.hideLoading();
+      if (res.data.code == 0) {
+        th.data.curpage++;
+        var arr1 = th.data.cosmetology_list;
+        var arr2 = res.data.data;
+        var arr3 = [...arr1, ...arr2];
+      
+    
+        th.setData({
+          cosmetology_list: arr3,
+          total: res.data.data.total,      
+          is_service_read: 1,
+          is_cosmetology_read:1
+        }), wx.stopPullDownRefresh(); //停止下拉刷新
+      } else {
+        th.setData({
+          is_cosmetology_read:1,
+		  ismore:1
+        })
+      }
+    })
+  },
+	
+	
+  //图片失败，默认图片
+  bind_bnerr1: function(e) {
+    var _errImg = e.target.dataset.errorimg;
+    var _Img = e.target.dataset.img;
+    if (_Img != undefined) {
+      var _errObj = {};
+      _errObj[_errImg] = "/miniapp/images/no-head.jpg";
+      console.log(_errObj,"zzzzzzz");
+      this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;
+    }
+  },
+	
+	
+	
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function(options) {
+		console.log('options--->', options);
+    var th = this;
+    this.setData({
+			options,
+      projectId: options.projectId,
+      itemId: options.itemId,
+      storageId: options.storageId
+    })
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function() {
+    var th = this;
+	th.data.curpage++;	    
+	th.setData({
+	  cosmetology_list: [],
+	  total: 0,      
+	  is_service_read: 0,
+	  is_cosmetology_read:0
+	})	
+    th.query_cology();
+  },
+
+
+})
 \ No newline at end of file
+{
+  "navigationBarTitleText": "美容师列表",
+  "usingComponents": {
+    "warn": "/components/long_warn/long_warn"
+  }
+}
 \ No newline at end of file
+<view class="container">
+  <image class="appointment" src="{{iurl}}/miniapp/images/yyservice/Cosm_appo.png"></image>
+
+  <!-- 总预约 -->
+  <view wx:if="{{cosmetology_list.length>0}}">
+    <!-- 当个预约 -->
+    <view class="single" wx:for="{{cosmetology_list}}" wx:for-item="item">
+      <!-- 个人属性 -->
+      <view class="flex-vertical-between">
+        <view class="flex-vertical">
+          <image class="portrait" src="{{(!item.PhotoUrl || item.PhotoUrl=='')?iurl+defimgurl:item.PhotoUrl}}" lazy-load="true" data-errorimg="cosmetology_list[{{index}}].PhotoUrl" binderror="bind_bnerr1"  data-img="cosmetology_list[{{index}}].PhotoUrl"></image>
+          <view>
+            <!-- 用户名 -->
+            <view class="UserName ellipsis-1 fs32">{{item.StaffName}}</view>
+            <!-- 评价星数 -->
+            <view class="flex" style="margin-top:10rpx;">
+              <image class="Stars" src="{{iurl}}{{key<item.Star || item.Star==''?'/miniapp/images/StarsredCk.png':'/miniapp/images/StarswhiteUnCk.png'}}" wx:for="{{item.Star==''?5:5}}" wx:for-index="key" wx:for-item="it"></image>
+              <!-- images/StarswhiteUnCk.png//白色星星地址 -->
+            </view>
+            <!-- 个人标签 -->
+            <view class="Labels fs22 flex" wx:if="{{item.EvaluationLabel!=''?true:false}} ">
+              <view wx:if="{{lab<3}}" class="flex-center Labelitem itone {{lab==1?'itwo':''}} {{lab==2?'ith':''}}" wx:for="{{item.EvaluationLabel}}" wx:for-item="it" wx:for-index="lab">
+                <view class="ellipsis-1">{{it.LabelName}}</view>
+              </view>
+            </view>
+          </view>
+        </view>
+
+        <!-- 预约状态 -->
+        <navigator class="flex-center gofu go" url="/packageA/pages/my_service/beauty_deta?StorageId={{item.StorageId}}&BeauticianID={{item.staffid}}&itemId={{itemId}}&iscos=1&modify=0&projectId={{projectId}}&StaffName={{item.StaffName}}">
+          <view class="fs24">预约</view>
+        </navigator>
+      </view>
+      <view class="fs26 information">
+        <block wx:if="{{item.Remark1!=''}}">
+          <view class="ellipsis-3">{{item.Remark1}}
+          </view>
+        </block>
+        <block wx:else>
+          <view>暂无介绍</view>
+        </block>
+      </view>
+    </view>
+    <!-- 没有数据 -->
+    <!-- 加载完毕并且数据大于=页大小 -->
+    <view class="After_all flex-center" wx:if="{{ismore && cosmetology_list.length>=4}}">
+      <view class="Line"></view>
+      <view class="end fs26 xc-black">到底了</view>
+      <view class="Line"></view>
+    </view>
+  </view>
+</view>
+<!-- 无美容师 -->
+<view class="empty_order" wx:if="{{cosmetology_list.length<1 && is_cosmetology_read}}">
+  <view class="flex-level">
+    <image src="{{iurl}}miniapp/images/yyservice/no_beauty.png"></image>
+  </view>
+  <view class="flex-level fs30 xc-ash">暂无美容师</view>
+  <view class="flex-level">
+    <navigator url="/pages/user/my_service/i_service" bindtap="goto">
+      <view class="flex-center fs28 white">其他项目</view>
+    </navigator>
+  </view>
+</view>
+<warn id="warn"></warn>
 \ No newline at end of file
+page{
+  height: 100%;
+}
+.container{
+   background-color: rgb(255,255,255);
+}
+.appointment {
+  width: 100%;
+  height: 305rpx;
+}
+
+.single {
+  margin-left: 10rpx;
+  border-bottom: 1rpx solid rgb(229, 229, 229);
+  padding-bottom: 30rpx;
+  padding-left: 20rpx;
+  padding-right: 35rpx;
+  padding-top: 30rpx;
+}
+
+.portrait {
+  width: 140rpx;
+  height: 140rpx;
+  border-radius: 50%;
+  margin-right: 30rpx;
+}
+.UserName{
+  max-width: 250rpx;
+}
+.Stars {
+  width: 25rpx;
+  height: 25rpx;
+  margin-right: 7rpx;
+}
+.Labels{
+  width: 100%;
+  margin-top: 15rpx;
+}
+.Label {
+  margin-top: 25rpx;
+}
+
+.Labelitem {
+  width: 100rpx;
+  height: 30rpx;
+  border-radius: 20rpx;
+  line-height: 30rpx;
+  margin-right: 10rpx;
+  padding:0rpx 9rpx;
+}
+
+.itone {
+  border: 2rpx solid rgb(22, 232, 131);
+  color: rgb(22, 232, 131);
+}
+
+.itwo {
+  border: 2rpx solid rgb(92, 135, 248);
+  color: rgb(92, 135, 248);
+}
+
+.ith {
+  border: 2rpx solid rgb(244, 143, 55);
+  color: rgb(244, 143, 55);
+}
+
+.gofu {
+  width: 120rpx;
+  padding: 5rpx 0rpx;
+  border-radius: 25rpx;
+}
+
+.go {
+  border: 1rpx solid rgb(196, 26, 46);
+  color: rgb(196, 26, 46);
+  background-color: rgb(255,255,255);
+}
+
+.gofull {
+  border: 1rpx solid rgb(185, 185, 185);
+  color: rgb(185, 185, 185);
+  background-color: rgb(255,255,255);
+}
+
+.information {
+  margin-top: 25rpx;
+  text-indent: 2em;
+  color: rgb(103, 103, 103);
+}
+/* 无订单 */
+.empty_order image {
+  width: 330rpx;
+  height: 280rpx;
+  margin-top: 120rpx;
+}
+
+.empty_order .xc-ash {
+  margin-top: 10rpx;
+  font-weight: 600px;
+}
+
+.empty_order navigator {
+  margin-top: 60rpx;
+  border-radius: 40rpx;
+}
+
+.empty_order navigator view {
+  width: 247rpx;
+  height: 56rpx;
+  background-color: rgb(255, 72, 72);
+  border-radius: 40rpx;
+}
+.After_all {
+  height: 80rpx;
+}
+
+.After_all .Line {
+  border-top: 3rpx solid rgb(0, 0, 0);
+  width: 130rpx;
+}
+
+.After_all .end {
+  margin: 0rpx 15rpx;
+}
+var e = getApp(),
+  a = e.globalData.setting,
+  os = a,
+  t = e.request,
+  d = e.globalData;
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    iurl: a.imghost,
+    isPickerShow: false,
+    isPickerRender: false,
+    startTime: "",
+    endTime: "",
+    pickerConfig: {
+      endDate: true,
+      column: "",
+      dateLimit: true,
+      initStartTime: "2019-01-01 12:32:44",
+      initEndTime: "2019-12-01 12:32:44",
+      limitStartTime: "1917-05-06 12:32:44",
+      limitEndTime: "2055-05-06 12:32:44"
+    },
+    hist_List: [], //服务项目列表
+    is_service_read: 0,
+    curpage: 1, //当前分页数
+    pageSize: 15, //页大小
+    total: 0,
+    ismore: 0, //是否加载完毕
+    is_screen: 0, //是否通过筛选来选择历史服务
+    is_reset: 0, //是否重复点击
+    is_nav: 1, //是否显示导航栏
+  },
+  pickerShow: function() {
+    this.setData({
+      isPickerShow: true,
+      isPickerRender: true,
+      chartHide: true
+    });
+  },
+  pickerHide: function() {
+    var th = this;
+    th.setData({
+      isPickerShow: false,
+      chartHide: false
+    });
+  },
+  //--选择时间--
+  setPickerTime: function(val) {
+    let data = val.detail,
+      gl_data = getApp().globalData,
+      th = this;
+    th.setData({
+      startTime: data.startTime,
+      endTime: data.endTime,
+      val: 0,
+      distance: 0,
+      hist_List: [],
+      curpage: 1,
+      is_screen: 1,
+      is_nav: 1
+    });
+    th.query_hist();
+  },
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function(options) {
+    var th = this;
+		console.log('xxoptions==>', options);
+		this.setData({
+			options,
+		});
+    th.query_hist();
+  },
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function() {},
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function() {
+    var th = this;
+    if (th.data.total <= th.data.pageSize) return false;
+    if (th.data.ismore) return false;
+
+    wx.showLoading({
+      title: '加载中...',
+    })
+    th.query_hist();
+  },
+  //重置历史服务数据
+  his_reset: function() {
+    var th = this;
+    var is_reset = th.data.is_reset;
+    if (is_reset == 0) {
+      th.setData({
+        hist_List: [],
+        curpage: 1,
+        is_service_read: 0,
+        is_screen: 1,
+        is_reset: 1,
+        startTime: "",
+        endTime: "",
+        is_nav: 1
+      })
+      th.query_hist();
+    }
+  },
+  query_hist: function() {
+
+    var th = this;
+    var startTime = th.data.startTime.substring(0, 10); //开始
+    var endTime = th.data.endTime.substring(0, 10); //结束
+    var url = "/api/weshop/marketing/reservation/history/reservation/page";
+    getApp().request.promiseGet(url, {
+      data: {
+        storeId: a.stoid,
+        userId: th.data.options.userid,
+        beginDate: startTime,
+        endDate: endTime,
+        page: th.data.curpage,
+        pageSize: th.data.pageSize
+      }
+    }).then(res => {
+      wx.hideLoading();
+      th.setData({
+        is_reset: 0
+      })
+      if (res.data.code == 0) {
+        th.data.curpage++;
+        var arr1 = th.data.hist_List;
+        var arr2 = res.data.data.pageData;
+        var arr3 = [...arr1, ...arr2];
+        var ismore = 0;
+        if (arr3.length == res.data.total) ismore = 1
+        th.setData({
+          hist_List: arr3,
+          total: res.data.data.total,
+          ismore: ismore,
+          is_service_read: 1,
+        }), wx.stopPullDownRefresh(); //停止下拉刷新
+      } else {
+        th.setData({
+          is_service_read: 1,
+          is_screen: 0,
+          ismore: 1
+        })
+        if (startTime!="") {
+            th.setData({
+              total:0
+            })
+        }
+      }
+    })
+  }
+})
 \ No newline at end of file
+{
+  "navigationBarTitleText": "历史预约",
+  "usingComponents": {
+    "timePicker": "/components/timePicker/timePicker",
+    "warn": "/components/long_warn/long_warn"
+  }
+}
 \ No newline at end of file
+<view class="{{isPickerRender==true?'container':''}}">
+  <!-- 点击方法 -->
+  <view class="exption flex-vertical-between fs28" wx:if="{{is_nav || hist_List.length>0}}">
+    <view class="flex">
+      共使用
+      <view class="count">{{total}}</view>
+      次服务
+    </view>
+    <view class="flex">
+      <view class="Resetfram flex-center" bindtap="his_reset">
+        <view class="Reset">重置</view>
+        <image class="Resetsub" src="{{iurl}}/miniapp/images/reset.png"></image>
+      </view>
+      <view class="flex-center" bindtap='pickerShow'>
+        <view>筛选</view>
+        <view wx:if="{{true}}" class="box"></view>
+      </view>
+    </view>
+  </view>
+
+  <!-- 总的服务列表 -->
+  <view class="items">
+    <!-- 单个 -->
+    <view class="item flex-vertical-between" wx:for="{{hist_List}}">
+      <!-- left -->
+      <view>
+        <view class="flex fs28">
+          <view class="itemName ellipsis-1">{{item.ServiceName==''?'匿名':item.ServiceName}}</view>
+          <block wx:if="{{item.State==1 || item.State==4}}">
+            <view>(服务美容师：</view>
+          </block>
+          <block wx:else>
+            <view>(预约美容师：</view>
+          </block>
+          <view class="itemUsna ellipsis-1">{{item.BeauticianName}}</view>
+          )
+        </view>
+        <view class="fs24">{{item.ArrangeTime}}</view>
+      </view>
+      <!-- right -->
+      <view class="serState fs32">
+        <view wx:if="{{item.State==0}}">未服务</view>
+        <view wx:if="{{item.State==1}}">已服务</view>
+        <view wx:if="{{item.State==2}}">已过期</view>
+        <view wx:if="{{item.State==3}}">已取消</view>
+        <view wx:if="{{item.State==4}}">已评价</view>
+      </view>
+    </view>
+    <!-- 没有数据 -->
+    <!-- 加载完毕并且数据大于=页大小 -->
+    <view class="After_all flex-center" wx:if="{{ismore && hist_List.length>=pageSize}}">
+      <view class="Line"></view>
+      <view class="end fs26 xc-black">到底了</view>
+      <view class="Line"></view>
+    </view>
+  </view>
+</view>
+<view wx:if="{{hist_List.length<1 && startTime!=''}}" class="flex-center fs26 slot">
+  <view>该时间段无预约记录</view>
+</view>
+<!-- 无历史服务 -->
+<view class="empty_order" wx:if="{{hist_List.length<1 && is_service_read && startTime==''}}">
+  <view class="flex-level">
+    <image src="{{iurl}}miniapp/images/yyservice/no_history.png"></image>
+  </view>
+  <view class="flex-level fs30 xc-ash">暂无服务记录</view>
+  <view class="flex-level">
+    <navigator url="/pages/user/my_service/i_service">
+      <view class="flex-center fs32 white">前往使用</view>
+    </navigator>
+  </view>
+</view>
+
+
+<!-- 引用时间主键 -->
+<timePicker pickerShow="{{isPickerShow}}" id="picker" wx:if="{{isPickerRender}}" bind:hidePicker="pickerHide" bind:setPickerTime="setPickerTime" config="{{pickerConfig}}"></timePicker>
+<warn id="warn"></warn>
 \ No newline at end of file
+page {
+  height: 100%;
+}
+
+.box {
+  width: 0px;
+  height: 0px;
+  margin-left: 15rpx;
+  border-top: 11rpx solid rgba(0, 0, 0, 0);
+  border-right: 10rpx solid rgba(0, 0, 0, 0);
+  border-left: 10rpx solid rgba(0, 0, 0, 0);
+  display: inline-block;
+  margin-bottom: 10rpx;
+  color: red;
+  transform: rotate(0deg);
+  border-bottom: 18rpx solid rgb(153, 153, 153);
+}
+
+.exption {
+  padding: 0rpx 45rpx;
+  background-color: rgb(238, 238, 238);
+  height: 70rpx;
+  color: rgb(153, 153, 153);
+  position: fixed;
+  top:0rpx;
+  left: 0rpx;
+  width: 660rpx;
+}
+
+.count {
+  margin: 0rpx 5rpx;
+}
+
+.Resetfram {
+  margin-right: 40rpx;
+}
+
+.Reset {
+  margin-right: 5rpx;
+}
+
+.Resetsub {
+  width: 30rpx;
+  height: 30rpx;
+}
+.items{
+  margin-top: 70rpx;
+}
+.item {
+  margin: 0rpx 25rpx;
+  padding: 0rpx 20rpx;
+  height: 100rpx;
+  border-bottom: 1rpx solid rgb(242, 242, 242);
+}
+
+.itemName {
+  margin-right: 10rpx;
+  max-width: 130rpx;
+}
+
+.itemUsna {
+  max-width: 150rpx;
+}
+
+.serState {
+  color: rgb(255, 82, 125);
+}
+
+.container {
+  position: fixed;
+  width: 100%;
+  top: 0rpx;
+}
+
+/* 无历史服务 */
+
+.empty_order {
+  height: 100%;
+  background-color: rgb(238, 238, 238);
+}
+
+.empty_order image {
+  width: 329rpx;
+  height: 229rpx;
+  margin-top: 202rpx;
+}
+
+.empty_order .xc-ash {
+  margin-top: 10rpx;
+  font-weight: 600px;
+}
+
+.empty_order navigator {
+  margin-top: 65rpx;
+  border-radius: 40rpx;
+}
+
+.empty_order navigator view {
+  width: 247rpx;
+  height: 65rpx;
+  background-color: rgb(255, 72, 72);
+  border-radius: 40rpx;
+}
+
+.After_all {
+  height: 80rpx;
+}
+
+.After_all .Line {
+  border-top: 3rpx solid rgb(0, 0, 0);
+  width: 130rpx;
+}
+
+.After_all .end {
+  margin: 0rpx 15rpx;
+}
+.slot{
+  color: rgb(153, 153, 153);
+  height:300rpx;
+  width:100%;
+}
 \ No newline at end of file
+var e = getApp(),
+  a = e.globalData.setting,
+  os = a,
+  t = e.request,
+  d = e.globalData;
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    qr_code_object: {
+      val: "12121",
+      content: "请将二维码展示给核销员，服务更快捷！"
+    },
+    iurl: a.imghost,
+    defimgurl: "/miniapp/images/yyservice/yyxmdefault.jpg",
+    service_List: [], //服务项目列表
+    is_service_read: 0,
+    curpage: 1, //当前分页数
+    pageSize: 10, //页大小
+    total: 0,
+    ismore: 0, //是否加载完毕
+    userinfo: null,
+    is_sub: 0, //是否重复提交预约
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function(options) {
+		console.log('options==>', options);
+    var userinfo = getApp().globalData.userInfo;
+    if (userinfo == null) {
+      //界面必须使用warn 做ID,并调用
+      // return false;
+    };
+    this.setData({
+      userinfo: userinfo,
+			options,
+    });
+    var th = this;
+		// if(options.UserId) {
+			th.query_service();
+		// };
+    
+  },
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function() {
+    var th = this;
+    var my_confirm = th.selectComponent("#my_confirm"); //组件的id
+    my_confirm.open_cancel(0);
+  },
+	
+  onReachBottom: function() {
+    var th = this;
+    if (this.data.total <= th.data.pageSize) return;
+    if (this.data.ismore) return;
+
+    th.query_service();
+  },
+  //查询服务项目列表
+  query_service: function() {
+    wx.showLoading({
+      title: '加载中',
+    })
+    var th = this;
+    var url = "/api/weshop/marketing/reservation/sm/page?State=1";
+    getApp().request.promiseGet(url, {
+      data: {
+        storeId: a.stoid,
+        userId: th.data.options.UserId,
+        page: th.data.curpage,
+        pageSize: th.data.pageSize
+      }
+    }).then(res => {
+      wx.hideLoading();
+      if (res.data.code == 0) {
+        th.data.curpage++;
+        var arr1 = th.data.service_List;
+        var arr2 = res.data.data.pageData;
+        var arr3 = [...arr1, ...arr2];
+        var ismore = 0;
+        if (arr3.length == res.data.data.total) ismore = 1
+        th.setData({
+            service_List: arr3,
+            total: res.data.data.total,
+            ismore: ismore,
+            is_service_read: 1,
+          }),
+          wx.stopPullDownRefresh(); //停止下拉刷新
+      } else {
+        th.setData({
+          is_service_read: 1
+        })
+      }
+    })
+  },
+  /*-- 打开服务项目 --*/
+  open_fw: function(e) {
+    wx.showLoading({
+      title: '加载中',
+    })
+    var th = this;
+    var url = e.currentTarget.dataset.url;
+    var service_id = e.currentTarget.dataset.service_id; //服务id
+    var project_id = e.currentTarget.dataset.project_id;
+    var ind = e.currentTarget.dataset.ind;
+    var item = this.data.service_List[ind];
+    var ewm = "^" + th.data.userinfo.erpvipid + "|" + item.ProjectID + "|" + item.BuyType + "|TY01|";
+    var tt = th.format_time(1);
+    ewm = ewm + tt;
+    th.data.qr_code_object.val = ewm;
+    th.data.qr_code_object.is_fw = 1;
+    var qc_com = th.selectComponent("#qc_com"); //组件的id
+    getApp().request.promiseGet("/api/weshop/marketing/reservation/reservation/check", {
+      data: {
+        serviceId: service_id,
+        storeId: a.stoid,
+        userId: th.data.options.UserId,
+      }
+    }).then(res => {
+      wx.hideLoading();
+      th.setData({
+        is_sub: 0
+      })
+      if (res.data.data != null) {
+        var my_confirm = th.selectComponent("#my_confirm"); //组件的id
+        my_confirm.open_cancel(1);
+        my_confirm.open(
+          "已有预约记录!",
+          "预约详情",
+          "继续使用",
+          function() {
+            my_confirm.open_cancel(0);
+            var deta_url = "/packageA/pages/my_service/tment_details?userid="+ th.data.options.UserId + "&number=" + res.data.data.Number;
+            wx.navigateTo({
+              url: deta_url
+            })
+          },
+          function() {
+            my_confirm.open_cancel(0);
+            qc_com.open(th.data.qr_code_object)
+          }
+
+        )
+
+      } else {
+        qc_com.open(th.data.qr_code_object)
+      }
+    })
+
+  },
+  //图片失败，默认图片
+  bind_bnerr1: function(e) {
+    var _errImg = e.target.dataset.errorimg;
+    var _Img = e.target.dataset.img;
+    if (_Img != undefined) {
+      var _errObj = {};
+      _errObj[_errImg] = "/miniapp/images/no_cate_def.png";
+      this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;
+    }
+  },
+  format_time: function(isFull) {
+    var d = new Date();
+    var m = d.getMonth() + 1;
+    if (m < 10) m = "0" + m;
+    var dd = d.getDate();
+    if (dd < 10) dd = "0" + dd;
+    var fm = [d.getFullYear(), m, dd].join('-');
+    if (isFull == 1)
+      fm = fm + ' ' + [d.getHours(), d.getMinutes(), d.getSeconds()].join(':')
+    return fm;
+  },
+  //跳转到首页
+  goto: function(e) {
+    var url = e.currentTarget.dataset.url;
+    getApp().goto(url);
+  },
+  //校正是否可预约
+  correcting: function(e) {
+    var th = this;
+    wx.showLoading({
+      title: '加载中',
+    })
+    if (th.data.is_sub == 0) {
+      th.setData({
+        is_sub: 1
+      })
+      var url = e.currentTarget.dataset.url;
+      var service_id = e.currentTarget.dataset.service_id; //服务id
+      var project_id = e.currentTarget.dataset.project_id;
+      getApp().request.promiseGet("/api/weshop/marketing/reservation/reservation/check", {
+        data: {
+          serviceId: service_id,
+          storeId: a.stoid,
+          userId: th.data.options.UserId,
+        }
+      }).then(res => {
+        wx.hideLoading();
+        th.setData({
+          is_sub: 0
+        })
+        if (res.data.code == 0) {
+          if (res.data.data != null) {
+
+            var number = res.data.data.Number;
+            var my_confirm = th.selectComponent("#my_confirm"); //组件的id
+            my_confirm.open_cancel(1);
+            my_confirm.open(
+              "已有预约记录!",
+              "预约详情",
+               "继续预约",
+              function() {
+                my_confirm.open_cancel(0);
+                var deta_url = "/packageA/pages/my_service/tment_details?number=" + number + "&userid="+ th.data.options.UserId;
+                wx.navigateTo({
+                  url: deta_url
+                })
+              },
+               function() {
+                my_confirm.open_cancel(0);
+                getApp().request.promiseGet("/api/weshop/marketing/reservation/reservation/sm/check", {
+                  data: {
+                    projectId: project_id,
+                    serviceId: service_id,
+                    storeId: a.stoid,
+                    userId:  th.data.options.UserId,
+                  }
+                }).then(res => {
+                  if (res.data.code == 0) {
+                    wx.navigateTo({
+                      url: url
+                    })
+                  } else {
+                    getApp().my_warnning(res.data.msg, 0, th);
+                  }
+                })
+              }
+            )
+          } else {
+            wx.navigateTo({
+              url: url,
+            })
+          }
+
+        } else {
+          getApp().my_warnning(res.data.msg, 0, th);
+        }
+      })
+    }
+  },
+  //关闭导航
+  close: function () {
+    var th = this;
+    var nav_b = th.selectComponent("#nav_b"); //组件的id
+    nav_b.close_box();
+  }
+
+})
 \ No newline at end of file
+{
+  "navigationBarTitleText": "服务项目",
+	"enablePullDownRefresh": false,
+  "usingComponents": {
+    "qr_code": "/components/qr_code/qr_code",
+    "warn": "/components/long_warn/long_warn",
+    "my_confirm": "/components/my_confirm/my_confirm",
+    "nav_b": "/components/nav_b/nav_b"
+  }
+}
 \ No newline at end of file
+<!-- 背景图片 -->
+<view catchtap="close">
+  <image class="backimage" src="{{iurl}}/miniapp/images/yyservice/backimage.png" lazy-load="true"></image>
+	<navigator class="History fs26" url="/packageA/pages/service_record/service_record?userid={{options.UserId}}" style="left:10px;right:auto;">服务记录</navigator>
+	<navigator class="History fs26" url="/packageA/pages/my_service/hist_service?userid={{options.UserId}}">历史预约</navigator>
+</view>
+
+
+
+
+<!-- 预约内容 -->
+<!-- 项目框架 -->
+<view class="Serviceitems" catchtap="close">
+  <!-- 单个项目 -->
+  <view class="rel" wx:for="{{service_List}}">
+    <view class="abs">
+      <!-- 皇冠log -->
+      <block wx:if="{{item.BuyType==4}}">
+        <image class="equity_money" src="{{iurl}}/miniapp/images//yyservice/equity.png" lazy-load="true"></image>
+      </block>
+      <!-- 金钱log -->
+      <block wx:if="{{item.BuyType==1 || item.BuyType==2 }}">
+        <image class="equity_money" src="{{iurl}}/miniapp/images/yyservice/money.png" lazy-load="true"></image>
+      </block>
+      <!-- 礼包log -->
+      <block wx:if="{{item.BuyType==3}}">
+        <image class="equity_money" src="{{iurl}}/miniapp/images/yyservice/giftpackage.png" lazy-load="true"></image>
+      </block>
+    </view>
+    <view>
+      <view class="flex-center">
+        <image class="itemimage" src="{{item.ImageUrl==''?iurl+defimgurl:item.ImageUrl}}" lazy-load="true" data-errorimg="service_List[{{index}}].ImageUrl" binderror="bind_bnerr1" data-img="{{item.ImageUrl}}"></image>
+      </view>
+
+      <view class="flex-center itemName">
+        <view class="fs32 Name ellipsis-1">{{item.ServiceName}}</view>
+      </view>
+
+      <view class="flex-center fs24 itemCount">
+        <view>剩余次数：</view>
+        <view>{{item.ObtainTimes}}</view>
+      </view>
+
+      <view class="flex-center fs24 itemEffective">
+        <view>有效期至</view>
+        <view class="Date">{{item.Validay==""?"长期有效":item.Validay}}</view>
+      </view>
+
+    </view>
+		
+		
+		<view class="flex-center fs28 functionMax">
+		  <view class="flex-level btn" data-url="/packageA/pages/my_service/appment_main?service_id={{item.ServiceID}}&BuyType={{item.BuyType}}&ProjectID={{item.ProjectID}}&Validay={{item.Validay}}&userid={{options.UserId}}&usercode={{options.UserCode}}&firstleader={{options.first_leader}}" bindtap="correcting" data-service_id="{{item.ServiceID}}" data-project_id="{{item.ProjectID}}">
+		    <view>帮你预约</view>
+		  </view>
+		</view>
+  </view>
+  <!-- 没有数据 -->
+  <!-- 加载完毕并且数据大于=页大小 -->
+  <!-- <view class="After_all flex-center" wx:if="{{ismore && service_List.length>=6}}">
+    <view class="Line"></view>
+    <view class="end fs26 xc-black">到底了</view>
+    <view class="Line"></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">
+		<view class="flex t-c">
+			<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">张三</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>
+	</scroll-view>
+</view>
+<!-- 无服务项目 -->
+<!-- <view wx:if="{{service_List.length<1 && is_service_read}}">
+  <view class="cover"></view>
+  <view class="empty_order" wx:if="{{true}}">
+    <view class="flex-level">
+      <image src="{{iurl}}miniapp/images/yyservice/no_history.png"></image>
+    </view>
+    <view class="flex-level fs30 xc-ash">暂无服务项目</view>
+    <view class="flex-level">
+      <navigator data-url="/pages/user/index/index" bindtap="goto">
+        <view class="flex-center fs28 white">回到首页</view>
+      </navigator>
+    </view>
+  </view>
+</view> -->
+<!--  制作一个圆球导航  -->
+<!-- <nav_b id="nav_b"></nav_b> -->
+<!-- 弹出框扫描 -->
+<!-- <qr_code id="qc_com"></qr_code>
+<warn id="warn"></warn>
+<my_confirm id="my_confirm"></my_confirm> -->
+page {
+  overflow-x: scroll;
+}
+
+/* 背景定位 */
+
+.backimage {
+  position: absolute;
+  top: 0rpx;
+  left: 0rpx;
+  z-index: -1;
+  width: 100%;
+  /* height: 100%; */
+}
+
+/* 历史服务定位 */
+
+.History {
+  position: absolute;
+  top: 30rpx;
+  right: 20rpx;
+  z-index: 1;
+  color: rgb(255, 255, 255);
+}
+
+.rel {
+  background-color: rgb(255, 255, 255);
+  width: 350rpx;
+  height: 430rpx;
+  border-radius: 20rpx;
+  display: inline-block;
+  margin-right: 15rpx;
+  margin-bottom: 20rpx;
+  box-shadow: 0rpx 3rpx 3rpx 3rpx rgb(233, 233, 233);
+}
+
+.abs {
+  left: 10rpx;
+  top: 10rpx;
+}
+
+.equity_money {
+  width: 50rpx;
+  height: 55rpx;
+}
+
+.Serviceitems {
+  position: absolute;
+  top: 370rpx;
+  left: 0rpx;
+  z-index: 2;
+  padding-left: 18rpx;
+  padding-bottom: 20rpx;
+}
+
+.itemimage {
+  width: 120rpx;
+  height: 120rpx;
+  border-radius: 50%;
+  margin-top: 30rpx;
+  margin-bottom: 20rpx;
+}
+
+.itemName {
+  margin-bottom: 25rpx;
+  color: rgb(48, 48, 48);
+}
+
+.itemName .Name {
+  max-width: 250rpx;
+  text-align: center;
+}
+
+.itemCount {
+  margin-bottom: 5rpx;
+  color: rgb(177, 177, 177);
+  align-items: baseline;
+}
+
+.itemEffective {
+  margin-bottom: 30rpx;
+  color: rgb(177, 177, 177);
+  align-items: baseline;
+}
+
+.functionMax {
+  padding: 0rpx 25rpx;
+  color: rgb(254, 255, 255);
+}
+
+.Use {
+  width: 170rpx;
+  height: 50rpx;
+  line-height: 50rpx;
+  border-radius: 25rpx;
+  background-color: red;
+}
+
+.appointment {
+  width: 115rpx;
+  height: 50rpx;
+  line-height: 50rpx;
+  border-radius: 25rpx;
+  margin-left: 20rpx;
+}
+
+.Date {
+  margin-left: 10rpx;
+}
+
+/* 无服务项目 */
+
+.cover {
+  position: fixed;
+  z-index: 1;
+  left: 0rpx;
+  top: 390rpx;
+  width: 100%;
+  height: 200rpx;
+  background-color: rgb(255, 255, 255);
+}
+
+/* 无历史服务 */
+
+.empty_order {
+  position: fixed;
+  left: 0rpx;
+  top: 500rpx;
+  z-index: 2;
+  width: 100%;
+}
+
+.empty_order image {
+  width: 329rpx;
+  height: 229rpx;
+  margin-top: 80rpx;
+}
+
+.empty_order .xc-ash {
+  margin-top: 10rpx;
+  font-weight: 600px;
+}
+
+.empty_order navigator {
+  margin-top: 60rpx;
+  border-radius: 40rpx;
+}
+
+.empty_order navigator view {
+  width: 247rpx;
+  height: 56rpx;
+  background-color: rgb(255, 72, 72);
+  border-radius: 40rpx;
+}
+
+.After_all {
+  height: 80rpx;
+}
+
+.After_all .Line {
+  border-top: 3rpx solid rgb(0, 0, 0);
+  width: 130rpx;
+}
+
+.After_all .end {
+  margin: 0rpx 15rpx;
+}
+
+.btn {
+	background-color: red;
+	padding: 10rpx 20rpx;
+	border-radius: 30rpx;
+}
+
+.table {
+	background-color: white;
+	border-top: 2rpx solid rgba(218, 217, 217, 1);
+	border-left: 2rpx solid rgba(218, 217, 217, 1);
+	margin-top: 400rpx;
+}
+.blue {
+	background: rgba(241, 252, 255, 1);
+}
+.td {
+	width: 100rpx;
+	height: 100rpx;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	border-right: 2rpx solid rgba(218, 217, 217, 1);
+	border-bottom: 2rpx solid rgba(218, 217, 217, 1);
+}
+
+.left {
+	box-shadow: 4px 0px 6px #e7e9eb;
+}
+
+.right {
+	width: calc(100% - 102rpx);
+}
+var e = getApp(),
+  a = e.globalData.setting,
+  os = a,
+  t = e.request,
+  d = e.globalData;
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    url: a.url,
+    iurl: a.imghost,
+    tment_details: [], //预约详情
+    number: "", //订单号
+    arrangeTime: "", //预约年月日
+    day: "", //判断是上午还是下午
+    states: 3, //3为取消预约
+  },
+  //取消预约
+  cancel_tment: function(e) {
+    var th = this;
+    var my_confirm = th.selectComponent("#my_confirm"); //组件的id
+    my_confirm.open(
+      "确定取消？",
+      "取消",
+      "确定",
+      function() {
+        my_confirm.open_cancel(0);
+      },
+      function() {
+        var index = e.currentTarget.dataset.index;
+        var states = th.data.states;
+        var tment_details = th.data.tment_details;
+        var number = th.data.number;
+        var json = {
+          "number": number,
+          "storeId": a.stoid,
+          "states": states,
+          "isxz": 1
+        };
+        var data = JSON.stringify(json);
+        var url = th.data.url + "/api/weshop/marketing/reservation/reservation/update"; //预约接口地址
+        wx.request({
+          url: url,
+          data: data,
+          method: 'put',
+          header: {
+            'content-type': 'application/json'
+          }, // 设置请求的 header
+          success: function(res) {
+            my_confirm.open_cancel(0);
+            if (res.data.code == 0) {
+              getApp().my_warnning("取消成功", 1, th);
+              var start = 'tment_details[' + 0 + '].State';
+                th.setData({
+                  [start]: 3
+                })     
+            } else {
+              getApp().my_warnning(res.data.msg, 0, th);
+            }
+          }
+        })
+      }
+    );
+
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function(options) {
+	  
+	 console.log("预约详情"); 
+	 console.log(options); 
+	  
+    var th = this;
+    th.setData({
+			options,
+      number: options.number
+    })
+  },
+  //查询美容师详情
+  query_bea: function() {
+    var th = this;
+    var number = th.data.number;
+    var url = "/api/weshop/marketing/reservation/reservation/page";
+    getApp().request.promiseGet(url, {
+      data: {
+        storeId: a.stoid,
+        userId: th.data.options.userid,
+        number: number
+      }
+    }).then(res => {
+      wx.hideLoading();
+      if (res.data.code == 0) {
+        var data = res.data.data.pageData;
+        var arrangeTime = data[0].ArrangeTime.substring(0, 11);
+        var day = data[0].ArrangeTime.substring(11, 16);
+        th.setData({
+          tment_details: data,
+          arrangeTime: arrangeTime,
+          day: day
+        })
+
+      } else {
+        getApp().my_warnning(res.data.msg, 0, th);
+      }
+    })
+  },
+  //显示核销码
+  code_show: function(e) {
+    var th = this;
+    //--获取成功的时候--
+    var no = e.currentTarget.dataset.order_sn;
+    var qc_com = th.selectComponent("#qc_com"); //组件的id
+    var obj = {
+      val: no,
+      content: "请将二维码展示给核销员，使用更快捷"
+    };
+    qc_com.open(obj)
+  },
+  //跳到首页
+  goto: function(e) {
+    var th = this;
+    wx.navigateTo({
+      url: '/pages/index/index/index',
+    })
+  },
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function() {
+    var th = this;
+    th.query_bea();
+  },
+  //关闭导航
+  close: function () {
+    var th = this;
+    var nav_b = th.selectComponent("#nav_b"); //组件的id
+    nav_b.close_box();
+  }
+})
 \ No newline at end of file
+{
+  "navigationBarTitleText": "预约详情",
+  "usingComponents": {
+    "qr_code": "/components/qr_code/qr_code",
+    "warn": "/components/long_warn/long_warn",
+    "my_confirm": "/components/my_confirm/my_confirm",
+    "nav_b": "/components/nav_b/nav_b"
+  }
+}
 \ No newline at end of file
+<view class="container" wx:for="{{tment_details}}" wx:if="{{index<1}}" catchtap="close">
+  <!-- 预约人的属性 -->
+  <view class="Subscriber padding">
+    <!-- 状态栏 -->
+    <view class="statusBar fs32 flex-vertical-between lf">
+      <view>预约状态：</view>
+      <view wx:if="{{item.State==0}}">未服务</view>
+      <view wx:if="{{item.State==1}}">已服务</view>
+      <view wx:if="{{item.State==2}}">已过期</view>
+      <view wx:if="{{item.State==3}}">已取消</view>
+      <view wx:if="{{item.State==4}}">已评价</view>
+    </view>
+    <view class="fs30">
+      <view class="items lf">
+        <!-- 预约订单 -->
+        <view class="flex-vertical bmt" bindtap="code_show" data-order_sn="{{number}}" wx:if="{{item.State==0}}">
+          <view class="flex-vertical ai-bas">
+            <view class="name">预约订单:</view>
+            <view class="ellipsis-1 value">{{number}}</view>
+          </view>
+          <image src="{{iurl}}miniapp/images/order/code.png" class="code"></image>
+        </view>
+
+        <!-- 预约门店 -->
+        <view class="flex-vertical bmt ai-bas">
+          <view class="name">预约门店:</view>
+          <view class="ellipsis-1 value">{{item.StorageName}}</view>
+        </view>
+
+        <!-- 预约项目 -->
+        <view class="flex-vertical bmt ai-bas">
+          <view class="name">预约项目:</view>
+          <view class="ellipsis-1 value">{{item.ServiceName}}</view>
+        </view>
+
+        <!-- 预约时间 -->
+        <view class="flex-vertical bmt ai-bas">
+          <view class="name">预约时间:</view>
+          <view class="date">{{arrangeTime}}</view>
+          <view>{{day}}</view>
+        </view>
+      </view>
+      <view class="bt">
+
+        <!-- 美容师 -->
+        <view class="flex-vertical bmt ai-bas">
+          <view class="name flex-vertical-between">
+            <block wx:if="{{item.State==1 || item.State==4}}">
+              <view>服务美容师:</view>
+            </block>
+            <block wx:else>
+              <view>预约美容师:</view>
+            </block>
+          </view>
+          <view class="ellipsis-1 value">{{item.BeauticianName}}</view>
+        </view>
+        <!-- 预约人及联系方式 -->
+        <!-- 姓名 -->
+        <view class="flex-vertical bmt ai-bas">
+          <view class="name flex-vertical-between">
+            <view>预</view>
+            <view>约</view>
+            <view>人:</view>
+          </view>
+          <view class="ellipsis-1 value">{{item.VIPName}}</view>
+        </view>
+        <!-- 号码 -->
+        <view class="flex-vertical ai-bas">
+          <view class="name flex-vertical-between">
+            <view>手</view>
+            <view>机</view>
+            <view>号:</view>
+          </view>
+          <view>{{item.MobileTel}}</view>
+        </view>
+      </view>
+    </view>
+
+  </view>
+
+  <!-- 温馨提示内容 -->
+  <view class="Tips fs30 lf rel padding">
+    <!-- 棒槌 -->
+    <view class="Stickl abs"></view>
+    <view class="Stickl Stickr abs"></view>
+
+    <view class="Cozy flex-center" style="background-image: url({{iurl}}/miniapp/images/yyservice/icon.png);">
+      <view>温馨提示</view>
+    </view>
+    <view>1.预约成功后需在指定时间前到达;</view>
+    <view>2.如有任何问题可致电咨询;</view>
+    <view>3.如需退约，需提前取消。</view>
+  </view>
+  <!-- submit栏 -->
+  <view class="subs flex-vertical-between fs32">
+    <!-- 左边栏 -->
+    <view class="sub flex-center yellow-b" wx:if="{{item.State==0}}" bindtap="cancel_tment">
+      <view class="yellow-b" data-index="{{index}}">取消预约</view>
+    </view>
+    <navigator wx:if="{{item.State>0}}" class="sub flex-center yellow-b" url="/packageA/pages/my_service/tment_order_list?userid={{options.userid}}">
+      <view class="yellow-b">我的服务</view>
+    </navigator>
+    <!-- 右边栏 -->
+    <navigator wx:if="{{item.State==0}}" class="sub rb flex-center" url="/packageA/pages/my_service/beauty_deta?BeauticianID={{item.BeauticianID}}&number={{item.Number}}&itemId={{item.ServiceID}}&modify=1&projectId={{item.ProjectID}}">
+      <view>更改时间</view>
+    </navigator>
+    <navigator wx:if="{{item.State==1}}" class="sub rb flex-center" url="/packageA/pages/my_service/tment_eval?Number={{item.Number}}&evaluate={{0}}&userid={{options.userid}}">
+      <view>发表评价</view>
+    </navigator>
+    <navigator wx:if="{{item.State==4}}" class="sub rb flex-center" url="/packageA/pages/my_service/tment_eval?Number={{item.Number}}&evaluate={{1}}&userid={{options.userid}}">
+      <view>查看评价</view>
+    </navigator>
+    <navigator wx:if="{{item.State==2 || item.State==3}}" class="sub rb flex-center" url="/packageA/pages/my_service/appment_main?ProjectID={{item.ProjectID}}&BuyType={{item.BuyType}}&service_id={{item.ServiceID}}&userid={{options.userid}}">
+      <view>重新预约</view>
+    </navigator>
+
+  </view>
+
+</view>
+
+<!--  制作一个圆球导航  -->
+<nav_b id="nav_b"></nav_b>
+<my_confirm id="my_confirm"></my_confirm>
+<!-- 弹出框扫描 -->
+<qr_code id="qc_com"></qr_code>
+<warn id="warn"></warn>
 \ No newline at end of file
+page {
+  width: 100%;
+  background-color: rgb(238, 238, 238);
+}
+
+/* 公用 */
+
+.lf {
+  padding: 0rpx 40rpx;
+}
+
+.bt {
+  margin: 0rpx 15rpx;
+  padding: 0rpx 25rpx;
+  border-top: 2rpx dashed rgb(238, 238, 238);
+  padding-top: 50rpx;
+  padding-bottom: 50rpx;
+}
+
+.bmt {
+  margin-bottom: 35rpx;
+}
+
+.name {
+  width: 160rpx;
+  margin-right: 25rpx;
+}
+
+.value {
+  max-width: 390rpx;
+}
+
+/* 公用 */
+
+.container {
+  padding-bottom:70rpx;
+}
+
+.padding{
+  margin: 0rpx 20rpx;
+}
+
+.Subscriber {
+  overflow: hidden;
+  margin-top: 25rpx;
+  background-color: rgb(255, 255, 255);
+  border-radius: 10rpx;
+}
+
+.statusBar {
+  height: 80rpx;
+  background-color: rgb(214, 1, 33);
+  color: rgb(255, 255, 255);
+}
+
+.date {
+  margin-right: 25rpx;
+}
+
+.items {
+  margin: 40rpx 0rpx;
+}
+
+.Tips {
+  margin-top: 20rpx;
+  padding-top: 35rpx;
+  height: 255rpx;
+  border-radius: 10rpx;
+  background-color: rgb(255, 255, 255);
+  margin-bottom: 50rpx;
+}
+
+.Cozy {
+  width: 165rpx;
+  height: 43rpx;
+  margin-bottom: 20rpx;
+  color: rgb(255, 255, 255);
+  background-size: 100%;
+}
+
+.subs {
+  width: 710rpx;
+  padding: 15rpx 20rpx;
+  position: fixed;
+  bottom:0rpx;
+  background-color: rgb(255,255,255);
+}
+
+.sub {
+  width: 325rpx;
+  height: 65rpx;
+  border-radius: 30rpx;
+  color: rgb(255, 255, 255);
+}
+.code{
+  margin-left: 10rpx;
+  width: 50rpx;
+  height: 50rpx;
+}
+.rb {
+  background-color: rgb(214, 1, 33);
+}
+
+/* 棒槌 */
+
+.Stickl {
+  width: 39rpx;
+  height: 10rpx;
+  background-color: rgb(153, 153, 153);
+  transform: rotate(270deg);
+  border-radius: 20rpx;
+  left: 95rpx;
+  top: -15rpx;
+}
+
+.Stickr {
+  left: 590rpx;
+}
+ var e = getApp(),
+  a = e.globalData.setting,
+  os = a,
+  t = e.request,
+  d = e.globalData;
+Page({ 
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    url: a.url, //接口网址
+    iurl: a.imghost,
+    defimgurl: "/miniapp/images/no-head.jpg",
+    stars_index: -1, //当前点击的星星下标
+    labels: [], //星级标签数组
+    sub_evaluate: 0, //是否评价成功
+    proposal: "", //用户输入的建议
+    proposal_size: 100, //评价意见和建议限定字数
+    number: "", //订单单号
+    beautician: "", //美容师信息
+    fromType: "服务评价", //评价来源
+    arrangeTime: "", //服务日期
+    is_evaluate: 0, //是否评价
+    EvaluateDatetime: "", //评价时间
+	is_act:0, //是否能购获取图片 
+	actId:0,   //活动ID
+	giftBagId:0, //礼包ID
+	
+  },
+  //点击星级
+  check_stars: function(e) {
+    var th = this;
+    var is_evaluate = th.data.is_evaluate; //0可点击
+    if (is_evaluate == 0) {
+      var index = e.currentTarget.dataset.index;
+      var stars_index = th.data.stars_index;
+      if (index != stars_index) {
+        var url = "/api/weshop/marketing/reservation/star/label/list";
+        getApp().request.promiseGet(url, {
+          data: {
+            Star: index + 1,
+            storeId: a.stoid,
+          }
+        }).then(res => {
+          if (res.data.code == 0) {
+            th.setData({
+              labels: res.data.data
+            })
+          } else {
+            getApp().my_warnning(res.data.msg, 0, th);
+            return;
+          }
+        })
+        th.setData({
+          stars_index: index
+        })
+      }
+    }
+  },
+  //输入评价意见和建议
+  input_proposal: function(e) {
+    var th = this;
+    var value = e.detail.value;
+    th.setData({
+      proposal: value
+    })
+  },
+  //图片失败，默认图片
+  bind_bnerr1: function (e) {
+    var th = this;
+    var _errImg = e.target.dataset.errorimg;
+    var _Img = e.target.dataset.img;
+    if (_Img != undefined) {
+      var _errObj = {};
+      _errObj[_errImg] = "/miniapp/images/no-head.jpg";
+      th.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;
+    }
+  },
+  //选择标签
+  check_label: function(e) {
+    var th = this;
+    var evaluate = th.data.is_evaluate; //0为未评价，未评价才可点击标签
+    if (evaluate == 0) {
+      var index = e.currentTarget.dataset.index;
+      var label_id = th.data.labels[index].check;
+      var labels = 'labels[' + index + '].check';
+      if (label_id) {
+        label_id = 0
+      } else {
+        label_id = 1
+      }
+      th.setData({
+        [labels]: label_id
+      })
+    }
+  },
+  //查询美容师信息
+  query_bea: function() {
+    var th = this;
+    var url = "/api/weshop/marketing/reservation/reservation/page";
+    var number = th.data.number; //订单编号
+    getApp().request.promiseGet(url, {
+      data: {
+        storeId: a.stoid,
+        userId: th.data.options.userid,
+        number: number
+      }
+    }).then(res => {
+      if (res.data.code == 0) {
+        var data = res.data.data.pageData;
+        var arrangeTime = data[0].ArrangeTime;
+        th.setData({
+          beautician: data,
+          arrangeTime: arrangeTime
+        })
+      } else {
+        getApp().my_warnning(res.data.msg, 0, th);
+      }
+    })
+  },
+  //获取预约评价
+  evaluate_get: function() {
+    var th = this;
+    var url = "/api/weshop/evaluation/evaluate/get";
+    getApp().request.promiseGet(url, {
+      data: {
+        number: th.data.number,
+        storeId: a.stoid,
+      }
+    }).then(res => {
+      if (res.data.code == 0) {
+        th.setData({
+          stars_index: res.data.data.Star-1,
+          labels: res.data.data.EvaluationList,
+          proposal: res.data.data.Remark,
+          EvaluateDatetime: res.data.data.EvaluateDatetime.substring(0, 19)
+        })
+      } else {
+        getApp().my_warnning(res.data.msg, 0, th);
+      }
+    })
+  },
+  //提交评价
+  evaluate_save: function() {
+    var th = this;
+    var stars = th.data.stars_index; //评价星级
+    var proposal = th.data.proposal;
+    //判断是否评级
+    if (stars < 0) {
+      getApp().my_warnning("请进行评分", 0, th);
+      return false;
+    } else if (proposal == "") {
+      getApp().my_warnning("给点建议呗", 0, th);
+      return false;
+    }
+    wx.showLoading({
+      title: '加载中',
+    })
+    var labels = th.data.labels; //星级标签数组
+    var evaLabList = []; //用户选择的评价标签
+    // 查询评价标签
+    for (var i = 0; i < labels.length; i++) {
+      if (labels[i].check) {
+        evaLabList.push(labels[i].LabelName);
+      }
+    }
+    var url = th.data.url + "/api/weshop/evaluation/evaluate/insert";
+    var posNo = th.data.number; //收银单号
+    var proposal = th.data.proposal; //用户建议内容
+    var fromType = th.data.fromType; //评价来源
+    var json = {
+      "evaLabList": evaLabList,
+      "fromType": 2,
+      "number": posNo,
+      "remark": proposal,
+      "star": stars + 1,
+      "storeId": a.stoid,
+    };
+    var data = JSON.stringify(json); //转换成json格式
+    wx.request({
+      url: url,
+      data: data,
+      method: 'POST',
+      header: {
+        'content-type': 'application/json'
+      }, // 设置请求的 header
+      success: function(res) {
+        wx.hideLoading();
+        if (res.data.code == 0) {
+          getApp().my_warnning("评价成功", 1, th);
+          var namber=th.data.number;
+          setTimeout(function() {
+            wx.redirectTo({
+              url: "/pages/user/my_service/tment_eval?Number="+namber+"&evaluate="+1
+            });
+          }, 2000);
+        } else {
+          getApp().my_warnning(res.data.msg, 0, th);
+        }
+      }
+    })
+
+  },
+  //图片失败，默认图片
+  bind_bnerr1: function(e) {
+    var th = this;
+    var _errImg = e.target.dataset.errorimg;
+    var _Img = e.target.dataset.img;
+    if (_Img != undefined) {
+     
+      var _errObj = {};
+      _errObj[_errImg] = th.data.iurl+"/miniapp/images/no-head.jpg";
+      th.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;
+    }
+  },
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function(options) {
+    var th = this;
+    th.setData({
+			options,
+      number: options.Number,
+      is_evaluate: options.evaluate
+    })
+    th.query_bea();
+	th.judge_act();
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function() {
+    var th = this;
+    var is_evaluate = th.data.is_evaluate;
+    if (is_evaluate == 1) {
+      th.evaluate_get();
+    }
+  },
+  //评价其他跳转
+  evaluate_qt:function(){
+    
+    wx.redirectTo({
+      url: "/pages/user/my_service/tment_order_list?state="+2
+    });
+  },
+  //点击领取礼包
+  clike_lb:function(){
+        
+        var id=this.data.actId;
+        var gifbagid = this.data.gifbagid;   
+    console.log(id,"订单", this.data.number),
+        wx.redirectTo({
+          url: "/pages/giftpack/evaluategift/evaluategift?actId="+id+ "&orderType=2&orderNumber="+this.data.number
+        });
+   
+  },
+
+  //--评价有礼判断---
+  judge_act: function () {
+    var th = this;
+    var url = "/api/weshop/marketing/comment/act/judge";
+    getApp().request.promiseGet(url, {
+      data: {
+        orderNumber: th.data.number,
+        orderType: 2,
+        storeId: a.stoid,
+        userId: th.data.options.userid,
+      }
+    }).then(res => {
+      if (res.data.code == 0) {
+        var id = res.data.data.id;
+        var giftbagid = res.data.data.giftbagid;
+        th.setData({
+          is_act: 1,
+          actId: id,
+          giftBagId: giftbagid
+        })
+      } else{
+        th.setData({
+          is_act:0
+        })
+      }
+    })
+  },
+  
+})
 \ No newline at end of file
+{
+  "navigationBarTitleText": "预约评价",
+  "usingComponents": {
+    "qr_code": "/components/qr_code/qr_code",
+    "warn": "/components/long_warn/long_warn"
+  }
+}
 \ No newline at end of file
+<view class="container" wx:for="{{beautician}}" wx:if="{{index<1}}" wx:for-item="it">
+
+  <!-- 头像 -->
+  <view class="flex-center head">
+ 
+    <image class="headimg" src="{{it.PhotoUrl==''?iurl+defimgurl:it.PhotoUrl}}" lazy-load="true" data-errorimg="beautician[{{index}}].PhotoUrl" binderror="bind_bnerr1"  data-img="beautician[{{index}}].PhotoUrl"></image>
+  </view>
+
+  <!-- 姓名 --> 
+  <view class="flex-level item">
+    <view class="itemlf flex-level-right">
+      <view class="fs32">服务美容师：</view>
+    </view>
+    <view class="itemlr fs30 ellipsis-1">{{it.BeauticianName}}</view>
+  </view>
+
+  <!-- 项目 -->
+  <view class="flex-center item">
+    <view class="itemlf fs32 flex-level-right">服务项目：</view>
+    <view class="itemlr fs30 ellipsis-1">{{it.ServiceName}}</view>
+  </view>
+
+  <!-- 时间 -->
+  <view class="flex-center item">
+    <view class="itemlf fs32 flex-level-right">服务时间：</view>
+    <view class="itemlr fs30">{{it.WriteTime}}</view>
+  </view>
+
+  <!-- 评价时间 -->
+  <view class="flex-center" wx:if="{{is_evaluate==1}}">
+    <view class="itemlf fs32 flex-level-right">评价时间：</view>
+    <view class="itemlr fs30">{{EvaluateDatetime}}</view>
+  </view>
+
+  <!-- 设置虚线 -->
+
+  <view class="flex-center">
+    <view class="starss">
+      <image class="stars" src="{{iurl}}{{key<=stars_index?'/miniapp/images/StarsredCk.png':'/miniapp/images/StarswhiteUnCk.png'}}" wx:for="{{5}}" bindtap="check_stars" data-index="{{key}}" wx:for-index="key"></image>
+    </view>
+  </view>
+  <view class="tea_labs">
+    <view class="flex-center fs26">
+      <block wx:if="{{is_evaluate==0}}">
+        <textarea class="rel textarea" placeholder="写其他意见和建议" placeholder-class="fs24" maxlength="{{proposal_size}}" bindinput="input_proposal" value="{{proposal}}">
+          <!-- 提示已输入多少数字 -->
+          <view if="{{is_evaluate==0}}" class="proposal abs">{{proposal.length}}/{{proposal_size}}</view>
+        </textarea>
+      </block>
+      <block wx:else>
+        <view wx:if="{{proposal!=''}}" class="textarea">
+          {{proposal}}
+        </view>
+      </block>
+    </view>
+
+    <view wx:if="{{labels.length>0 && is_evaluate==0}}" class="labels flex fs24 ellipsis-3">
+      <view class="label {{item.check==1?'checklabel':''}} flex-center" wx:for="{{labels}}" bindtap="check_label" data-index="{{key}}" wx:for-index="key">
+        <view class="ellipsis-1">{{item.LabelName}}</view>
+      </view>
+
+    </view>
+    <view wx:if="{{labels.length>0 && is_evaluate==1}}" class="{{labels.length==1 || labels.length==2?'flex-center':''}}" style="width:100%;">
+      <view class="labels flex fs24 ellipsis-3">
+        <view class="label checklabel flex-center" wx:for="{{labels}}" bindtap="check_label" data-index="{{key}}" wx:for-index="key">
+          <view class="ellipsis-1">{{item.LabelName}}</view>
+        </view>
+
+      </view>
+    </view>
+
+  </view>
+
+  <view wx:if="{{is_evaluate==0}}" class="feedback flex-center fs28">
+    <view>满意的话请打五星噢，谢谢您的支持!</view>
+  </view>
+
+  <block wx:if="{{sub_evaluate}}">
+    <view class="subSuccess">
+      <view class="flex-center">
+        <image class="Success" src="{{iurl}}/miniapp/images/yyservice/Success.png"></image>
+      </view>
+      <view class="fs36 flex-center">
+        <view>评价成功</view>
+      </view>
+    </view>
+  </block>
+</view>
+<navigator wx:if="{{is_evaluate==0}}" class="Subs fs32 flex-center">
+  <view class="Submission flex-center" bindtap="evaluate_save">
+    <view>确认提交</view>
+  </view>
+</navigator>
+<view wx:else> 
+
+
+<view style="margin: auto;margin-bottom: 30rpx;" class="Submission flex-center" bindtap="evaluate_qt">
+    <view>评价其他</view>
+  </view>
+ 
+  <view wx:if="{{is_act==1}}" style="margin: auto;margin-bottom: 30rpx;"  class="Submission flex-center yellow-b" bindtap="clike_lb">
+    <view>点击领取礼品</view>
+  </view>
+ </view>
+<warn id="warn"></warn>
 \ No newline at end of file
+.container {
+  border-top: 7rpx solid rgb(245, 245, 245);
+  padding-bottom: 100rpx;
+  background-color: rgb(255, 255, 255);
+}
+
+.head {
+  height: 270rpx;
+}
+
+.headimg {
+  width: 190rpx;
+  height: 190rpx;
+  border-radius: 50%;
+}
+
+.item {
+  margin-bottom: 20rpx;
+}
+
+.itemlf {
+  width: 195rpx;
+}
+
+.itemlr {
+  width: 360rpx;
+}
+
+.starss {
+  margin-top: 15rpx;
+  border-top: 3rpx dashed rgb(203, 203, 203);
+  padding-top: 25rpx;
+  padding-left: 15rpx;
+}
+
+.stars {
+  width: 50rpx;
+  height: 50rpx;
+  margin-right: 20rpx;
+}
+
+.datetime {
+  width: 190rpx;
+}
+
+.tea_labs {
+  padding: 0rpx 56rpx;
+  margin-top: 20rpx;
+}
+
+.proposal {
+  right: 20rpx;
+  bottom: 20rpx;
+  color: rgb(152, 152, 152);
+}
+
+.textarea {
+  width: 100%;
+  height: 200rpx;
+  margin-top: 70rpx;
+  border: 2rpx solid rgb(203, 203, 203);
+  border-radius: 13rpx;
+  padding-top: 25rpx;
+  padding-left: 30rpx;
+  margin-bottom: 30rpx;
+  padding-right: 15rpx;
+  padding-bottom: 20rpx;
+}
+
+.labels {
+  display: inline-block;
+  max-height: 240rxp;
+  line-height: 50rpx;
+  padding-left: 15rpx;
+}
+
+.label {
+  padding: 0rpx 10rpx;
+  height: 48rpx;
+  line-height: 48rpx;
+  border: 2rpx solid rgb(218, 218, 218);
+  color: rgb(152, 152, 152);
+  border-radius: 5rpx;
+  margin-right: 20rpx;
+  width: 165rpx;
+  display: inline-block;
+  text-align: center;
+  margin-bottom: 10rpx;
+}
+
+/* 选择标签的样式 */
+
+.checklabel {
+  border: 2rpx solid rgb(214, 1, 33);
+  background-color: rgb(255, 231, 235);
+  color: rgb(214, 1, 33);
+}
+
+.feedback {
+  color: rgb(152, 152, 152);
+  margin-bottom: 70rpx;
+}
+
+.Subs {
+  background-color: rgb(255, 255, 255);
+  position: fixed;
+  width: 100%;
+  bottom: 40rpx;
+}
+
+.Submission {
+  width: 400rpx;
+  height: 65rpx;
+  border-radius: 60rpx;
+  background-color: rgb(214, 1, 33);
+  color: rgb(255, 255, 255);
+}
+.Submission.yellow-b{
+  background-color: #ffb03f;
+
+}
+
+.clonri {
+  margin: 0rpx;
+}
+
+.subSuccess {
+  position: fixed;
+  z-index: 3;
+  top: 435rpx;
+  left: 66rpx;
+  background-color: #a6a6a6a4;
+  width: 615rpx;
+  height: 315rpx;
+  border-radius: 20rpx;
+  color: rgb(255, 255, 255);
+}
+
+.Success {
+  width: 110rpx;
+  height: 110rpx;
+  margin-top: 50rpx;
+  margin-bottom: 45rpx;
+}
+var e = getApp(),
+  a = e.globalData.setting,
+  os = a,
+  t = e.request,
+  d = e.globalData;
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    url: a.url, //接口网址
+    iurl: a.imghost, //图片网址
+    activeCategoryId: 0, //类别选中下标
+    defimgurl: "/miniapp/images/yyservice/yyxmdefault.jpg",
+    categories: [{
+      name: "全部",
+      id: 0
+    }, {
+      name: "未服务",
+      id: 1
+    }, {
+      name: "已服务",
+      id: 2
+    }, {
+      name: "已过期",
+      id: 3
+    }],
+    tm_order_list: [], //我的预约订单列表
+    curpage: 1, //当前分页数
+    pageSize: 10, //页大小
+    total: 0,
+    ismore: 0, //是否加载完毕
+    is_read: 0, //是否加载接口
+    states: 4, //4为取消预约
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function(options) {
+		this.setData({
+			options,
+		});
+    var state=options.state;
+    if (state != null && state != undefined && state!=""){
+      this.setData({ activeCategoryId: state });
+    }
+    
+  },
+  changeTab: function(e) {
+    var th = this;
+    var id = e.currentTarget.dataset.id;
+    var activeCategoryId = th.data.activeCategoryId;
+    if (id != activeCategoryId) {
+      th.setData({
+        activeCategoryId: id,
+        tm_order_list: [],
+        curpage: 1,
+        ismore: 0,
+        is_read: 0
+      })
+      th.query_orderList();
+    } else {
+      return false;
+    }
+  },
+  //显示核销码
+  code_show: function(e) {
+    var th = this;
+    //--获取成功的时候--
+    var no = e.currentTarget.dataset.order_sn;
+    var qc_com = th.selectComponent("#qc_com"); //组件的id
+    var obj = {
+      val: no,
+      content: "请将二维码展示给核销员，使用更快捷"
+    };
+    qc_com.open(obj)
+  },
+  query_orderList: function() {
+    wx.showLoading({
+      title: '加载中',
+    })
+    var th = this;
+    var url = "/api/weshop/marketing/reservation/reservation/page";
+
+    var state_index = th.data.activeCategoryId;
+    if (state_index == 0) {
+      state_index = "";
+    } else {
+      --state_index;
+    }
+    th.setData({
+      is_read: 0
+    })
+    getApp().request.promiseGet(url, {
+      data: {
+        storeId: a.stoid,
+        userId: th.data.options.userid,
+        state: state_index,
+        page: th.data.curpage,
+        pageSize: th.data.pageSize
+      }
+    }).then(res => {
+      wx.hideLoading();
+      if (res.data.code == 0) {
+        th.data.curpage++;
+        var arr1 = th.data.tm_order_list;
+        var arr2 = res.data.data.pageData;
+        var arr3 = [...arr1, ...arr2];
+        for(var i = 0;i<arr3.length;i++){
+          arr3[i].ArrangeTime = arr3[i].ArrangeTime.substring(0, 16);
+        }
+        var ismore = 0;
+        if (arr3.length == res.data.data.total) ismore = 1
+        th.setData({
+          tm_order_list: arr3,
+          total: res.data.data.total,
+          ismore: ismore,
+          is_read: 1
+        }), wx.stopPullDownRefresh(); //停止下拉刷新 {
+      } else {
+        wx.hideLoading();
+        th.setData({
+          tm_order_list: [],
+          is_read: 1
+        })
+      }
+    })
+
+  },
+  //取消预约
+  cancel_tment: function(e) {
+    var th = this;
+    var th = this;
+    var my_confirm = th.selectComponent("#my_confirm"); //组件的id
+    my_confirm.open(
+      "确定取消？",
+      "取消",
+      "确定",
+      function() {
+        my_confirm.open_cancel(0);
+      },
+      function() {
+        my_confirm.open_cancel(0);
+        var index = e.currentTarget.dataset.index;
+        var states = th.data.states;
+        var order_list = th.data.tm_order_list;
+        var number = order_list[index].Number;
+        var json = {
+          "number": number,
+          "storeId": a.stoid,
+          "states": 3
+        };
+        var data = JSON.stringify(json);
+        var url = th.data.url + "/api/weshop/marketing/reservation/reservation/update"; //预约接口地址
+        wx.request({
+          url: url,
+          data: data,
+          method: 'put',
+          header: {
+            'content-type': 'application/json'
+          }, // 设置请求的 header
+          success: function(res) {
+            if (res.data.code == 0) {
+              getApp().my_warnning("取消成功", 1, th);
+              var id = th.data.activeCategoryId;
+              if (id == 1) {
+                order_list.splice(index, 1);
+                th.setData({
+                  tm_order_list: order_list
+                })
+              } else {
+                var start = 'tm_order_list[' + index + '].State';
+                th.setData({
+                  [start]: 3
+                })
+              }
+              wx.stopPullDownRefresh(); //停止下拉刷新
+            } else {
+              getApp().my_warnning(res.data.msg, 0, th);
+            }
+          }
+        })
+      })
+
+  },
+  //图片失败，默认图片
+  bind_bnerr1: function(e) {
+    var _errImg = e.target.dataset.errorimg;
+    var _Img = e.target.dataset.img;
+    if (_Img != undefined) {
+      var _errObj = {};
+      _errObj[_errImg] = "/miniapp/images/no_cate_def.png";
+      this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;
+    }
+  },
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function() {
+    var th = this;
+    th.setData({
+      curpage: 1,
+      total: 0,
+      ismore: 0,
+      is_read: 0,
+      tm_order_list: []
+    })
+    th.query_orderList();
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function() {
+    var th = this;
+    if (th.data.total <= th.data.pageSize) return;
+    if (th.data.ismore) return;
+
+    wx.showLoading({
+      title: '加载中...',
+    })
+    th.query_orderList();
+  },
+  //关闭导航
+  close: function() {
+    var th = this;
+    var nav_b = th.selectComponent("#nav_b"); //组件的id
+    nav_b.close_box();
+  }
+
+})
 \ No newline at end of file
+{
+  "navigationBarTitleText": "我的预约",
+  "usingComponents": {
+    "qr_code": "/components/qr_code/qr_code",
+    "warn": "/components/long_warn/long_warn",
+    "my_confirm": "/components/my_confirm/my_confirm",
+    "nav_b": "/components/nav_b/nav_b"
+  }
+}
 \ No newline at end of file
+<view class="container" catchtap="close">
+  <!-- 导航栏 -->
+  <view class="type-navbar padding flex-vertical fs30">
+    <view class="type-box flex-center {{activeCategoryId==item.id?'chtypebox':''}}" wx:for="{{categories}}" bindtap="changeTab" data-id="{{item.id}}">
+      <view>{{item.name}}</view>
+    </view>
+  </view>
+  <view class="itemMax">
+    <!-- 预约项目 -->
+    <view wx:for="{{tm_order_list}}">
+      <!-- 商品编号和状态 -->
+      <view class="Commodity_number flex-vertical-between fs26 padding">
+        <!--商品编号 -->
+        <text class="order_number ellipsis-1" selectable='true'>订单编号：{{item.Number}}</text>
+        <!-- 订单状态 -->
+        <view class="flex-center state">
+          <view wx:if="{{item.State==0}}">未服务</view>
+          <view wx:if="{{item.State==1}}">已服务</view>
+          <view wx:if="{{item.State==2}}">已过期</view>
+          <view wx:if="{{item.State==3}}">已取消</view>
+          <view wx:if="{{item.State==4}}">已评价</view>
+        </view>
+      </view>
+
+      <!-- 项目属性 -->
+      <navigator class="items padding flex-vertical" url="/pages/user/my_service/tment_details?number={{item.Number}}">
+
+        <view class="flex-center fs26">
+          <view class="itemimage">
+            <image class="itemimage" src="{{item.ImageUrl==''?iurl+defimgurl:item.ImageUrl}}" lazy-load="true" data-errorimg="tm_order_list[{{index}}].ImageUrl" binderror="bind_bnerr1" data-img="{{item.ImageUrl}}"></image>
+          </view>
+          <!-- 项目内容 -->
+          <view class="details">
+            <view class="item flex-vertical base">
+              <view class="itemname flex-level-right">预约门店:</view>
+              <view class="itemvalue ellipsis-1">{{item.StorageName}}</view>
+            </view>
+            <view class="item flex-vertical base">
+              <view class="itemname flex-level-right">预约项目:</view>
+              <view class="itemvalue ellipsis-1">{{item.ServiceName}}</view>
+            </view>
+            <view class="item flex-vertical base">
+              <block wx:if="{{item.State==1 || item.State==4}}">
+                <view class="itemname flex-level-right">服务美容师:
+                </view>
+              </block>
+              <block wx:else>
+                <view class="itemname flex-level-right">预约美容师:
+                </view>
+              </block>
+              <view class="itemvalue ellipsis-1">{{item.BeauticianName}}</view>
+            </view>
+            <view class="item flex-vertical base">
+              <view class="itemname flex-level-right">预约时间:</view>
+              <view>{{item.ArrangeTime}}</view>
+            </view>
+            <view class="item flex-vertical base" wx:if="{{item.WriteTime==''?false:true}}">
+              <view class="itemname flex-level-right">服务时间:</view>
+              <view>{{item.WriteTime}}</view>
+            </view>
+          </view>
+
+        </view>
+      </navigator>
+      <view class="Unim flex-right-vertical fs26 padding">
+        <image wx:if="{{item.State==0}}" src="{{iurl}}miniapp/images/order/code.png" class="code" bindtap="code_show" data-order_sn="{{item.Number}}"></image>
+        <block wx:if="{{item.State==0}}">
+          <view class="Unimportance flex-level" data-index="{{index}}" bindtap="cancel_tment">取消预约</view>
+        </block>
+        <block wx:else>
+          <navigator url="/packageA/pages/my_service/tment_details?number={{item.Number}}&userid={{options.userid}}" class="Unimportance flex-level">查看详情</navigator>
+        </block>
+        <navigator wx:if="{{item.State==0}}" class="important Unimportance flex-level" url="/packageA/pages/my_service/beauty_deta?BeauticianID={{item.BeauticianID}}&number={{item.Number}}&itemId={{item.ServiceID}}&modify=1&projectId={{item.ProjectID}}&userid={{options.userid}}">更改时间</navigator>
+        <navigator wx:if="{{item.State==1}}" url="/packageA/pages/my_service/tment_eval?Number={{item.Number}}&evaluate={{0}}&userid={{options.userid}}" class="important Unimportance flex-level">发表评价</navigator>
+        <navigator wx:if="{{item.State==2 || item.State==3}}" url="/packageA/pages/my_service/appment_main?ProjectID={{item.ProjectID}}&BuyType={{item.BuyType}}&service_id={{item.ServiceID}}&userid={{options.userid}}" class="important Unimportance flex-level">重新预约</navigator>
+        <navigator wx:if="{{item.State==4}}" url="/packageA/pages/my_service/tment_eval?Number={{item.Number}}&evaluate={{1}}&userid={{options.userid}}" class="important Unimportance flex-level">评价详情</navigator>
+      </view>
+    </view>
+    <view class="exactly flex-center fs26" wx:if="{{ismore && tm_order_list.length>=3}}">
+      <view class="line"></view>
+      <view class="exactly_text">到底了</view>
+      <view class="line"></view>
+    </view>
+  </view>
+</view>
+
+<!-- 无预约订单 -->
+<view class="empty_order" wx:if="{{tm_order_list.length<1 && is_read}}" catchtap="close">
+  <view class="flex-level">
+    <image src="{{iurl}}miniapp/images/order/empty_order.png" lazy-load="true"></image>
+  </view>
+  <view class="flex-level fs30 xc-ash">无预约记录</view>
+  <view class="flex-level">
+    <navigator url="/pages/user/my_service/i_service" bindtap="goto">
+      <view class="flex-center fs32 white">立即预约</view>
+    </navigator>
+  </view>
+</view>
+<my_confirm id="my_confirm"></my_confirm>
+<!--  制作一个圆球导航  -->
+<nav_b id="nav_b"></nav_b>
+<!-- 弹出框扫描 -->
+<qr_code id="qc_com"></qr_code>
+<warn id="warn"></warn>
 \ No newline at end of file
+page {
+  height: 100%;
+}
+
+.container {
+  background-color: rgb(255, 255, 255);
+}
+
+.type-navbar {
+  border-top: 3rpx solid rgb(221, 221, 221);
+  display: flex;
+  justify-content: space-between;
+  position: fixed;
+  background-color: rgb(255,255,255);
+  width:696rpx;
+}
+.itemMax{
+  margin-top: 93rpx;
+}
+
+.type-box {
+  height: 88rpx;
+  line-height: 88rpx;
+  padding: 0rpx 15rpx;
+  border-bottom: 5rpx solid rgb(255, 255, 255);
+}
+
+.chtypebox {
+  border-bottom: 5rpx solid rgb(224, 18, 18);
+}
+
+.Commodity_number {
+  height: 80rpx;
+  border-top: 13rpx solid rgb(245, 245, 245);
+}
+
+.Commodity_number image {
+  width: 30rpx;
+  height: 32rpx;
+}
+
+.padding {
+  padding: 0rpx 27rpx;
+}
+
+.lin {
+  border-left: 2rpx solid rgb(211, 29, 54);
+  margin-left: 17rpx;
+  margin-right: 14rpx;
+  height: 40rpx;
+}
+
+.order_number {
+  max-width: 550rpx;
+}
+.state{
+  color: rgb(216,63,82);
+}
+.items {
+  border-top: 4rpx solid rgb(245, 245, 245);
+  border-bottom: 4rpx solid rgb(245, 245, 245);
+  height: 260rpx;
+}
+.code{
+  width: 55rpx;
+  height: 55rpx;
+}
+.itemimage {
+  width: 190rpx;
+  height: 190rpx;
+  margin-right: 20rpx;
+  border-radius: 50%;
+ border: 1px solid #eee;
+}
+
+.details {
+  height: 190rpx;
+}
+
+.itemname {
+  width: 150rpx;
+  margin-right: 20rpx;
+}
+
+.itemvalue {
+  max-width: 300rpx;
+}
+
+.Unimportance {
+  width: 140rpx;
+  height: 40rpx;
+  line-height: 40rpx;
+  border-radius: 8rpx;
+  background-color: rgb(255, 255, 255);
+  margin-left: 20rpx;
+  border: 2rpx solid rgb(191, 191, 191);
+}
+
+.important {
+  background-color: rgb(212, 28, 52);
+  border: 2rpx solid rgb(212, 28, 52);
+  color: rgb(255, 255, 255);
+}
+
+.Unim {
+  height: 110rpx;
+}
+
+.exactly {
+  height: 80rpx;
+  background-color: rgb(245, 245, 245);
+}
+
+.exactly_text {
+  margin: 0rpx 15rpx;
+}
+
+.line {
+  border-top: 2rpx solid rgb(0, 0, 0);
+  width: 130rpx;
+}
+
+/* 无预约 */
+
+.empty_order image {
+  width: 300rpx;
+  height: 280rpx;
+  margin-top: 202rpx;
+}
+
+.empty_order .xc-ash {
+  margin-top: 10rpx;
+  font-weight: 600px;
+}
+
+.empty_order navigator {
+  margin-top: 60rpx;
+  border-radius: 40rpx;
+}
+
+.empty_order navigator view {
+  width: 247rpx;
+  height: 65rpx;
+  background-color: rgb(255, 72, 72);
+  border-radius: 40rpx;
+}
+.base{
+  display: flex;
+  height: 38rpx;
+  line-height: 38rpx;
+  align-items: baseline;
+}
 \ No newline at end of file
@@ -239,7 +239,7 @@ Page({
 		var dd = {
 		  store_id: r.stoid,
 		  isstop: 0,
-		  pageSize: 300
+		  pageSize: 2000
 		}
 		th.setData({
 		  sort_store: 0
@@ -251,140 +251,142 @@ Page({
 		  dd.lon = th.data.lon;
 		}
 		//----------获取门店----------------
-		getApp().request.promiseGet("/api/weshop/pickup/list", {
+		getApp().request.get("/api/weshop/pickup/list", {
 		  data: dd,
-		}).then(res => {
-		  var e = res;
-		  if (e.data.code == 0) {
-		    //-- 如果有默认选择门店的时候，要把默认门店放在第一位 --
-		    if (th.data.def_pick_store) {
-		      for (var k = 0; k < e.data.data.pageData.length; k++) {
-		        if (e.data.data.pageData[k].pickup_id == th.data.def_pick_store.pickup_id) {
-		          e.data.data.pageData.splice(k, 1); //删除
-		          break;
-		        }
-		      }
-		      e.data.data.pageData.splice(0, 0, th.data.def_pick_store); //添加
-		    }
-		
-		    //单总量超出5个的时候
-		    if (e.data.data.total > 5) {
-		      i.get("/api/weshop/storagecategory/page", {
-		        data: {
-		          store_id: r.stoid,
-		          is_show: 1,
-		          pageSize: 300
-		        },
-		        success: function(ee) {
-		          if (ee.data.code == 0) {
-		            if (ee.data.data.pageData.length > 0) {
-		              var def_arr = new Array();
-		              var ishas = 0;
-		              //-- 开始就看5个门店 --
-		              for (var k = 0; k < 5; k++) {
-		                if (k == e.data.data.pageData.length) break;
-		                def_arr.push(e.data.data.pageData[k]);
-		              }
-		
-		              th.setData({
-		                def_pickpu_list: def_arr,
-		                pickpu_list: ee.data.data.pageData
-		              });
-		              var sto_cate = ee.data.data.pageData;
-		              var sto_arr = e.data.data.pageData;
-		              var newarr = new Array();
-		              var qita = new Array();
-		
-		              //----要进行门店分组--------
-		              for (var i = 0; i < sto_arr.length; i++) {
-		                //找一下这个门店有没有在分类数组内
-		                var find2 = 0,
-		                  find2name = "";
-		                for (var m = 0; m < sto_cate.length; m++) {
-		                  if (sto_arr[i].category_id == sto_cate[m].cat_id) {
-		                    find2 = sto_cate[m].cat_id;
-		                    find2name = sto_cate[m].cat_name;
-		                    break;
-		                  }
-		                }
-		
-		                if (newarr.length > 0) {
-		                  var find = 0;
-		                  //如果有找到，那门店就在这个分组内，否则，分类就要排在其他
-		                  if (find2 != 0) {
-		                    for (var ii = 0; ii < newarr.length; ii++) {
-		                      if (sto_arr[i].category_id == newarr[ii].cat_id) {
-		                        newarr[ii].s_arr.push(sto_arr[i]);
-		                        find = 1;
-		                        break;
-		                      }
-		                    }
-		                    if (find == 0) {
-		                      var arr0 = new Array();
-		                      arr0.push(sto_arr[i]);
-		                      var item = {
-		                        cat_id: find2,
-		                        name: find2name,
-		                        s_arr: arr0
-		                      };
-		                      newarr.push(item);
-		                    }
-		                  } else {
-		                    qita.push(sto_arr[i]);
-		                  }
-		                } else {
-		                  //如果有找到，那门店就在这个分组内，否则，分类就要排在其他
-		                  if (find2 != 0) {
-		                    var arr0 = new Array();
-		                    arr0.push(sto_arr[i]);
-		                    var item = {
-		                      cat_id: find2,
-		                      name: find2name,
-		                      s_arr: arr0
-		                    };
-		                    newarr.push(item);
-		                  } else {
-		                    qita.push(sto_arr[i]);
-		                  }
-		                }
-		              }
-		
-		              //----安排其他的分类-----
-		              if (qita.length > 0) {
-		                var item = {
-		                  cat_id: -1,
-		                  name: "其他",
-		                  s_arr: qita
-		                };
-		                newarr.push(item);
-		              }
-		              th.setData({
-		                is_show_sto_cat: 1,
-		                all_sto: newarr
-		              });
-		
-		            } else {
-		              th.setData({
-		                is_show_sto_cat: -1,
-		                only_pk: e.data.data.pageData
-		              });
-		            }
-		          } else {
-		            th.setData({
-		              is_show_sto_cat: -1,
-		              only_pk: e.data.data.pageData
-		            });
-		          }
-		        }
-		      });
-		    } else {
-		      th.setData({
-		        is_show_sto_cat: 0,
-		        only_pk: e.data.data.pageData
-		      });
-		    }
+		  success:function(res){
+			  var e = res;
+			  if (e.data.code == 0) {
+			    //-- 如果有默认选择门店的时候，要把默认门店放在第一位 --
+			    if (th.data.def_pick_store) {
+			      for (var k = 0; k < e.data.data.pageData.length; k++) {
+			        if (e.data.data.pageData[k].pickup_id == th.data.def_pick_store.pickup_id) {
+			          e.data.data.pageData.splice(k, 1); //删除
+			          break;
+			        }
+			      }
+			      e.data.data.pageData.splice(0, 0, th.data.def_pick_store); //添加
+			    }
+			  		
+			    //单总量超出5个的时候
+			    if (e.data.data.total > 5) {
+			      i.get("/api/weshop/storagecategory/page", {
+			        data: {
+			          store_id: r.stoid,
+			          is_show: 1,
+			          pageSize: 300
+			        },
+			        success: function(ee) {
+			          if (ee.data.code == 0) {
+			            if (ee.data.data.pageData.length > 0) {
+			              var def_arr = new Array();
+			              var ishas = 0;
+			              //-- 开始就看5个门店 --
+			              for (var k = 0; k < 5; k++) {
+			                if (k == e.data.data.pageData.length) break;
+			                def_arr.push(e.data.data.pageData[k]);
+			              }
+			  		
+			              th.setData({
+			                def_pickpu_list: def_arr,
+			                pickpu_list: ee.data.data.pageData
+			              });
+			              var sto_cate = ee.data.data.pageData;
+			              var sto_arr = e.data.data.pageData;
+			              var newarr = new Array();
+			              var qita = new Array();
+			  		
+			              //----要进行门店分组--------
+			              for (var i = 0; i < sto_arr.length; i++) {
+			                //找一下这个门店有没有在分类数组内
+			                var find2 = 0,
+			                  find2name = "";
+			                for (var m = 0; m < sto_cate.length; m++) {
+			                  if (sto_arr[i].category_id == sto_cate[m].cat_id) {
+			                    find2 = sto_cate[m].cat_id;
+			                    find2name = sto_cate[m].cat_name;
+			                    break;
+			                  }
+			                }
+			  		
+			                if (newarr.length > 0) {
+			                  var find = 0;
+			                  //如果有找到，那门店就在这个分组内，否则，分类就要排在其他
+			                  if (find2 != 0) {
+			                    for (var ii = 0; ii < newarr.length; ii++) {
+			                      if (sto_arr[i].category_id == newarr[ii].cat_id) {
+			                        newarr[ii].s_arr.push(sto_arr[i]);
+			                        find = 1;
+			                        break;
+			                      }
+			                    }
+			                    if (find == 0) {
+			                      var arr0 = new Array();
+			                      arr0.push(sto_arr[i]);
+			                      var item = {
+			                        cat_id: find2,
+			                        name: find2name,
+			                        s_arr: arr0
+			                      };
+			                      newarr.push(item);
+			                    }
+			                  } else {
+			                    qita.push(sto_arr[i]);
+			                  }
+			                } else {
+			                  //如果有找到，那门店就在这个分组内，否则，分类就要排在其他
+			                  if (find2 != 0) {
+			                    var arr0 = new Array();
+			                    arr0.push(sto_arr[i]);
+			                    var item = {
+			                      cat_id: find2,
+			                      name: find2name,
+			                      s_arr: arr0
+			                    };
+			                    newarr.push(item);
+			                  } else {
+			                    qita.push(sto_arr[i]);
+			                  }
+			                }
+			              }
+			  		
+			              //----安排其他的分类-----
+			              if (qita.length > 0) {
+			                var item = {
+			                  cat_id: -1,
+			                  name: "其他",
+			                  s_arr: qita
+			                };
+			                newarr.push(item);
+			              }
+			              th.setData({
+			                is_show_sto_cat: 1,
+			                all_sto: newarr
+			              });
+			  		
+			            } else {
+			              th.setData({
+			                is_show_sto_cat: -1,
+			                only_pk: e.data.data.pageData
+			              });
+			            }
+			          } else {
+			            th.setData({
+			              is_show_sto_cat: -1,
+			              only_pk: e.data.data.pageData
+			            });
+			          }
+			        }
+			      });
+			    } else {
+			      th.setData({
+			        is_show_sto_cat: 0,
+			        only_pk: e.data.data.pageData
+			      });
+			    }
+			  }
+			  		
 		  }
-		}, 200)	
+		})	
  
   },
  
+{
+	"navigationBarTitleText": "门店详情"
+}
 \ No newline at end of file
+<view class="container">
+	<!-- 轮播图 -->
+	<view class="swiper-container">
+		<swiper
+		 indicator-dots
+		 autoplay
+		 circular>
+			<swiper-item><image class="img" src="https://ss2.bdstatic.com/70cFvnSh_Q1YnxGkpoWK1HF6hhy/it/u=2841289551,2117307057&fm=26&gp=0.jpg"></image></swiper-item>
+			<swiper-item><image class="img" src="https://ss3.bdstatic.com/70cFv8Sh_Q1YnxGkpoWK1HF6hhy/it/u=1399951667,129331942&fm=26&gp=0.jpg"></image></swiper-item>
+		</swiper>
+	</view>
+	
+	<view class="shop-container">
+		<!-- 地址 -->
+		<view class="address-container section flex">
+			<view class="left">
+				<view>{{shop.pickup_name}}</view>
+				<view class="address">{{shop.fulladdress}}</view>
+			</view>
+			<view class="right">
+				<view class="btn btn-nav"><text class="iconfont icon-daohang"></text>导航</view>
+				<view class="distance">999.0千米</view>
+			</view>
+		</view>
+		
+		<!-- 电话 -->
+		<view class="section flex">
+			<view>{{shop.pickup_phone}}</view>
+			<view class="btn btn-phone" bindtap="onPhone"><text class="iconfont icon-phone"></text>电话</view>
+		</view>
+	</view>
+</view>
 \ No newline at end of file
+page {
+	height: 100%;
+	background-color: #F7F7F7;
+}
+.container {
+	background-color: white;
+}
+.swiper-container {
+	background-color: pink;
+}
+.img {
+	display: block;
+	width: 100%;
+	height: 100%;
+}
+.shop-container {
+	padding: 0 30rpx;
+}
+
+.address-container {
+	align-items: center;
+}
+
+.left {
+	padding-right: 40rpx;
+}
+
+.address {
+	color: #6E6E6E;
+	font-size: 26rpx;
+	text-align: justify;
+	padding-top: 20rpx;
+}
+
+.distance {
+	padding-top: 20rpx;
+	color: #6E6E6E;
+	font-size: 26rpx;
+	text-align: right;
+}
+
+.right {
+	flex-shrink: 0;
+	text-align: right;
+}
+
+
+.btn {
+	display: inline-block;
+	height: 60rpx;
+	line-height: 60rpx;
+	padding: 0 30rpx;
+	border-radius: 30rpx;
+	border: 2rpx solid #B0B0B0;
+	font-size: 26rpx;
+}
+
+
+
+
+.section {
+	align-items: center;
+	justify-content: space-between;
+	padding: 36rpx 0;
+	border-bottom: 2rpx solid #F0F0F0;
+}
+
+.section:last-child {
+	border-bottom: none;
+}
+
+.iconfont {
+	margin-right: 20rpx;
+	font-size: 28rpx;
+}
 \ No newline at end of file
+// packageA//pages/text/text.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  }
+})
 \ No newline at end of file
+{
+  "usingComponents": {}
+}
 \ No newline at end of file
+<!--packageA//pages/text/text.wxml-->
+<text>packageA//pages/text/text.wxml</text>
+/* packageA//pages/text/text.wxss */
 \ No newline at end of file
@@ -267,13 +267,22 @@ Page({
                             var isok = 1;
                             await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + item.goods_id + "/1", {}).then(res => {
                                 if (res.data.code == 0) {
-                                    var r_data = res.data.data;
+                                    var r_data = res.data.data;									
                                     if (!r_data.promGoodsLists) {
                                         var url = '/api/weshop/cart/del/' + oo.stoid + '/' + item.id;
                                         getApp().request.delete(url, {});
-                                        //商品已经下架
+                                        //商品已经无活动
                                         isok = 0;
-                                    }
+                                    }else{
+										//如果活动的ID不一样，说明原先的活动已经没有参与了或者过期了
+										if(item.prom_id!=r_data.promGoodsLists[0].prom_id ){
+											var url = '/api/weshop/cart/del/' + oo.stoid + '/' + item.id;
+											getApp().request.delete(url, {});
+											//商品已经下架
+											isok = 0;
+										}
+									}
+																			
                                 } else {
                                     var url = '/api/weshop/cart/del/' + oo.stoid + '/' + item.id;
                                     getApp().request.delete(url, {});
@@ -490,6 +490,11 @@ Page({
             return false;
           }
         }
+		
+		//阶梯团强制带1，自提~~~
+		if(th.data.kt_type==3 ){
+			th.data.bn_exp_type=1;
+		}
  
         var item={
           'user_id': to.globalData.user_id,
@@ -2086,7 +2086,7 @@ Page({
       var e = res;
       if (e.data.code == 0) arrdata = e.data.data.pageData;
     })
-    if(!arrdata) return fasle;
+    if(!arrdata) return false;
  
     var arrsku = new Array();
     var gitem = null;
@@ -26,6 +26,7 @@ Page({
  
 				searchRecord: [],
 				keyword: '',
+				is_his:0,
     },
  
     onLoad: function(t) {
@@ -282,7 +283,8 @@ Page({
 	 historyRecord() {
 		let self = this;
 	 	let keyword = this.data.key_str;
-	 	let searchRecord = this.data.searchRecord;
+	 	let searchRecord = this.data.searchRecord;	
+		if(!searchRecord || searchRecord.length==0) searchRecord=wx.getStorageSync('searchRecord') || [];
  
 	 	if(keyword) {
 	 		if(searchRecord.indexOf(keyword) > -1) {
 {
   "navigationBarTitleText": "服务项目",
+	"enablePullDownRefresh": false,
   "usingComponents": {
     "qr_code": "/components/qr_code/qr_code",
     "warn": "/components/long_warn/long_warn",
@@ -96,4 +96,8 @@
 <!-- 弹出框扫描 -->
 <qr_code id="qc_com"></qr_code>
 <warn id="warn"></warn>
-<my_confirm id="my_confirm"></my_confirm>
 \ No newline at end of file
+<my_confirm id="my_confirm"></my_confirm>
+
+
+<!-- 批量预约图标 -->
+<view class="icon-container" bindtap="goto" data-url="/packageA/pages/my_service2/appment_main"><text class="iconfont icon-plyy"></text></view>
 \ No newline at end of file
@@ -166,3 +166,18 @@ page {
   margin: 0rpx 15rpx;
 	color: #ccc;
 }
+
+.icon-container {
+	position: fixed;
+	right: 10rpx;
+	bottom: 440rpx;
+	background-color: #272636;
+	color: white;
+	width: 80rpx;
+	height: 80rpx;
+	border-radius: 50%;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	z-index: 999;
+}
@@ -287,7 +287,7 @@ Page({
 		var dd = {
 		  store_id: r.stoid,
 		  isstop: 0,
-		  pageSize: 300
+		  pageSize: 2000
 		}
 		th.setData({
 		  sort_store: 0
@@ -299,140 +299,141 @@ Page({
 		  dd.lon = th.data.lon;
 		}
 		//----------获取门店----------------
-		getApp().request.promiseGet("/api/weshop/pickup/list", {
+		getApp().request.get("/api/weshop/pickup/list", {
 		  data: dd,
-		}).then(res => {
-		  var e = res;
-		  if (e.data.code == 0) {
-		    //-- 如果有默认选择门店的时候，要把默认门店放在第一位 --
-		    if (th.data.def_pick_store) {
-		      for (var k = 0; k < e.data.data.pageData.length; k++) {
-		        if (e.data.data.pageData[k].pickup_id == th.data.def_pick_store.pickup_id) {
-		          e.data.data.pageData.splice(k, 1); //删除
-		          break;
-		        }
-		      }
-		      e.data.data.pageData.splice(0, 0, th.data.def_pick_store); //添加
-		    }
-		
-		    //单总量超出5个的时候
-		    if (e.data.data.total > 5) {
-		      i.get("/api/weshop/storagecategory/page", {
-		        data: {
-		          store_id: r.stoid,
-		          is_show: 1,
-		          pageSize: 300
-		        },
-		        success: function(ee) {
-		          if (ee.data.code == 0) {
-		            if (ee.data.data.pageData.length > 0) {
-		              var def_arr = new Array();
-		              var ishas = 0;
-		              //-- 开始就看5个门店 --
-		              for (var k = 0; k < 5; k++) {
-		                if (k == e.data.data.pageData.length) break;
-		                def_arr.push(e.data.data.pageData[k]);
-		              }
-		
-		              th.setData({
-		                def_pickpu_list: def_arr,
-		                pickpu_list: ee.data.data.pageData
-		              });
-		              var sto_cate = ee.data.data.pageData;
-		              var sto_arr = e.data.data.pageData;
-		              var newarr = new Array();
-		              var qita = new Array();
-		
-		              //----要进行门店分组--------
-		              for (var i = 0; i < sto_arr.length; i++) {
-		                //找一下这个门店有没有在分类数组内
-		                var find2 = 0,
-		                  find2name = "";
-		                for (var m = 0; m < sto_cate.length; m++) {
-		                  if (sto_arr[i].category_id == sto_cate[m].cat_id) {
-		                    find2 = sto_cate[m].cat_id;
-		                    find2name = sto_cate[m].cat_name;
-		                    break;
-		                  }
-		                }
-		
-		                if (newarr.length > 0) {
-		                  var find = 0;
-		                  //如果有找到，那门店就在这个分组内，否则，分类就要排在其他
-		                  if (find2 != 0) {
-		                    for (var ii = 0; ii < newarr.length; ii++) {
-		                      if (sto_arr[i].category_id == newarr[ii].cat_id) {
-		                        newarr[ii].s_arr.push(sto_arr[i]);
-		                        find = 1;
-		                        break;
-		                      }
-		                    }
-		                    if (find == 0) {
-		                      var arr0 = new Array();
-		                      arr0.push(sto_arr[i]);
-		                      var item = {
-		                        cat_id: find2,
-		                        name: find2name,
-		                        s_arr: arr0
-		                      };
-		                      newarr.push(item);
-		                    }
-		                  } else {
-		                    qita.push(sto_arr[i]);
-		                  }
-		                } else {
-		                  //如果有找到，那门店就在这个分组内，否则，分类就要排在其他
-		                  if (find2 != 0) {
-		                    var arr0 = new Array();
-		                    arr0.push(sto_arr[i]);
-		                    var item = {
-		                      cat_id: find2,
-		                      name: find2name,
-		                      s_arr: arr0
-		                    };
-		                    newarr.push(item);
-		                  } else {
-		                    qita.push(sto_arr[i]);
-		                  }
-		                }
-		              }
-		
-		              //----安排其他的分类-----
-		              if (qita.length > 0) {
-		                var item = {
-		                  cat_id: -1,
-		                  name: "其他",
-		                  s_arr: qita
-		                };
-		                newarr.push(item);
-		              }
-		              th.setData({
-		                is_show_sto_cat: 1,
-		                all_sto: newarr
-		              });
-		
-		            } else {
-		              th.setData({
-		                is_show_sto_cat: -1,
-		                only_pk: e.data.data.pageData
-		              });
-		            }
-		          } else {
-		            th.setData({
-		              is_show_sto_cat: -1,
-		              only_pk: e.data.data.pageData
-		            });
-		          }
-		        }
-		      });
-		    } else {
-		      th.setData({
-		        is_show_sto_cat: 0,
-		        only_pk: e.data.data.pageData
-		      });
-		    }
-		  }
-		}, 200)		 
+		  success:function(res){
+			    var e = res;
+			    if (e.data.code == 0) {
+			      //-- 如果有默认选择门店的时候，要把默认门店放在第一位 --
+			      if (th.data.def_pick_store) {
+			        for (var k = 0; k < e.data.data.pageData.length; k++) {
+			          if (e.data.data.pageData[k].pickup_id == th.data.def_pick_store.pickup_id) {
+			            e.data.data.pageData.splice(k, 1); //删除
+			            break;
+			          }
+			        }
+			        e.data.data.pageData.splice(0, 0, th.data.def_pick_store); //添加
+			      }
+			    		
+			      //单总量超出5个的时候
+			      if (e.data.data.total > 5) {
+			        i.get("/api/weshop/storagecategory/page", {
+			          data: {
+			            store_id: r.stoid,
+			            is_show: 1,
+			            pageSize: 300
+			          },
+			          success: function(ee) {
+			            if (ee.data.code == 0) {
+			              if (ee.data.data.pageData.length > 0) {
+			                var def_arr = new Array();
+			                var ishas = 0;
+			                //-- 开始就看5个门店 --
+			                for (var k = 0; k < 5; k++) {
+			                  if (k == e.data.data.pageData.length) break;
+			                  def_arr.push(e.data.data.pageData[k]);
+			                }
+			    		
+			                th.setData({
+			                  def_pickpu_list: def_arr,
+			                  pickpu_list: ee.data.data.pageData
+			                });
+			                var sto_cate = ee.data.data.pageData;
+			                var sto_arr = e.data.data.pageData;
+			                var newarr = new Array();
+			                var qita = new Array();
+			    		
+			                //----要进行门店分组--------
+			                for (var i = 0; i < sto_arr.length; i++) {
+			                  //找一下这个门店有没有在分类数组内
+			                  var find2 = 0,
+			                    find2name = "";
+			                  for (var m = 0; m < sto_cate.length; m++) {
+			                    if (sto_arr[i].category_id == sto_cate[m].cat_id) {
+			                      find2 = sto_cate[m].cat_id;
+			                      find2name = sto_cate[m].cat_name;
+			                      break;
+			                    }
+			                  }
+			    		
+			                  if (newarr.length > 0) {
+			                    var find = 0;
+			                    //如果有找到，那门店就在这个分组内，否则，分类就要排在其他
+			                    if (find2 != 0) {
+			                      for (var ii = 0; ii < newarr.length; ii++) {
+			                        if (sto_arr[i].category_id == newarr[ii].cat_id) {
+			                          newarr[ii].s_arr.push(sto_arr[i]);
+			                          find = 1;
+			                          break;
+			                        }
+			                      }
+			                      if (find == 0) {
+			                        var arr0 = new Array();
+			                        arr0.push(sto_arr[i]);
+			                        var item = {
+			                          cat_id: find2,
+			                          name: find2name,
+			                          s_arr: arr0
+			                        };
+			                        newarr.push(item);
+			                      }
+			                    } else {
+			                      qita.push(sto_arr[i]);
+			                    }
+			                  } else {
+			                    //如果有找到，那门店就在这个分组内，否则，分类就要排在其他
+			                    if (find2 != 0) {
+			                      var arr0 = new Array();
+			                      arr0.push(sto_arr[i]);
+			                      var item = {
+			                        cat_id: find2,
+			                        name: find2name,
+			                        s_arr: arr0
+			                      };
+			                      newarr.push(item);
+			                    } else {
+			                      qita.push(sto_arr[i]);
+			                    }
+			                  }
+			                }
+			    		
+			                //----安排其他的分类-----
+			                if (qita.length > 0) {
+			                  var item = {
+			                    cat_id: -1,
+			                    name: "其他",
+			                    s_arr: qita
+			                  };
+			                  newarr.push(item);
+			                }
+			                th.setData({
+			                  is_show_sto_cat: 1,
+			                  all_sto: newarr
+			                });
+			    		
+			              } else {
+			                th.setData({
+			                  is_show_sto_cat: -1,
+			                  only_pk: e.data.data.pageData
+			                });
+			              }
+			            } else {
+			              th.setData({
+			                is_show_sto_cat: -1,
+			                only_pk: e.data.data.pageData
+			              });
+			            }
+			          }
+			        });
+			      } else {
+			        th.setData({
+			          is_show_sto_cat: 0,
+			          only_pk: e.data.data.pageData
+			        });
+			      }
+			    }
+		  }	  
+		})	 
  
 	},2)