~admin/hmy_farmer-main.git

			@@ -51,10 +51,18 @@
			// #endif
			}
			// #endif
			// #ifdef PUB_CUSTOMER
			uni.reLaunch({
			url: '/pages/home/home'
			})
			// #ifdef PUB_CUSTOMER
			// 需要处理一下，判断是跳转登录还是原封不动
			if(options.partnerUserId){
			//需要去注册页面
			console.log('options',options)

			}else{
			uni.reLaunch({
			url: '/pages/home/home'
			})
			}

			// #endif

			},
			@@ -402,7 +410,9 @@
			.m-t-15 {
			margin-top: 30rpx;
			}

			.p-t-12{
			padding-top: 30rpx;
			}
			.m-t-icon {
			margin-top: 8rpx;
			}
			@@ -774,7 +784,6 @@

			.msg-tip {
			font-size: 24rpx;
			font-family: PingFangSC, PingFang SC;
			font-weight: 400;
			color: #999999;
			line-height: 34rpx;
			@@ -892,7 +901,6 @@
			border-radius: 62rpx;

			font-size: 32rpx;
			font-family: PingFangSC, PingFang SC;
			font-weight: 600;
			color: #FFFFFF;
			line-height: 80rpx;
			@@ -909,7 +917,6 @@
			border-radius: 62rpx;
			border: 2rpx solid #666666;
			font-size: 32rpx;
			font-family: PingFangSC, PingFang SC;
			font-weight: 400;
			color: #666666;
			line-height: 92rpx;
			@@ -920,7 +927,6 @@
			.close-parent {
			position: relative;
			font-size: 28rpx;
			font-family: PingFangSC, PingFang SC;
			font-weight: 600;
			color: #000000;
			line-height: 40rpx;