diff --git a/config/request.js b/config/request.js index df4cc58..aea2d7a 100644 --- a/config/request.js +++ b/config/request.js @@ -5,9 +5,8 @@ */ export default { - // baseURL: 'https://huorantech.cn/', - baseURL: 'http://192.168.31.217:10010/', - // baseURL: 'http://124.71.79.122/', + // baseURL: 'http://192.168.31.217:10010/', + baseURL: 'http://124.71.79.122/', headers: { 'Content-Type': 'application/json;charset=UTF-8' }, diff --git a/libs/share.js b/libs/share.js index a8d0166..f8dc185 100644 --- a/libs/share.js +++ b/libs/share.js @@ -3,7 +3,7 @@ export default{ onShareAppMessage() { // 设置转发的参数 return { - title: "职站商城", + title: "GPAC", // path: '', imageUrl: "", success: function(res) { @@ -19,7 +19,7 @@ export default{ // 分享到朋友圈 onShareTimeline:function(res){ return { - title: '职站商城', + title: 'GPAC', // imageUrl:'/static/image/phone.png', query:'' } @@ -27,7 +27,7 @@ export default{ // 收藏 onAddToFavorites:function(res) { return { - title: '职站商城', + title: 'GPAC', // imageUrl:'/static/image/phone.png', query: '', } diff --git a/other/activityDetail/activityDetail.vue b/other/activityDetail/activityDetail.vue index 20c326f..4d4f943 100644 --- a/other/activityDetail/activityDetail.vue +++ b/other/activityDetail/activityDetail.vue @@ -44,7 +44,7 @@ - + @@ -54,7 +54,7 @@ - + {{ form.signed ? '取消报名' : '立刻报名' }} @@ -257,6 +257,7 @@ .banner { .pic { width: 100%; + max-height: 500rpx; } } .info { @@ -333,9 +334,16 @@ text-align: center; } .share { + width: 200rpx; + margin: 0; + font-size: 28rpx; + color: #fff; + text-align: center; background-color: #75b4ff; + border-radius: 0; border-top-left-radius: 40rpx; border-bottom-left-radius: 40rpx; + border: 0; } .sign { background-color: $uni-primary; diff --git a/pages/person/person.vue b/pages/person/person.vue index 8982df8..9605e5a 100644 --- a/pages/person/person.vue +++ b/pages/person/person.vue @@ -203,6 +203,7 @@ // #ifdef MP-WEIXIN this.headerTop = uni.getMenuButtonBoundingClientRect().top + 8 + 'px' // #endif + this.platformId = uni.getStorageSync('platformId') this.per = true this.getInfo() if (this.platformId !== 7) { @@ -216,15 +217,15 @@ const { result } = await viewUserDetails({ openId: this.openId }) - // status为false,说明用户被删除了,则退出登录 - // if (result.status === false) { - // this.$util.errMsg(result.message) - // setTimeout(() => { - // uni.clearStorageSync() - // this.$util.to('/pages/login/login') - // }, 1500) - // return false - // } + // status为true,说明用户被删除了,则退出登录 + if (result.status === true) { + this.$util.errMsg(result.message) + setTimeout(() => { + uni.clearStorageSync() + this.$util.to('/pages/login/login') + }, 1500) + return false + } if (result.hrUserInfo) { if (!result.hrUserInfo.userAvatars) result.hrUserInfo.userAvatars = Common.avatar // 没有头像则显示默认头像 diff --git a/pages/supplier/supplier.vue b/pages/supplier/supplier.vue index d4d088a..e98c498 100644 --- a/pages/supplier/supplier.vue +++ b/pages/supplier/supplier.vue @@ -114,6 +114,7 @@ } }, onShow() { + this.active = '' this.keyword = '' this.per = true this.typeVisible = false @@ -138,6 +139,7 @@ pageSize: this.pageSize, platformSource: 6, keyWord: this.keyword, + supplierClassificationId: this.active, }).then(async ({ data }) => { this.list = this.reachBottom > 0 ? [...this.list, ...data.records] : data.records this.page++ // 每次获取了数据后page+1 @@ -155,9 +157,10 @@ this.classifications = list[0].children }, // 分类点击回调 - classificationClick(item, query) { + classificationClick(item) { this.active = item.id - query && this.initList() + this.typeVisible = false + this.initList() }, // 关闭分类弹框 closeType() { diff --git a/team/auth/auth.vue b/team/auth/auth.vue index f6e01a0..cbe6f28 100644 --- a/team/auth/auth.vue +++ b/team/auth/auth.vue @@ -37,7 +37,7 @@