diff --git a/api/model/boss.js b/api/model/boss.js index 9666fe3..c4ff17d 100644 --- a/api/model/boss.js +++ b/api/model/boss.js @@ -2,6 +2,12 @@ // boss相关接口 const api = { + //查询手机号 + queryPhoneNum: { + url: '/employ/user/queryPhoneNum', + method: 'GET', + auth: true, + }, } export default api \ No newline at end of file diff --git a/components/list/userList/index.vue b/components/list/userList/index.vue index 24236de..06af718 100644 --- a/components/list/userList/index.vue +++ b/components/list/userList/index.vue @@ -5,7 +5,8 @@ @scrolltolower="loadMoreData"> + + diff --git a/components/list/userList/userItem.vue b/components/list/userList/userItem.vue index cac2662..536c8dd 100644 --- a/components/list/userList/userItem.vue +++ b/components/list/userList/userItem.vue @@ -103,6 +103,7 @@ }, methods: { callPhone(){ + // 检查数据是否有效和电话号码是否存在 if (!this.isDataValid || !this.phone) { uni.showToast({ @@ -112,15 +113,21 @@ return; } - uni.makePhoneCall({ - phoneNumber: this.phone, - success() { - console.log('安卓拨打成功'); - }, - fail() { - console.log('安卓拨打失败'); - } - }) + this.$store.commit('checkViewCount', { + data : this.item, + phone : this.phone, + type : 'phone', + }) + + // uni.makePhoneCall({ + // phoneNumber: this.phone, + // success() { + // console.log('安卓拨打成功'); + // }, + // fail() { + // console.log('安卓拨打失败'); + // } + // }) }, } } diff --git a/components/screen/screenWork.vue b/components/screen/screenWork.vue index 33645b5..8519149 100644 --- a/components/screen/screenWork.vue +++ b/components/screen/screenWork.vue @@ -114,7 +114,7 @@ result: [], activeName: 'areaId', areaId: { - label: '全部', + label: '地点', value: 0, activeIndex: 0, color: '#333', @@ -392,12 +392,12 @@ this.popupSelectedAddress = '全部地区' // 更新areaId的状态 - this.areaId.label = '全部地区' + this.areaId.label = '地点' this.areaId.value = 'all' // 调用clickItem来更新result数组并触发父组件事件 this.clickItem({ - label: '全部地区', + label: '地点', value: 'all', }) diff --git a/mixins/configList.js b/mixins/configList.js index c972abf..498123a 100644 --- a/mixins/configList.js +++ b/mixins/configList.js @@ -21,6 +21,7 @@ export default { let o = { ...this.Gshare, title: this.configList.config_app_name, + imageUrl: this.configList.config_share_image, } if (this.userInfo.id) { o.path = this.Gshare.path + '?shareId=' + this.userInfo.id @@ -32,6 +33,7 @@ export default { let o = { ...this.Gshare, title: this.configList.config_app_name, + imageUrl: this.configList.config_share_image, } if (this.userInfo.id) { o.path = this.Gshare.path + '?shareId=' + this.userInfo.id diff --git a/pages/index/center.vue b/pages/index/center.vue index a8816da..c4c9fe8 100644 --- a/pages/index/center.vue +++ b/pages/index/center.vue @@ -216,7 +216,9 @@ 我的服务 - + 会员充值 diff --git a/pages/index/index.vue b/pages/index/index.vue index 5d001fa..139196b 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -2,23 +2,32 @@ @@ -215,10 +224,31 @@ .banner{ position: relative; background-color: $uni-color; + .banner-top{ + display: flex; + flex-direction: column; + justify-content: flex-end; + height: 250rpx; + background-color: $uni-color; + + .title{ + color: #fff; + font-size: 40rpx; + font-weight: 900; + padding-left: 30rpx; + font-family: "Arial","Microsoft YaHei","黑体","宋体",sans-serif; + text{ + font-size: 24rpx; + font-weight: 500; + margin-left: 20rpx; + margin-top: 10rpx; + } + } + } .top{ - position: absolute; - top: 190rpx; - left:00rpx; + // position: absolute; + // top: 190rpx; + // left:00rpx; padding-top: 30rpx; display: flex; width: 100%; diff --git a/pages_order/auth/certification.vue b/pages_order/auth/certification.vue index 8e9c180..f5655a6 100644 --- a/pages_order/auth/certification.vue +++ b/pages_order/auth/certification.vue @@ -97,6 +97,26 @@ @delete="deleteImage"> + + + + + 技能证书(选填) + + + + + + + @@ -147,7 +167,8 @@ form : {}, fileList: [], authFileList : [], - sub:0 + skillBook : [], + sub : 0, } }, onLoad() { @@ -170,10 +191,16 @@ }) : [] this.authFileList = this.form.authorizationBook ? this.form.authorizationBook.split(',').map(url => { - return { - url - } - }) : [] + return { + url + } + }) : [] + + this.skillBook = this.form.skillBook ? this.form.skillBook.split(',').map(url => { + return { + url + } + }) : [] } }) }, @@ -199,6 +226,8 @@ }) } this.form.image = this.fileList.map((item) => item.url).join(",") + this.form.authorizationBook = this.authFileList.map((item) => item.url).join(",") + this.form.skillBook = this.skillBook.map((item) => item.url).join(",") if(this.$utils.verificationAll(this.form,{ name:'请输入姓名', cerNo:'请输入身份证号码', @@ -214,6 +243,7 @@ delete this.form.updateBy delete this.form.updateTime delete this.form.userId + delete this.form.validTime this.$api('addAuthenticationPerson',this.form, res =>{ if(res.code == 200){ diff --git a/pages_order/auth/certificationEnterprise.vue b/pages_order/auth/certificationEnterprise.vue index f3a7b45..e70aa84 100644 --- a/pages_order/auth/certificationEnterprise.vue +++ b/pages_order/auth/certificationEnterprise.vue @@ -241,6 +241,7 @@ delete this.form.updateBy delete this.form.updateTime delete this.form.userId + delete this.form.validTime this.$api('addAuthenticationCompany', this.form, res =>{ if(res.code == 200){ diff --git a/pages_order/auth/wxLogin.vue b/pages_order/auth/wxLogin.vue index e4ef5e5..9eaa323 100644 --- a/pages_order/auth/wxLogin.vue +++ b/pages_order/auth/wxLogin.vue @@ -12,7 +12,7 @@ - 授权登录 + 快捷登录