diff --git a/components/template/pic_text/pic_text.vue b/components/template/pic_text/pic_text.vue index 6194434..926b0cb 100644 --- a/components/template/pic_text/pic_text.vue +++ b/components/template/pic_text/pic_text.vue @@ -87,7 +87,7 @@ + background-color: rgba(0,0,0,.3);" v-if="commentShow" @click.stop="closeCommentShow"> @@ -215,6 +215,9 @@ export default { editCom(){ this.commentShow=true; }, + closeCommentShow(){ + this.commentShow=false; + }, // 提交评论 submit(){ let _this = this, diff --git a/components/template/tabs/tabs-copy.vue b/components/template/tabs/tabs-copy.vue index 7f816f7..68b764a 100644 --- a/components/template/tabs/tabs-copy.vue +++ b/components/template/tabs/tabs-copy.vue @@ -46,7 +46,7 @@ - + diff --git a/pages/mainPages/userCenter/userCenter.vue b/pages/mainPages/userCenter/userCenter.vue index e08109c..38dd6f6 100644 --- a/pages/mainPages/userCenter/userCenter.vue +++ b/pages/mainPages/userCenter/userCenter.vue @@ -226,7 +226,7 @@ - + @@ -586,12 +586,12 @@ }); return; } - if(url.indexOf('pagesA/campusActivities/myActivities') != -1 && this.memberInfo.identity=='达人'){// 达人的校园活动 - App.navigationTo({ - url: 'pagesA/campusActivities/activitiesExtend' - }); - return; - } + // if(url.indexOf('pagesA/campusActivities/myActivities') != -1 && this.memberInfo.identity=='达人'){// 达人的校园活动 + // App.navigationTo({ + // url: 'pagesA/campusActivities/activitiesExtend' + // }); + // return; + // } if(this.memberInfo.identity=='企业' || this.memberInfo.identity=='商家'){//企业版-传入店铺id uni.setStorageSync('checkStoreid', this.memberInfo.storeid); App.navigationTo({ diff --git a/pages/subPages/mineCollection/mineCollection.vue b/pages/subPages/mineCollection/mineCollection.vue index 592d211..74516ff 100644 --- a/pages/subPages/mineCollection/mineCollection.vue +++ b/pages/subPages/mineCollection/mineCollection.vue @@ -1,7 +1,7 @@ @@ -113,7 +136,7 @@ export default { data() { return { source: 2, - type: 1, + type: 4,// 1店铺2帖子3名片4校园活动 storeCollectList: [], page: 1, lat: null, @@ -133,7 +156,9 @@ export default { is_have:1, cradTotal:1, citycardflag:0, - platformInfor:{} + platformInfor:{}, + ActivitiesPage: 1, + ActivitiesList: [] }; }, onLoad: function() { @@ -143,7 +168,8 @@ export default { _this.agencyData = uni.getStorageSync('agencyData'); _this.platformInfor = uni.getStorageSync('platformInfor') _this.storeCollect(_this.curLoction.latitude, _this.curLoction.longitude); - _this.init() + _this.init(); + _this.getActivitiesList(); // if (client === '1' || client === '3') { // // // #ifdef H5 @@ -343,7 +369,37 @@ export default { _this.page++; _this.storeCollect(); } - } + }, + + getActivitiesList(){ + let _this = this; + App._post_form('&p=student&do=campusActivitiesList', + {page:_this.ActivitiesPage, size: 10, mid: _this.mid, collect: 1}, res => { + if(_this.ActivitiesPage===1){ + if(res.data.data.length>0){ + _this.setData({ + ActivitiesList: res.data.data + }) + } + }else{ + if(res.data.data.length>0){ + let ActivitiesList = _this.ActivitiesList.concat(res.data.data); + _this.setData({ + ActivitiesList + }) + } + } + }); + }, + toActivitiesDetail(id){ + uni.navigateTo({ + url:'/pagesA/campusActivities/campusActivities?id='+id + }) + }, + ActivitiesLoad(){ + this.ActivitiesPage++; + this.getActivitiesList(); + } } }; @@ -431,7 +487,8 @@ page { } .topFull { width: 750upx; - height: 108upx; + // height: 108upx; + height: 0px; } .scdpMb { background: rgba(255, 255, 255, 1); @@ -548,5 +605,49 @@ page { vertical-align: middle; } } +} +.dis-flex{ + display: flex; + align-items: center; +} +.content_wrapper{ + .list-item{ + display: flex; + padding: 15px 0px; + border-bottom: 1px solid #efefef; + } + image{ + width: 80px; + height: 80px; + border-radius: 6px; + margin-right: 10px; + } + .text-box{ + height: 80px; + flex: 1; + overflow: hidden; + display: flex; + flex-direction: column; + justify-content: space-between; + } + .text1{ + font-size: 14px;font-weight: bold; + display: -webkit-box; + -webkit-box-orient: vertical; + -webkit-line-clamp: 2; + overflow: hidden; + } + .text{ + display: -webkit-box;//将盒子转换为弹性盒子 -webkit-box-orient: vertical;//文本显示方式，默认水平 -webkit-line-clamp: 1;//设置显示多少行 overflow: hidden; + font-size: 12px; + color: #999; + } + .label{ + background-color: #509DFD; + color: #fff;font-size: 10px; + padding: 8upx 16upx; + margin-left: 10px; + // border-radius: 10upx; + } } diff --git a/pages/subPages2/hirePlatform/addResume/addResume.vue b/pages/subPages2/hirePlatform/addResume/addResume.vue index e8a2c78..49a1c84 100644 --- a/pages/subPages2/hirePlatform/addResume/addResume.vue +++ b/pages/subPages2/hirePlatform/addResume/addResume.vue @@ -1216,7 +1216,8 @@ export default{ delete data.graduated_school; console.log(data); for(let key in data){ - if(!data[key] && data[key] !== 0){ + if(!data[key] && data[key] !== 0 && key != 'self_evaluation'){ + // && key != 'self_evaluation' 自我评价非必填 uni.showToast({ icon:'none', title:'请完善资料' @@ -1225,7 +1226,7 @@ export default{ return }else if(Array.isArray(data[key])){ - if(data[key].length == 0 && key != 'educational_experience' && key != 'work_experience'){ + if(data[key].length == 0 && key != 'educational_experience' && key != 'work_experience' && key != 'school_office'){ uni.showToast({ icon:'none', title:'请完善资料' diff --git a/pagesA/businessCooperation/index.vue b/pagesA/businessCooperation/index.vue index 7611e00..40d7af6 100644 --- a/pagesA/businessCooperation/index.vue +++ b/pagesA/businessCooperation/index.vue @@ -107,9 +107,9 @@ export default { mid: mid }; App._post_form('&p=Certified&do=initApplyCertified', data, res => { - _this.setData({ - business: res.data - }) + // _this.setData({ + // business: res.data + // }) }, (err)=>{ console.log(err.data.message); uni.navigateBack({ diff --git a/pagesA/campusActivities/activitiesExtend.vue b/pagesA/campusActivities/activitiesExtend.vue index 02409e3..2d68bfe 100644 --- a/pagesA/campusActivities/activitiesExtend.vue +++ b/pagesA/campusActivities/activitiesExtend.vue @@ -1,8 +1,256 @@ - \ No newline at end of file diff --git a/pagesA/campusActivities/activitiesList.vue b/pagesA/campusActivities/activitiesList.vue new file mode 100644 index 0000000..02409e3 --- /dev/null +++ b/pagesA/campusActivities/activitiesList.vue @@ -0,0 +1,8 @@ + + + + + \ No newline at end of file diff --git a/pagesA/campusActivities/campusActivities.vue b/pagesA/campusActivities/campusActivities.vue index 3ccbf46..8c0fe7c 100644 --- a/pagesA/campusActivities/campusActivities.vue +++ b/pagesA/campusActivities/campusActivities.vue @@ -1,45 +1,92 @@