1

config.js

@@ -1,6 +1,6 @@
 // 应用全局配置
 module.exports = {
-	baseUrl: 'http://192.168.1.4:8081',
+	baseUrl: 'https://notice.lighting-it.cn',
 	// baseUrl: 'http://localhost:8080',
 	// 应用信息
 	appInfo: {

pages/login.vue

@@ -1,9 +1,8 @@
 <template>
 	<view class="normal-login-container">
 		<view class="logo-content align-center justify-center flex">
-			<!--      <image style="width: 100rpx;height: 100rpx;" :src="globalConfig.appInfo.logo" mode="widthFix">-->
+			<image style="width: 260rpx;height: 260rpx;" src="@/static/logo.png" mode="widthFix">
-			<!--      </image>-->
+			</image>
-			<text class="title">请登录</text>
 		</view>
 		<view class="login-form-content">
 			<!--      <view class="input-item flex align-center">-->
@@ -23,7 +22,7 @@
 			<!--      </view>-->
 			<view class="action-btn">
 				<button open-type="getPhoneNumber" @getphonenumber="getPhone"
-					class="login-btn cu-btn block bg-blue lg round">手机号快捷登录</button>
+					class="login-btn cu-btn block bg-blue lg round" style="background-color: #FC1F3E;">手机号快捷登录</button>
 				<!--        <button @click="handleLogin" class="login-btn cu-btn block bg-blue lg round">登录</button>-->
 				<!--        <u-button open-type='getPhoneNumber' text="手机号快捷登录" @getphonenumber="wxHandleLogin" class="login-btn cu-btn block bg-green lg round"></u-button>-->
 			</view>
@@ -32,11 +31,11 @@
 			<!--        <text @click="handleUserRegister" class="text-blue">立即注册</text>-->
 			<!--      </view>-->
 			<view class="xieyi text-center">
-				<text class="text-grey1">登录即代表同意</text>
+				<uni-data-checkbox @change="chooseAllFun()" multiple :localdata="chooseAll" />
-				<text @click="handleUserAgrement(globalConfig.appInfo.agreements[0])"
+				<text @click="handleUserAgrement(globalConfig.appInfo.agreements[0])" class="text-blue"
-					class="text-blue">《{{globalConfig.appInfo.agreements[0].title}}》</text>
+					style="color: #FC1F3E;font-size: 14px;">《{{globalConfig.appInfo.agreements[0].title}}》</text>
-				<text @click="handleUserAgrement(globalConfig.appInfo.agreements[1])"
+				<text @click="handleUserAgrement(globalConfig.appInfo.agreements[1])" class="text-blue"
-					class="text-blue">《{{ globalConfig.appInfo.agreements[1].title }}》</text>
+					style="color: #FC1F3E;font-size: 14px;">《{{ globalConfig.appInfo.agreements[1].title }}》</text>
 			</view>
 		</view>
 
@@ -47,7 +46,9 @@
 	import {
 		getCodeImg
 	} from '@/api/login'
-
+	import {
+		toast
+	} from '@/utils/common'
 
 	export default {
 		data() {
@@ -68,7 +69,13 @@
 					code: "",
 					encryptedIv: "",
 					encryptedData: ""
-				}
+				},
+				chooseAll: [{
+					text: '我已阅读并同意',
+					value: true
+				}],
+				//是否同意
+				ifAgree: false,
 			}
 		},
 		created() {
@@ -76,6 +83,19 @@
 			this.wxLogin()
 		},
 		methods: {
+			/**
+			 * 同意
+			 * @param {Object} e
+			 */
+			chooseAllFun(e) {
+				if (e.detail.value.length > 0) {
+					//同意
+					this.ifAgree = true
+				} else {
+					//未勾选
+					this.ifAgree = false
+				}
+			},
 			// 用户注册
 			handleUserRegister() {
 				this.$tab.redirectTo(`/pages/register`)
@@ -110,6 +130,10 @@
 			},
 			//微信授权登录
 			getPhone(e) {
+				if (!this.ifAgree) {
+					toast("请先阅读并同意《隐私协议》《用户服务协议》")
+					return
+				}
 				console.log("微信小程序发起授权登录")
 				this.$modal.loading("登录中...")
 				uni.checkSession({
@@ -181,6 +205,10 @@
 		background-color: #ffffff;
 	}
 
+	.checklist-box {
+		margin-right: 0rpx !important;
+	}
+
 	.dl {
 		width: 90%;
 		height: 44px;
@@ -201,7 +229,7 @@
 			width: 100%;
 			font-size: 21px;
 			text-align: center;
-			padding-top: 15%;
+			padding-top: 55%;
 
 			image {
 				border-radius: 4px;
@@ -212,11 +240,16 @@
 			}
 		}
 
+		.action-btn {
+			margin: auto;
+			width: 80%;
+		}
+
 		.login-form-content {
 			text-align: center;
 			margin: 20px auto;
 			margin-top: 15%;
-			width: 80%;
+			width: 100%;
 
 			.input-item {
 				margin: 20px auto;
@@ -250,6 +283,9 @@
 			}
 
 			.xieyi {
+				display: flex;
+				align-items: center;
+				justify-content: center;
 				color: #333;
 				margin-top: 20px;
 			}