From 62a240df3ff2f1bcddea834ccb15fccefc51ae26 Mon Sep 17 00:00:00 2001
From: liuwh <hugeinfo123>
Date: Sat, 09 May 2020 09:18:16 +0800
Subject: [PATCH] 5-8开发任务

---
 SunshineLnsMinApp/pages/pfyy/pfyy.js |   35 +++++++++++++++++++----------------
 1 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/SunshineLnsMinApp/pages/pfyy/pfyy.js b/SunshineLnsMinApp/pages/pfyy/pfyy.js
index 37a4b35..e08726e 100644
--- a/SunshineLnsMinApp/pages/pfyy/pfyy.js
+++ b/SunshineLnsMinApp/pages/pfyy/pfyy.js
@@ -14,13 +14,13 @@
     picType: '',
     evalList: {},
     picturesInfo: {},
-    ReplyLogs:[]
+    ReplyLogs: []
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
-  onLoad: function (options) {
+  onLoad: function(options) {
     var that = this;
     console.log(options)
     let id = options.id
@@ -28,7 +28,7 @@
     var userinfo = wx.getStorageSync("user");
     wx.request({
       url: app.globalData.url + '/api/v1/appointment/find?id=' + id,
-      success: function (res) {
+      success: function(res) {
         console.log(res.data.data.lawAppointment)
         if (res.data.code == 0) {
           var data1 = res.data.data.ReplyLogs || [];
@@ -36,7 +36,7 @@
             picturesInfo: {
               ...res.data.data.lawAppointment,
               createId: userinfo.id,
-              activitiesTime: app.formatDateday(res.data.data.lawAppointment.activitiesTime)
+              activitiesTime: app.formatDateday(res.data.data.lawAppointment.activitiesTime || new Date())
             },
             ReplyLogs: data1,
             disabled
@@ -51,7 +51,7 @@
     })
   },
 
-  inputChange: function (e) {
+  inputChange: function(e) {
     var name = e.currentTarget.dataset.name;
     this.setData({
       picturesInfo: {
@@ -62,7 +62,7 @@
 
   },
 
-  reply: function (e) {
+  reply: function(e) {
     var that = this;
     var openId = wx.getStorageSync("openId")
     var obj = {
@@ -72,20 +72,20 @@
       busId: that.data.picturesInfo.id
     };
     wx.request({
-      url: app.globalData.url + '/api/v1/pictures/reply',
+      url: app.globalData.url + '/api/v1/appointment/reply',
       data: obj,
       method: 'POST',
       header: {
         "Content-Type": "application/json"
       },
-      success: function (res) {
+      success: function(res) {
         if (res.data.code == 0) {
           wx.showToast({
             title: '提交回复成功',
             icon: 'success',
             duration: 2000
           })
-          setTimeout(function () {
+          setTimeout(function() {
             wx.navigateBack({
               changed: true
             }); //返回上一页
@@ -100,7 +100,7 @@
     })
   },
 
-  submit: function (e) {
+  submit: function(e) {
     var picturesInfo = this.data.picturesInfo;
     if (!picturesInfo.schoolName) {
       return app.showModal("请填写学校名称!");
@@ -112,7 +112,10 @@
       return app.showModal("请填写联系人!");
     }
     if (!picturesInfo.contactPhone) {
-      return app.showModal("请填写联系方式!");
+      return app.showModal("请填写手机号码!");
+    }
+    if (/^[1]([3-9])[0-9]{9}$/.test(picturesInfo.contactPhone) == false) {
+      return app.showModal("手机号码有误!");
     }
     if (!picturesInfo.activitiesTime) {
       return app.showModal("请填写活动时间!");
@@ -126,9 +129,9 @@
     if (!picturesInfo.activitiesAddress) {
       return app.showModal("请填写活动场地!");
     }
-    if (!picturesInfo.remake) {
-      return app.showModal("请填写备注!");
-    }
+    // if (!picturesInfo.remake) {
+    //   return app.showModal("请填写备注!");
+    // }
     var that = this;
     wx.request({
       url: app.globalData.url + '/api/v1/appointment/save',
@@ -137,14 +140,14 @@
       header: {
         "Content-Type": "application/json"
       },
-      success: function (res) {
+      success: function(res) {
         if (res.data.code == 0) {
           wx.showToast({
             title: '提交成功',
             icon: 'success',
             duration: 2000
           })
-          setTimeout(function () {
+          setTimeout(function() {
             wx.reLaunch({
               url: '../zhwj/zhwj',
             })

--
Gitblit v1.8.0