From 7d4f1607fe2f84afa517121caceb8456a423e4f6 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Mon, 11 Nov 2024 11:49:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=9A=90=E7=A7=81=E6=94=BF?=
 =?UTF-8?q?=E7=AD=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 http/yskApi/http.js   |  4 ++--
 pages/login/index.vue | 22 ++++++++++++++++------
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/http/yskApi/http.js b/http/yskApi/http.js
index 67aef22..9f39d97 100644
--- a/http/yskApi/http.js
+++ b/http/yskApi/http.js
@@ -17,13 +17,13 @@ import infoBox from "@/commons/utils/infoBox.js"
 import go from '@/commons/utils/go.js';
 import { reject } from 'lodash';
 // 测试服
-let baseUrl = 'https://admintestpapi.sxczgkj.cn'
+// let baseUrl = 'https://admintestpapi.sxczgkj.cn'
 
 //预发布
 // let baseUrl = 'https://pre-cashieradmin.sxczgkj.cn'
 
 //正式
-// let baseUrl = 'https://cashieradmin.sxczgkj.cn'
+let baseUrl = 'https://cashieradmin.sxczgkj.cn'
 
 // 王伟本地测
 // let baseUrl = '/ww'
diff --git a/pages/login/index.vue b/pages/login/index.vue
index 968bfe6..366bca4 100644
--- a/pages/login/index.vue
+++ b/pages/login/index.vue
@@ -109,7 +109,16 @@
 				</view>
 
 			</uni-forms>
-
+			
+			<view class="agreement-policy">
+				<JeepayCheckbox v-model:checked="vdata.isSelectedAgreement" />
+				同意
+				<text class="agreement" @click="toPrivacy">《用户服务协议》</text>
+				<text>与</text>
+				<text class="policy" @click="toPrivacy">《隐私政策》</text>
+			</view>
+			
+			
 			<!-- <view class="agreement-policy">
 				<JeepayCheckbox v-model:checked="vdata.isSelectedAgreement" />
 				同意
@@ -294,10 +303,10 @@
 	function loginFunc() {
 		// 表单验证 
 		formUtil.validate(loginFormRef.value).then(() => {
-			// if (!vdata.isSelectedAgreement) {
-			// 	refAgr.value.open()
-			// 	return false
-			// }
+			if (!vdata.isSelectedAgreement) {
+				infoBox.showToast('请勾选同意用户服务协议与隐私政策')
+				return false
+			}
 			let loginPromise = null;
 			if (vdata.loginType == 'pwd') { // 用户名密码登录 
 				// loginPromise = $loginByPwd(vdata.formData.username, vdata.formData.pwd, vdata.formData.safetyCode)
@@ -340,7 +349,7 @@
 		go.to('PAGES_STATIC_POLICY')
 		// #endif
 		// 打开小程序隐私政策
-		// #ifdef APP-PLUS
+		// #ifdef MP-WEIXIN
 		wx.openPrivacyContract({
 			fail: () => {
 				uni.showToast({
@@ -463,6 +472,7 @@
 
 			.agreement-policy {
 				display: flex;
+				justify-content: center;
 				align-items: center;
 				padding: 0 30rpx;
 				margin-top: 10rpx;