Skip to content

C
CFFP-HB
Commit 297ee982 by sunerhu
Options

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

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