登录页隐私协议 服务协议链接

manifest.json

@@ -2,8 +2,8 @@
     "name" : "云飞智控",
     "appid" : "__UNI__DBA6730",
     "description" : "",
-    "versionName" : "1.9.5",
-    "versionCode" : 195,
+    "versionName" : "1.9.6",
+    "versionCode" : 196,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

pages/login/login.vue

@@ -12,18 +12,31 @@
 				<view class="uni-form-item uni-column">
 					<view class="username">
 						<u-icon name="account" size="36" style="margin-right:30rpx;color: #fff;"></u-icon>
-						<u-input class="uni-input" name="username" v-model="formdata.username" placeholder-class="icon iconfont icon-bianji1"
-						 placeholder="请输入用户名" placeholderStyle="color:#ffffff;" color="#FFFFFF" @blur="blur" />
+						<u-input class="uni-input" name="username" v-model="formdata.username"
+							placeholder-class="icon iconfont icon-bianji1" placeholder="请输入用户名"
+							placeholderStyle="color:#ffffff;" color="#FFFFFF" @blur="blur" />
 					</view>
 					<view class="passwold">
 						<u-icon name="lock" size="36" style="margin-right:30rpx;color: #fff;"></u-icon>
-						<u-input v-model="formdata.passwold" type="password" :password-icon="true" :clearable="false" placeholder="请输入密码"
-						 @confirm="formSubmit" @input="passwoldddata" placeholderStyle="color:#fff;" suffixIconStyle="color:#fff;" color="#fff" class="uni-input" />
+						<u-input v-model="formdata.passwold" type="password" :password-icon="true" :clearable="false"
+							placeholder="请输入密码" @confirm="formSubmit" @input="passwoldddata"
+							placeholderStyle="color:#fff;" suffixIconStyle="color:#fff;" color="#fff"
+							class="uni-input" />
 					</view>
-					<view class="aboutpass">
+					<!-- <view class="aboutpass">
 						<u-checkbox-group>
-							<u-checkbox v-model="checked" :label-disabled="false" size="28" @change="rempass">记住密码</u-checkbox>
+							<u-checkbox v-model="checked" :label-disabled="false" size="28"
+								@change="rempass">记住密码</u-checkbox>
 						</u-checkbox-group>
+					</view> -->
+					<view class="checkInfo">
+						<u-checkbox-group >
+							<u-checkbox v-model="isAgree" :customStyle="{marginBottom: '8px'}" :label-disabled="false" @change="checkboxChange">
+							</u-checkbox>
+						</u-checkbox-group>
+						<view class="link">
+							已阅读并同意<a href="http://8.136.98.49:8002/service_negotiate/">服务协议</a>和<a href="http://8.136.98.49:8002/safe_negotiate/">隐私政策</a>
+						</view>
 					</view>
 					<view class="uni-btn-v">
 						<button form-type="submit" @click="denglu">登 录</button>
@@ -49,14 +62,16 @@
 						<u-icon :name="arrowtf?'arrow-up':'arrow-down'" @click="arrow"></u-icon>
 					</view>
 					<scroll-view scroll-y="true" class="scroll-Y" v-if="arrowtf">
-						<view :id="'demo'+index" class="scroll-view-item uni-bg-red" v-for="item,index in httparr" :key="index" @click="value = item">{{item}}</view>
+						<view :id="'demo'+index" class="scroll-view-item uni-bg-red" v-for="item,index in httparr"
+							:key="index" @click="value = item">{{item}}</view>
 					</scroll-view>
 				</view>
 			</view>
 		</view>
 		<u-modal title="升级中请勿随意操作" :show-confirm-button="false" v-model="showA" :content="contentA">
 			<view class="upgradeBox">
-				<u-line-progress v-show="isShow" active-color="#19be6b" :striped="true" :percent="percentNum" :striped-active="true"></u-line-progress>
+				<u-line-progress v-show="isShow" active-color="#19be6b" :striped="true" :percent="percentNum"
+					:striped-active="true"></u-line-progress>
 			</view>
 		</u-modal>
 	</view>
@@ -66,6 +81,7 @@
 	export default {
 		data() {
 			return {
+				isAgree: false,
 				checked: false,
 				formdata: {
 					username: '',
@@ -84,8 +100,7 @@
 				turnover: true,
 			}
 		},
-		onLoad() {
-		},
+		onLoad() {},
 		onShow() {
 			uni.getStorage({
 				key: 'user_pass',
@@ -121,6 +136,9 @@
 			this.getEquipList()
 		},
 		methods: {
+			checkboxChange(e) {
+				this.isAgree = e.value;
+			},
 			async getEquipList() {
 				const res = await this.$myRequest({
 					url: '/api/api_gateway?method=home.homes.app_version_record',
@@ -131,7 +149,7 @@
 				console.log(res)
 				this.appName = res[0].app_name
 				this.versions = Number(res[0].app_num.match(/\d+/g).join(""))
-				var id = Number(plus.runtime.version.match(/\d+/g).join(""))
+				let id = Number(plus.runtime.version.match(/\d+/g).join(""))
 				console.log(this.versions, plus.runtime.version)
 				if (this.percentNum > 0) {
 					console.log("更新中")
@@ -176,7 +194,7 @@
 									}
 								}
 							})
-						}else{
+						} else {
 							uni.getStorage({
 								key: 'session_key',
 								success: (res) => {
@@ -208,12 +226,12 @@
 				console.log(this.appName)
 				// var url = this.value + "/app_file/" + this.appName
 				var appName = ""
-				if(this.$isneutral){
-					appName = "big_data"//云飞
-				}else{
-					appName = "big_data2"//中性
+				if (this.$isneutral) {
+					appName = "big_data" //云飞
+				} else {
+					appName = "big_data2" //中性
 				}
-				var url = "http://hnyfwlw.com/app/"+appName+".apk"
+				var url = "http://hnyfwlw.com/app/" + appName + ".apk"
 				const downloadTask = uni.downloadFile({
 					url: url, //仅为示例，并非真实的资源
 					success: (res) => {
@@ -241,6 +259,13 @@
 				});
 			},
 			async formSubmit() {
+				if(!this.isAgree) {
+					uni.showToast({
+						title: "请先阅读并同意服务协议、隐私协议",
+						icon: "error"
+					})
+					return
+				}
 				console.log(11111)
 				const res = await this.$myRequest({
 					url: '/api/api_gateway?method=user.login.login_user',
@@ -337,17 +362,19 @@
 </script>
 
 <style lang="scss">
-	page{
+	page {
 		background-image: url(../../static/images/login/bg.png);
 		background-size: 100% 100%;
 		padding-top: 700rpx;
 	}
-	.apptitle{
+
+	.apptitle {
 		font-size: 52rpx;
 		color: #fff;
 		width: 80%;
 		margin: 0 auto 40rpx;
 	}
+
 	.logo {
 		width: 100%;
 		height: 340rpx;
@@ -384,6 +411,7 @@
 	/deep/.u-input__right-icon {
 		line-height: 35px !important;
 	}
+
 	.uni-form-item {
 		width: 100%;
 
@@ -393,7 +421,7 @@
 			display: flex;
 			margin-bottom: 40rpx;
 			padding-bottom: 10rpx;
-			border-bottom: 2rpx solid rgba(249,249,249,0.4);
+			border-bottom: 2rpx solid rgba(249, 249, 249, 0.4);
 
 			.u-icon__icon {
 				margin-top: 17rpx;
@@ -403,7 +431,8 @@
 				width: 100%;
 				color: #fff;
 			}
-			/deep/.uni-input-input{
+
+			/deep/.uni-input-input {
 				color: #fff;
 			}
 		}
@@ -414,19 +443,22 @@
 			display: flex;
 			margin-bottom: 40rpx;
 			padding-bottom: 10rpx;
-			border-bottom: 2rpx solid rgba(249,249,249,0.4);
+			border-bottom: 2rpx solid rgba(249, 249, 249, 0.4);
 
 			.u-icon__icon {
 				margin-top: 17rpx;
 			}
-			/deep/.uni-input-input{
+
+			/deep/.uni-input-input {
 				color: #fff;
 			}
+
 			.uni-input {
 				width: 100%;
 				color: #fff;
 			}
-			/deep/.uicon-eye{
+
+			/deep/.uicon-eye {
 				color: #fff !important;
 			}
 		}
@@ -441,17 +473,28 @@
 				color: #fff;
 				font-size: 28rpx;
 			}
-			/deep/.uicon-checkbox-mark{
+
+			/deep/.uicon-checkbox-mark {
 				border-color: #FF0000;
 				// color: #f00 !important;
 			}
+
 			/deep/.u-checkbox__label {
 				font-size: 28rpx;
 				color: #fff;
 				margin-right: 0;
 			}
 		}
-
+		.checkInfo{
+			width: 80%;
+			margin: 0 auto;
+			display: flex;
+			align-items: center;
+			color: #fff;
+			a{
+				color: #2979ff;
+			}
+		}
 		.uni-btn-v {
 			width: 80%;
 			margin: 112rpx auto 0;
@@ -464,7 +507,7 @@
 				line-height: 90rpx;
 				color: #FFFFFF;
 				font-size: 36rpx;
-				background-image: linear-gradient(to bottom, rgba(249,249,249,0.6), rgba(249, 249, 249, 0.1));
+				background-image: linear-gradient(to bottom, rgba(249, 249, 249, 0.6), rgba(249, 249, 249, 0.1));
 				color: #5DC18B;
 			}
 		}
@@ -544,4 +587,4 @@
 	.upgradeBox {
 		padding: 15rpx;
 	}
-</style>
+</style>