From 5e44ebf4c6feb89149008da522133eb080943afb Mon Sep 17 00:00:00 2001 From: peihaoyu Date: Sun, 27 Sep 2020 15:39:35 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E8=A7=A3=E7=AD=94?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- HSLink-app/manifest.json | 4 +- HSLink-app/pages.json | 40 + HSLink-app/pages/login/login.vue | 16 +- HSLink-app/pages/notice-edit/notice-edit.vue | 14 +- .../person-info-page/person-info-page.vue | 100 +- HSLink-app/pages/tabbar/follow/fans-list.vue | 198 +- .../pages/tabbar/follow/follow-list.vue | 31 +- HSLink-app/pages/tabbar/follow/follow.vue | 10 +- .../pages/tabbar/homepage/data-details.vue | 119 +- HSLink-app/pages/tabbar/homepage/homepage.vue | 7 +- HSLink-app/pages/tabbar/message/chat-page.vue | 50 +- HSLink-app/pages/tabbar/message/message.vue | 17 +- .../pages/tabbar/my/edit-info/edit-info.vue | 5 + .../pages/tabbar/my/my-article/my-article.vue | 12 +- HSLink-app/pages/tabbar/my/my.vue | 128 +- HSLink-app/pages/tabbar/release/release.vue | 2 +- .../dist/build/app-plus/app-config-service.js | 4 +- .../dist/build/app-plus/app-service.js | 8 +- .../unpackage/dist/build/app-plus/app-view.js | 2 +- .../dist/build/app-plus/manifest.json | 2 +- .../dist/build/app-plus/static/js/public.js | 37 +- .../dist/dev/app-plus/app-config-service.js | 4 +- .../dist/dev/app-plus/app-service.js | 5420 ++++++++++++++--- .../unpackage/dist/dev/app-plus/app-view.js | 5240 ++++++++++++++-- .../unpackage/dist/dev/app-plus/manifest.json | 2 +- .../dist/dev/app-plus/static/js/public.js | 37 +- HSLink-app/util/request.js | 12 +- 27 files changed, 9972 insertions(+), 1549 deletions(-) diff --git a/HSLink-app/manifest.json b/HSLink-app/manifest.json index 81dbaca..eaa213c 100644 --- a/HSLink-app/manifest.json +++ b/HSLink-app/manifest.json @@ -2,8 +2,8 @@ "name" : "HSLink", "appid" : "__UNI__7C9492E", "description" : "", - "versionName" : "1.0.0", - "versionCode" : "100", + "versionName" : "1.0.4", + "versionCode" : 104, "transformPx" : false, "app-plus" : { "usingComponents" : true, diff --git a/HSLink-app/pages.json b/HSLink-app/pages.json index 11d4ff4..b16c742 100644 --- a/HSLink-app/pages.json +++ b/HSLink-app/pages.json @@ -224,6 +224,46 @@ } } } + ,{ + "path" : "pages/components/avatar/avatar", + "style" : {} + } + ,{ + "path" : "pages/tabbar/my/collection/collection", + "style": { + "enablePullDownRefresh": true, + "navigationBarTitleText": "收藏列表",//顶部名称 + "navigationBarBackgroundColor": "#333",//顶部背景色 + "navigationBarTextStyle": "white" //文字颜色，目前只支持white和black这两种颜色（小程序） + } + } + ,{ + "path" : "pages/tabbar/my/article-management/article-management", + "style": { + "enablePullDownRefresh": true, + "navigationBarTitleText": "文章管理",//顶部名称 + "navigationBarBackgroundColor": "#333",//顶部背景色 + "navigationBarTextStyle": "white" //文字颜色，目前只支持white和black这两种颜色（小程序） + } + } + ,{ + "path" : "pages/tabbar/my/people-management/people-management", + "style": { + "enablePullDownRefresh": true, + "navigationBarTitleText": "人员管理",//顶部名称 + "navigationBarBackgroundColor": "#333",//顶部背景色 + "navigationBarTextStyle": "white" //文字颜色，目前只支持white和black这两种颜色（小程序） + } + } + ,{ + "path" : "pages/tabbar/my/help-answer/help-answer", + "style": { + "enablePullDownRefresh": true, + "navigationBarTitleText": "帮助答复",//顶部名称 + "navigationBarBackgroundColor": "#333",//顶部背景色 + "navigationBarTextStyle": "white" //文字颜色，目前只支持white和black这两种颜色（小程序） + } + } ], "globalStyle": { "navigationBarTextStyle": "black", diff --git a/HSLink-app/pages/login/login.vue b/HSLink-app/pages/login/login.vue index 4901375..490aada 100644 --- a/HSLink-app/pages/login/login.vue +++ b/HSLink-app/pages/login/login.vue @@ -38,7 +38,7 @@ data() { return { //角色列表 - roleList: ["教师","家长","学生"], + roleList: [], //角色序号 roleIndex: -1, //角色 @@ -96,9 +96,9 @@ }) } else { request.post('/hs/login',{ - role:this.role, + role: this.role, username: this.username, - password:this.password + password: this.password }).then(res => { console.log("登录信息",res) if (res.data === null) { @@ -106,6 +106,16 @@ icon: 'none', title: '账号或密码错误' }) + } else if (res.data.frozen_state === "1") { + uni.showToast({ + icon: 'none', + title: '该账号已冻结' + }) + } else if (res.data.user_type !== this.role) { + uni.showToast({ + icon: 'none', + title: '角色不匹配' + }) } else { uni.setStorageSync("userInfo", res.data); uni.switchTab({ diff --git a/HSLink-app/pages/notice-edit/notice-edit.vue b/HSLink-app/pages/notice-edit/notice-edit.vue index af9730b..2096e55 100644 --- a/HSLink-app/pages/notice-edit/notice-edit.vue +++ b/HSLink-app/pages/notice-edit/notice-edit.vue @@ -103,7 +103,7 @@ id: this.noticeInfo.id, label: this.noticeInfo.label, title: this.noticeInfo.title, - content: this.noticeInfo.content + content: this.noticeInfo.content, }).then(res => { console.log("保存文章",res); if (res.data === 1) { @@ -135,11 +135,14 @@ .title{ padding-top: 0; } - .title textarea, .label textarea, .content textarea{ + .title, .label, .content{ background-color: #F1F1F1; - padding: 20rpx; - width: 100%; border-radius: 10rpx; + padding: 20rpx; + margin: 20rpx; + } + .title textarea, .label textarea, .content textarea{ + width: 100%; } .title textarea{ height: 128rpx; @@ -148,9 +151,6 @@ .label textarea{ height: 80rpx; } - .content textarea{ - text-indent: 40rpx; - } .page{ background-color: #FFFFFF; } 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 d640542..4415190 100644 --- a/HSLink-app/pages/person-info-page/person-info-page.vue +++ b/HSLink-app/pages/person-info-page/person-info-page.vue @@ -2,30 +2,21 @@ - - {{userInfo.headerPhoto}} - +