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