Merge branch 'dev' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into gh

pages/index/index.vue

@@ -184,11 +184,11 @@
 		// 	icon: '/static/indexImg/icon-cashier.svg',
 		// 	pageUrl: 'PAGES_SHOP_SETUP',
 		// },
-		// {
-		// 	title: '优惠券',
-		// 	icon: '/static/coupon/icon_coupon.svg',
-		// 	pageUrl: 'PAGES_COUPON_INDEX',
-		// },
+		{
+			title: '优惠券',
+			icon: '/static/coupon/icon_coupon.svg',
+			pageUrl: 'PAGES_COUPON_INDEX',
+		},
 		{
 			title: '订阅通知',
 			icon: '/static/indexImg/icon-notification.svg',

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;