Merge branch 'dev_1.0.0' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into ymf

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'

pages/login/index.vue

@@ -110,6 +110,15 @@
 
 			</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) {
+			if (!vdata.isSelectedAgreement) {
-			// 	refAgr.value.open()
+				infoBox.showToast('请勾选同意用户服务协议与隐私政策')
-			// 	return false
+				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;