diff --git a/HSLink-app/manifest.json b/HSLink-app/manifest.json index 26ccb67..673a772 100644 --- a/HSLink-app/manifest.json +++ b/HSLink-app/manifest.json @@ -1,9 +1,9 @@ { "name" : "HSLink", "appid" : "__UNI__7C9492E", - "description" : "", - "versionName" : "1.0.7", - "versionCode" : 107, + "description" : "“家校通”是一种现代信息化管理系统,具有良好的可扩展性,能够适应幼儿园、小学、初中、高中,大学等不同类型的学校,同时,也能够适应不同结构的学校,为了家、校能够及时方便地传递信息", + "versionName" : "1.0.9", + "versionCode" : 109, "transformPx" : false, "app-plus" : { "usingComponents" : true, @@ -86,8 +86,7 @@ "quickapp" : {}, /* 快应用特有相关 */ "mp-weixin" : { - /* 小程序特有相关 */ - "appid" : "", + "appid" : "wxe81cc6c613901bf9", "setting" : { "urlCheck" : true }, diff --git a/HSLink-app/pages.json b/HSLink-app/pages.json index cfd3260..6131617 100644 --- a/HSLink-app/pages.json +++ b/HSLink-app/pages.json @@ -74,21 +74,7 @@ "enablePullDownRefresh": true, "navigationBarTitleText": "我",//顶部名称 "navigationBarBackgroundColor": "#333",//顶部背景色 - "navigationBarTextStyle": "white" ,//文字颜色,目前只支持white和black这两种颜色(小程序) - "app-plus": { - "bounce": "none", //关闭窗口回弹效果 - "titleNView": { - "buttons": [ //原生标题栏按钮配置, - { - "type":"none", - "text":"通知 ", - "fontSize":"16px", - "float":"right", - "redDot" : true - } - ] - } - } + "navigationBarTextStyle": "white" //文字颜色,目前只支持white和black这两种颜色(小程序) } } ,{ @@ -305,6 +291,32 @@ "navigationBarTextStyle": "white" //文字颜色,目前只支持white和black这两种颜色(小程序) } } + ,{ + "path" : "pages/tabbar/my/mass-hair/select-people", + "style": { + "enablePullDownRefresh": true, + "navigationBarTitleText": "群发消息",//顶部名称 + "navigationBarBackgroundColor": "#333",//顶部背景色 + "navigationBarTextStyle": "white" ,//文字颜色,目前只支持white和black这两种颜色(小程序) + "app-plus": { + "bounce": "none", //关闭窗口回弹效果 + "titleNView": { + "buttons": [ //原生标题栏按钮配置, + { + "type":"none", + "text":"下一步 ", + "float":"right", + "fontSize":"16px" + } + ] + } + } + } + } + ,{ + "path" : "pages/tabbar/my/mass-hair/mass-hair", + "style" : {} + } ], "globalStyle": { "navigationBarTextStyle": "black", diff --git a/HSLink-app/pages/notice-edit/notice-edit.vue b/HSLink-app/pages/notice-edit/notice-edit.vue index 2096e55..91002a8 100644 --- a/HSLink-app/pages/notice-edit/notice-edit.vue +++ b/HSLink-app/pages/notice-edit/notice-edit.vue @@ -99,27 +99,44 @@ * 保存 */ preservation() { - request.post('/hs/updateOneContent',{ - id: this.noticeInfo.id, - label: this.noticeInfo.label, - title: this.noticeInfo.title, - content: this.noticeInfo.content, - }).then(res => { - console.log("保存文章",res); - if (res.data === 1) { - uni.showToast({ - icon: 'loading', - title: '保存成功' - }); - setTimeout(() => { - uni.navigateBack({ - delta: 1 - }) - },1000) - } - },err=>{ - console.log("err",err); - }) + if (this.noticeInfo.title === '') { + uni.showToast({ + icon: 'none', + title: '请输入文章标题' + }) + } else if (this.noticeInfo.label.length !== 4) { + uni.showToast({ + icon: 'none', + title: '文章标签只能4个字符哦' + }) + } else if (this.noticeInfo.content === '') { + uni.showToast({ + icon: 'none', + title: '请输入文章内容' + }) + } else { + request.post('/hs/updateOneContent',{ + id: this.noticeInfo.id, + label: this.noticeInfo.label, + title: this.noticeInfo.title, + content: this.noticeInfo.content, + }).then(res => { + console.log("保存文章",res); + if (res.data === 1) { + uni.showToast({ + icon: 'loading', + title: '保存成功' + }); + setTimeout(() => { + uni.navigateBack({ + delta: 1 + }) + },1000) + } + },err=>{ + console.log("err",err); + }) + } } } } diff --git a/HSLink-app/pages/person-info-page/person-info-page.vue b/HSLink-app/pages/person-info-page/person-info-page.vue index 4415190..989b183 100644 --- a/HSLink-app/pages/person-info-page/person-info-page.vue +++ b/HSLink-app/pages/person-info-page/person-info-page.vue @@ -39,7 +39,7 @@ 暂无数据,点击重新加载 - + diff --git a/HSLink-app/pages/tabbar/homepage/data-details.vue b/HSLink-app/pages/tabbar/homepage/data-details.vue index eb37223..63e05e6 100644 --- a/HSLink-app/pages/tabbar/homepage/data-details.vue +++ b/HSLink-app/pages/tabbar/homepage/data-details.vue @@ -37,7 +37,7 @@ @tap="collection(noticeInfo.isCollection)"> - + 写留言 @@ -117,10 +117,13 @@ messageDialog: false, //留言内容 messageContent: '', + //是否有留言功能 + isMessage: true } }, onLoad(option) { this.noticeId = option.noticeId; + this.isMessage = option.isMessage || true; }, onReady() { diff --git a/HSLink-app/pages/tabbar/message/chat-page.vue b/HSLink-app/pages/tabbar/message/chat-page.vue index f10f6b6..fba0ae2 100644 --- a/HSLink-app/pages/tabbar/message/chat-page.vue +++ b/HSLink-app/pages/tabbar/message/chat-page.vue @@ -1,12 +1,12 @@