校友捐赠

packages/donate/index.vue

@@ -26,6 +26,26 @@
 		</view>
 		<u-picker @confirm="selectCourse" v-model="showCourse" :range="courseList" range-key="value"
 			mode="selector"></u-picker>
+
+		<!-- 进入后没有手机号的话 绑定 或者 注册 -->
+		<view class="modal">
+			<u-popup v-model="showRegister" mode="bottom" :mask-close-able='false'>
+				<view>
+					<view class="modal-tip">提示</view>
+					<view class="modal-content">
+						<view>如您已是我方校友，请先绑定账号</view>
+						<view @click="goBind" class="modal-bind">
+							去绑定
+						</view>
+						<view>如您还不是我方校友，请先注册</view>
+						<view @click="toRegister" class="modal-register">
+							去注册
+						</view>
+					</view>
+				</view>
+
+			</u-popup>
+		</view>
 	</view>
 </template>
 
@@ -33,8 +53,10 @@
 	export default {
 		data() {
 			return {
+				showRegister: false,
+				hasMobile: false,
 				showCourse: false,
-				isLocked:false,
+				isLocked: false,
 				form: {
 					username: '',
 					course: '',
@@ -112,7 +134,7 @@
 				let that = this
 				this.$refs.uForm.validate(valid => {
 					if (valid) {
-						if(this.isLocked){
+						if (this.isLocked) {
 							return
 						}
 						this.isLocked = true
@@ -154,6 +176,13 @@
 									'vuex_token': res1.token,
 									'vuex_user': res2.user
 								})
+								if (that.base.isNull(res.user.mobile)) {
+									that.showRegister = true
+									that.hasMobile = false
+								} else {
+									that.showRegister = false
+									that.hasMobile = true
+								}
 							})
 						}).catch(err => {
 							console.log('login-error:', JSON.stringify(err))
@@ -165,14 +194,36 @@
 				});
 			},
 			getUserInfo() {
+				let that = this
 				this.$u.api.user().then(res => {
 					this.form.username = res.user.username
 					this.form.mobile = res.user.mobile
 					this.form.company_position = res.user.company_position
 					this.form.company_name = res.user.company_name
 					this.$u.vuex('vuex_user', res.user)
+					if (that.base.isNull(res.user.mobile)) {
+						that.showRegister = true
+						that.hasMobile = false
+					} else {
+						that.showRegister = false
+						that.hasMobile = true
+					}
 				})
 			},
+			
+			// 去绑定登录
+			goBind() {
+				uni.redirectTo({
+					url: '/packages/register/login?isDonate=isDonate'
+				})
+			},
+			// 去注册
+			toRegister() {
+				uni.redirectTo({
+					url: '/packages/register/index?isDonate=isDonate'
+				})
+			},
+			
 		}
 	}
 </script>
@@ -214,6 +265,48 @@
 				padding: 20rpx;
 			}
 		}
+		.modal {
+			::v-deep .u-drawer-bottom {
+				border-radius: 40rpx;
+			}
+		
+			&-tip {
+				text-align: center;
+				padding: 30rpx;
+				font-size: 32rpx;
+			}
+		
+			&-content {
+				height: 450rpx;
+				padding: 0 30rpx;
+				font-size: 32rpx;
+				text-align: center;
+		
+				&>view {
+					margin: 30rpx auto;
+				}
+			}
+		
+			&-bind {
+				width: 45%;
+				text-align: center;
+				margin: 0 auto;
+				color: #fff;
+				border-radius: 30rpx;
+				padding: 20rpx;
+				background: linear-gradient(to right, #e4cdb4, #c69c6d);
+			}
+		
+			&-register {
+				width: 45%;
+				text-align: center;
+				margin: 0 auto;
+				color: #fff;
+				border-radius: 30rpx;
+				padding: 20rpx;
+				background: linear-gradient(to right, #5e5fbc, #0d0398);
+			}
+		}
 
 	}
 </style>

packages/register/index.vue

@@ -69,6 +69,7 @@
 		data() {
 			return {
 				showMobile: false,
+				isDonate:false,
 				myMobile:'',
 				myCode: '',
 				hasSend: false,
@@ -149,6 +150,7 @@
 		},
 		onLoad(options) {
 			this.course_id = options.id ? options.id : null
+			this.isDonate = options.isDonate?options.isDonate:false
 		},
 		onUnload() {
 			if (this.sendTimer) {
@@ -246,6 +248,10 @@
 										// uni.redirectTo({
 										// 	url:'/pages/course/index'
 										// })
+									}else if(that.isDonate){
+										uni.redirectTo({
+											url: '/packages/donate/index'
+										})
 									} else {
 										uni.switchTab({
 											url: '/pages/me/index'

packages/register/login.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="container">
-		<image class="cbg"  :src="base.imgHost('login-top.png')"></image>
+		<image class="cbg" :src="base.imgHost('login-top.png')"></image>
 		<view class="login">
 			<image class="login-logo" :src="base.imgHost('login-logo.png')"></image>
 			<view class="login-form">
@@ -28,6 +28,7 @@
 		data() {
 			return {
 				hasSend: false,
+				isDonate:false,
 				count: 60,
 				inputStyle: {
 					'padding': '0rpx 30rpx',
@@ -46,20 +47,21 @@
 					code: '',
 				},
 				sendTimer: null,
-				type:'me'
+				type: 'me'
 			}
 		},
 		onLoad(options) {
-			this.type=options.id?'course':'me'
+			this.type = options.id ? 'course' : 'me'
+			this.isDonate = options.isDonate?true:false
 		},
 		onUnload() {
-			if(this.sendTimer){
+			if (this.sendTimer) {
 				clearInterval(this.sendTimer);
 				this.sendTimer = null
 			}
 		},
 		onHide() {
-			if(this.sendTimer){
+			if (this.sendTimer) {
 				clearInterval(this.sendTimer);
 				this.sendTimer = null
 			}
@@ -105,7 +107,7 @@
 					return
 				}
 				let that = this
-				console.log("this.type",this.type)
+				console.log("this.type", this.type)
 				this.$u.api.checkMobile({
 					mobile: this.form.mobile,
 					code: this.form.code
@@ -120,11 +122,15 @@
 						'vuex_token': res.token
 					})
 
-					if(that.type=='course'){
+					if (that.type == 'course') {
 						uni.switchTab({
 							url: '/pages/course/index'
 						})
-					}else{
+					} else if (that.isDonate) {
+						uni.redirectTo({
+							url: '/packages/donate/index'
+						})
+					} else {
 						uni.switchTab({
 							url: '/pages/me/index'
 						})
@@ -135,9 +141,9 @@
 					// })
 				})
 			},
-			toRegister(){
+			toRegister() {
 				uni.redirectTo({
-					url:'/packages/register/index'
+					url: '/packages/register/index'
 				})
 			}
 
@@ -230,10 +236,11 @@
 					padding: 20rpx;
 				}
 			}
-			&-msg{
+
+			&-msg {
 				text-align: center;
-				padding:20rpx 0;
-				color:#0d0398;
+				padding: 20rpx 0;
+				color: #0d0398;
 			}
 		}
 	}