From 9937240a37a9a992034f116ce35b7ae502d8bf50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E5=89=8D=E6=98=8E?= <909355014@qq.com>
Date: Sun, 18 Sep 2022 08:52:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8C=85=E5=8F=8A=E9=83=A8=E5=88=86?=
=?UTF-8?q?=E7=95=8C=E9=9D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
App.vue | 6 ++++++
manifest.json | 2 +-
pages/home/detail/eventHandle.vue | 12 +++++++++---
pages/login/login.vue | 9 +++++++++
pages/login/login_.vue | 11 ++++++++++-
pages/login/login_password.vue | 3 +++
pages/login/userRegister.vue | 5 ++++-
pages/my/my.vue | 2 +-
pages/my/myInfo.vue | 6 +++++-
pages/my/my_.vue | 2 +-
store/index.js | 4 ++--
11 files changed, 51 insertions(+), 11 deletions(-)
diff --git a/App.vue b/App.vue
index 511dfb5..5d2d6bc 100644
--- a/App.vue
+++ b/App.vue
@@ -37,6 +37,9 @@
}).then(res => {
that.$u.vuex('vuex_token', res.access)
that.$u.api.getUserInfo().then(res => {
+ if(res.avatar){
+ res.avatar = that.vuex_host + res.avatar
+ }
uni.hideLoading()
uni.showToast({
title: "登录成功",
@@ -102,6 +105,9 @@
})
that.$u.api.loginSecret(JSON.parse(secret)).then(res => {
that.$u.api.getUserInfo().then(res => {
+ if(res.avatar){
+ res.avatar = this.vuex_host + res.avatar
+ }
that.$u.vuex('vuex_user', res)
let perms = [];
for (let key in user.perms) {
diff --git a/manifest.json b/manifest.json
index de30a94..3d2038d 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,7 +2,7 @@
"name" : "曲阳金隅EHS",
"appid" : "__UNI__B00D419",
"description" : "曲阳金隅EHS",
- "versionName" : "1.00.07",
+ "versionName" : "1.00.08",
"versionCode" : 10007,
"transformPx" : false,
/* 5+App特有相关 */
diff --git a/pages/home/detail/eventHandle.vue b/pages/home/detail/eventHandle.vue
index f108610..872de89 100644
--- a/pages/home/detail/eventHandle.vue
+++ b/pages/home/detail/eventHandle.vue
@@ -68,13 +68,13 @@
{{eventDetail.create_time}}
-
+
事件截图：
-
-
+
+
@@ -143,6 +143,12 @@
getEventItem() {
this.$u.api.eventtItem(this.eventId).then((res) => {
this.eventDetail = res;
+ if(res.global_img){
+ res.global_img = this.vuex_host + res.global_img
+ }
+ if(res.face_img){
+ res.face_img = this.vuex_host + res.face_img
+ }
debugger;
console.log(res)
});
diff --git a/pages/login/login.vue b/pages/login/login.vue
index f421676..30528d1 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -138,6 +138,9 @@
}
// #endif
this.$u.api.getUserInfo().then(res => {
+ if(res.avatar){
+ res.avatar = this.vuex_host + res.avatar
+ }
this.$u.vuex('vuex_user', res)
// 修改资源请求地址
// this.$u.vuex('vuex_user.avatar', this.vuex_user.avatar +
@@ -186,6 +189,9 @@
}).then(res => {
this.$u.vuex('vuex_token', res.access)
this.$u.api.getUserInfo().then(res => {
+ if(res.avatar){
+ res.avatar = this.vuex_host + res.avatar
+ }
uni.hideLoading()
uni.showToast({
title: "登录成功",
@@ -225,6 +231,9 @@
}).then(res => {
this.$u.vuex('vuex_token', res.access)
this.$u.api.getUserInfo().then(res => {
+ if(res.avatar){
+ res.avatar = this.vuex_host + res.avatar
+ }
uni.hideLoading()
uni.showToast({
title: "登录成功",
diff --git a/pages/login/login_.vue b/pages/login/login_.vue
index 2f168dc..d43d09a 100644
--- a/pages/login/login_.vue
+++ b/pages/login/login_.vue
@@ -370,7 +370,13 @@
that.$u.vuex('vuex_token', res.access)
that.$u.vuex('vuex_refresh', res.refresh)
that.$u.api.getUserInfo().then(user => {
+ if(user.avatar){
+ user.avatar = this.vuex_host + user.avatar
+ }
that.$u.vuex('vuex_user', user)
+ if(user.avatar){
+ user.avatar = this.vuex_host + user.avatar
+ }
let perms = [];
for (let key in user.perms) {
perms.push(key);
@@ -385,7 +391,7 @@
url: '/pages/home/home_'
})
}else{
- //非企业员工
+ //非正式员工
if(res.id_number==''||res.photo==''||res.id_number==null||res.photo==null){
//信息不完善，进入信息完善页面
uni.reLaunch({
@@ -435,6 +441,9 @@
// let data = {openid: uni.getStorageSync('wxmp_openid')}
// that.$u.api.bindmp(data).then(res=>{})
that.$u.api.getUserInfo().then(res => {
+ if(res.avatar){
+ res.avatar = this.vuex_host + res.avatar
+ }
that.$u.vuex('vuex_user', res)
// 修改资源请求地址
})
diff --git a/pages/login/login_password.vue b/pages/login/login_password.vue
index 2fc6811..9806559 100644
--- a/pages/login/login_password.vue
+++ b/pages/login/login_password.vue
@@ -92,6 +92,9 @@ export default {
}
// #endif
this.$u.api.getUserInfo().then(res=>{
+ if(res.avatar){
+ res.avatar = this.vuex_host + res.avatar
+ }
this.$u.vuex('vuex_user', res)
// 修改资源请求地址
diff --git a/pages/login/userRegister.vue b/pages/login/userRegister.vue
index e3b7877..b1699b7 100644
--- a/pages/login/userRegister.vue
+++ b/pages/login/userRegister.vue
@@ -108,6 +108,9 @@
that.$u.vuex('vuex_token', res.access)
that.$u.vuex('vuex_refresh', res.refresh)
that.$u.api.getUserInfo().then(user => {
+ if(user.avatar){
+ user.avatar = this.vuex_host + user.avatar
+ }
that.$u.vuex('vuex_user', user)
let perms = [];
for (let key in user.perms) {
@@ -128,7 +131,7 @@
url: '/pages/home/home_'
})
}else{
- //非企业员工
+ //非正式员工
if(res.id_number==''||res.photo==''||res.id_number==null||res.photo==null){
//信息不完善，进入信息完善页面
uni.reLaunch({
diff --git a/pages/my/my.vue b/pages/my/my.vue
index 5feb8b8..85cef6f 100644
--- a/pages/my/my.vue
+++ b/pages/my/my.vue
@@ -19,7 +19,7 @@
{{vuex_user.name}}
-
+
diff --git a/pages/my/myInfo.vue b/pages/my/myInfo.vue
index ec1177b..f1ad586 100644
--- a/pages/my/myInfo.vue
+++ b/pages/my/myInfo.vue
@@ -61,7 +61,7 @@
证件照
-
+
@@ -81,6 +81,10 @@
methods: {
getUserInfo() {
this.$u.api.hrmUserInfo().then(res => {
+ if(res.photo){
+ res.photo = this.vuex_host + res.photo
+ }
+ console.log(res)
this.userInfo = res;
})
},
diff --git a/pages/my/my_.vue b/pages/my/my_.vue
index 7762ffe..fe54360 100644
--- a/pages/my/my_.vue
+++ b/pages/my/my_.vue
@@ -33,7 +33,7 @@
{{vuex_user.name}}
-
+
diff --git a/store/index.js b/store/index.js
index d3f0d74..32767f8 100644
--- a/store/index.js
+++ b/store/index.js
@@ -36,8 +36,8 @@ const store = new Vuex.Store({
vuex_perm: lifeData.vuex_perm ? lifeData.vuex_perm : [],
vuex_appid: 'wxf7d6140f507466be',
vuex_login: 'http://qyjy.ctc-zc.com/h5/',
- vuex_host: 'http://127.0.0.1:8000',
- vuex_api: 'http://10.99.5.79:20309/api',
+ vuex_host: 'http://222.222.144.147:6013',
+ vuex_api: 'http://222.222.144.147:6013/api',
vuex_apifile: 'https://testsearch.ctc.ac.cn/api/file/',
},
mutations: {