diff --git a/pages/user/my_service/appment_main.js b/pages/user/my_service/appment_main.js
index 0cfbbbc..8ac5f77 100644
--- a/pages/user/my_service/appment_main.js
+++ b/pages/user/my_service/appment_main.js
@@ -88,122 +88,104 @@ Page({
     var th = this;
     var store = th.data.store_name; //门店名称
     var bea_name = th.data.beautician_name; //美容师名称
-    var time = th.data.time + ":00"; //预约时间
+    var time = th.data.time; //预约时间
     var is_sub = th.data.is_sub; //是否重复提交
-    //提交预约前的判断
-    if (store == "") {
-      getApp().my_warnning("请选择服务门店", 0, th);
-      th.settime();
-      return false;
-    } else if (bea_name == "") {
-      getApp().my_warnning("请选择美容师", 0, th);
-      th.settime();
-      return false;
-    } else if (time == "") {
-      getApp().my_warnning("请选择预约时间", 0, th);
-      th.settime();
-      return false;
-    } else {
-      wx.showLoading({
-        title: '加载中',
-      })
-      var url = th.data.inurl + "/api/weshop/marketing/reservation/reservation/insert"; //接口路径
-      var serviceId = th.data.itemId; //服务id
-      var beauticianID = th.data.beauticianID; //美容师id
-      var buyType = th.data.buyType; //服务项目类型
-      var storeId = a.stoid; //商家id
-      var storageId = th.data.storageId; //门店id
-      var userId = d.user_id; //用户id
-      var remarks = th.data.remarks; //用户备注
-      var project_id = th.data.project_id; //项目id
-      var validay = th.data.validay;
-      var json = {
-        "arrangeTime": time,
-        "beauticianId": beauticianID,
-        "buyType": buyType,
-        "effectiveDay": "",
-        "number": "",
-        "projectId": project_id,
-        "remark": remarks,
-        "serviceId": serviceId,
-        "states": 0,
-        "storageId": storageId,
-        "storeId": storeId,
-        "userId": userId,
-        "validay": validay
-      }
-      var data = JSON.stringify(json);
-      wx.request({
-        url: url,
-        data: json,
-        method: 'post',
-        header: {
-          'content-type': 'application/json'
-        }, // 设置请求的 header
-        success: function(res) {
-          th.setData({
-            is_sub: 0
+    wx.showLoading({
+      title: '加载中',
+    })
+    var url = th.data.inurl + "/api/weshop/marketing/reservation/reservation/insert"; //接口路径
+    var serviceId = th.data.itemId; //服务id
+    var beauticianID = th.data.beauticianID; //美容师id
+    var buyType = th.data.buyType; //服务项目类型
+    var storeId = a.stoid; //商家id
+    var storageId = th.data.storageId; //门店id
+    var userId = d.user_id; //用户id
+    var remarks = th.data.remarks; //用户备注
+    var project_id = th.data.project_id; //项目id
+    var validay = th.data.validay;
+    var json = {
+      "arrangeTime": time + ":00",
+      "beauticianId": beauticianID,
+      "buyType": buyType,
+      "effectiveDay": "",
+      "number": "",
+      "projectId": project_id,
+      "remark": remarks,
+      "serviceId": serviceId,
+      "states": 0,
+      "storageId": storageId,
+      "storeId": storeId,
+      "userId": userId,
+      "validay": validay
+    }
+    var data = JSON.stringify(json);
+    wx.request({
+      url: url,
+      data: json,
+      method: 'post',
+      header: {
+        'content-type': 'application/json'
+      }, // 设置请求的 header
+      success: function(res) {
+        th.setData({
+          is_sub: 0
+        })
+        wx.hideLoading();
+        if (res.data.code == 0) {
+          getApp().my_warnning("预约成功", 1, th);
+          var store_name = th.data.store_name; //预约门店
+          var number = res.data.data.Number;
+          var temp_url = "/api/wx/open/app/user/sendSubscribeMsg"; //模版接口     
+          var userinfo = getApp().globalData.userInfo;
+          var name = d.userInfo.nickname;
+          var json = {
+            // "formId": formid,
+            "keyWord": [{
+                "keyword": res.data.data.ServiceName
+              },
+              {
+                "keyword": time.substring(0, 16)
+              }, {
+                "keyword": res.data.data.BeauticianName
+              }, {
+                "keyword": res.data.data.StorageName
+              }, {
+                "keyword": res.data.data.Address
+              }
+            ],
+            "page": "/pages/user/my_service/tment_details?number=" + number,
+            "storeId": a.stoid,
+            "typeId": "1011",
+            "userId": d.user_id
+          };
+          var data = JSON.stringify(json);
+          //调用发送预约成功模版接口
+          wx.request({
+            url: th.data.inurl + temp_url,
+            data: data,
+            method: 'post',
+            header: {
+              'content-type': 'application/json'
+            }, // 设置请求的 header
+            success: function(data) {}
           })
-          wx.hideLoading();
-          if (res.data.code == 0) {
-            getApp().my_warnning("预约成功", 1, th);
-            var store_name = th.data.store_name; //预约门店
-            var number = res.data.data.Number;
-            var temp_url = "/api/wx/open/app/user/sendSubscribeMsg"; //模版接口     
-            var userinfo = getApp().globalData.userInfo;
-            var name = d.userInfo.nickname;
-            var json = {
-              // "formId": formid,
-              "keyWord": [{
-                  "keyword": res.data.data.ServiceName
-                },
-                {
-                  "keyword": time.substring(0, 16)
-                }, {
-                  "keyword": res.data.data.BeauticianName
-                }, {
-                  "keyword": res.data.data.StorageName
-                }, {
-                  "keyword": res.data.data.Address
-                }
-              ],
-              "page": "/pages/user/my_service/tment_details?number=" + number,
-              "storeId": a.stoid,
-              "typeId": "1011",
-              "userId": d.user_id
-            };
-            var data = JSON.stringify(json);
-            //调用发送预约成功模版接口
-            wx.request({
-              url: th.data.inurl + temp_url,
-              data: data,
-              method: 'post',
-              header: {
-                'content-type': 'application/json'
-              }, // 设置请求的 header
-              success: function(data) {}
-            })
-            setTimeout(function() {
-              wx.redirectTo({
-                url: "/pages/user/my_service/tment_details?number=" + number
-              });
-            }, 1000);
-          } else {
-            getApp().my_warnning(res.data.msg, 0, th);
-            th.settime();
-            th.setData({
-              is_sub: 0
-            })
-          }
+          setTimeout(function() {
+            wx.redirectTo({
+              url: "/pages/user/my_service/tment_details?number=" + number
+            });
+          }, 1000);
+        } else {
+          getApp().my_warnning(res.data.msg, 0, th);
+          th.settime();
         }
-      })
-    }
+      }
+    })
 
   },
   //定时显示texteat
-  settime:function(){
+  settime: function() {
     var th = this;
-    setTimeout(function () {
+    setTimeout(function() {
       th.setData({
         is_textea: 1
       })
@@ -217,10 +199,28 @@ Page({
     if (th.data.is_sub == 1) {
       return false;
     }
+    var store = th.data.store_name; //门店名称
+    var bea_name = th.data.beautician_name; //美容师名称
+    var time = th.data.time; //预约时间
+    var is_sub = th.data.is_sub; //是否重复提交
     th.setData({
       is_textea: 0,
       is_sub: 1
     })
+    //提交预约前的判断
+    if (store == "") {
+      getApp().my_warnning("请选择服务门店", 0, th);
+      th.settime();
+      return false;
+    } else if (bea_name == "") {
+      getApp().my_warnning("请选择美容师", 0, th);
+      th.settime();
+      return false;
+    } else if (time == "") {
+      getApp().my_warnning("请选择预约时间", 0, th);
+      th.settime();
+      return false;
+    }else{
     //获取模版id
     getApp().request.promiseGet(temp_url, {
       data: {
@@ -228,23 +228,29 @@ Page({
         typeid: "1011"
       }
     }).then(res => {
-      if (res.data.code == 0 && res.data.data.pageData.length>0) {
+      if (res.data.code == 0 && res.data.data.pageData.length > 0) {
         template_id = res.data.data.pageData[0].template_id;
         // //授权订阅
         wx.requestSubscribeMessage({
           tmplIds: [template_id],
-          success(res) { th.success();},
-          fail(res) { th.success();}
+          success(res) {
+            th.success();
+          },
+          fail(res) {
+            th.success();
+          }
         })
       } else {
         th.success();
       }
     })
+    }
   },
   goto: function(e) {
     var th = this;
     th.setData({
-      beautician: 0
+      beautician: 0,
+      is_textea: 0
     })
     if (th.data.store_name == "") {
       getApp().my_warnning("请选择服务门店", 0, th);
@@ -253,6 +259,9 @@ Page({
       getApp().my_warnning("请选择美容师", 0, th);
       th.settime();
     } else {
+      th.setData({
+        is_textea: 1
+      })
       var url = e.currentTarget.dataset.url;
       getApp().goto(url);
     }
@@ -284,7 +293,7 @@ Page({
       store: 0,
       store_name: store_name,
       storageId: Id,
-      is_textea:1
+      is_textea: 1
     })
   },
   onReachBottom: function() {
@@ -449,7 +458,7 @@ Page({
       wx.navigateTo({
         url: "/pages/user/my_service/cosmetology_list?" + 'storageId=' + storageId + '&' + 'itemId=' + itemId + '&' + "projectId=" + project_id
       });
-      
+
     }
   },
   /**
@@ -533,7 +542,7 @@ Page({
     }
     th.setData({
       time: th.data.time.substring(0, 16),
-      is_textea:1
+      is_textea: 1
     })
     th.query_project();
   },
@@ -554,7 +563,7 @@ Page({
           validay: res.data.data.pageData[0].Validay
         })
       } else {
-        getApp().my_warnning(res.data.msg, 0, th); 
+        getApp().my_warnning(res.data.msg, 0, th);
         th.settime();
       }
     })