diff --git a/crmMeeting.go b/crmMeeting.go
index 8015d7b..bddfccc 100644
--- a/crmMeeting.go
+++ b/crmMeeting.go
@@ -46,7 +46,8 @@ type crmdMeeting struct {
CoverName string `json:"coverName,omitempty"`
//for web spa operation
- spaErrMsg []string
+ spaFlashTitle string
+ spaFlashMsg []string
}
func (m crmdMeeting) save() (newMeeting crmdMeeting, err error) {
@@ -75,20 +76,29 @@ func (m crmdMeeting) save() (newMeeting crmdMeeting, err error) {
}
func (m *crmdMeeting) clearSpaErr(e string) {
- m.spaErrMsg = []string{}
+ m.spaFlashMsg = []string{}
}
-func (m *crmdMeeting) addSpaErr(e string) {
- m.spaErrMsg = append(m.spaErrMsg, e)
+func (m *crmdMeeting) addFlashMsg(e string) {
+ m.spaFlashMsg = append(m.spaFlashMsg, e)
}
-func (m crmdMeeting) ErrorMessage() string {
- v := strings.Join(m.spaErrMsg, "
")
+func (m crmdMeeting) FlashMessage() string {
+ v := strings.Join(m.spaFlashMsg, "
")
return v
}
+func (m crmdMeeting) FlashTitle() string {
+ return m.spaFlashTitle
+}
+
+func (m *crmdMeeting) setFlashTitle(val string) string {
+ m.spaFlashTitle = val
+ return m.spaFlashTitle
+}
+
func (m crmdMeeting) hasError() bool {
- return len(m.spaErrMsg) > 0
+ return len(m.spaFlashMsg) > 0
}
func (m crmdMeeting) CoverCacheURL() string {
diff --git a/spa/assets/js/spa.js b/spa/assets/js/spa.js
index bfd5e8f..b387ef0 100644
--- a/spa/assets/js/spa.js
+++ b/spa/assets/js/spa.js
@@ -54,7 +54,7 @@ $(document).ready(function() {
aftershow: function(){} //Function for after opening timepicker
});
- if ($("#errmsg").text() !="" && $("#errmsg").text() != "{{.ErrorMessage}}"){
+ if ($("#errmsg").text() !="" && $("#errmsg").text() != "{{.FlashMessage}}"){
$('#modalerr').modal('open');
}
@@ -62,10 +62,5 @@ $(document).ready(function() {
console.log("spa ready");
});
-$("form").submit(function(event){
- if ( $(this).find("input.Iagree").is(":checked") == false) {
- alert("发起活动之前，请选择同意主办方须知");
- event.preventDefault();
- }
-});
+
diff --git a/spa/edit.html b/spa/edit.html
index 934d811..a94e321 100644
--- a/spa/edit.html
+++ b/spa/edit.html
@@ -102,8 +102,6 @@
closeWechatBrowser();
}
});
-
-