打包及部分界面修改

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) {

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特有相关 */

pages/home/detail/eventHandle.vue

@@ -68,13 +68,13 @@
 						<view>{{eventDetail.create_time}}</view>
 					</view>
 				</view>
-				<view class="form-item" v-if="eventDetail.global_img_f!==null&&eventDetail.global_img_f!==undefined">
+				<view class="form-item" v-if="eventDetail.global_img!==null&&eventDetail.global_img!==undefined">
 					<view class="form-left form-left-img">
 						<text class="form-left-text">事件截图：</text>
 					</view>
 					<view class="form-right" style="">
-						<image fit="cover" class="form-img" :src="eventDetail.global_img_f"></image>
+						<image fit="cover" class="form-img" :src="eventDetail.global_img"></image>
-						<image fit="cover" class="form-img form-img-face" v-if="eventDetail.face_img_f!==null&&eventDetail.face_img_f!==undefined" :src="eventDetail.face_img_f"></image>
+						<image fit="cover" class="form-img form-img-face" v-if="eventDetail.face_img!==null&&eventDetail.face_img!==undefined" :src="eventDetail.face_img"></image>
 					</view>
 				</view>
 			</view>
@@ -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)
 				});

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: "登录成功",

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)
 						// 修改资源请求地址
 					})

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)
 							
 							// 修改资源请求地址

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({

pages/my/my.vue

@@ -19,7 +19,7 @@
 				<view>
 					<view style="font-weight: bold;" class="user-name">{{vuex_user.name}}</view>
 					<view class="user-phone">
-						<u-tag text="企业员工" v-if="vuex_user.type === 'employee'"/>
+						<u-tag text="正式员工" v-if="vuex_user.type === 'employee'"/>
 						<u-tag text="相关方" v-if="vuex_user.type === 'remployee'"/>
 						<u-tag text="访客" v-if="vuex_user.type === 'visitor'"/>
 					</view>

pages/my/myInfo.vue

@@ -61,7 +61,7 @@
 			<view class="item">
 				<view class="title">证件照</view>
 				<view class="content">
-					<image :src="userInfo.photo_f"></image>
+					<image :src="userInfo.photo"></image>
 				</view>
 			</view>
 		</view>
@@ -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;
 				})
 			},

pages/my/my_.vue

@@ -33,7 +33,7 @@
 				<view class="u-flex-1">
 					<view class="u-font-18 u-p-b-20">
 						{{vuex_user.name}}
-						<u-tag text="企业员工" v-if="vuex_user.type == 'employee'"/>
+						<u-tag text="正式员工" v-if="vuex_user.type == 'employee'"/>
 						<u-tag text="相关方" v-if="vuex_user.type == 'remployee'"/>
 						<u-tag text="访客" v-if="vuex_user.type == 'visitor'"/>
 						<u-tag v-if="vuex_user.wxmp_openid" text="小程序" size="mini"></u-tag>

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_host: 'http://222.222.144.147:6013',
-		vuex_api: 'http://10.99.5.79:20309/api',
+		vuex_api: 'http://222.222.144.147:6013/api',
 		vuex_apifile: 'https://testsearch.ctc.ac.cn/api/file/',
 	},
 	mutations: {