Browse Source

合并更新

master
luyisha 3 years ago
parent
commit
cfe4bb00c0
  1. 13
      pages/mainPages/Settled/Settled.vue
  2. 1
      pages/mainPages/userCenter/userCenter.vue
  3. 5
      pages/subPages/merchant/merchantOrderList/merchantOrderList.vue
  4. 69
      pages/subPages2/hirePlatform/postRecruitment/postRecruitment.vue
  5. 31
      pages/subPages2/hirePlatform/recruitmentDetails/recruitmentDetails.vue
  6. 2
      pagesA/businessCooperation/index.vue
  7. 5
      pagesA/identityList/bloggerCertification.vue
  8. 58
      pagesA/identityList/teacherCertification.vue
  9. 27
      pagesA/rule_center/rule_center.vue
  10. 70
      pagesA/studentIdentification/studentIdentification.vue
  11. BIN
      static/Influencer-rafiki.png
  12. BIN
      static/Learning-cuate.png
  13. BIN
      static/Learning-pana.png
  14. BIN
      static/partner-rafiki.png

13
pages/mainPages/Settled/Settled.vue

@ -53,7 +53,7 @@
<view class="userInfoInputMain">
<span style="color:red;width:10rpx;">*</span>
<span>{{languageStatus!=1?'职务':'이름'}}</span>
<input :placeholder="languageStatus!=1?'请输入职务名称':'이름을 입력하세요'" v-model="userInfo.name" />
<input :placeholder="languageStatus!=1?'请输入职务名称':'이름을 입력하세요'" v-model="userInfo.position" />
</view>
<view class="userInfoInputMain">
<span style="color:red;width:10rpx;">*</span>
@ -217,7 +217,7 @@
<view class="userInfoInputMain">
<span>招聘状态</span>
<view class="timePickerView">
<picker @change="switchChange" class="dataPicker" :value="switchIndex" range-key="title" :range="switchList">
<picker @change="switchChange" class="dataPicker" :value="switchIndex" :disabled="true" range-key="title" :range="switchList">
<view class="uni-input">{{switchList[switchIndex].title}}
</view>
</picker>
@ -649,6 +649,7 @@
userInfo: {
storename: '',
name: '',
position: '',
mobile: '',
lat: '',
lng: '',
@ -1454,6 +1455,14 @@
});
return;
}
if (_this.userInfo.position == '') {
uni.showToast({
icon: 'none',
title: '职务不能为空',
duration: 2000
});
return;
}
let phone_reg = new RegExp(/^(\(\d{3,4}\)|\d{3,4}-|\s)?\d{7,14}$/);
let myreg = /^(((13[0-9]{1})|(14[0-9]{1})|(15[0-9]{1})|(16[0-9]{1})|(17[0-9]{1})|(19[0-9]{1})|(18[0-9]{1}))+\d{8})$/;
if (!myreg.test(_this.userInfo.mobile) && !phone_reg.test(_this.userInfo.mobile)) {

1
pages/mainPages/userCenter/userCenter.vue

@ -587,6 +587,7 @@
return;
}
if(this.memberInfo.identity=='企业' || this.memberInfo.identity=='商家'){//-id
uni.setStorageSync('checkStoreid', this.memberInfo.storeid);
App.navigationTo({
url:url + `?sid=${this.memberInfo.storeid}`
});

5
pages/subPages/merchant/merchantOrderList/merchantOrderList.vue

@ -401,8 +401,9 @@
_this.userid = '';
}
if (!!e.storeid) {
_this.storeid = e.storeid;
uni.setStorageSync('checkStoreid', e.storeid);
// _this.storeid = e.storeid;
// uni.setStorageSync('checkStoreid', e.storeid);
_this.storeid = e.sid;
} else {}
_this.init();
},

69
pages/subPages2/hirePlatform/postRecruitment/postRecruitment.vue

@ -324,13 +324,20 @@
</view>
</block>
</view>
<view class="dis-flex f-24">
<button class="buttondrag" open-type="contact" hover-class="none"
style="color: #376CF3;margin: 0px;margin-top: 12px;background-color: transparent;
line-height: 20px;font-size: 12px;padding: 0px;" @click="contactService">
联系平台制作宣传片
</button>
</view>
<!-- 上传视频展示 -->
<view class="Zsvideo-main" v-if="userInfo.video_link !== '' && !!userInfo.video_link">
<!-- <view class="t-r" v-if="isAndroid === '1' && isAdclose"> -->
<view class="t-r" v-if="isAndroid === '1'">
<image :src="imgfixUrls + 'merchant/close.png'" class="adcloseImg" @click="deletVideo"></image>
</view>
<video class="zsVideo" :src="src">
<video class="zsVideo" :src="src" id="Zsvideo">
<block v-if="isAndroid === '2'">
<cover-image :src="imgfixUrls + 'merchant/close.png'" class="closeImg" @click="deletVideo"></cover-image>
</block>
@ -632,9 +639,13 @@
<view class="title">温馨提示</view>
<view class="content">你尚未上传招聘视频可能会影响招聘效果</view>
<view class="dis-flex">
<view class="left-1">联系平台制作宣传片</view>
<button class="left-1" open-type="contact" hover-class="none"
style="background-color: transparent;line-height: 40px;
font-size: 14px;padding: 0px;" @click="contactService">
联系平台制作宣传片
</button>
<view class="left-2" @click="showModalA = false;upButton()">上传</view>
<view class="right" @click="submitRequest()">跳过</view>
<view class="right" @click="showModalA = false;submitRequest()">跳过</view>
</view>
</view>
</PopManager>
@ -814,7 +825,12 @@
// images: [],
src: '',
showModalA: false,
submitDatas: {}//
submitDatas: {},//
CustomerService:{},
scrollTimer: null,
scrollLock: null,
videoContext: '',
query: ''
}
},
components:{
@ -1178,7 +1194,7 @@
// }
if(this.userInfo.img.length==0){
uni.showToast({
title: '请上传轮播图',
title: '请上传图',
icon: 'none'
})
return;
@ -2005,7 +2021,48 @@
_this.isAdclose = false;
// _this.marginT.marginTop = '20rpx'
},
}
//
contactService(){
this.showModalA = false;
this.CustomerService = uni.getStorageSync('CustomerService');
console.log(this.CustomerService,'CustomerService------');
wx.openCustomerServiceChat({
extInfo: {url: ''},
corpId: this.CustomerService.enterpriseid,
success(res) {
// console.log(res, 'success');
},
fail(err){
// console.log(err, 'fail');
}
})
},
handlerScroll(){
this.scrollLock = false;
this.query.select('.Zsvideo-main').boundingClientRect(data=>{
if(data){
console.log(data.top,'视频在屏幕的高度');
if(data.top==0 || data.top<0){
console.log('视频暂停');
this.videoContext.stop();
}
}
}).exec();
},
},
onReady() {
this.videoContext = wx.createVideoContext('Zsvideo', this);
this.query = uni.createSelectorQuery().in(this);
},
onPageScroll(){
//
this.scrollLock = true;
// this.handlerScroll();
clearTimeout(this.scrollTimer);
this.scrollTimer = setTimeout(()=>{
this.handlerScroll();
}, 300)
},
}
</script>

31
pages/subPages2/hirePlatform/recruitmentDetails/recruitmentDetails.vue

@ -219,6 +219,10 @@ export default {
videoshow: '',
videolint: '',
recommendList: [],
scrollTimer: null,
scrollLock: null,
videoContext: '',
query: ''
};
},
components:{
@ -403,7 +407,32 @@ export default {
url: "pages/subPages2/hirePlatform/recruitmentDetails/recruitmentDetails?id=" + item.id
});
},
}
handlerScroll(){
this.scrollLock = false;
this.query.select('.media_wrapper').boundingClientRect(data=>{
if(data){
console.log(data.top,'视频在屏幕的高度');
if(data.top==0 || data.top<0){
console.log('视频暂停');
this.videoContext.stop();
}
}
}).exec();
},
},
onReady() {
this.videoContext = wx.createVideoContext('myvideo', this);
this.query = uni.createSelectorQuery().in(this);
},
onPageScroll(){
//
this.scrollLock = true;
// this.handlerScroll();
clearTimeout(this.scrollTimer);
this.scrollTimer = setTimeout(()=>{
this.handlerScroll();
}, 300)
},
};
</script>

2
pagesA/businessCooperation/index.vue

@ -15,7 +15,7 @@
<text class="colorBlack font24 verticalM">姓名</text>
<input placeholder="请输入姓名/昵称" class="colorBlack font24 inlineBlock verticalM p0p50" v-model="business.name" />
</view>
<view class="inputView">
<view class="inputView marginT18">
<text class="colorBlack font24 verticalM">职务</text>
<input placeholder="请输入您的职务" class="colorBlack font24 inlineBlock verticalM p0p50" v-model="business.position" />
</view>

5
pagesA/identityList/bloggerCertification.vue

@ -20,7 +20,7 @@
<input placeholder="请输入您的联系电话" class="colorBlack font24 inlineBlock verticalM p0p50" v-model="bloggerInfo.mobile" />
</view>
<view class="inputView marginT18" style="display: flex;align-items: center;background: #fff;">
<view class="inputView" style="width:">
<view class="inputView">
<text class="colorBlack font24 verticalM">手机验证码</text>
<input placeholder="请输入验证码" class="colorBlack font24 inlineBlock verticalM p0p50"
v-model="bloggerInfo.code" style="width:190upx;" />
@ -249,7 +249,8 @@ export default {
}
let data = {
phone: _this.bloggerInfo.mobile,
type: 2
type: 4,
is_verifycode: 1
};
App._post_form('&do=PIN', data, res => {
let timer_num = 60;

58
pagesA/identityList/teacherCertification.vue

@ -23,6 +23,20 @@
<text class="colorBlack font24 verticalM">院系</text>
<input placeholder="请输入所属院系" class="colorBlack font24 inlineBlock verticalM p0p50" v-model="teacherInfo.faculty" />
</view>
<view class="inputView marginT18">
<text class="colorBlack font24 verticalM">联系电话</text>
<input placeholder="请输入您的联系电话" class="colorBlack font24 inlineBlock verticalM p0p50" v-model="teacherInfo.mobile" />
</view>
<view class="inputView marginT18" style="display: flex;align-items: center;background: #fff;">
<view class="inputView">
<text class="colorBlack font24 verticalM">手机验证码</text>
<input placeholder="请输入验证码" class="colorBlack font24 inlineBlock verticalM p0p50"
v-model="teacherInfo.code" style="width:190upx;" />
</view>
<view class="colorBlack font24 verticalM marginL10"
style="background: #fafafa;border-radius: 10rpx;line-height: 83rpx;padding: 0px 10px;flex-shrink: 0;"
@click="getCode" >{{codeBtnText}}</view>
</view>
</view>
</view>
<!-- 上传证件 -->
@ -73,9 +87,12 @@ export default {
name:'',
school_name:'',
faculty:'',
mobile:'',
code:'',
document_img:''
},
id: null
id: null,
codeBtnText: '获取验证码',
};
},
computed: {
@ -119,6 +136,8 @@ export default {
name: _this.teacherInfo.name,
school_name: _this.teacherInfo.school_name,
faculty: _this.teacherInfo.faculty,
mobile: _this.teacherInfo.mobile,
code: _this.teacherInfo.code,
documents: _this.teacherInfo.document_img
};
if(data.name==''){
@ -239,6 +258,39 @@ export default {
},
maskClick(){
},
//
getCode(){
if(this.codeBtnText!='获取验证码'){
return;
}
let _this = this;
if (_this.teacherInfo.mobile == '' || _this.teacherInfo.mobile.length !== 11) {
uni.showToast({
icon: 'none',
title: '请输入正确的手机号',
duration: 2000
});
return;
}
let data = {
phone: _this.teacherInfo.mobile,
type: 4,
is_verifycode: 1
};
App._post_form('&do=PIN', data, res => {
let timer_num = 60;
let timeClock = setInterval(function() {
timer_num--;
_this.codeBtnText = timer_num + 's后重试';
// _this.timeCount = timer_num;
if (timer_num == 0) {
clearInterval(timeClock);
_this.codeBtnText='获取验证码';
}
}, 1000);
// _this.getSmsCode = res.data.code;
});
}
}
};
@ -311,7 +363,7 @@ export default {
> text {
display: inline-block;
line-height: 83upx;
width: 126upx;
width: 160upx;
text-align: right;
position: relative;
}
@ -324,7 +376,7 @@ export default {
}
> input {
height: 100%;
width: 400upx;
width: 365upx;
}
}
.marginT18 {

27
pagesA/rule_center/rule_center.vue

@ -1,7 +1,7 @@
<template>
<view style="min-height: 100vh;background-color: #f8f8f8;box-sizing: border-box;">
<view class="content_wrapper">
<view v-for="(item,index) in dataList" :key="item.id" class="list-item" @click="toDetail(item.id)">
<view v-for="(item,index) in dataList" :key="item.id" class="list-item" @click="Detail(item)">
<image :src="item.img" mode="aspectFill"></image>
<!-- <view class="text-box">
<view style="font-size: 14px;line-height: 22px;font-weight: bold;">{{item.title}}</view>
@ -37,14 +37,14 @@
let _this = this;
App._post_form('&p=member&do=getRuleCenterList', {page:_this.page, pageSize: 10}, res => {
if(_this.page===1){
if(res.data.data.length>0){
if(res.data.list.length>0){
_this.setData({
dataList: res.data.data
dataList: res.data.list
})
}
}else{
if(res.data.data.length>0){
let dataList = _this.dataList.concat(res.data.data);
if(res.data.list.length>0){
let dataList = _this.dataList.concat(res.data.list);
_this.setData({
dataList
})
@ -54,10 +54,19 @@
});
},
toDetail(id){
// uni.navigateTo({
// url:'/pagesA/campusActivities/campusActivities?id='+id
// })
Detail(item){
uni.previewImage({
urls: [item.img],
// longPressActions: {
// itemList: ['', '', ''],
// success: function(data) {
// console.log('' + (data.tapIndex + 1) + ',' + (data.index + 1) + '');
// },
// fail: function(err) {
// console.log(err.errMsg);
// }
// }
});
}
},
onReachBottom(){

70
pagesA/studentIdentification/studentIdentification.vue

@ -30,11 +30,25 @@
<view class="inputView marginT18">
<text class="colorBlack font24 verticalM">入学时间</text>
<!-- <input placeholder="请选择入学时间" class="colorBlack font24 inlineBlock verticalM p0p50" type="number" v-model="studInfo.start_date" /> -->
<view class="colorBlack font24 inlineBlock verticalM p0p50" style="height: 100%;width: 400upx;">
<view class="colorBlack font24 inlineBlock verticalM p0p50" style="height: 100%;width: 360upx;">
<uni-datetime-picker type="date" :clear-icon="false" v-model="studInfo.start_date" @maskClick="maskClick"
@change="changeDate" placeholder="请选择" />
</view>
</view>
<view class="inputView marginT18">
<text class="colorBlack font24 verticalM">联系电话</text>
<input placeholder="请输入您的联系电话" class="colorBlack font24 inlineBlock verticalM p0p50" v-model="studInfo.mobile" />
</view>
<view class="inputView marginT18" style="display: flex;align-items: center;background: #fff;">
<view class="inputView">
<text class="colorBlack font24 verticalM">手机验证码</text>
<input placeholder="请输入验证码" class="colorBlack font24 inlineBlock verticalM p0p50"
v-model="studInfo.code" style="width:190upx;" />
</view>
<view class="colorBlack font24 verticalM marginL10"
style="background: #fafafa;border-radius: 10rpx;line-height: 83rpx;padding: 0px 10px;flex-shrink: 0;"
@click="getCode" >{{codeBtnText}}</view>
</view>
</view>
</view>
</view>
@ -98,10 +112,13 @@ export default {
userInfo: {},
studInfo: {
start_date: '',
mobile:'',
code:'',
certificate_img: '',
id: null
},
id: null
id: null,
codeBtnText: '获取验证码',
};
},
computed: {
@ -154,7 +171,12 @@ export default {
studInfo: res.data
})
console.log(_this.studInfo)
});
}, (err)=>{
// console.log(err.data.message);
uni.navigateBack({
delta: 1
})
});
},
setInfo() {
let _this = this;
@ -167,6 +189,8 @@ export default {
department_name: _this.studInfo.department_name,
code: _this.studInfo.code,
start_date: _this.studInfo.start_date,
mobile: _this.studInfo.mobile,
code: _this.studInfo.code,
certificate_img: _this.studInfo.img,
id: _this.studInfo.id,
};
@ -231,6 +255,7 @@ export default {
}, 2000)
}
}, (err)=>{
// console.log(err.data.message);
if(err.data.message=='认证已成功,请勿重复申请认证'){
uni.navigateBack({
delta: 1
@ -328,6 +353,39 @@ export default {
},
maskClick(){
},
//
getCode(){
if(this.codeBtnText!='获取验证码'){
return;
}
let _this = this;
if (_this.studInfo.mobile == '' || _this.studInfo.mobile.length !== 11) {
uni.showToast({
icon: 'none',
title: '请输入正确的手机号',
duration: 2000
});
return;
}
let data = {
phone: _this.studInfo.mobile,
type: 4,
is_verifycode: 1
};
App._post_form('&do=PIN', data, res => {
let timer_num = 60;
let timeClock = setInterval(function() {
timer_num--;
_this.codeBtnText = timer_num + 's后重试';
// _this.timeCount = timer_num;
if (timer_num == 0) {
clearInterval(timeClock);
_this.codeBtnText='获取验证码';
}
}, 1000);
// _this.getSmsCode = res.data.code;
});
}
}
};
@ -360,7 +418,7 @@ export default {
}
.informationView {
width: 690upx;
height: 600upx;
height: 790upx;
background: rgba(255, 255, 255, 1);
border-radius: 10upx;
margin-top: 10px!important;
@ -417,7 +475,7 @@ export default {
> text {
display: inline-block;
line-height: 83upx;
width: 126upx;
width: 160upx;
text-align: right;
position: relative;
}
@ -430,7 +488,7 @@ export default {
}
> input {
height: 100%;
width: 400upx;
width: 365upx;
}
}
.marginT18 {

BIN
static/Influencer-rafiki.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 15 KiB

BIN
static/Learning-cuate.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 12 KiB

BIN
static/Learning-pana.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.1 KiB

After

Width:  |  Height:  |  Size: 12 KiB

BIN
static/partner-rafiki.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.3 KiB

After

Width:  |  Height:  |  Size: 13 KiB

Loading…
Cancel
Save