diff --git a/HSLink-app/App.vue b/HSLink-app/App.vue
index f97fbc7..28fc551 100644
--- a/HSLink-app/App.vue
+++ b/HSLink-app/App.vue
@@ -1,7 +1,15 @@
diff --git a/HSLink-app/components/uni-collapse-item/uni-collapse-item.vue b/HSLink-app/components/uni-collapse-item/uni-collapse-item.vue
new file mode 100644
index 0000000..d750969
--- /dev/null
+++ b/HSLink-app/components/uni-collapse-item/uni-collapse-item.vue
@@ -0,0 +1,212 @@
+
+
+
+
+ {{ title }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/HSLink-app/components/uni-collapse/uni-collapse.vue b/HSLink-app/components/uni-collapse/uni-collapse.vue
new file mode 100644
index 0000000..cf2f4be
--- /dev/null
+++ b/HSLink-app/components/uni-collapse/uni-collapse.vue
@@ -0,0 +1,54 @@
+
+
+
+
+
+
+
diff --git a/HSLink-app/manifest.json b/HSLink-app/manifest.json
index eaa213c..26ccb67 100644
--- a/HSLink-app/manifest.json
+++ b/HSLink-app/manifest.json
@@ -2,8 +2,8 @@
"name" : "HSLink",
"appid" : "__UNI__7C9492E",
"description" : "",
- "versionName" : "1.0.4",
- "versionCode" : 104,
+ "versionName" : "1.0.7",
+ "versionCode" : 107,
"transformPx" : false,
"app-plus" : {
"usingComponents" : true,
diff --git a/HSLink-app/pages.json b/HSLink-app/pages.json
index b16c742..cfd3260 100644
--- a/HSLink-app/pages.json
+++ b/HSLink-app/pages.json
@@ -50,7 +50,7 @@
"buttons": [ //原生标题栏按钮配置,
{
"type":"none",
- "text":"发表 ",
+ "text":"发表 ",
"fontSize":"16px",
"float":"right"
}
@@ -74,7 +74,21 @@
"enablePullDownRefresh": true,
"navigationBarTitleText": "我",//顶部名称
"navigationBarBackgroundColor": "#333",//顶部背景色
- "navigationBarTextStyle": "white" //文字颜色,目前只支持white和black这两种颜色(小程序)
+ "navigationBarTextStyle": "white" ,//文字颜色,目前只支持white和black这两种颜色(小程序)
+ "app-plus": {
+ "bounce": "none", //关闭窗口回弹效果
+ "titleNView": {
+ "buttons": [ //原生标题栏按钮配置,
+ {
+ "type":"none",
+ "text":"通知 ",
+ "fontSize":"16px",
+ "float":"right",
+ "redDot" : true
+ }
+ ]
+ }
+ }
}
}
,{
@@ -99,7 +113,7 @@
"buttons": [ //原生标题栏按钮配置,
{
"type":"none",
- "text":"删除 ",
+ "text":"删除 ",
"fontSize":"16px",
"float":"right"
}
@@ -130,7 +144,7 @@
"buttons": [ //原生标题栏按钮配置,
{
"type":"none",
- "text":"私信 ",
+ "text":"私信 ",
"float":"right",
"fontSize":"16px"
}
@@ -215,7 +229,7 @@
"buttons": [ //原生标题栏按钮配置,
{
"type":"none",
- "text":"保存 ",
+ "text":"保存 ",
"float":"right",
"fontSize":"16px"
}
@@ -264,6 +278,33 @@
"navigationBarTextStyle": "white" //文字颜色,目前只支持white和black这两种颜色(小程序)
}
}
+ ,{
+ "path" : "pages/login/register",
+ "style": {
+ "enablePullDownRefresh": true,
+ "navigationBarTitleText": "用户注册",//顶部名称
+ "navigationBarBackgroundColor": "#333",//顶部背景色
+ "navigationBarTextStyle": "white" //文字颜色,目前只支持white和black这两种颜色(小程序)
+ }
+ }
+ ,{
+ "path" : "pages/tabbar/my/register-management/register-management",
+ "style": {
+ "enablePullDownRefresh": true,
+ "navigationBarTitleText": "注册管理",//顶部名称
+ "navigationBarBackgroundColor": "#333",//顶部背景色
+ "navigationBarTextStyle": "white" //文字颜色,目前只支持white和black这两种颜色(小程序)
+ }
+ }
+ ,{
+ "path" : "pages/tabbar/my/notice/notice",
+ "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 490aada..5918a15 100644
--- a/HSLink-app/pages/login/login.vue
+++ b/HSLink-app/pages/login/login.vue
@@ -27,6 +27,14 @@
+
+
+ 忘记密码
+
+
+ 用户注册
+
+
@@ -51,14 +59,37 @@
}
},
onLoad() {
- this.role = uni.getStorageSync("userInfo").user_type;
- this.username = uni.getStorageSync("userInfo").real_name;
- this.password = uni.getStorageSync("userInfo").pass_word;
+ console.log(uni.getStorageSync("userInfo"))
+ if (uni.getStorageSync("userInfo").data !== null && uni.getStorageSync("userInfo") !== "") {
+ uni.switchTab({
+ url: '/pages/tabbar/homepage/homepage'
+ });
+ }
+ this.role = uni.getStorageSync("loginInfo").user_type;
+ this.username = uni.getStorageSync("loginInfo").real_name;
+ this.password = uni.getStorageSync("loginInfo").pass_word;
},
onShow() {
this.getUserType();
},
methods: {
+ /**
+ * 用户注册
+ */
+ register() {
+ uni.navigateTo({
+ url: "/pages/login/register"
+ })
+ },
+ /**
+ * 忘记密码
+ */
+ forgetPassword() {
+ uni.showToast({
+ icon: "none",
+ title: "请联系管理员重置密码"
+ })
+ },
/**
* 获取字典项数据(用户类型)
*/
@@ -116,8 +147,14 @@
icon: 'none',
title: '角色不匹配'
})
+ } else if (res.data.take_effect === '0') {
+ uni.showToast({
+ icon: 'none',
+ title: '该账号注册流程正在审核'
+ })
} else {
uni.setStorageSync("userInfo", res.data);
+ uni.setStorageSync("loginInfo", res.data);
uni.switchTab({
url: '/pages/tabbar/homepage/homepage'
});
@@ -144,7 +181,13 @@
-
diff --git a/HSLink-app/pages/tabbar/follow/follow.vue b/HSLink-app/pages/tabbar/follow/follow.vue
index fa94a7e..590c513 100644
--- a/HSLink-app/pages/tabbar/follow/follow.vue
+++ b/HSLink-app/pages/tabbar/follow/follow.vue
@@ -8,7 +8,7 @@
v-model="searchStr"
>
- 暂无数据,点击重新加载
+ 暂无关注,打开他人主页可关注
diff --git a/HSLink-app/pages/tabbar/homepage/data-details.vue b/HSLink-app/pages/tabbar/homepage/data-details.vue
index d614be1..eb37223 100644
--- a/HSLink-app/pages/tabbar/homepage/data-details.vue
+++ b/HSLink-app/pages/tabbar/homepage/data-details.vue
@@ -52,7 +52,7 @@
@@ -68,7 +68,7 @@
- 留言
+ 留言
@@ -95,8 +95,10 @@
+
+
diff --git a/HSLink-app/pages/tabbar/my/people-management/people-management.vue b/HSLink-app/pages/tabbar/my/people-management/people-management.vue
index c836810..c498f30 100644
--- a/HSLink-app/pages/tabbar/my/people-management/people-management.vue
+++ b/HSLink-app/pages/tabbar/my/people-management/people-management.vue
@@ -17,6 +17,9 @@
{{item.real_name}}
+
+ ({{item.user_type}})
+
@@ -145,7 +148,7 @@
console.log("人员管理列表",res);
uni.startPullDownRefresh();
this.followList = res.data;
- this.noData = this.followList.length === 0 ? true : false;
+ this.noData = this.followList.length === 0 ? true : false;
},err => {
console.log("err",err)
})
@@ -155,6 +158,11 @@
diff --git a/HSLink-app/pages/tabbar/my/settings/settings.vue b/HSLink-app/pages/tabbar/my/settings/settings.vue
index d8c9609..e9f9099 100644
--- a/HSLink-app/pages/tabbar/my/settings/settings.vue
+++ b/HSLink-app/pages/tabbar/my/settings/settings.vue
@@ -52,7 +52,7 @@
content: "确认退出登录?",
success(res) {
if (res.confirm) {
- uni.setStorageSync("userInfo",{});
+ uni.setStorageSync("userInfo","");
uni.showToast({
icon: 'loading',
title: `退出成功`
diff --git a/HSLink-app/pages/tabbar/release/release.vue b/HSLink-app/pages/tabbar/release/release.vue
index c381db8..da1f69b 100644
--- a/HSLink-app/pages/tabbar/release/release.vue
+++ b/HSLink-app/pages/tabbar/release/release.vue
@@ -1,5 +1,8 @@
+
+ 重置
+
文章名称:
@@ -31,7 +34,7 @@
@@ -53,14 +56,15 @@
}
},
onShow() {
+
+ },
+ mounted() {
this.noticeInfo = {
title: '',
label: '',
content: ''
}
},
- mounted() {
- },
onPullDownRefresh () {
uni.startPullDownRefresh();
},
@@ -68,6 +72,16 @@
this.preservation()
},
methods: {
+ /**
+ * 清空
+ */
+ clear() {
+ this.noticeInfo = {
+ title: '',
+ label: '',
+ content: ''
+ }
+ },
/**
* 发表
*/
@@ -106,6 +120,11 @@