Skip to content

C
CFFP-HB
Commit f2eb2988 by sunerhu
Options

1.修改申请加盟提交申请刷新第234 步。

parent 47c6c847
Showing with 175 additions and 107 deletions
pages/application-process/bank-card.vue
...@@ -72,6 +72,9 @@ ...@@ -72,6 +72,9 @@
this.shareId = options.shareId this.shareId = options.shareId
}, },
onShow() { onShow() {
uni.showLoading({
title: '加载中...'
});
if (uni.getStorageSync('applyId')) { if (uni.getStorageSync('applyId')) {
this.queryById(uni.getStorageSync('applyId'), null) this.queryById(uni.getStorageSync('applyId'), null)
} else if (this.shareId) { } else if (this.shareId) {
...@@ -95,6 +98,7 @@ ...@@ -95,6 +98,7 @@
this.sureBankAccountId = ''; this.sureBankAccountId = '';
} }
} }
uni.hideLoading()
}) })
}, },
//去除输入空格 //去除输入空格
......
pages/application-process/basic-info.vue
...@@ -299,14 +299,17 @@ ...@@ -299,14 +299,17 @@
} }
}, },
async queryById(id, userId) { async queryById(id, userId) {
uni.showLoading({
title: '加载中...'
});
await this.erpInitialize(); await this.erpInitialize();
api.queryById({ api.queryById({
id: id, id: id,
userId: userId userId: userId
}).then((res) => { }).then((res) => {
uni.hideLoading();
if (res['success']) { if (res['success']) {
this.applyParam = res['data']['data']; this.applyParam = res['data']['data'];
console.log(res, 125115)
if (this.applyParam.inviterInvitationCode) { if (this.applyParam.inviterInvitationCode) {
this.Invitationcodetype = true this.Invitationcodetype = true
} }
......
pages/application-process/contract.vue
...@@ -46,9 +46,17 @@ ...@@ -46,9 +46,17 @@
</view> </view>
<scroll-view scroll-y style="height: 100%;"> <scroll-view scroll-y style="height: 100%;">
<view class="contract" v-html="curContract"></view> <view class="contract" v-html="curContract"></view>
<!-- <view :class="nineTime == false?'agree':'gree'" @click="agree(curContractId)">
<text>同意</text>
<text style="margin-left: 10rpx;" v-if="nineTime">({{remainTimes}}s)</text>
</view> -->
<view class="agree" @click="agree(curContractId)">
<text>同意</text>
<!-- <text style="margin-left: 10rpx;" v-if="nineTime">({{remainTimes}}s)</text> -->
</view>
</scroll-view> </scroll-view>
<view class="agree" @click="agree(curContractId)">同意</view>
</view> </view>
</template> </template>
...@@ -64,9 +72,11 @@ ...@@ -64,9 +72,11 @@
contractTermsList: [], contractTermsList: [],
isShow: undefined, isShow: undefined,
curTitle: '', curTitle: '',
remainTimes:10,
curContract: '', curContract: '',
curContractId: null, curContractId: null,
isAllAgree: false, isAllAgree: false,
nineTime: true,
applyParam: { applyParam: {
contractTerms: '', contractTerms: '',
approvalStatus: '' approvalStatus: ''
...@@ -80,6 +90,9 @@ ...@@ -80,6 +90,9 @@
this.shareId = options.shareId this.shareId = options.shareId
}, },
onShow() { onShow() {
uni.showLoading({
title: '加载中...'
});
this.getContractList(); this.getContractList();
setTimeout(() => { setTimeout(() => {
if (uni.getStorageSync('applyId')) { if (uni.getStorageSync('applyId')) {
...@@ -140,12 +153,20 @@ ...@@ -140,12 +153,20 @@
}, },
readContract(contractItem) { readContract(contractItem) {
console.log(contractItem, 1515)
if (this.applyParam.approvalStatus == 0 || this.applyParam.approvalStatus == 2) { if (this.applyParam.approvalStatus == 0 || this.applyParam.approvalStatus == 2) {
if (contractItem.confirmStatus == 1) { if (contractItem.confirmStatus == 1) {
contractItem.confirmStatus = 0; contractItem.confirmStatus = 0;
} else { } else {
this.isShow = true; this.isShow = true;
this.nineTime = true;
this.timer = setInterval(() => {
this.remainTimes--;
if (this.remainTimes <= 0) {
this.nineTime = false
this.remainTimes = 10;
clearInterval(this.timer);
}
}, 1000);
this.curContract = contractItem.termNote; this.curContract = contractItem.termNote;
this.curTitle = contractItem.termName; this.curTitle = contractItem.termName;
this.curContractId = contractItem.id; this.curContractId = contractItem.id;
...@@ -157,6 +178,9 @@ ...@@ -157,6 +178,9 @@
}, },
//同意合同条款 //同意合同条款
agree() { agree() {
// if(this.nineTime == true){
// return false
// }
this.isShow = false; this.isShow = false;
for (let i = 0; i < this.contractTermsList.length; i++) { for (let i = 0; i < this.contractTermsList.length; i++) {
if (this.curContractId == this.contractTermsList[i]["id"]) { if (this.curContractId == this.contractTermsList[i]["id"]) {
...@@ -188,6 +212,7 @@ ...@@ -188,6 +212,7 @@
this.isAllAgree = true; this.isAllAgree = true;
} }
} }
uni.hideLoading()
}) })
}, },
} }
...@@ -256,5 +281,17 @@ ...@@ -256,5 +281,17 @@
position: relative; position: relative;
bottom: 0; bottom: 0;
} }
.gree {
width: 100%;
height: 45px;
line-height: 45px;
background: #cacaca;
text-align: center;
color: #fff;
font-size: 20px;
font-weight: bold;
position: relative;
bottom: 0;
}
} }
</style> </style>
pages/application-process/education.vue
...@@ -19,45 +19,46 @@ ...@@ -19,45 +19,46 @@
</view> </view>
<view class="wrapper"> <view class="wrapper">
<view class="title"> <view class="title">
<view> <view>
<text class="line"></text>学历信息 <text class="line"></text>学历信息
</view> </view>
<text class="page_mark">4/8</text> <text class="page_mark">4/8</text>
</view> </view>
<view class="content"> <view class="content">
<view class="contentDetail employ"> <view class="contentDetail employ">
<view class="contentItem"> <view class="contentItem">
<text>最高学历：如本科、专科、硕士</text> <text>最高学历：如本科、专科、硕士</text>
<picker @change="changeEducation" :value="educationIdx" :range="educationLevelList" <picker @change="changeEducation" :value="educationIdx" :range="educationLevelList"
range-key="name" :disabled="this.applyParam.approvalStatus!= 0 && this.applyParam.approvalStatus != 2"> range-key="name"
<view class="uni-input">{{educationLevelList[educationIdx]['name']}} :disabled="this.applyParam.approvalStatus!= 0 && this.applyParam.approvalStatus != 2">
<text class="iconfont icon-youjiantou"></text> <view class="uni-input">{{educationLevelList[educationIdx]['name']}}
</view> <text class="iconfont icon-youjiantou"></text>
</picker> </view>
</view> </picker>
<view class="contentItem"> </view>
<text>毕业学校</text> <view class="contentItem">
<input type="text" class="form-control" v-model="applyParam.lastGraduateSchool" placeholder="请输入毕业院校" <text>毕业学校</text>
:disabled="this.applyParam.approvalStatus!= 0 && this.applyParam.approvalStatus != 2"/> <input type="text" class="form-control" v-model="applyParam.lastGraduateSchool"
</view> placeholder="请输入毕业院校"
<view class="contentItem" style="border:none;"> :disabled="this.applyParam.approvalStatus!= 0 && this.applyParam.approvalStatus != 2" />
<text>毕业证</text> </view>
<view></view> <view class="contentItem" style="border:none;">
</view> <text>毕业证</text>
</view> <view></view>
<view class="photo_wrapper" v-if="!applyParam.lastGraduateCertificationOssPath" @click="upLoadPhoto()"> </view>
<text class="iconfont icon-weibiaoti553"></text> </view>
<view style="margin-top: 10px;" >点击添加毕业证照片</view> <view class="photo_wrapper" v-if="!applyParam.lastGraduateCertificationOssPath" @click="upLoadPhoto()">
</view> <text class="iconfont icon-weibiaoti553"></text>
<!-- mode="widthFix" --> <view style="margin-top: 10px;">点击添加毕业证照片</view>
<view class="photo_w" v-if="applyParam.lastGraduateCertificationOssPath"> </view>
<image :src="applyParam.lastGraduateCertificationOssPath" <!-- mode="widthFix" -->
@click="upLoadPhoto()" ></image> <view class="photo_w" v-if="applyParam.lastGraduateCertificationOssPath">
</view> <image :src="applyParam.lastGraduateCertificationOssPath" @click="upLoadPhoto()"></image>
</view>
<view class="tips">
<view>（jpg,png 文件大小不大于1mb）</view> <view class="tips">
</view> <view>（jpg,png 文件大小不大于1mb）</view>
</view>
</view> </view>
</view> </view>
<view class="fixed" @click="saveInfo()"> <view class="fixed" @click="saveInfo()">
...@@ -68,20 +69,25 @@ ...@@ -68,20 +69,25 @@
<script> <script>
import api from '../../api/api'; import api from '../../api/api';
import { CommonUpload } from '@/util/uploaderFile'; import {
export default{ CommonUpload
data(){ } from '@/util/uploaderFile';
export default {
data() {
return { return {
educationLevelList:[{id:null,name:'请选择'}], educationLevelList: [{
educationIdx:0, id: null,
applyParam:{ name: '请选择'
lastGraduateGrade:'', }],
lastGraduateSchool:'', educationIdx: 0,
lastGraduateCertificationOssPath:'', applyParam: {
approvalStatus:'' lastGraduateGrade: '',
lastGraduateSchool: '',
lastGraduateCertificationOssPath: '',
approvalStatus: ''
}, },
shareId:null, shareId: null,
dataForm:{ dataForm: {
loginId: uni.getStorageSync('cffp_userId'), loginId: uni.getStorageSync('cffp_userId'),
targetType: "5", targetType: "5",
targetId: '', targetId: '',
...@@ -91,65 +97,71 @@ ...@@ -91,65 +97,71 @@
} }
} }
}, },
components:{}, components: {},
onLoad(options){ onLoad(options) {
this.educationLevelQuery(); this.educationLevelQuery();
setTimeout(()=>{ if (uni.getStorageSync('applyId')) {
if(uni.getStorageSync('applyId')){ this.queryById(uni.getStorageSync('applyId'), null)
this.queryById(uni.getStorageSync('applyId'),null) } else if (options.shareId) {
}else if(options.shareId){ this.queryById(options.shareId, null)
this.queryById(options.shareId,null) } else {
}else{ this.queryById(null, uni.getStorageSync('cffp_userId'))
this.queryById(null,uni.getStorageSync('cffp_userId')) }
}
},500)
}, },
onShow() { onShow() {
uni.$on("ckqueryById", res => { uni.$on("ckqueryById", res => {
if(res == true){ console.log('第四步骤')
if (res == true) {
this.queryById(null, uni.getStorageSync('cffp_userId')) this.queryById(null, uni.getStorageSync('cffp_userId'))
} }
// 移除监听事件
uni.$off('ckqueryById');
}) })
// 移除监听事件
uni.$off('ckqueryById');
}, },
methods:{ methods: {
educationLevelQuery(){ educationLevelQuery() {
api.educationLevelQuery().then((res)=>{ api.educationLevelQuery().then((res) => {
console.log(res) console.log(res)
if(res['success']){ if (res['success']) {
this.educationLevelList = this.educationLevelList.concat(res['data']['educationLevelList']); this.educationLevelList = this.educationLevelList.concat(res['data'][
'educationLevelList']);
} }
}) })
}, },
queryById(id,userId){ queryById(id, userId) {
api.queryById({id:id,userId:userId}).then((res)=>{ uni.showLoading({
console.log(res, 111) title: '加载中...'
if(res['success']){ });
api.queryById({
id: id,
userId: userId
}).then((res) => {
if (res['success']) {
this.applyParam = res['data']['data']; this.applyParam = res['data']['data'];
for(let i=0;i<this.educationLevelList.length;i++){ for (let i = 0; i < this.educationLevelList.length; i++) {
if(this.applyParam.lastGraduateGrade == this.educationLevelList[i].name){ if (this.applyParam.lastGraduateGrade == this.educationLevelList[i].name) {
this.educationIdx = i; this.educationIdx = i;
} }
} }
} }
uni.hideLoading()
}) })
}, },
upLoadPhoto(event){ upLoadPhoto(event) {
if(this.applyParam.approvalStatus== 0 || this.applyParam.approvalStatus == 2){ if (this.applyParam.approvalStatus == 0 || this.applyParam.approvalStatus == 2) {
this.dataForm.targetId = this.applyParam.id this.dataForm.targetId = this.applyParam.id
CommonUpload(this.dataForm).then(res => { CommonUpload(this.dataForm).then(res => {
this.applyParam.lastGraduateCertificationOssPath = res.data.filePath; this.applyParam.lastGraduateCertificationOssPath = res.data.filePath;
}); });
} }
}, },
changeEducation:function(e){ changeEducation: function(e) {
this.educationIdx = e.detail.value; this.educationIdx = e.detail.value;
this.applyParam.lastGraduateGrade = this.educationLevelList[this.educationIdx]['name']; this.applyParam.lastGraduateGrade = this.educationLevelList[this.educationIdx]['name'];
}, },
saveInfo(){ saveInfo() {
if(this.applyParam.approvalStatus== 0 || this.applyParam.approvalStatus == 2){ if (this.applyParam.approvalStatus == 0 || this.applyParam.approvalStatus == 2) {
if(!this.applyParam.lastGraduateGrade){ if (!this.applyParam.lastGraduateGrade) {
uni.showToast({ uni.showToast({
title: '请选择最高学历', title: '请选择最高学历',
duration: 2000, duration: 2000,
...@@ -157,7 +169,7 @@ ...@@ -157,7 +169,7 @@
}) })
return; return;
} }
if(!this.applyParam.lastGraduateSchool){ if (!this.applyParam.lastGraduateSchool) {
uni.showToast({ uni.showToast({
title: '请输入毕业学校', title: '请输入毕业学校',
duration: 2000, duration: 2000,
...@@ -165,7 +177,7 @@ ...@@ -165,7 +177,7 @@
}) })
return; return;
} }
if(!this.applyParam.lastGraduateCertificationOssPath){ if (!this.applyParam.lastGraduateCertificationOssPath) {
uni.showToast({ uni.showToast({
title: '请上传毕业证书', title: '请上传毕业证书',
duration: 2000, duration: 2000,
...@@ -174,18 +186,16 @@ ...@@ -174,18 +186,16 @@
return; return;
} }
this.applyParam = { this.applyParam = {
...this.applyParam, ...this.applyParam,
operatStep:4, operatStep: 4,
} }
api.saveApplyInfo(this.applyParam).then((res)=>{ api.saveApplyInfo(this.applyParam).then((res) => {
if(res['success']){ if (res['success']) {
uni.navigateTo({ uni.navigateTo({
// url:`bank-card?id=${res['data']['id']}` // url:`bank-card?id=${res['data']['id']}`
url:`bank-card` url: `bank-card`
}); });
// 发送广播 } else {
uni.$emit("ckqueryById",true);
}else{
uni.showToast({ uni.showToast({
title: res['message'], title: res['message'],
duration: 2000, duration: 2000,
...@@ -194,10 +204,10 @@ ...@@ -194,10 +204,10 @@
return; return;
} }
}) })
}else{ } else {
uni.navigateTo({ uni.navigateTo({
// url:`bank-card?id=${res['data']['id']}` // url:`bank-card?id=${res['data']['id']}`
url:`bank-card` url: `bank-card`
}); });
} }
} }
...@@ -207,14 +217,16 @@ ...@@ -207,14 +217,16 @@
<style lang="scss"> <style lang="scss">
@import 'applyCommon.scss'; @import 'applyCommon.scss';
.photo_w{
.photo_w {
height: 320rpx; height: 320rpx;
width: 80%; width: 80%;
margin: auto; margin: auto;
padding-bottom: 20rpx; padding-bottom: 20rpx;
} }
.photo_w image { .photo_w image {
width: 100%; width: 100%;
height: 100%; height: 100%;
} }
</style> </style>
\ No newline at end of file
pages/application-process/id-card.vue
...@@ -88,7 +88,6 @@ ...@@ -88,7 +88,6 @@
}, },
components: {}, components: {},
onLoad(options) { onLoad(options) {
console.log(options, 111111)
// this.shareId = options.shareId // this.shareId = options.shareId
if (uni.getStorageSync('applyId')) { if (uni.getStorageSync('applyId')) {
this.queryById(uni.getStorageSync('applyId'), null) this.queryById(uni.getStorageSync('applyId'), null)
...@@ -100,23 +99,26 @@ ...@@ -100,23 +99,26 @@
}, },
onShow() { onShow() {
uni.$on("ckqueryById", res => { uni.$on("ckqueryById", res => {
console.log('‘第三步接受广播进行刷新') console.log('第3步骤')
if (res == true) { if (res == true) {
this.queryById(null, uni.getStorageSync('cffp_userId')) this.queryById(null, uni.getStorageSync('cffp_userId'))
} }
uni.$off('ckqueryById');
}) })
uni.$off('ckqueryById');
}, },
methods: { methods: {
queryById(id, userId) { queryById(id, userId) {
uni.showLoading({
title: '加载中...'
});
api.queryById({ api.queryById({
id: id, id: id,
userId: userId userId: userId
}).then((res) => { }).then((res) => {
console.log(res)
if (res['success']) { if (res['success']) {
this.applyParam = res['data']['data']; this.applyParam = res['data']['data'];
} }
uni.hideLoading()
}) })
}, },
upLoadPhoto(type) { upLoadPhoto(type) {
...@@ -167,7 +169,6 @@ ...@@ -167,7 +169,6 @@
// url:`id-card?id=${res['data']['id']}` // url:`id-card?id=${res['data']['id']}`
url: `education` url: `education`
}); });
uni.$emit("ckqueryById", true);
} else { } else {
uni.showToast({ uni.showToast({
title: res['message'], title: res['message'],
......
pages/application-process/personal-statement.vue
...@@ -61,6 +61,9 @@ ...@@ -61,6 +61,9 @@
this.shareId = options.shareId this.shareId = options.shareId
}, },
onShow() { onShow() {
uni.showLoading({
title: '加载中...'
});
this.dropOptionsQuery(); this.dropOptionsQuery();
setTimeout(()=>{ setTimeout(()=>{
if(uni.getStorageSync('applyId')){ if(uni.getStorageSync('applyId')){
...@@ -102,6 +105,7 @@ ...@@ -102,6 +105,7 @@
} }
} }
} }
uni.hideLoading()
}) })
}, },
saveInfo(){ saveInfo(){
......
pages/application-process/signature.vue
...@@ -124,14 +124,14 @@ ...@@ -124,14 +124,14 @@
} }
api.saveApplyInfo(this.applyParam).then((res)=>{ api.saveApplyInfo(this.applyParam).then((res)=>{
if(res['success']){ if(res['success']){
// 发送广播
uni.$emit("ckqueryById", true);
uni.navigateTo({ uni.navigateTo({
url: `application-result?partnerLevel=${this.applyParam.partnerLevel}&areaName=${this.applyParam.areaName}&shareId=${this.shareId}`, url: `application-result?partnerLevel=${this.applyParam.partnerLevel}&areaName=${this.applyParam.areaName}&shareId=${this.shareId}`,
success: res => {}, success: res => {},
fail: () => {}, fail: () => {},
complete: () => {} complete: () => {}
}); });
// 发送广播
uni.$emit("ckqueryById",true);
}else{ }else{
uni.showToast({ uni.showToast({
title: res['message'], title: res['message'],
......
pages/application-process/work-experience.vue
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
</view> </view>
<view class="photo_wrapper" @click="upLoadPhoto()" v-if="!applyParam.certificate"> <view class="photo_wrapper" @click="upLoadPhoto()" v-if="!applyParam.certificate">
<text class="iconfont icon-weibiaoti553"></text> <text class="iconfont icon-weibiaoti553"></text>
<view style="margin-top: 10px;">点击添加荣誉证书照片</view> <view style="margin-top: 10px;">点击添加荣誉证书照片</view>
</view> </view>
<view v-if="applyParam.certificate" style="width: 100%;text-align: center;"> <view v-if="applyParam.certificate" style="width: 100%;text-align: center;">
<view class="photo_w" v-for="picItem in picList"> <view class="photo_w" v-for="picItem in picList">
...@@ -102,7 +102,8 @@ ...@@ -102,7 +102,8 @@
<script> <script>
import api from '../../api/api'; import api from '../../api/api';
import { import {
CommonUpload,ckbigImg CommonUpload,
ckbigImg
} from '@/util/uploaderFile'; } from '@/util/uploaderFile';
export default { export default {
data() { data() {
...@@ -147,9 +148,12 @@ ...@@ -147,9 +148,12 @@
}, },
onShow() { onShow() {
uni.$on("ckqueryById", res => { uni.$on("ckqueryById", res => {
if(res == true){ console.log(res,'接收到广播，第二步', )
if (res == true) {
this.queryById(null, uni.getStorageSync('cffp_userId')) this.queryById(null, uni.getStorageSync('cffp_userId'))
} }
// 移除监听事件
uni.$off('ckqueryById');
}) })
}, },
methods: { methods: {
...@@ -226,6 +230,9 @@ ...@@ -226,6 +230,9 @@
} }
}, },
queryById(id, userId) { queryById(id, userId) {
uni.showLoading({
title: '加载中...'
});
api.queryById({ api.queryById({
id: id, id: id,
userId: userId userId: userId
...@@ -243,6 +250,7 @@ ...@@ -243,6 +250,7 @@
} }
} }
} }
uni.hideLoading()
}) })
} }
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment