Commit 297ee982 by sunerhu

1.修改退课按钮入参错误

2.修改了一些Bug
parent c69fffff
......@@ -17,7 +17,7 @@
<view class="d-box" v-if="item.level === 0 || checkOpen(item.pids[item.pids.length - 1])">
<!-- :class="`padding-left-${item.level * 5 + 10}`"-->
<view class="d-td">
<view class="" style="display: flex;">
<view class="" style="display: flex;text-align: left;">
<!-- <view class="">
<uni-icons v-if="item.hasChildren && !treeList[0]"
:type="checkLazy(item.id) ? 'spinner-cycle' : !checkOpen(item.id) ? 'arrowright' : 'arrowdown'"
......@@ -373,6 +373,7 @@
// padding: 0 20rpx;
font-size: 26rpx;
.d-td {
flex: 1;
align-items: center;
padding: 5rpx 10rpx;
}
......
......@@ -27,16 +27,14 @@
</view>
<view class="content">
<view class="contentDetail employ">
<view class="contentItem">
<view class="contentItem" v-if="Invitationcodetype == true">
<text>邀请码</text>
<input type="text" class="form-control" placeholder="非必填"
v-model="applyParam.inviterInvitationCode"
:disabled="this.display"/>
v-model="applyParam.inviterInvitationCode" :disabled="this.display" />
</view>
<view class="contentItem">
<text>申请身份</text>
<picker @change="changeIdentity" :value="identityIdx" :range="identityArr"
range-key="name"
<picker @change="changeIdentity" :value="identityIdx" :range="identityArr" range-key="name"
:disabled="this.display">
<view class="uni-input">{{identityArr[identityIdx]['name']}}
<text class="iconfont icon-youjiantou"></text>
......@@ -45,16 +43,14 @@
</view>
<view class="contentItem" v-if="applyParam.partnerLevel == 'B1'">
<text>工作室名称</text>
<input type="text" class="form-control" v-model="applyParam.b1Name" placeholder="请输入工作室名称"
/>
<input type="text" class="form-control" v-model="applyParam.b1Name" placeholder="请输入工作室名称" />
</view>
<view class="contentItem">
<text>所属组织</text>
<input type="text" v-if="applyParam.applyType == 1" class="form-control" v-model="applyParam.areaName" placeholder="请输入工作室名称"
:disabled="this.display"/>
<input type="text" v-if="applyParam.applyType == 1" class="form-control"
v-model="applyParam.areaName" placeholder="请输入工作室名称" :disabled="this.display" />
<picker v-else @change="changeArea" :value="areaIdIdx" :range="cffpAreaQuerys"
range-key="areaName"
:disabled="this.display">
range-key="areaName" :disabled="this.display">
<view class="uni-input">{{cffpAreaQuerys[areaIdIdx]['areaName']}}
<text class="iconfont icon-youjiantou"></text>
</view>
......@@ -62,15 +58,13 @@
</view>
<view class="contentItem">
<text>姓名</text>
<input type="text" class="form-control" v-model="applyParam.name" placeholder="请输入姓名"
auto-blur=true @blur="checkInput(1,applyParam.name)"
:disabled="this.display" />
<input type="text" class="form-control" v-model="applyParam.name" placeholder="请输入姓名"
auto-blur=true @blur="checkInput(1,applyParam.name)" :disabled="this.display" />
</view>
<view class="contentItem">
<text>手机号</text>
<input type="text" class="form-control" v-model="applyParam.mobileNumber"
placeholder="请输入手机号" maxlength="11" auto-blur=true
@blur="checkInput(2,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.display" />
</view>
<view class="contentItem">
......@@ -140,7 +134,7 @@
areaId: '',
approvalStatus: 0,
b1Name: '',
liveAddress:''
liveAddress: ''
// birthday:`${new Date().getFullYear()}-${new Date().getMonth() + 1} -${new Date().getDate()}`,
},
idTypesList: [{
......@@ -159,9 +153,10 @@
partnerLevelName: null,
name: null,
mobile: null,
userId:uni.getStorageSync('cffp_userId'),
userId: uni.getStorageSync('cffp_userId'),
shareId: null,
display: false,
Invitationcodetype: false,
cffp_userInfo: {
name: '',
mobile: ''
......@@ -200,7 +195,7 @@
},
methods: {
erpInitialize() {
return new Promise((resolve,reject)=>{
return new Promise((resolve, reject) => {
api.erpInitialize({}).then((res) => {
resolve(res['success']);
if (res['success']) {
......@@ -212,14 +207,18 @@
},
queryOrgList() {
const param = {
userId:this.userId,
userId: this.userId,
partnerLevel: this.applyParam.partnerLevel
}
console.log(param)
api.queryOrgList(param).then((res) => {
console.log(res)
if (res['success']) {
this.cffpAreaQuerys = []
this.cffpAreaQuerys = [{
areaId: null,
areaName: "请选择所属组织",
levelOrder: null
}]
this.cffpAreaQuerys = this.cffpAreaQuerys.concat(res['data']['cffpAreaQuerys'])
for (let j = 0; j < this.cffpAreaQuerys.length; j++) {
if (this.applyParam.areaId == this.cffpAreaQuerys[j].areaId) {
......@@ -304,19 +303,24 @@
}).then((res) => {
if (res['success']) {
this.applyParam = res['data']['data'];
if (this.applyParam.inviterInvitationCode) {
this.Invitationcodetype = true
}
this.queryOrgList();
for (let m = 0; m < this.identityArr.length; m++) {
if (this.applyParam.partnerLevel == this.identityArr[m].partnerLevel) {
this.identityIdx = m;
}
}
for (let i = 0; i < this.idTypesList.length; i++) {
if (this.idTypesList[i].name == this.applyParam.idType) {
if (this.idTypesList[i].name == this.applyParam.idType) {
this.idTypeIdx = i;
}
}
if(this.applyParam.approvalStatus!= 0 && this.applyParam.approvalStatus != 2 || this.applyParam.applyType == '1'){
if (this.applyParam.approvalStatus != 0 && this.applyParam.approvalStatus != 2 || this
.applyParam.applyType == '1') {
this.display = true
}
} else {
......@@ -369,7 +373,7 @@
}
}
}
if (!this.applyParam.idType || this.applyParam.idType=='请选择') {
if (!this.applyParam.idType || this.applyParam.idType == '请选择') {
uni.showToast({
title: '请选择证件类型',
duration: 2000,
......@@ -395,10 +399,10 @@
}
this.applyParam = {
...this.applyParam,
applyType: this.applyParam.inviterInvitationCode? '1': '2',
applyType: this.applyParam.inviterInvitationCode ? '1' : '2',
operatStep: 1,
userId:this.userId,
hasCrossDistrict: this.applyParam.hasCrossDistrict?this.applyParam.hasCrossDistrict: '0'
userId: this.userId,
hasCrossDistrict: this.applyParam.hasCrossDistrict ? this.applyParam.hasCrossDistrict : '0'
}
api.saveApplyInfo(this.applyParam).then((res) => {
if (res['success']) {
......
......@@ -14,7 +14,7 @@
</view>
</view>
<!-- 退课 -->
<view class="dropClassBox" v-if="type=='drop' && orderDetail.operationStatus == '1'">
<view class="dropClassBox" v-if="Withdrawal=='1' && orderDetail.operationStatus == '1'">
<view class="dropBtn" @click="dropClasses()">退课</view>
</view>
</view>
......@@ -47,6 +47,7 @@
],
type:'',
orderDetail:{},
Withdrawal:'',
commissionType:null
};
},
......@@ -59,6 +60,7 @@
commissionType:this.commissionType,
}
api.userCourseInfo(param).then(res=>{
console.log(res, 15151515)
if(res['success']){
const data = this.orderDetail = res['data']['orderDetail'];
this.fileId = data.fileId;
......@@ -83,12 +85,12 @@
this.orderId = option.id;
console.log(this.orderId, 2222)
this.type = option.type;
this.Withdrawal = option.Withdrawal
this.commissionType = option.commissionType;
},
onShow() {
mounted() {
this.userCourseInfo();
uni.$on("radiobroadcast", res => {
console.log(res, 74120748)
this.type = res.type;
// 清除监听
uni.$off('radiobroadcast');
......
......@@ -14,13 +14,13 @@
<!-- <view class="d-td" v-for="item in datatitleList">
<span class="">{{item}}</span>
</view> -->
<view class="d-td">
<view class="d-td" style="text-align: left;">
<text>辖下组织/成员</text>
</view>
<view class="d-td">
<view class="d-td" style="flex: 1;text-align: center;">
<text>职级</text>
</view>
<view class="d-td">
<view class="d-td" style="flex: 1;text-align: center;">
<text>成员数量</text>
</view>
</view>
......
......@@ -111,7 +111,7 @@
viewDetail(item){
let type = this.tabType == 1 ? 'drop': ''
uni.navigateTo({
url:`/pages/orderDetail/orderDetail?id=${item.orderId}&type=${type}`
url:`/pages/orderDetail/orderDetail?id=${item.orderId}&type=${type}&Withdrawal=1`
})
},
bindDateChange: function(e) {
......
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