Merge branch 'dev' into 'test'

Dev See merge request !631

Merge branch 'dev' into 'test'
Dev See merge request !631
后端研发-苏明海
2 parents 2ef45846 41e2d97d
Showing 11 changed files with 66 additions and 33 deletions
app.json
packageA/pages/my_service/appment_main.json
packageA/pages/my_service/appment_main.wxml
packageA/pages/my_service/hist_service.js
packageA/pages/my_service/i_service.js
packageA/pages/my_service/i_service.json
packageA/pages/my_service/i_service.wxml
packageA/pages/my_service/my_service.js
packageA/pages/my_service/my_service.wxml
packageA/pages/service_record/service_record.js
pages/distribution/distribution.js
@@ -121,7 +121,6 @@
 				 "pages/hongBaoDetails/hongBaoDetails",
 				 "pages/service_record/service_record",
 				 "pages/checkin/checkin",
-				 "pages/distribution/main/main",
 				 "pages/distribution/myteam/myteam",
 				 "pages/distribution/order/order",
 				 "pages/distribution/commision/commision",
@@ -132,7 +131,15 @@
 				 "pages/distribution/rookie/rookie",
 				 "pages/service_share/service_share",
 				 "pages/cardList/cardList",
-				 "pages/cardDetails/cardDetails"
+				 "pages/goodsInfo/goodsInfo",
+				 "pages/my_service/appment_main",
+				 "pages/my_service/i_service",
+				 "pages/my_service/cosmetology_list",
+				 "pages/my_service/hist_service",
+				 "pages/my_service/tment_details",
+				 "pages/my_service/tment_eval",
+				 "pages/my_service/tment_order_list",
+				 "pages/my_service/beauty_deta"
       ]
   }],
 {
   "navigationBarTitleText": "预约服务",
-    "usingComponents": {
-      "warn": "/components/long_warn/long_warn",
-      "nav_b": "/components/nav_b/nav_b"
-    }
+	"enablePullDownRefresh": false,
+	"usingComponents": {
+		"warn": "/components/long_warn/long_warn",
+		"nav_b": "/components/nav_b/nav_b"
+	}
 }
 \ No newline at end of file
@@ -83,14 +83,12 @@
       <view>注：剩余可预约人数{{tment_count}}人</view>
     </view>
-    <view class="submitMax flex-space-between fs32">
-      <navigator class="appment flex-center" url="/pages/user/my_service/tment_order_list">
+    <view class="submitMax flex-space-center fs32">
+      <!-- <navigator class="appment flex-center" url="/pages/user/my_service/tment_order_list">
         <view>我的预约</view>
-      </navigator>
+      </navigator> -->
       <form report-submit='true' bindtap="sub_success">
-        <button form-type="submit" class="sub_appment flex-center">
-          <view>提交预约</view>
-        </button>
+        <button form-type="submit" class="sub_appment flex-center">帮你预约</button>
         </form>
     </view>
   </view>
@@ -69,6 +69,10 @@ Page({
    */
   onLoad: function(options) {
     var th = this;
+		// console.log('xxoptions==>', options);
+		this.setData({
+			options,
+		});
     th.query_hist();
   },
   /**
@@ -116,7 +120,7 @@ Page({
     getApp().request.promiseGet(url, {
       data: {
         storeId: a.stoid,
-        userId: d.user_id,
+        userId: this.data.options.userid,
         beginDate: startTime,
         endDate: endTime,
         page: th.data.curpage,
@@ -29,13 +29,15 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function(options) {
+		console.log('options==>', options);
     var userinfo = getApp().globalData.userInfo;
     if (userinfo == null) {
       //界面必须使用warn 做ID,并调用
-      return false;
-    }
+      // return false;
+    };
     this.setData({
-      userinfo: userinfo
+      userinfo: userinfo,
+			options,
     });
     var th = this;
     th.query_service();
@@ -48,6 +50,7 @@ Page({
     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;
@@ -65,7 +68,7 @@ Page({
     getApp().request.promiseGet(url, {
       data: {
         storeId: a.stoid,
-        userId: d.user_id,
+        userId: th.data.options.UserId,
         page: th.data.curpage,
         pageSize: th.data.pageSize
       }
@@ -113,7 +116,7 @@ Page({
       data: {
         serviceId: service_id,
         storeId: a.stoid,
-        userId: d.user_id
+        userId: th.data.options.UserId,
       }
     }).then(res => {
       wx.hideLoading();
@@ -190,7 +193,7 @@ Page({
         data: {
           serviceId: service_id,
           storeId: a.stoid,
-          userId: d.user_id
+          userId: th.data.options.UserId,
         }
       }).then(res => {
         wx.hideLoading();
@@ -221,7 +224,7 @@ Page({
                     projectId: project_id,
                     serviceId: service_id,
                     storeId: a.stoid,
-                    userId: d.user_id
+                    userId:  th.data.options.UserId,
                   }
                 }).then(res => {
                   if (res.data.code == 0) {
 {
   "navigationBarTitleText": "服务项目",
+	"enablePullDownRefresh": false,
   "usingComponents": {
     "qr_code": "/components/qr_code/qr_code",
     "warn": "/components/long_warn/long_warn",
 <!-- 背景图片 -->
 <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;">服务记录</navigator>
-	<navigator class="History fs26" url="/pages/user/my_service/hist_service">历史预约</navigator>
+	<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>
 </view>
 <!-- 预约内容 -->
@@ -14,10 +14,11 @@ Page({
 		endDate: '结束日期',
   },
-  onLoad: function(t) {
+  onLoad: function(options) {
 		_this = this;
 		this.setData({
+			options,
 			currentDate: this.currentDate(),	
 		});
@@ -27,15 +28,23 @@ Page({
   },
   onShow: function() {
-    this.isLogin()
-    .then(function(data) {
-    	reqData.url = '/api/weshop/marketing/servicewrite/page';
-    	reqData.data = {
-    		storeId: app.globalData.setting.stoid,
-    		userId: app.globalData.user_id,
-    	};
-    	_this.getData(true, reqData.url, reqData.data);
-    });
+		reqData.data = {
+			storeId: app.globalData.setting.stoid,
+		};
+		
+		if(this.data.options.userid) {
+			reqData.data.userId = this.data.options.userid;
+			_this.getData(true, reqData.url, reqData.data);
+		} else {
+			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);
+			});
+		};
+    
   },
@@ -268,7 +268,17 @@ Page({
 				    mobile: mobile,
 				  },
 				  success: function (res) {  	
-					  var showtxt=res.data.msg;     						
+					  var showtxt=res.data.msg;     
+										  
+					  if(!res.data.data){
+						  wx.showToast({
+						    title: showtxt,
+						    icon: 'none',
+						    duration: 1500
+						  }); 
+						  return false;
+					  }						  
+											  
 					  if(res.data.data.indexOf('已成为分销商')!=-1){					  
 						  showtxt="成功成为分销商";
 						  var txt="fenxiao["+index+"].pass";