From 31b2267c2c4dcf781006928d21976c777e7411a4 Mon Sep 17 00:00:00 2001 From: luyisha Date: Fri, 18 Aug 2023 18:36:33 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/jin-edit/jin-edit.vue | 9 +- components/page/pageComponents/goodsStyle.vue | 4 +- components/page/pageComponents/tabMenu.vue | 17 + components/template/PhoneMask.vue | 24 +- components/template/diypages.vue | 6 +- components/template/nonemores.vue | 4 +- components/template/partTimeJob.vue | 13 +- components/template/pic_text/pic_text.vue | 18 +- .../template/pic_text/pic_text_list.vue | 57 +- components/template/postListTwo.vue | 62 ++- components/template/tabBar.vue | 4 +- components/template/tabs/tabs-copy.vue | 118 +++- components/template/workList.vue | 38 +- components/w-picker/date-picker.vue | 10 + components/w-picker/w-picker.vue | 7 +- manifest.json | 2 +- pages.json | 8 + pages/mainPages/Settled/Settled.vue | 80 ++- pages/mainPages/index/diypage.vue | 2 +- pages/mainPages/index/index.vue | 120 ++++- pages/mainPages/login/minLogin.vue | 4 +- .../sendInformation/sendInformation.vue | 54 +- pages/mainPages/userCenter/userCenter.vue | 2 +- pages/mainPages/userset/userset.vue | 2 +- pages/subPages/goods/index.css | 6 +- pages/subPages/homepage/chat/chat.vue | 5 + pages/subPages/homepage/homepage/homepage.vue | 8 +- pages/subPages/homepage/private/private.vue | 6 +- .../mineCollection/mineCollection.vue | 10 +- .../orderList/orderDetails/orderDetails.vue | 2 +- pages/subPages/orderList/orderList.vue | 2 +- pages/subPages/paySuccess/paySuccess.vue | 3 +- pages/subPages/postRelease/postRelease.vue | 25 +- .../addReceivingAddress.vue | 3 + pages/subPages/search/search.vue | 31 +- pages/subPages/submitOrder/submitOrder.vue | 7 +- .../curriculumVitae/curriculumVitae.vue | 82 ++- .../postRecruitment/postRecruitment.vue | 11 +- .../recruitmentDetails/recruitmentDetails.vue | 8 +- .../recruitmentEnter/recruitmentEnter.vue | 10 +- .../subPages2/hirePlatform/resume/resume.vue | 71 ++- pages/subPages2/subscription/subscription.vue | 72 ++- pages/subPages2/userInfo/userInfo.vue | 32 +- pagesA/businessCooperation/index.vue | 37 +- pagesA/campusActivities/activitiesExtend.vue | 35 +- pagesA/campusActivities/campusActivities.vue | 25 +- pagesA/campusActivities/index.vue | 2 +- pagesA/campusActivities/myActivities.vue | 16 +- .../communityClassification.vue | 505 ++++++++++++++++++ pagesA/identityList/bloggerCertification.vue | 27 +- pagesA/identityList/identityList.vue | 22 +- pagesA/identityList/teacherCertification.vue | 27 +- pagesA/instantMessenger/instantMessenger.vue | 5 + .../pictureTextDetails/pictureTextDetails.vue | 50 +- .../studentIdentification.vue | 10 +- 55 files changed, 1501 insertions(+), 319 deletions(-) create mode 100644 pagesA/communityClassification/communityClassification.vue diff --git a/components/jin-edit/jin-edit.vue b/components/jin-edit/jin-edit.vue index c468658..efd8e25 100644 --- a/components/jin-edit/jin-edit.vue +++ b/components/jin-edit/jin-edit.vue @@ -23,7 +23,7 @@ - + @@ -109,7 +109,8 @@ export default { showCenter: false, showRight: false, showSettingLayer: false, - activeColor: '#F56C6C' + activeColor: '#F56C6C', + set_color: '#509DFD', }; }, components: { @@ -308,12 +309,14 @@ export default { this.showSettingLayer = !this.showSettingLayer; }, async editFocus() { - + this.set_color = "#509DFD"; + this.$emit('editFocus', this.set_color); }, editBlur() { }, release(isPublic) { + this.set_color = "#666666"; this.showSettingLayer = false; this.editorCtx.getContents({ success: res => { diff --git a/components/page/pageComponents/goodsStyle.vue b/components/page/pageComponents/goodsStyle.vue index cbdd78e..9bae654 100644 --- a/components/page/pageComponents/goodsStyle.vue +++ b/components/page/pageComponents/goodsStyle.vue @@ -17,7 +17,7 @@ :style="{ padding: issearch === '1' ? '10rpx 30rpx' : !isdiyPage ? '20rpx' : isdiyPageStyle.padding * 2 + 'rpx' }" > - 抢购 + 抢购 抢购 @@ -55,7 +55,7 @@ > {{ goodsItem.is_follow === 0 || goodsItem.is_show === 0 ? '提醒我' : '已关注' }} - + {{ goodsItem.stk === 0 ? '已售罄' : '马上抢' }} 已结束 diff --git a/components/page/pageComponents/tabMenu.vue b/components/page/pageComponents/tabMenu.vue index 49c5d45..6349310 100644 --- a/components/page/pageComponents/tabMenu.vue +++ b/components/page/pageComponents/tabMenu.vue @@ -163,6 +163,10 @@ default: function() { return {} } + }, + isLogin:{ + type: Boolean, + default: true } }, methods: { @@ -203,6 +207,19 @@ } // #endif + let tk = uni.getStorageSync('weliam_user_token');//空值为未登录 + if(!tk){ + uni.showToast({ + title: '请先登录', + icon: 'none' + }) + setTimeout(()=>{ + uni.navigateTo({ + url: '/pages/mainPages/login/minLogin' + }) + }, 1000) + return; + } App.navigationTo({ url }) diff --git a/components/template/PhoneMask.vue b/components/template/PhoneMask.vue index 2343370..883b070 100644 --- a/components/template/PhoneMask.vue +++ b/components/template/PhoneMask.vue @@ -4,33 +4,33 @@ - + 绑定手机号 手机号: - + 图形验证码: - + 验证码: - - 获取验证码 + + 获取验证码 - {{ timeEnd }} + {{ timeEnd }} - 绑定手机号 + 绑定手机号 @@ -387,7 +387,7 @@ border-radius: 20upx; overflow: hidden; - >image { + >.image1 { width: 600upx; height: 112upx; } @@ -418,7 +418,7 @@ background: rgba(248, 248, 248, 1); border-radius: 10upx; - >input { + >.n_input { height: 90upx; margin-left: 30upx; font-size: 28upx; @@ -435,7 +435,7 @@ margin-top: 20upx; position: relative; - >input { + >.s_input { vertical-align: middle; display: inline-block; height: 90upx; @@ -456,7 +456,7 @@ border-radius: 6upx; text-align: center; - >span { + >.span1 { line-height: 58upx; font-size: 24upx; @@ -472,7 +472,7 @@ border-radius: 37upx; text-align: center; - >span { + >.span2 { line-height: 74upx; font-size: 28upx; diff --git a/components/template/diypages.vue b/components/template/diypages.vue index 139e25b..ad0f99c 100644 --- a/components/template/diypages.vue +++ b/components/template/diypages.vue @@ -582,7 +582,7 @@ - + @@ -1637,6 +1637,10 @@ default: function() { return '' } + }, + isLogin:{ + type: Boolean, + default: true } }, computed: { diff --git a/components/template/nonemores.vue b/components/template/nonemores.vue index 46c7f96..5f1a34b 100644 --- a/components/template/nonemores.vue +++ b/components/template/nonemores.vue @@ -1,7 +1,7 @@ + + diff --git a/pagesA/identityList/bloggerCertification.vue b/pagesA/identityList/bloggerCertification.vue index 9971da3..b37457a 100644 --- a/pagesA/identityList/bloggerCertification.vue +++ b/pagesA/identityList/bloggerCertification.vue @@ -6,6 +6,9 @@ + + 驳回原因：{{bloggerInfo.reject}} + 博主信息 @@ -109,29 +112,45 @@ export default { methods: { init(mid) { let _this = this; - _this.getInfo(mid); + _this.verifyInfo(mid); }, // 信息验证接口 - getInfo(mid) { + verifyInfo(mid) { let _this = this; let data = { mid: mid }; App._post_form('&p=Certified&do=initApplyCertified', data, res => { + _this.getInfo(mid); }, (err)=>{ - console.log(err.data.message); + // console.log(err.data.message); uni.navigateBack({ delta: 1 }) }); }, + // 信息获取接口 + getInfo(mid) { + let _this = this; + let data = this.bloggerInfo; + data.mid = mid; + data.type = "get"; + App._post_form('&p=certified&do=applyBloggerCertified',data, res => { + if(res.errno==0){ + _this.setData({ + bloggerInfo: res.data + }) + } + }); + }, setInfo() { let _this = this; let data = { name: _this.bloggerInfo.name, mobile: _this.bloggerInfo.mobile, code: _this.bloggerInfo.code, - screenshot: _this.bloggerInfo.screenshot + screenshot: _this.bloggerInfo.screenshot, + type: 'set' }; if(data.name.replace(/(^\s*)|(\s*$)/g, "")==''){ // 去掉空格 diff --git a/pagesA/identityList/identityList.vue b/pagesA/identityList/identityList.vue index a047554..0e65602 100644 --- a/pagesA/identityList/identityList.vue +++ b/pagesA/identityList/identityList.vue @@ -24,7 +24,8 @@ export default { data() { return { - page: 1, + page: 1, + storeid: '', dataList: [ {title1:"我是学生",title2:"I am a student",img:"Learning-cuate.png", url:'/pagesA/studentIdentification/studentIdentification'}, {title1:"我是教师",title2:"I am a teacher",img:"Learning-pana.png", url:'/pagesA/identityList/teacherCertification'}, @@ -36,6 +37,12 @@ components: { loadmore }, + onLoad(e) { + if(e.sid){ + // 申请过企业入驻 + this.storeid = e.sid; + } + }, onShow() { // this.getList(); }, @@ -62,9 +69,16 @@ }); }, toDetail(url){ - uni.navigateTo({ - url:url - }) + if('/pages/mainPages/Settled/Settled'==url){ + uni.navigateTo({ + url:url+'?storeid='+this.storeid + }) + }else{ + uni.navigateTo({ + url:url + }) + } + } }, onReachBottom(){ diff --git a/pagesA/identityList/teacherCertification.vue b/pagesA/identityList/teacherCertification.vue index 92e228f..c24c4cb 100644 --- a/pagesA/identityList/teacherCertification.vue +++ b/pagesA/identityList/teacherCertification.vue @@ -6,6 +6,9 @@ + + 驳回原因：{{teacherInfo.reject}} + 教师信息 @@ -118,22 +121,37 @@ export default { methods: { init(mid) { let _this = this; - _this.getInfo(mid); + _this.verifyInfo(mid); }, // 信息验证接口 - getInfo(mid) { + verifyInfo(mid) { let _this = this; let data = { mid: mid }; App._post_form('&p=Certified&do=initApplyCertified', data, res => { + _this.getInfo(mid); }, (err)=>{ - console.log(err.data.message); + // console.log(err.data.message); uni.navigateBack({ delta: 1 }) }); }, + // 信息获取接口 + getInfo(mid) { + let _this = this; + let data = this.teacherInfo; + data.mid = mid; + data.type = "get"; + App._post_form('&p=certified&do=applyTeacherCertified',data, res => { + if(res.errno==0){ + _this.setData({ + teacherInfo: res.data + }) + } + }); + }, setInfo() { let _this = this; let data = { @@ -142,7 +160,8 @@ export default { faculty: _this.teacherInfo.faculty, mobile: _this.teacherInfo.mobile, code: _this.teacherInfo.code, - documents: _this.teacherInfo.document_img + documents: _this.teacherInfo.document_img, + type: 'set' }; if(data.name.replace(/(^\s*)|(\s*$)/g, "")==''){ // 去掉空格 diff --git a/pagesA/instantMessenger/instantMessenger.vue b/pagesA/instantMessenger/instantMessenger.vue index bc1a07a..b31c8d2 100644 --- a/pagesA/instantMessenger/instantMessenger.vue +++ b/pagesA/instantMessenger/instantMessenger.vue @@ -841,6 +841,11 @@ export default { _this.vxshow = true; //#endif } + if(fail.data.data.is_jump==1){ + uni.navigateTo({ + url: '/pages/subPages/Equity/Equity' + }) + } } ); if (im_type != 4) { diff --git a/pagesA/pictureTextDetails/pictureTextDetails.vue b/pagesA/pictureTextDetails/pictureTextDetails.vue index 79582a2..c599397 100644 --- a/pagesA/pictureTextDetails/pictureTextDetails.vue +++ b/pagesA/pictureTextDetails/pictureTextDetails.vue @@ -533,36 +533,34 @@ export default { }, onShareAppMessage(res){ let _this = this; + let listId; if (res.from === 'button') {// 来自页面内分享按钮 - let listId = res.target.id; - let title = res.target.dataset.title; - App._post_form('&p=pocket&do=shareNum', { id: listId }, res => { - if(listId == _this.id){ - _this.detailinfo.share++; - }else{ - for(let index=0;index<_this.communityList.length;index++){ - if(_this.communityList[index].id == listId){ - _this.communityList[index].share++; - } + listId = res.target.id; + // let title = res.target.dataset.title; + }else{//右上角按钮 + listId = this.id; + } + App._post_form('&p=pocket&do=shareNum', { id: listId }, res => { + if(listId == _this.id){ + _this.detailinfo.share++; + }else{ + for(let index=0;index<_this.communityList.length;index++){ + if(_this.communityList[index].id == listId){ + _this.communityList[index].share++; } } - setTimeout(()=>{ - uni.showToast({ - icon: 'none', - title: '分享成功', - duration: 2000 - }); - }, 2000) - }); - return { - title: '粤职才', - path: '/pagesA/pictureTextDetails/pictureTextDetails?id='+listId - } - }else{ - return { - title: '粤职才', - path: '/pages/mainPages/index/index' } + setTimeout(()=>{ + uni.showToast({ + icon: 'none', + title: '分享成功', + duration: 2000 + }); + }, 2000) + }); + return { + title: '粤职才', + path: '/pagesA/pictureTextDetails/pictureTextDetails?id='+listId } }, onPageScroll(){ diff --git a/pagesA/studentIdentification/studentIdentification.vue b/pagesA/studentIdentification/studentIdentification.vue index ac05260..fc008a2 100644 --- a/pagesA/studentIdentification/studentIdentification.vue +++ b/pagesA/studentIdentification/studentIdentification.vue @@ -6,6 +6,9 @@ + + 驳回原因：{{studInfo.reject}} + 学生信息 @@ -176,13 +179,13 @@ export default { App._post_form('&p=Certified&do=initApplyCertified', data, res => { _this.getInfo(mid); }, (err)=>{ - console.log(err.data.message); + // console.log(err.data.message); uni.navigateBack({ delta: 1 }) }); }, - // 信息设置接口 + // 信息获取接口 getInfo(mid) { let _this = this; let data = { @@ -203,6 +206,7 @@ export default { }) }); }, + // 信息设置接口 setInfo() { let _this = this; let data = { @@ -462,7 +466,7 @@ export default { } .informationView { width: 690upx; - height: 790upx; + // height: 790upx; background: rgba(255, 255, 255, 1); border-radius: 10upx; margin-top: 10px!important;