注册--对接登录接口

components/myteam/lazy-tree.vue

@@ -2,8 +2,8 @@
 	<view class="container">
 		<view class="d-table">
 			<view class="content-box">
-				<view class=""   v-for="item in datatitleList">
-					<span  class="content-box-title">{{item}}</span>
+				<view class="content-box-title"   v-for="item in datatitleList">
+					<span  class="">{{item}}</span>
 				</view>
 			</view>
 			<view class="d-tr">
@@ -15,20 +15,28 @@
 			<!-- 为了提高dom渲染效率，当list产生破坏性变动时（如删除其中一项，或者排序等）必须使用唯一确定的key，而不能使用index -->
 			<block v-for="(item, i) in treeList" :key="item.id">
 				<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;align-items:  center;">
-							<uni-icons
-								v-if="item.hasChildren"
-								:type="checkLazy(item.id) ? 'spinner-cycle' : !checkOpen(item.id) ? 'arrowright' : 'arrowdown'"
-								size="12"
-								
-							></uni-icons>
+					<!--  -->
+					<view class="d-td" :class="`padding-left-${item.level * 5 + 10}`">
+						<view class="" style="display: flex;">
+							<view class="">
+								<uni-icons
+									v-if="item.hasChildren"
+									:type="checkLazy(item.id) ? 'spinner-cycle' : !checkOpen(item.id) ? 'arrowright' : 'arrowdown'"
+									size="12"
+									
+								></uni-icons>
+							</view>
 							<view @click="open(item, i)" v-if="item.level && !item.hasChildren" style="width: 24rpx;height: 26rpx;display: inline-block;"></view>
 							<view  v-else @click="open(item, i)" :class="item.levelCode == 'B1' ? 'content-box-title-a' : item.levelCode == 'C3' ? 'content-box-title-b':'content-box-title'">
-								<!--  -->
-								<text class="" v-if="item.levelCode == 'A1'" style="text-align: center;font-size: 26rpx;line-height: rpx;">{{ item.name || '张麻花' }}</text>
-								<text class="" v-else style="text-align: center;font-size: 13px;line-height: 26px;">{{ item.areaCenterName || '张麻花' }}</text>
+								 <!-- class="d-header" -->
+								 <!-- class="d-header" -->
+								  <!-- :class="item.levelCode == 'B1' ? 'content-box-title-a' : item.levelCode == 'C3' ? 'content-box-title-b':'content-box-title'" -->
+								<!-- <view > -->
+									<text style="color: #000;" v-if="item.levelCode == 'A1'" >{{ item.name || '张麻花' }}</text>
+									<text  v-else >{{ item.areaCenterName || '张麻花' }}</text>
+									
+								<!-- </view> -->
+								
 							</view>
 						</view>
 						
@@ -302,46 +310,62 @@ export default {
 	}
 	
 	.content-box-title {
-		padding: 5px 0;
+		// padding: 5px 0;
 		flex: 1;
 		justify-content: space-between;
 		align-items: center;
 		text-align: center;
 	}
-	.content-box-title{
-		
-	}
 	.content-box-title-a {
+		// min-width: 100rpx;
 		flex: 1;
-		color: #FFFFFF;
-		background: #3F52B7;
-		align-items: center;
-		height: 26px;
-		width: 120px;
-		margin-top: 5px;
+		height: 80rpx;
+		// line-height: 80rpx;
 		background: url('../../static/myteam/Group1660.png');
-		background-size: 100%;
-		border-radius: 5px;
-		text-align: center;
+		background-repeat: no-repeat;
+		// background-color: #3F52B7;
+		background-size:  100%;
+		margin-left: 20rpx;
+		color: #FFFFFF;
 	}
 	.content-box-title-b{
+		// min-width: 100rpx;
 		flex: 1;
-		color: #FFFFFF;
-		/* margin: 0 10px; */
-		background: #3F52B7;
-		height: 26px;
-		width: 120px;
+		// min-height: 60rpx;
+		// padding: 10rpx 0;
 		background: url('../../static/myteam/Group1662.png');
-		background-size: 100%;
-		border-radius: 5px;
-		text-align: center;
-		color: #000000;
+		background-repeat: no-repeat;
+		background-size:  100%;
+		color: #000;
+		border-radius: 10rpx;
+		// border: 1rpx solid #3F52B7;
 	}
+	// .content-box-title-b{
+	// 	flex: 1;
+	// 	color: #000;
+	// 	/* margin: 0 10px; */
+	// 	// background: #3F52B7;
+	// 	// min-width: 240rpx;
+	// 	background: url('../../static/myteam/Group1662.png');
+	// 	background-repeat: no-repeat;
+	// 	background-size: 100%;
+	// 	border-radius: 5px;
+	// 	// border-top-left-radius: 820rpx;
+	// 	// border-bottom-left-radius: 40rpx;
+	// 	text-align: center;
+	// }
 	.d-box{
 		display: flex;
 		justify-content: space-between;
+		.d-header{
+			text-align: center;font-size: 26rpx;
+		}
 		.d-td{
 			flex: 1;
+			font-size: 26rpx;
+			min-height: 60rpx;
+			ling-height: 80rpx;
+			// padding: 10rpx 0;
 		}
 	}
 	.d-tr{

pages/invitationRegister/invitationRegister.vue

@@ -8,7 +8,7 @@
 	   </view>
 	   <view class="inviteInfo">
 		   <text>{{invitationName}}邀请您申请为</text>
-		   <text>{{areaName}}</text>
+		   <text>{{areaName}}{{levelaName}}</text>
 	   </view>
 	   <view class="register" @click="ckregister()">
 		   <text>点击注册</text>
@@ -22,7 +22,8 @@
             return {
 				areaName:'',
 				invitationName:'',
-				shareId:''
+				shareId:'',
+				levelaName:''
             }
         },
 		onLoad(options) {
@@ -34,12 +35,14 @@
 				api.queryById({id:this.shareId}).then(res =>{
 					this.areaName = res.data.data.areaName
 					this.invitationName = res.data.data.invitationName
+					this.name = res.data.data.name
 					this.mobileNumber = res.data.data.mobileNumber
+					this.levelaName = res.data.data.partnerLevel == 'B1' ?'工作室': '事业合作伙伴'
 				})
 			},
 			ckregister(){
 				let dataForm = {
-					name: this.invitationName,
+					name: this.name,
 					mobile: this.mobileNumber,
 					id:this.shareId
 				};

pages/invitationRegister/invitationlogin.vue

@@ -16,7 +16,7 @@
 			</view>
 			<view class="login-code">
 				<!-- <view class="text" style="display: flex;justify-content: space-between;"> -->
-					<input name="form.code" placeholder="输入验证码" v-model="code" type="number" maxlength="6"/>
+					<input name="form.code" placeholder="输入验证码" v-model="form.code" type="number" maxlength="6"/>
 					<text @click="sendMessage()" :class="{'grey':disabledSendBtn}">{{sendCodeHtml}}</text>
 				<!-- </view> -->
 					
@@ -42,15 +42,15 @@
 			return {
 				imgSrc: '../../static/cffp_logo.jpg',
 				liginName: '登录',
-				code:　'',
 				disabledSendBtn:false,
 				agreeFlag:false,
 				remainTimes:60,
 				sendCodeHtml:'获取验证码',
+				userId: '',
 				form:{
 					name: '',
 					mobile: '',
-					code: ''
+					code: null
 				}
 			}
 		},
@@ -73,6 +73,8 @@
 				}else{
 					common.errorDialog(2,'手机号校验错误')
 				}
+				
+				
 			},
 			delayTime() {
 				this.disabledSendBtn = true;
@@ -88,9 +90,43 @@
 				}, 1000);
 			  },
 			nextstep(){
-				uni.navigateTo({
-					url:`/pages/application-process/basic-info?shareId=${this.form.id}`
+				console.log(this.form.code, 555)
+				if(this.form.code =='' ||this.form.code == null ){
+					uni.showToast({
+						title: '请输入验证码',
+						duration: 2000,
+						icon: 'none'
+					});
+					return false
+				}
+				if(this.agreeFlag == false) {
+					uni.showToast({
+						title: '请阅读并勾选银盾保险经纪服务协议和隐私条款',
+						duration: 2000,
+						icon: 'none'
+					});
+					return false
+				}
+				const params = {
+					loginType:'3',
+					...this.form
+				}
+				api.loginVerification(params).then((res)=>{
+					console.log(res, 5524)
+					if(res['success']){
+						this.userId = String(res['data']['userId']);
+						uni.navigateTo({
+							url:'/pages/application-process/basic-info?userId=' + this.userId
+						})
+					}else{
+						uni.showToast({
+							title: res['message'],
+							duration: 2000,
+							icon: 'none'
+						})
+					}
 				})
+
 			}
 		}
 	}

pages/inviteJoin/inviteJoin.vue

@@ -29,8 +29,7 @@
 					</view>
 					<view class="liBox" v-if="applyIdentity == 0">
 						<text>工作室名称：</text>
-						<text><input v-model="dataForm.b1Name" class="uni-input" 
-								placeholder="工作室名称" /></text>
+						<text><input v-model="dataForm.b1Name" class="uni-input" placeholder="工作室名称" /></text>
 					</view>
 					<view class="liBox">
 						<text>所属组织：</text>
@@ -97,7 +96,8 @@
 						<text v-else-if="item.approvalStatus=='3'" class="success">邀请成功</text>
 						<text v-else class="fail">邀请失败</text>
 					</view>
-					<view class="liBox-footer" v-if="item.approvalStatus == 0 || item.approvalStatus== '2'" @click="reinvite(item.id)">
+					<view class="liBox-footer" v-if="item.approvalStatus == 0 || item.approvalStatus== '2'"
+						@click="reinvite(item.id)">
 						<text>重新邀请</text>
 					</view>
 				</view>
@@ -132,22 +132,22 @@
 
 <script>
 	import api from "@/api/api"
+	import common from '../../common/common';
 	export default {
 		data() {
 			return {
 				dataForm: {
 					applyType: '1', //申请类型邀请加盟传 1 申请加盟传 2
 					operatStep: '1', // 99:最后一步,1:第一步,2:为第二步该obj 为第一步
-					userId: '32', // 目前Id 为1
 					name: '', //姓名
 					mobileNumber: '', //被邀请人手机号
-					b1Name:'', // 工作室
+					b1Name: '', // 工作室
 					partnerLevel: '', //被邀请人身份
 					hasCrossDistrict: '', //是否跨区邀请
 					areaId: '', //所属组织Id
 					areaName: '' //所属组织名称
 				},
-				userId: '1',
+				userId: uni.getStorageSync('cffp_userId'),
 				tabType: 1,
 				identityArr: ['工作室', '事业伙伴'],
 				applyIdentity: 0,
@@ -191,50 +191,57 @@
 
 			// 发起邀请事件
 			shareToggle() {
+
 				this.dataForm.partnerLevel = this.applyIdentity == 0 ? 'B1' : 'A1'
 				this.dataForm.hasCrossDistrict = this.isCross == true ? '1' : '0'
 				this.dataForm.areaId = this.queryorgList[this.index].areaId
-				this.dataForm.areaName = this.isCross == false ? this.queryorgList[this.index].areaName : this.dataForm.areaName
+				this.dataForm.userId = this.userId
+				this.dataForm.areaName = this.isCross == false ? this.queryorgList[this.index].areaName : this.dataForm
+					.areaName
 				// this.dataForm.b1Name = this.applyIdentity == 'B1' ? this.dataForm.b1Name : null
 				// if(this.applyIdentity == 'B1'){
 				// 	if(this.dataForm.b1Name ==''){
-						
+
 				// 	}
 				// }
-					if (this.dataForm.name == "" || this.dataForm.mobileNumber == "" || this.dataForm.areaName =='' ||  this.applyIdentity == 'B1' && this.dataForm.b1Name =='') {
+				if (this.dataForm.name == "" || this.dataForm.mobileNumber == "" || this.dataForm.areaName == '' || this
+					.applyIdentity == 'B1' && this.dataForm.b1Name == '') {
+					uni.showToast({
+						title: '请将信息补充完整',
+						duration: 2000,
+						icon: 'none'
+					});
+					return false
+				}
+				if (common.mobileNoValid(this.dataForm.mobileNumber)) {
+					api.saveApplyInfo(this.dataForm).then(res => {
+						if (res['success']) {
+							// this.switchTab(2)
+							// this.$refs.share.open()
+							this.shareId = res.data.id
+							uni.navigateTo({
+								url: '/pages/invitationRegister/invitationRegister?shareId=' + this.shareId
+							})
+						}
 						uni.showToast({
-							title: '请将信息补充完整',
+							title: res['message'],
 							duration: 2000,
 							icon: 'none'
 						});
-						return false
-					}
+					})
+				} else {
+					common.errorDialog(2, '手机号校验错误')
+				}
 
-				api.saveApplyInfo(this.dataForm).then(res => {
-					if (res['success']) {
-					 // this.switchTab(2)
-						// this.$refs.share.open()
-						this.shareId = res.data.id
-						uni.navigateTo({
-							url:'/pages/invitationRegister/invitationRegister?shareId=' + this.shareId
-						})
-					}
-					uni.showToast({
-						title: res['message'],
-						duration: 2000,
-						icon: 'none'
-					});
-				})
 			},
 			closeShare() {
 				this.$refs.share.close()
 			},
-			reinvite(id){
-				 this.shareId = id
+			reinvite(id) {
+				this.shareId = id
 				this.$refs.share.open()
 			},
 			uniShare(type) {
-				console.log(type, 4455)
 				if (type === 1) {
 					uni.share({
 						provider: "weixin",
@@ -437,7 +444,8 @@
 
 			}
 		}
-		.liBox-footer{
+
+		.liBox-footer {
 			width: 200rpx;
 			height: 50rpx;
 			color: #FFFFFF;
@@ -447,6 +455,7 @@
 			border-radius: 30rpx;
 			background: #20269B;
 		}
+
 		.popup-footer {
 			color: #666;
 			font-size: 36rpx;

pages/personalCenter/teamMembers/members.vue

@@ -64,8 +64,8 @@
 	justify-content: center;
 }
 .concent-title{
-	width: 223px;
-	height: 40px;
+	width: 446rpx;
+	height: 80rpx;
 	background: url('../../../static/Group 1623.png');
 	background-size: auto 100%;
 }

pages/personalCenter/teamPerformance/teamPerformance.vue

@@ -28,16 +28,16 @@
 		</view>
 		<view class="classtotal">
 			<view class="classtotal-box">
-				<span v-if="totalOrder" class="totalsingular">￥{{totalOrder}}</span>
+				<span  class="totalsingular">{{totalOrder || 0}}</span>
 				<p>总单数</p>
 			</view>
-			<view class="classtotal-box">
-				<span class="totalsingular">￥{{totalCoursePrice}}</span>
+			<view class="classtotal-box" style="width: 40%;">
+				<span class="totalsingular">￥{{totalCoursePrice || 0}}</span>
 				<p>总销售额</p>
-				<p style="font-size: 5px;">温馨提示：业绩以最终核算为准</p>
+				<p style="font-size: 5rpx;">温馨提示：业绩以最终核算为准</p>
 			</view>
 			<view class="classtotal-box">
-				<span class="totalsingular">￥{{totalIncome}}</span>
+				<span class="totalsingular">￥{{totalIncome || 0}}</span>
 				<p>总销售收入</p>
 			</view>
 		</view>