Skip to content

C
CFFP-HB
Commit da3e50c2 by sunchao
Options

一些bug修复

parent e11b0bde
Showing with 100 additions and 86 deletions
components/bootpage/bootpage.vue
...@@ -136,6 +136,7 @@ ...@@ -136,6 +136,7 @@
}, },
closebootpage() { closebootpage() {
debugger;
this.$emit('close', this.userId) this.$emit('close', this.userId)
}, },
} }
......
components/courseItem/courseItem.vue
...@@ -153,7 +153,7 @@ ...@@ -153,7 +153,7 @@
strong { strong {
color: #F15A1F; color: #F15A1F;
font-size: 30rpx; font-size: 30rpx;
// margin: 10rpx 20rpx 10rpx 0; margin: 10rpx 20rpx 10rpx 0;
} }
text { text {
......
components/myteam/lazy-tree.vue
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
<text>{{item.areaCenterName}}</text> <text>{{item.areaCenterName}}</text>
<view class="" style="width: 36rpx;height: 36rpx;margin-left: 5rpx; "> <view class="" style="width: 36rpx;height: 36rpx;margin-left: 5rpx; ">
<image style="width: 36rpx;height: 36rpx;" src="../../static/Group1665.png" <image style="width: 36rpx;height: 36rpx;" src="../../static/Group1665.png"
mode=""></image> mode="widthFix"></image>
</view> </view>
</view> </view>
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
<text>{{item.areaCenterName}}</text> <text>{{item.areaCenterName}}</text>
<view class="" style="width: 36rpx;height: 36rpx;margin-left: 5rpx; "> <view class="" style="width: 36rpx;height: 36rpx;margin-left: 5rpx; ">
<image style="width: 36rpx;height: 36rpx;" src="../../static/Group1665.png" <image style="width: 36rpx;height: 36rpx;" src="../../static/Group1665.png"
mode=""></image> mode="widthFix"></image>
</view> </view>
</view> </view>
</view> </view>
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
<text>{{item.areaCenterName}}</text> <text>{{item.areaCenterName}}</text>
<view class="" style="width: 36rpx;height: 36rpx;margin-left: 5rpx;"> <view class="" style="width: 36rpx;height: 36rpx;margin-left: 5rpx;">
<image style="width: 36rpx;height: 36rpx;" src="../../static/Group1665.png" <image style="width: 36rpx;height: 36rpx;" src="../../static/Group1665.png"
mode=""></image> mode="widthFix"></image>
</view> </view>
</view> </view>
</view> </view>
......
pages/application-process/applyCommon.scss
...@@ -47,9 +47,7 @@ ...@@ -47,9 +47,7 @@
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
font-size: 30rpx; font-size: 30rpx;
.form-control{ width: 60%!important;
width: 50%;
}
} }
} }
.contentItem:last-child { .contentItem:last-child {
...@@ -121,7 +119,7 @@ ...@@ -121,7 +119,7 @@
} }
.fixed { .fixed {
position: fixed; position: fixed;
bottom: 40rpx; bottom: 30rpx;
left: 0; left: 0;
right: 0; right: 0;
height: 100rpx; height: 100rpx;
......
pages/application-process/bank-card.vue
...@@ -130,7 +130,9 @@ ...@@ -130,7 +130,9 @@
} }
if (this.backForm.approvalStatus == 0 || this.backForm.approvalStatus == 2) { if (this.backForm.approvalStatus == 0 || this.backForm.approvalStatus == 2) {
if (this.backForm.bankAccountId || this.sureBankAccountId) { if (this.backForm.bankAccountId || this.sureBankAccountId) {
if (this.backForm.bankAccountId != this.sureBankAccountId) { if (Number(this.backForm.bankAccountId) != Number(this.sureBankAccountId)) {
alert('卡号',this.backForm.bankAccountId)
alert('确认卡号',this.sureBankAccountId)
uni.showToast({ uni.showToast({
title: '两次银行卡号不一致,请重新输入', title: '两次银行卡号不一致,请重新输入',
duration: 2000, duration: 2000,
......
pages/application-process/contract.vue
...@@ -46,10 +46,11 @@ ...@@ -46,10 +46,11 @@
</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)"> <!-- <view :class="nineTime == false?'agree':'gree'" @click="agree(curContractId)">
<text>同意</text> <text>同意</text>
<text style="margin-left: 10rpx;" v-if="nineTime">({{remainTimes}}s)</text> <text style="margin-left: 10rpx;" v-if="nineTime">({{remainTimes}}s)</text>
</view> </view> -->
<view class="agree" @click="agree(curContractId)" >同意</view>
</scroll-view> </scroll-view>
...@@ -158,15 +159,15 @@ ...@@ -158,15 +159,15 @@
contractItem.confirmStatus = 0; contractItem.confirmStatus = 0;
} else { } else {
this.isShow = true; this.isShow = true;
this.nineTime = true; // this.nineTime = true;
this.timer = setInterval(() => { // this.timer = setInterval(() => {
this.remainTimes--; // this.remainTimes--;
if (this.remainTimes <= 0) { // if (this.remainTimes <= 0) {
this.nineTime = false // this.nineTime = false
this.remainTimes = 10; // this.remainTimes = 10;
clearInterval(this.timer); // clearInterval(this.timer);
} // }
}, 1000); // }, 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;
...@@ -178,9 +179,9 @@ ...@@ -178,9 +179,9 @@
}, },
//同意合同条款 //同意合同条款
agree() { agree() {
if(this.nineTime == true){ // if(this.nineTime == true){
return false // 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"]) {
......
pages/application-process/education.vue
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
</view> </view>
<text class="page_mark">4/8</text> <text class="page_mark">4/8</text>
</view> </view>
<view class="content"> <view class="content" style="padding-bottom: 150rpx;">
<view class="contentDetail employ"> <view class="contentDetail employ">
<view class="contentItem"> <view class="contentItem">
<text>最高学历：如本科、专科、硕士</text> <text>最高学历：如本科、专科、硕士</text>
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
</view> </view>
<!-- mode="widthFix" --> <!-- mode="widthFix" -->
<view class="photo_w" v-if="educationForm.lastGraduateCertificationOssPath"> <view class="photo_w" v-if="educationForm.lastGraduateCertificationOssPath">
<image :src="educationForm.lastGraduateCertificationOssPath" @click="upLoadPhoto()"></image> <image :src="educationForm.lastGraduateCertificationOssPath" @click="upLoadPhoto()" mode="widthFix"></image>
</view> </view>
<view class="tips"> <view class="tips">
...@@ -259,10 +259,9 @@ ...@@ -259,10 +259,9 @@
@import 'applyCommon.scss'; @import 'applyCommon.scss';
.photo_w { .photo_w {
height: 380rpx; // height: 380rpx;
width: 80%; width: 80%;
margin: auto; margin: auto;
padding-bottom: 20rpx;
} }
.photo_w image { .photo_w image {
......
pages/application-process/id-card.vue
...@@ -24,16 +24,16 @@ ...@@ -24,16 +24,16 @@
</view> </view>
<text class="page_mark">3/8</text> <text class="page_mark">3/8</text>
</view> </view>
<view class="content"> <view class="content" style="padding-bottom: 150rpx;">
<view class="content_wrapper"> <view class="content_wrapper">
<view class="photo" v-if="!cardForm.idFrontPageOssPath" @click="upLoadPhoto('front')"> <view class="photo" v-if="!cardForm.idFrontPageOssPath" @click="upLoadPhoto('front')">
<image src="../../static/front.png" alt="身份证正面" mode="widthFix"></image> <image src="../../static/front.png" alt="身份证正面" mode="widthFix"></image>
<text class="iconfont icon-weibiaoti553"></text> <text class="iconfont icon-weibiaoti553"></text>
<view class="choseBtn">点击添加身份证正面</view> <view class="choseBtn">点击添加身份证正面</view>
</view> </view>
<view class="content_w" v-if="cardForm.idFrontPageOssPath"> <!-- <view class="content_w" v-if="cardForm.idFrontPageOssPath"> -->
<image :src="cardForm.idFrontPageOssPath" @click="upLoadPhoto('front')"></image> <image class="picImg" v-if="cardForm.idFrontPageOssPath" :src="cardForm.idFrontPageOssPath" @click="upLoadPhoto('front')" mode="widthFix"></image>
</view> <!-- </view> -->
<view class="tips"> <view class="tips">
<view>（正确示例：身份证正面，字体清晰）</view> <view>（正确示例：身份证正面，字体清晰）</view>
<view>（jpg,png 文件大小不大于1mb）</view> <view>（jpg,png 文件大小不大于1mb）</view>
...@@ -45,9 +45,9 @@ ...@@ -45,9 +45,9 @@
<text class="iconfont icon-weibiaoti553"></text> <text class="iconfont icon-weibiaoti553"></text>
<view class="choseBtn">点击添加身份证反面</view> <view class="choseBtn">点击添加身份证反面</view>
</view> </view>
<view class="content_w" v-if="cardForm.idBackPageOssPath"> <!-- <view class="content_w" v-if="cardForm.idBackPageOssPath"> -->
<image :src="cardForm.idBackPageOssPath" @click="upLoadPhoto('back')"></image> <image class="picImg" v-if="cardForm.idBackPageOssPath" :src="cardForm.idBackPageOssPath" @click="upLoadPhoto('back')" mode="widthFix"></image>
</view> <!-- </view> -->
<view class="tips"> <view class="tips">
<view>（正确示例：身份证反面，字体清晰）</view> <view>（正确示例：身份证反面，字体清晰）</view>
<view>（jpg,png 文件大小不大于1mb）</view> <view>（jpg,png 文件大小不大于1mb）</view>
...@@ -226,7 +226,7 @@ ...@@ -226,7 +226,7 @@
justify-content: center; justify-content: center;
flex-wrap: wrap; flex-wrap: wrap;
margin-top: 10px; margin-top: 10px;
overflow: hidden; overflow: auto;
.photo { .photo {
text-align: center; text-align: center;
...@@ -253,17 +253,10 @@ ...@@ -253,17 +253,10 @@
bottom: 19%; bottom: 19%;
} }
} }
.picImg {
width: 60%!important;
} }
.content_w {
height: 380rpx;
width: 76%;
margin: auto;
padding-bottom: 20rpx;
} }
.content_w image {
width: 100%;
height: 100%;
}
</style> </style>
pages/application-process/work-experience.vue
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
<view class="content"> <view class="content">
<view class="contentDetail employ"> <view class="contentDetail employ">
<view class="contentItem"> <view class="contentItem">
<text>职业类型</text> <text>职业类型1</text>
<picker @change="changeIndustry" :value="industryIdx" :range="industry" <picker @change="changeIndustry" :value="industryIdx" :range="industry"
range-key="industryName" range-key="industryName"
:disabled="this.workform.approvalStatus!= 0 && this.workform.approvalStatus != 2"> :disabled="this.workform.approvalStatus!= 0 && this.workform.approvalStatus != 2">
...@@ -77,7 +77,7 @@ ...@@ -77,7 +77,7 @@
</view> </view>
<view v-if="workform.certificate" style="width: 100%;text-align: center;"> <view v-if="workform.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">
<image style="width: 100%;" :src="picItem" @click="clickImg(picItem)"></image> <image style="width: 100%;" :src="picItem" @click="clickImg(picItem)" mode="widthFix"></image>
</view> </view>
</view> </view>
<view class="tips"> <view class="tips">
...@@ -296,8 +296,8 @@ ...@@ -296,8 +296,8 @@
@import 'applyCommon.scss'; @import 'applyCommon.scss';
.photo_w { .photo_w {
height: 380rpx; // height: 380rpx;
width: 80%; width: 55%;
margin: auto; margin: auto;
padding-bottom: 20rpx; padding-bottom: 20rpx;
} }
......
pages/courseDetail/courseDetail.vue
...@@ -187,7 +187,10 @@ ...@@ -187,7 +187,10 @@
this.sharelogin = false this.sharelogin = false
this.userId = val this.userId = val
uni.setStorageSync('cffp_userId', this.userId); uni.setStorageSync('cffp_userId', this.userId);
this.getuserRead(1) this.courseDetail();
setTimeout(()=>{
this.getuserRead(this.courseInfo.status)
},500)
} else { } else {
this.sharelogin = false this.sharelogin = false
} }
......
pages/index/index.vue
...@@ -179,6 +179,7 @@ ...@@ -179,6 +179,7 @@
}) })
}, },
featureSelect(featureItem) { featureSelect(featureItem) {
console.log(featureItem)
if(this.loginornot == false && featureItem.name != "学习认证" && featureItem.name != "更多功能"){ if(this.loginornot == false && featureItem.name != "学习认证" && featureItem.name != "更多功能"){
uni.showToast({ uni.showToast({
title: "请登陆个人账户使用该功能", title: "请登陆个人账户使用该功能",
...@@ -190,6 +191,16 @@ ...@@ -190,6 +191,16 @@
}) })
return false return false
} }
if(featureItem.key=='02'){
if(this.cffpUserInfo.levelCode =='C1' || this.cffpUserInfo.levelCode =='C2' || this.cffpUserInfo.levelCode =='C3'){
uni.showToast({
title: "您已是区域服务中心，无需申请加盟",
duration: 2000,
icon: 'none'
});
return false
}
}
if (this.cffpUserInfo.partnerType == null && featureItem.name == '邀请加盟') { if (this.cffpUserInfo.partnerType == null && featureItem.name == '邀请加盟') {
uni.showToast({ uni.showToast({
title: "您本人尚未加盟，您加盟后可邀请加盟", title: "您本人尚未加盟，您加盟后可邀请加盟",
......
pages/orderConfirm/orderConfirm.vue
...@@ -171,6 +171,7 @@ ...@@ -171,6 +171,7 @@
tipsFlag:false, tipsFlag:false,
isRedirect:null, isRedirect:null,
amount:0, amount:0,
calculatedPrice:0
} }
}, },
computed:{ computed:{
...@@ -191,9 +192,6 @@ ...@@ -191,9 +192,6 @@
}, },
methods: { methods: {
replaceUrl(){
},
// 支付 // 支付
pay(){ pay(){
if(this.paymentBtnDisabled){ if(this.paymentBtnDisabled){
...@@ -202,10 +200,10 @@ ...@@ -202,10 +200,10 @@
this.paymentBtnDisabled = true; this.paymentBtnDisabled = true;
let param = { let param = {
orderId:this.orderId, orderId:this.orderId,
amount:this.totalPrice, amount:this.isRedirect==1?this.calculatedPrice : this.totalPrice,
paymentMethod:this.paymentMethod, paymentMethod:this.paymentMethod,
userId:this.userId, userId:this.userId,
integralExchange:this.isDeduction == true ? parseFloat(this.deductionCore) : 0, integralExchange:this.isDeduction? parseFloat(this.deductionCore) : 0,
paymentType:'', paymentType:'',
isPayOrAuth:'', isPayOrAuth:'',
fileId:this.fileId fileId:this.fileId
...@@ -223,21 +221,19 @@ ...@@ -223,21 +221,19 @@
param.paymentType = 2; param.paymentType = 2;
//deviceType:PC为1,移动端为2,微信为3 //deviceType:PC为1,移动端为2,微信为3
if(this.deviceType == 3){ if(this.deviceType == 3){
param.isPayOrAuth = 1;
api.wxAuthorize(param).then((res)=>{
this.paymentBtnDisabled = false;
if(this.amount == '0'){ if(this.amount == '0'){
uni.navigateTo({ uni.navigateTo({
url:`/pages/orderStatus/orderStatus?orderId=${this.orderId}&fileId=${this.fileId}&orderStatus=2&userId=${this.userId}&isRedirect=1` url:`/pages/orderStatus/orderStatus?orderId=${this.orderId}&fileId=${this.fileId}&orderStatus=2&userId=${this.userId}&isRedirect=1`
}) })
return false return false
}else { }
param.isPayOrAuth = 1;
api.wxAuthorize(param).then((res)=>{
this.paymentBtnDisabled = false;
if(res['success']){ if(res['success']){
window.location.href = res['data']['paymentForm']['action']; window.location.href = res['data']['paymentForm']['action'];
} }
}) })
}
}else{ }else{
//微信二维码支付 //微信二维码支付
...@@ -290,24 +286,27 @@ ...@@ -290,24 +286,27 @@
} }
}) })
// #endif // #endif
console.log(param)
//#ifdef H5 //#ifdef H5
//支付宝h5支付 //支付宝h5支付
console.log(JSON.stringify(param))
param.paymentType = 2; param.paymentType = 2;
this.amount = this.totalPrice; // this.amount = this.totalPrice;
if(this.deviceType == 3){ if(this.deviceType == 3){
this.tipsFlag = true; this.tipsFlag = true;
this.amount = this.totalPrice; // this.amount = this.totalPrice;
this.paymentBtnDisabled = false; this.paymentBtnDisabled = false;
let deductionCore = this.isDeduction==true ? parseFloat(this.deductionCore) : 0; let deductionCore = this.isDeduction==true ? parseFloat(this.deductionCore) : 0;
let url = window.location.href + `&isRedirect=1&amount=${this.amount}&jumptime=${new Date()}&isDeduction=${this.isDeduction}&deductionCore=${deductionCore}`; let url = window.location.href + `&isRedirect=1&amount=${this.amount}&isDeduction=${this.isDeduction}&deductionCore=${deductionCore}&jumptime=${new Date()}`;
window.history.replaceState(null, '',url); window.history.replaceState(null, '',url);
return; return;
} }
api.unifiedPay(param).then((res)=>{ api.unifiedPay(param).then((res)=>{
const data = res['data']; const data = res['data'];
this.paymentBtnDisabled = false; this.paymentBtnDisabled = false;
if(res['success']){ if(res['success']){
debugger;
if(data.orderStatus != '' && data.orderStatus != null){ if(data.orderStatus != '' && data.orderStatus != null){
uni.navigateTo({ uni.navigateTo({
url:`/pages/orderStatus/orderStatus?orderId=${this.orderId}&fileId=${this.fileId}&orderStatus=2&userId=${this.userId}&isRedirect=1` url:`/pages/orderStatus/orderStatus?orderId=${this.orderId}&fileId=${this.fileId}&orderStatus=2&userId=${this.userId}&isRedirect=1`
...@@ -315,10 +314,10 @@ ...@@ -315,10 +314,10 @@
return false return false
} }
this.payForm = res['data']['aliOrderString']; this.payForm = res['data']['aliOrderString'];
this.$nextTick(() => { // this.$nextTick(() => {
console.log(document.forms) // console.log(document.forms)
document.forms['punchout_form'].submit(); // document.forms['punchout_form'].submit();
}) // })
}else{ }else{
uni.showModal({ uni.showModal({
content: res['message'], content: res['message'],
...@@ -410,12 +409,11 @@ ...@@ -410,12 +409,11 @@
} }
this.isRedirect = option.isRedirect; this.isRedirect = option.isRedirect;
if(this.isRedirect == 1){ if(this.isRedirect == 1){
if(option.amount){
this.deductionCore = option.deductionCore; this.deductionCore = option.deductionCore;
this.amount = option.amount; this.amount = Number(option.amount);
this.isDeduction = option.isDeduction; this.isDeduction = option.isDeduction;
} this.calculatedPrice = Number(this.amount);
this.totalPrice = this.amount; console.log(JSON.stringify(option))
setTimeout(()=>{ setTimeout(()=>{
this.pay(); this.pay();
},500) },500)
......
pages/personalCenter/teamMembers/jurisdiction.vue
...@@ -6,10 +6,10 @@ ...@@ -6,10 +6,10 @@
<text class="concent-text">{{item.areaCenterName}}</text> <text class="concent-text">{{item.areaCenterName}}</text>
</view> </view>
</view> </view>
<view style="text-align: right;margin: 20px;"> <view style="text-align: right;margin: 20rpx 40rpx;">
合计：{{item.rank}} 合计：{{item.count}}
</view> </view>
<view class=""> <view class="" style="margin-bottom: 80rpx;">
<view class="d-box"> <view class="d-box">
<view class="d-td"> <view class="d-td">
<text>辖下组织/成员</text> <text>辖下组织/成员</text>
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<text>成员数量</text> <text>成员数量</text>
</view> </view>
</view> </view>
<lazy-tree :datatitleList="datatitleList" :dataList="dataList" type="2"></lazy-tree> <lazy-tree :datatitleList="datatitleList" :dataList="getList(item,dataList)" type="2"></lazy-tree>
<!-- <myteam-table :datatitleList="datatitleList" :dataList="raiseList" type="2"></myteam-table> --> <!-- <myteam-table :datatitleList="datatitleList" :dataList="raiseList" type="2"></myteam-table> -->
<!-- <view class="table-content"> <!-- <view class="table-content">
<span>辖下组织/成员</span> <span>辖下组织/成员</span>
...@@ -57,27 +57,35 @@ ...@@ -57,27 +57,35 @@
this.dataList = this.raiseList this.dataList = this.raiseList
console.log(this.raiseList, 77777) console.log(this.raiseList, 77777)
}, },
methods:{
getList(item,arr){
return arr.filter((val)=>{
return item.areaCenterName == val.areaCenterName
})
}
},
data() { data() {
return { return {
datatitleList:['辖下组织/成员','职级','合计'], datatitleList:['辖下组织/成员','职级','合计'],
dataList:[] dataList:[],
lazyTreeData:[],
// dataList:[ // dataList:[
// { // {
// name: 'shirley一级服务中心', // name: 'shirley一级服务中心',
// rank: '50', // rank: '50',
// dataL:[ // dataL:[
// {name:'成员',rms:'2级别',smn:'111'}, // {name:'成员',levelName:'2级别',count:'111'},
// {name:'成员',rms:'2级别',smn:'111'}, // {name:'成员',levelName:'2级别',count:'111'},
// {name:'成员',rms:'2级别',smn:'111'} // {name:'成员',levelName:'2级别',count:'111'}
// ] // ]
// }, // },
// { // {
// name: '雪梨一级服务中心', // name: '雪梨一级服务中心',
// rank: '80', // rank: '80',
// dataL:[ // dataL:[
// {name:'成员',rms:'2级别',smn:'111'}, // {name:'成员',levelName:'2级别',count:'111'},
// {name:'成员',rms:'2级别',smn:'111'}, // {name:'成员',levelName:'2级别',count:'111'},
// {name:'成员',rms:'2级别',smn:'111'} // {name:'成员',levelName:'2级别',count:'111'}
// ] // ]
// } // }
// ] // ]
......
pages/personalCenter/teamMembers/teamMembers.vue
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
</view> </view>
</view> </view>
<view class="other" v-if="tabType===3"> <view class="other" v-if="tabType===3">
<other-team v-if="otherList.length != 0" :otherList="otherList"></other-team> <other-team v-if="otherList" :otherList="otherList"></other-team>
<view v-else class="zdata" style=""> <view v-else class="zdata" style="">
<text>暂无数据!</text> <text>暂无数据!</text>
</view> </view>
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
}, },
mounted() { mounted() {
this.switchTab(1) this.switchTab(2)
this.getmyseatem() this.getmyseatem()
}, },
methods:{ methods:{
......
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