修改

pages/homepage/homepage.vue

@@ -243,4 +243,4 @@
 
 <style lang="scss">
 	@import "./homepage.scss";
-</style>
+</style>

pages/register/register.vue

@@ -81,25 +81,20 @@
 			</u-form>
 		</view>
 		<view class="bottom">
-			<view class="radio">
+			<view class="radio-content">
-				<u-radio-group style="display: inline-block;position: relative;top: 5rpx;left: 26rpx;" size='20'
+				<view class="radio-right" @tap="changeRadio">
-					@change="onChange" v-model="selected">
+					<view class="radio" :class="selected == 2 ? 'radio-default':''">
-					<u-radio shape="circle" active-color="#26A888" name="1" />
+						<view :class="selected == 2 ? 'radio-active':''"></view>
-					<!-- <radio value="1"  active-color="#26A888"></radio> -->
+					</view>
-				</u-radio-group>
+				</view>
-
+				<view class="agreement">我已阅读并同意<text style="color: #26A888;" @tap='maskshow=true'>《用户协议》</text>
-				<view class="agreement">我已阅读并同意<text @tap='maskshow=true'>《用户协议》</text>
 				</view>
 			</view>
 			<view class="sbumit" @tap="submit">
-
 				提交
 			</view>
-
 		</view>
-
 		<u-toast ref="uToast" />
-
 		<u-mask :show="maskshow" class='mask' @click='maskshow=false'>
 			<view class="Agreement">
 				<view class="title">
@@ -184,9 +179,7 @@
 						disabled: false
 					}
 				],
-				// radio: 1,
+				selected: 1,
-
-				selected: '',
 				options: [{
 					value: '1',
 					label: '高血压'
@@ -200,8 +193,6 @@
 					value: '0',
 					label: '无'
 				}],
-				// checked:false,
-				// chooseLocation: '', //地图选址
 				arealist: [], //区街道list
 				list: [{
 					id: "",
@@ -332,7 +323,7 @@
 				}
 				that.$refs.uForm.validate(valid => {
 					if (valid) {
-						if (!that.selected) {
+						if (that.selected == 1) {
 							that.$refs.uToast.show({
 								title: '请审核并同意用户协议',
 								type: 'error'
@@ -364,6 +355,10 @@
 					} else {}
 				});
 			},
+			//切换
+			changeRadio() {
+				this.selected == 1 ? this.selected = 2 : this.selected = 1
+			},
 			// 性别
 			sexchange(e) {
 				if (e == '男') {
@@ -494,13 +489,6 @@
 			// 		}
 			// 	});
 			// },
-			//护理类型请求
-			// getNurseTypeInfo() {
-			// 	getNurseType().then(res => {
-			// 		this.medicalcarelist = res.data.filter(e => e.nurseTypeName == '医疗护理')
-			// 		this.getNurseTypelist = res.data.filter(e => e.nurseTypeName != '医疗护理')
-			// 	})
-			// },
 			//区街道
 			areaInfo() {
 				getSubordinateRegions().then(res => {
@@ -536,18 +524,7 @@
 					this.query.nurseTypeIdList = this.query.nurseTypeIdList.filter(e => e != item.id)
 				}
 			},
-			godisease(item) {
+			godisease(item) {},
-				// uni.navigateTo({
-				// 	url: `/pagesB/disease/disease?diseaseInfoList=${JSON.stringify(this.query.diseaseInfoList)}`
-				// })
-			},
-			changeRadio() {
-				if (this.radio == 1) {
-					this.radio = 2;
-				} else {
-					this.radio = 1;
-				}
-			},
 			tapradio() {
 				this.selected = 1;
 				this.maskshow = false;
@@ -566,18 +543,9 @@
 			this.areaInfo()
 			// this.getNurseTypeInfo();
 		},
-		// onUnload() {
-		//      // 移除监听事件
-		//         uni.$off('code');
-		// },
-
 		//带参返回
 		// 从地图选点插件返回后，在页面的onShow生命周期函数中能够调用插件接口，取得选点结果对象
 		onShow() {
-			// uni.$on('headPictureUrl',(res)=>{
-			// 				 console.log(res, '000') //  为 B 页面传过来的值
-			//        // this.usnerinfo = options;
-			//    })
 			var that = this
 			const invitationPatientId = uni.getStorageSync('invitationPatientId')
 			if (invitationPatientId) {
@@ -595,32 +563,13 @@
 			// 	that.query.homeLongitude = location.longitude;
 			// 	that.query.homeLatitude = location.latitude;
 			// }
-			uni.$on('disease', function(data) {
-				that.query.diseaseInfoList = JSON.parse(data.disease)
-				if (that.query.diseaseInfoList.length > 0) {
-					that.medicalcarelist.forEach(e => {
-						if (that.query.nurseTypeIdList.findIndex(el => el == e.id) == -1) {
-							that.query.nurseTypeIdList.push(e.id)
-						} else {}
-					})
-				} else {
-					that.medicalcarelist.forEach(e => {
-						that.query.nurseTypeIdList = that.query.nurseTypeIdList.filter(el => el != e.id)
-					})
-				}
-				uni.$off('disease')
-			})
 		},
-
-
-
-
-
 	}
 </script>
 
-<style lang="less" scoped>
+<style lang="scss">
 	.register {
+		padding-bottom: 100rpx;
 		display: flex;
 		flex-direction: column;
 		justify-content: center;
@@ -867,24 +816,44 @@
 			position: relative;
 			width: 100%;
 
-			.radio {
+			.radio-content {
-				position: relative;
+				width: 100%;
-				width: 44%;
+				height: 100rpx;
-				left: 50%;
+				text-align: center;
-				transform: translateX(-50%);
+				margin: 0 auto;
-				margin-top: 10%;
+				display: flex;
-				bottom: 20rpx;
+				align-items: center;
-
 
 				.agreement {
-					// width: 225rpx;
+					color: #333333;
-					// height: 17rpx;
+					width: 80%;
-					font-size: 18rpx;
+					text-align: left;
-					font-family: Source Han Sans CN;
+					padding-left: 20rpx;
-					font-weight: 500;
+				}
-					color: #26A888;
+
-					// line-height: 38rpx;
+				.radio-right {
-					display: inline-block;
+					width: 20%;
+
+					.radio {
+						display: inline-block;
+						width: 30rpx;
+						height: 30rpx;
+						border-radius: 70%;
+						border: 2rpx solid #26A888;
+						position: relative;
+						float: right;
+
+						.radio-active {
+							width: 15rpx;
+							height: 15rpx;
+							border-radius: 50%;
+							background-color: #178ffb;
+							position: absolute;
+							top: 50%;
+							left: 50%;
+							transform: translate(-50%, -50%);
+						}
+					}
 				}
 			}
 
@@ -901,16 +870,13 @@
 				color: #FFFFFF;
 				left: 50%;
 				position: relative;
-				margin-top: 20rpx;
+				margin-top: 100rpx;
 				// -webkit-transform: translateY(-50%);
 				transform: translateX(-50%);
 				bottom: 20rpx;
-
 			}
-
 		}
 
-
 		// 	.btn {
 		// 		width: 496rpx;
 		// 		height: 61rpx;