From 3ae48d6483378ddedcabe4540be16b7e4091e147 Mon Sep 17 00:00:00 2001 From: liudan <18634735655@163.com> Date: Mon, 12 Jun 2023 01:09:07 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/service.vue | 16 ++++-- pages/technician.vue | 100 ++++++++++++++++----------------- user/pages/technician-info.vue | 31 +++++++++- 3 files changed, 92 insertions(+), 55 deletions(-) diff --git a/pages/service.vue b/pages/service.vue index d610de8..a199bc1 100644 --- a/pages/service.vue +++ b/pages/service.vue @@ -223,6 +223,7 @@ autograph: state => state.user.autograph, userInfo: state => state.user.userInfo, mineInfo: state => state.user.mineInfo, + userPageType: state => state.user.userPageType, }), async onLoad(options) { this.getRecommend() @@ -244,7 +245,7 @@ key: 'pageActive', val: true }) - + console.log(this.mineInfo,this.userPageType,"88888") }, onPullDownRefresh() { @@ -346,9 +347,16 @@ }) } if(item.name=="技师招募"){ - uni.navigateTo({ - url:"/user/pages/gonggao/item?id=2" - }) + if(this.userPageType==1){ + uni.navigateTo({ + url:"/technician/pages/apply" + }) + }else{ + uni.navigateTo({ + url:"/user/pages/gonggao/item?id=1" + }) + } + } diff --git a/pages/technician.vue b/pages/technician.vue index 3d849b1..8d823bd 100644 --- a/pages/technician.vue +++ b/pages/technician.vue @@ -349,10 +349,10 @@ ...mapMutations(['updateUserItem', 'updateTechnicianItem']), async initIndex(refresh = false) { // #ifdef H5 - if (!refresh && this.$jweixin.isWechat()) { - await this.$jweixin.initJssdk(); - this.toAppShare() - } + // if (!refresh && this.$jweixin.isWechat()) { + // await this.$jweixin.initJssdk(); + // this.toAppShare() + // } // #endif if (!this.configInfo.id || refresh) { await this.getConfigInfo() @@ -470,52 +470,52 @@ } = this if (!location.lat) { // #ifdef H5 - if (this.$jweixin.isWechat()) { - this.$util.showLoading() - // await this.$jweixin.initJssdk(); - await this.$jweixin.wxReady2(); - let { - latitude: lat = 0, - longitude: lng = 0 - } = await this.$jweixin.getWxLocation() - location = { - lng, - lat, - address: '定位失败', - province: '', - city: '', - district: '' - } - if (lat && lng) { - let key = `${lat},${lng}` - let data = await this.$api.base.getMapInfo({ - location: key - }) - let { - status, - result - } = JSON.parse(data) - if (status == 0) { - let { - address, - address_component - } = result - let { - province, - city, - district - } = address_component - location = { - lng, - lat, - address, - province, - city, - district - } - } - } - } + // if (this.$jweixin.isWechat()) { + // this.$util.showLoading() + // // await this.$jweixin.initJssdk(); + // await this.$jweixin.wxReady2(); + // let { + // latitude: lat = 0, + // longitude: lng = 0 + // } = await this.$jweixin.getWxLocation() + // location = { + // lng, + // lat, + // address: '定位失败', + // province: '', + // city: '', + // district: '' + // } + // if (lat && lng) { + // let key = `${lat},${lng}` + // let data = await this.$api.base.getMapInfo({ + // location: key + // }) + // let { + // status, + // result + // } = JSON.parse(data) + // if (status == 0) { + // let { + // address, + // address_component + // } = result + // let { + // province, + // city, + // district + // } = address_component + // location = { + // lng, + // lat, + // address, + // province, + // city, + // district + // } + // } + // } + // } // #endif // #ifndef H5 location = await this.$util.getBmapLocation() diff --git a/user/pages/technician-info.vue b/user/pages/technician-info.vue index 18faf87..ec46cd6 100644 --- a/user/pages/technician-info.vue +++ b/user/pages/technician-info.vue @@ -19,7 +19,20 @@ - + + + + 爽约包退 + + + + 实名认证 + + + + 资质证书 + + 基本信息 @@ -218,4 +231,20 @@ display: block; } } + .tags{ + background: rgba(23,193,97,0.3); + display: flex; + justify-content: space-around; + margin:20rpx 30rpx; + padding:20rpx 0; + border-radius:20rpx; + .tagItem{ + display: flex; + align-items: center; + } + text{ + font-size:24rpx; + margin-left:10rpx; + } + }