Commit f2eb2988 by sunerhu

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

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