Skip to content

C
CFFP-HB
Commit a3c98e37 by kyle
Options

Merge branch 'dev' of http://139.224.139.2:9091/chaosun/CFFP into dev

parents e41cb573 1a40df24
Showing with 51 additions and 48 deletions
components/courseItem/courseItem.vue
......@@ -102,8 +102,7 @@
.itemContent{
display: flex;
.thumbnailBox{
width: 200rpx;
height: 200rpx;
width: 300rpx;
margin-right: 26rpx;
image{
max-width: 100%;
......@@ -138,7 +137,7 @@
strong{
color: #F15A1F;
font-size: 30rpx;
margin-right: 20rpx;
margin: 10rpx 20rpx 10rpx 0;
}
text{
font-size: 28rpx;
......@@ -147,13 +146,14 @@
.tagListBox{
display: flex;
flex-wrap: wrap;
margin-top: 20rpx;
.tagItem{
color: #20279B;
font-size: 28rpx;
font-size: 24rpx;
border-radius: 20rpx;
border-top-left-radius: 0;
border-bottom-right-radius: 0;
padding: 10rpx 18rpx;
padding: 5rpx 18rpx;
border: 1px solid #20279B;
margin-right: 20rpx;
white-space: nowrap;
......
pages/application-process/basic-info.vue
......@@ -31,14 +31,13 @@
<text>邀请码</text>
<input type="text" class="form-control" placeholder="非必填"
v-model="applyParam.inviterInvitationCode"
:disabled="this.applyParam.approvalStatus!= 0 && this.applyParam.approvalStatus != 2" />
:disabled="this.display"/>
</view>
<view class="contentItem">
<text>申请身份</text>
<text v-if="partnerLevelName">{{partnerLevelName}}</text>
<picker v-else @change="changeIdentity" :value="identityIdx" :range="identityArr"
<picker @change="changeIdentity" :value="identityIdx" :range="identityArr"
range-key="name"
:disabled="this.applyParam.approvalStatus!= 0 && this.applyParam.approvalStatus != 2">
:disabled="this.display">
<view class="uni-input">{{identityArr[identityIdx]['name']}}
<text class="iconfont icon-youjiantou"></text>
</view>
......@@ -47,14 +46,15 @@
<view class="contentItem" v-if="applyParam.partnerLevel == 'B1'">
<text>工作室名称</text>
<input type="text" class="form-control" v-model="applyParam.b1Name" placeholder="请输入工作室名称"
:disabled="this.applyParam.approvalStatus!= 0 && this.applyParam.approvalStatus != 2" />
:disabled="this.display"/>
</view>
<view class="contentItem">
<text>所属组织</text>
<text v-if="areaName">{{areaName}}</text>
<input type="text" v-if="applyParam.hasCrossDistrict == 1" class="form-control" v-model="applyParam.b1Name" placeholder="请输入工作室名称"
:disabled="this.display"/>
<picker v-else @change="changeArea" :value="areaIdIdx" :range="cffpAreaQuerys"
range-key="areaName"
:disabled="this.applyParam.approvalStatus!= 0 && this.applyParam.approvalStatus != 2">
:disabled="this.display">
<view class="uni-input">{{cffpAreaQuerys[areaIdIdx]['areaName']}}
<text class="iconfont icon-youjiantou"></text>
</view>
......@@ -62,18 +62,16 @@
</view>
<view class="contentItem">
<text>姓名</text>
<text v-if="applyParam.name">{{applyParam.name}}</text>
<input v-else type="text" class="form-control" v-model="applyParam.name" placeholder="请输入姓名"
<input type="text" class="form-control" v-model="applyParam.name" placeholder="请输入姓名"
auto-blur=true @blur="checkInput(1,applyParam.name)"
:disabled="this.applyParam.approvalStatus!= 0 && this.applyParam.approvalStatus != 2" />
:disabled="this.display" />
</view>
<view class="contentItem">
<text>手机号</text>
<text v-if="applyParam.mobileNumber">{{applyParam.mobileNumber}}</text>
<input v-else type="text" class="form-control" v-model="applyParam.mobileNumber"
<input type="text" class="form-control" v-model="applyParam.mobileNumber"
placeholder="请输入手机号" maxlength="11" auto-blur=true
@blur="checkInput(2,applyParam.mobileNumber)"
:disabled="this.applyParam.approvalStatus!= 0 && this.applyParam.approvalStatus != 2" />
:disabled="this.display" />
</view>
<view class="contentItem">
<text>证件类型</text>
......@@ -81,11 +79,11 @@
:disabled="this.applyParam.approvalStatus!= 0 && this.applyParam.approvalStatus != 2">
<view class="uni-input">{{idTypesList[idTypeIdx]['name']}}
<text class="iconfont icon-youjiantou"></text>
</view>
</view>
</picker>
</view>
<view class="contentItem">
<text>证件号码</text>
<text>证件号码{{this.applyParam.approvalStatus!= 0 && this.applyParam.approvalStatus != 2}}</text>
<view>
<input type="text" class="form-control" v-model="applyParam.idNo" placeholder="请输入证件号码"
auto-blur=true @blur="checkInput(3,applyParam.idNo)"
......@@ -162,6 +160,7 @@
name: null,
mobile: null,
shareId: null,
display: false,
cffp_userInfo: {
name: '',
mobile: ''
......@@ -171,16 +170,15 @@
components: {},
onLoad(options) {
if (options.dataForm) {
console.log(options, '唧唧哇哇')
let dataOneForm = JSON.parse(options.dataForm)
this.applyParam.name = dataOneForm.name
this.shareId = options.shareId
this.applyParam.inviterInvitationCode = dataOneForm.invitationCode
this.applyParam.mobileNumber = dataOneForm.mobile
this.areaName = dataOneForm.areaName
this.applyParam.partnerLevel = dataOneForm.partnerLevel
this.partnerLevelName = dataOneForm.partnerLevel == 'A1' ? '事业伙伴' : '工作室'
this.applyParam.areaId = dataOneForm.areaId
this.shareId = option.shareId
// let dataOneForm = JSON.parse(options.dataForm)
// this.applyParam.name = dataOneForm.name
// this.applyParam.inviterInvitationCode = dataOneForm.invitationCode
// this.applyParam.mobileNumber = dataOneForm.mobile
// this.areaName = dataOneForm.areaName
// this.applyParam.partnerLevel = dataOneForm.partnerLevel
// this.partnerLevelName = dataOneForm.partnerLevel == 'A1' ? '事业伙伴' : '工作室'
// this.applyParam.areaId = dataOneForm.areaId
uni.setStorageSync('applyId', '')
} else {
this.cffp_userInfo = uni.getStorageSync('cffp_userInfo');
......@@ -189,7 +187,7 @@
this.applyParam.mobileNumber = JSON.parse(uni.getStorageSync('cffp_userInfo'))['mobile'];
}
}
this.erpInitialize();
// this.erpInitialize();
// let routes = getCurrentPages(); // 获取当前打开过的页面路由数组
// let curRoute = routes[routes.length - 1].route // 获取当前页面路由，也就是最后一个打开的页面路由
// console.log('当前路由地址',curRoute)
......@@ -209,11 +207,14 @@
},
methods: {
erpInitialize() {
api.erpInitialize({}).then((res) => {
if (res['success']) {
this.idTypesList = this.idTypesList.concat(res['data']['idTypes']);
console.log(this.idTypesList)
}
return new Promise((resolve,reject)=>{
api.erpInitialize({}).then((res) => {
resolve(res['success']);
if (res['success']) {
this.idTypesList = this.idTypesList.concat(res['data']['idTypes']);
console.log(this.idTypesList)
}
})
})
},
queryOrgList() {
......@@ -302,7 +303,8 @@
}
},
queryById(id, userId) {
async queryById(id, userId) {
await this.erpInitialize();
api.queryById({
id: id,
userId: userId
......@@ -316,11 +318,13 @@
}
}
for (let i = 0; i < this.idTypesList.length; i++) {
if (this.applyParam.idType == this.idTypesList[i].name) {
if (this.idTypesList[i].name == this.applyParam.idType) {
this.idTypeIdx = i;
}
}
if(this.applyParam.approvalStatus!= 0 && this.applyParam.approvalStatus != 2 || this.applyParam.applyType == '1'){
this.display = true
}
} else {
this.queryOrgList();
}
......@@ -371,7 +375,7 @@
}
}
}
if (!this.applyParam.idType) {
if (!this.applyParam.idType || this.applyParam.idType=='请选择') {
uni.showToast({
title: '请选择证件类型',
duration: 2000,
......@@ -397,10 +401,9 @@
}
this.applyParam = {
...this.applyParam,
applyType: 2,
applyType: this.applyParam.inviterInvitationCode? '1': '2',
operatStep: 1,
userId: uni.getStorageSync('cffp_userId'),
hasCrossDistrict: 0
}
api.saveApplyInfo(this.applyParam).then((res) => {
if (res['success']) {
......
pages/application-process/education.vue
......@@ -36,7 +36,7 @@
</picker>
</view>
<view class="contentItem">
<text>毕业学校{{applyParam.approvalStatus}}</text>
<text>毕业学校{{applyParam.approvalStatus}} {{this.applyParam.approvalStatus!= 0 && this.applyParam.approvalStatus != 2}}</text>
<input class="form-control" v-model="applyParam.lastGraduateSchool" style="background: #666666;"
:disabled="this.applyParam.approvalStatus!= 0 && this.applyParam.approvalStatus != 2"/>
</view>
......
pages/application-process/signature.vue
......@@ -24,7 +24,7 @@
<text class="page_mark">8/8</text>
</view>
<view class="signatureContent" v-if="!applyParam.personalSignOssPath">
<e-signature :showCanvas="showCanvas" ref="signatureComponent" @sendImage="getImage"></e-signature>
<e-signature :style="{'width':'100vw','height':'80vh'}" :showCanvas="showCanvas" ref="signatureComponent" @sendImage="getImage"></e-signature>
</view>
<image :src="applyParam.personalSignOssPath" mode="widthFix" v-if="applyParam.personalSignOssPath"></image>
<view class="fixed" url="bank-card" @click="save()">
......@@ -124,11 +124,11 @@
<style lang="scss">
@import 'applyCommon.scss';
uni-page-wrapper{
overflow: hidden!important;
}
// uni-page-wrapper{
// overflow: hidden!important;
// }
.signatureContent{
padding: 0 36rpx 20rpx 26rpx;
// padding: 0 36rpx 20rpx 26rpx;
background: #fff;
margin-top: 20rpx;
height: 100%;
......
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