From be14e5f6d15fef63d716d869ac2bfd9fe30a6aa9 Mon Sep 17 00:00:00 2001 From: huliyong <2783385703@qq.com> Date: Fri, 25 Oct 2024 18:55:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.vue | 2 + api/api.js | 50 ++++++++- api/http.js | 2 +- .../PrivacyAgreementPoup/PrivacyAgreementPoup.vue | 5 - components/broadside/broadside.vue | 26 +++-- components/config/configPopup.vue | 45 ++++++++ components/config/customerServicePopup.vue | 116 +++++++++++++++++++++ config.js | 2 +- manifest.json | 2 +- pages.json | 14 +-- pages/index/center.vue | 20 +++- pages/index/index.vue | 15 ++- pages/login/login.vue | 4 +- pages/login/wxUserInfo.vue | 25 +++-- pages/subPack/static/icon.png | Bin 0 -> 20973 bytes pages/subPack/team/team.vue | 77 ++++++++++---- store/store.js | 39 ++++++- 17 files changed, 380 insertions(+), 64 deletions(-) create mode 100644 components/config/configPopup.vue create mode 100644 components/config/customerServicePopup.vue create mode 100644 pages/subPack/static/icon.png diff --git a/App.vue b/App.vue index cc1058b..cc050ac 100644 --- a/App.vue +++ b/App.vue @@ -4,6 +4,8 @@ }, onShow: function() { // this.$store.commit('initConfig') + this.$store.commit('getTeam') + this.$store.commit('getUserInfo') }, onHide: function() { } diff --git a/api/api.js b/api/api.js index 871475a..38b3659 100644 --- a/api/api.js +++ b/api/api.js @@ -23,12 +23,19 @@ const config = { }, // 修改个人信息接口 updateInfo: { - url: '/info/updateInfo', + url: '/user/edit', method: 'POST', auth: true, - limit : 500, + limit : 800, showLoading : true, }, + // 获取用户信息 + getInfo: { + url: '/user/info', + method: 'GET', + auth: true, + limit : 800, + }, //隐私政策 getPrivacyPolicy: { url: '/login/getPrivacyPolicy', @@ -39,6 +46,43 @@ const config = { url: '/login/getUserAgreement', method: 'GET', }, + + + + // 获取团队 + teamList: { + url: '/team/list', + method: 'GET', + }, + // 申请加入团队 + teamApply: { + url: '/team/apply', + method: 'POST', + }, + + + // 实名认证 + authApply: { + url: '/auth/apply', + method: 'POST', + }, + // 实名认证详情 + authInfo: { + url: '/auth/info', + method: 'GET', + }, + + + // 打卡 + clock: { + url: '/clock/in', + method: 'POST', + }, + // 打卡详情列表 + clockList: { + url: 'clock/in/log', + method: 'GET', + }, } @@ -74,7 +118,7 @@ export function api(key, data, callback, loadingTitle) { if (req.auth) { if (!uni.getStorageSync('token')) { uni.navigateTo({ - url: '/pages_order/auth/wxLogin' + url: '/pages/login/login' }) console.error('需要登录') return diff --git a/api/http.js b/api/http.js index 8f7078e..61d78eb 100644 --- a/api/http.js +++ b/api/http.js @@ -30,7 +30,7 @@ function http(uri, data, callback, method = 'GET', showLoading, title) { uni.removeStorageSync('token') console.error('登录过期'); uni.navigateTo({ - url: '/pages_order/auth/wxLogin' + url: '/pages/login/login' }) } diff --git a/components/PrivacyAgreementPoup/PrivacyAgreementPoup.vue b/components/PrivacyAgreementPoup/PrivacyAgreementPoup.vue index efdd727..a2e00a1 100644 --- a/components/PrivacyAgreementPoup/PrivacyAgreementPoup.vue +++ b/components/PrivacyAgreementPoup/PrivacyAgreementPoup.vue @@ -60,11 +60,6 @@ }) } }, - created() { - setTimeout(() => { - this.init() - }, 500) - }, methods: { //初始化 diff --git a/components/broadside/broadside.vue b/components/broadside/broadside.vue index bddf0ef..edab2a6 100644 --- a/components/broadside/broadside.vue +++ b/components/broadside/broadside.vue @@ -5,22 +5,28 @@ - + - 李知意 - 高新区项目一队 + {{ userInfo.nickName }} + {{ userInfo.team.name }} - - + + - - 高新区项目一队 + + {{ userInfo.team.name }} - + @@ -30,6 +36,7 @@ + + \ No newline at end of file diff --git a/components/config/customerServicePopup.vue b/components/config/customerServicePopup.vue new file mode 100644 index 0000000..a110108 --- /dev/null +++ b/components/config/customerServicePopup.vue @@ -0,0 +1,116 @@ + + + + + \ No newline at end of file diff --git a/config.js b/config.js index 5d818dd..9dfb093 100644 --- a/config.js +++ b/config.js @@ -12,7 +12,7 @@ const type = 'dev' // 环境配置 const config = { dev: { - baseUrl: 'http://www.gcosc.fun:82', + baseUrl: 'http://dev.java996.icu/clockin-api', }, prod: { baseUrl: 'http://xxx.xxx.xxx/xxx', diff --git a/manifest.json b/manifest.json index a366672..191c879 100644 --- a/manifest.json +++ b/manifest.json @@ -52,7 +52,7 @@ "quickapp" : {}, /* 小程序特有相关 */ "mp-weixin" : { - "appid" : "wxf7152f59d366236b", + "appid" : "wx69aadfc270684d2e", "setting" : { "urlCheck" : false }, diff --git a/pages.json b/pages.json index 42a7ce0..05d3380 100644 --- a/pages.json +++ b/pages.json @@ -1,15 +1,17 @@ { - "pages": [{ - "path": "pages/login/login", - "style": { - "navigationBarTitleText": "登录" - } - }, { + "pages": [ + { "path": "pages/index/index", "style": { "navigationBarTitleText": "打卡" } }, + { + "path": "pages/login/login", + "style": { + "navigationBarTitleText": "登录" + } + }, { "path": "pages/index/center", "style": { diff --git a/pages/index/center.vue b/pages/index/center.vue index 8a1d1f9..69ec71d 100644 --- a/pages/index/center.vue +++ b/pages/index/center.vue @@ -4,11 +4,13 @@