修改卡项列表、历史预约、服务项目、预约服务

taiyuan
1 parent e662d353
Showing 11 changed files with 55 additions and 25 deletions
components/diy_nav/diy_nav.js
packageA/pages/cardList/cardList.js
packageA/pages/cardList/cardList.wxml
packageA/pages/cardList/cardList.wxss
packageA/pages/my_service/appment_main.js
packageA/pages/my_service/hist_service.js
packageA/pages/my_service/i_service.js
packageA/pages/my_service/i_service.wxml
packageA/pages/service_record/service_record.js
packageA/pages/shop_details/shop_details.js
pages/user/my_service/i_service.wxml
@@ -46,7 +46,8 @@ Component({
     //智能跳转
     go_url:function (e) {
        var url=e.currentTarget.dataset.url;
-       getApp().goto(url);
+			 console.log('url==>', url);
+       // getApp().goto(url);
     }
   }
 })
 \ No newline at end of file
@@ -16,6 +16,8 @@ Page({
 		currentQuery: {
 			store_id: app.globalData.setting.stoid,
 		},
+		
+		default_img: '/miniapp/images/default_g_img.gif',
   },
  
   /**
 <view class="page">
 	<swiper class="swiper" autoplay indicator-dots circular easing-function="easeOutCubic">
-		<swiper-item wx:for="{{banner}}"><image src="{{item.ad_code}}" class="swiper-img"/></swiper-item>
+		<swiper-item wx:for="{{banner}}"><image src="{{item.ad_code ? item.ad_code : (imghost + default_img)}}" class="swiper-img"/></swiper-item>
 		<!-- <swiper-item>234</swiper-item>
 		<swiper-item>345</swiper-item> -->
 	</swiper>
@@ -26,6 +26,6 @@
 			<nodata class="t-c" wx:if="{{list.pageData.length == 0 || list == null}}"></nodata>
 		</view>
 		<!-- <nodata class="t-c" wx:if="{{list.pageData.length == 0  && list.pageData}}"></nodata> -->
-		<view class="noMore" hidden="{{!noMore}}" wx:if="{{list.pageData.length !== 0}}">- 已经到底了 -</view>
+		<view class="noMore">- 已经到底了 -</view>
 	</scroll-view>
 </view>
@@ -20,7 +20,7 @@ page {
 	display: block;
 	width: 240rpx;
 	height: 240rpx;
-	background-color: pink;
+	/* background-color: pink; */
 }
  
 .price {
@@ -96,7 +96,7 @@ Page({
     var buyType = th.data.buyType; //服务项目类型
     var storeId = a.stoid; //商家id
     var storageId = th.data.storageId; //门店id
-    var userId = d.user_id; //用户id
+    var userId = th.data.options.userid; //用户id
     var remarks = th.data.remarks; //用户备注
     var project_id = th.data.project_id; //项目id
     var validay = th.data.validay;
@@ -153,7 +153,7 @@ Page({
             "page": "/pages/user/my_service/tment_details?number=" + number,
             "storeId": a.stoid,
             "typeId": "1011",
-            "userId": d.user_id
+            "userId": th.data.options.userid
           };
           var data = JSON.stringify(json);
           //调用发送预约成功模版接口
@@ -373,7 +373,7 @@ Page({
     key_word = key_word.replace(/\s+/g, "");
     getApp().request.promiseGet(url, {
       data: {
-		userId:getApp().globalData.user_id,  
+				userId: th.data.options.userid,  
         storeId: a.stoid,
         serviceId: itemId,
         latitude: th.data.lat,
@@ -428,7 +428,7 @@ Page({
 	  getApp().request.promiseGet(url, {
         data: {
           storeId: a.stoid,
-          userId: d.user_id,
+          userId: th.data.options.userid,
           serviceId: itemid,
           storageId: storageId
         }
@@ -527,6 +527,7 @@ Page({
   onLoad: function(options) {
     var th = this;
     th.setData({
+			options,
       itemId: options.service_id,
       buyType: options.BuyType,
       project_id: options.ProjectID,
@@ -564,16 +565,18 @@ Page({
 		// 获取当前默认导购信息及归属门店信息
 		getApp().request.promiseGet('/api/weshop/shoppingGuide/geIdStaffInfo', {
 		  data: {
-		    store_id: 1,
-		    guide_id: 73,
-				UserCode: '01',
+		    store_id: a.stoid,
+		    guide_id: e.globalData.guide_id,
+				UserCode: th.data.options.usercode,
 		  }
 		}).then(res => {
-		  console.log('res==>', res.data.data);
-			th.setData({
-				store_name: res.data.data.StorageName,
-				beautician_name: res.data.data.StaffName,
-			});
+		  console.log('res==>', a.stoid, e.globalData.guide_id, th.data.options.usercode);
+			if(res.data.data.Tech) {
+				th.setData({
+					store_name: res.data.data.StorageName,
+					beautician_name: res.data.data.StaffName,
+				});
+			}
 		});
  
   },
@@ -630,7 +633,7 @@ Page({
     getApp().request.promiseGet(url, {
       data: {
         storeId: a.stoid,
-        userId: d.user_id,
+        userId: th.data.options.userid,
         projectId: project_id
       }
     }).then(res => {
@@ -120,7 +120,7 @@ Page({
     getApp().request.promiseGet(url, {
       data: {
         storeId: a.stoid,
-        userId: this.data.options.userid,
+        userId: th.data.options.userid,
         beginDate: startTime,
         endDate: endTime,
         page: th.data.curpage,
@@ -40,7 +40,10 @@ Page({
 			options,
     });
     var th = this;
-    th.query_service();
+		// if(options.UserId) {
+			th.query_service();
+		// };
+    
   },
   /**
    * 生命周期函数--监听页面显示
 <!-- 背景图片 -->
 <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" style="left:10px;right:auto;" data-userid="{{options.UserId}}">服务记录</navigator>
-	<navigator class="History fs26" url="/packageA/pages/my_service/hist_service" data-userid="{{options.UserId}}">历史预约</navigator>
+	<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>
  
 <!-- 预约内容 -->
@@ -50,7 +50,7 @@
 		  <!-- <view class="flex-level Use" bindtap="open_fw" data-ind="{{index}}" data-service_id="{{item.ServiceID}}">
 		    <view>帮你预约</view>
 		  </view> -->
-		  <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}}" bindtap="correcting" data-service_id="{{item.ServiceID}}" data-project_id="{{item.ProjectID}}">
+		  <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}}" bindtap="correcting" data-service_id="{{item.ServiceID}}" data-project_id="{{item.ProjectID}}">
 		    <view>帮你预约</view>
 		  </view>
 		</view>
@@ -28,6 +28,7 @@ Page({
   },
  
   onShow: function() {
+		reqData.url = '/api/weshop/marketing/servicewrite/page';
 		reqData.data = {
 			storeId: app.globalData.setting.stoid,
 		};
@@ -39,8 +40,6 @@ Page({
 			reqData.data.userId = app.globalData.user_id;
 			this.isLogin()
 			.then(function(data) {
-				reqData.url = '/api/weshop/marketing/servicewrite/page';
-				
 				_this.getData(true, reqData.url, reqData.data);
 			});
 		};
+Page({
+	data: {
+		shop: null,
+	},
+
+	onLoad(options) {
+		let shop = JSON.parse(decodeURIComponent(options.shop))
+		this.setData({
+			shop: shop,
+		});
+	},
+	
+	// 监听拨打电话
+	onPhone() {
+		wx.makePhoneCall({
+			phoneNumber: this.data.shop.pickup_phone,
+		})
+	},
+	
+})
 \ No newline at end of file
@@ -65,6 +65,7 @@
     <view class="end fs26 xc-black">到底了</view>
     <view class="Line"></view>
   </view>
+	<!-- <view class="After_all flex-center" wx:if="{{ismore && service_List.length>=6}}">选择更多服务卡项，</view> -->
 </view>
 <!-- 无服务项目 -->
 <view wx:if="{{service_List.length<1 && is_service_read}}">
@@ -75,7 +76,8 @@
     <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 fs30 xc-ash">暂无服务项目</view> -->
+		<view class="flex-level fs30 xc-ash">暂无服务卡项，<text class="ctb" data-url="/packageA/pages/cardList/cardList" bindtap="goto">立即购买！</text></view>
     <view class="flex-level">
       <navigator data-url="/pages/user/index/index" bindtap="goto">
         <view class="flex-center fs28 white">回到首页</view>