Merge branch 'main' of ssh://18.167.251.121:10002/aidlab/Aida_Purchaser_Front

src/views/digitalItem/index.vue

@@ -175,7 +175,7 @@ defineExpose({})
 			justify-content: flex-end;
 			> .filter-item{	
 				:deep(.el-select) {
-					width: 15rem;
+					width: 18rem;
 					--el-border-radius-base: 0;
 					--el-select-input-color: rgba(0, 0, 0, 0.5);
 					--el-select-input-font-size: 1rem;

src/views/home/UrlList.js

@@ -1,8 +0,0 @@
-export const UrlList = {
-	aida: 'https://www.aida.com.hk/',
-	codeCreate: 'https://www.code-create.com/',
-
-}
-export const openView = (url) => {
-	window.open(url, '_blank')
-}

src/views/home/section-aida.vue

@@ -12,7 +12,7 @@
 
 <script setup lang="ts">
 	import { computed, ref } from 'vue'
-	import { UrlList, openView } from './UrlList'
+	import { UrlList, openView } from '../../utils/UrlList'
 </script>
 
 <style lang="less">

src/views/home/section-footer.vue

@@ -52,7 +52,7 @@
 	import { useRouter } from 'vue-router'
 	const router = useRouter()
 	import HomeFooter from '@/components/Footer.vue'
-	import { UrlList, openView } from './UrlList'
+	import { UrlList, openView } from '../../utils/UrlList'
 </script>
 
 <style lang="less">

src/views/login/login.vue

@@ -33,7 +33,7 @@
 
 <script setup lang="ts">
 	import { computed, reactive, ref } from 'vue'
-	import { validateEmail, validatePassLength, validatePrivacy } from './tools'
+	import { validateEmail, validatePass, validatePrivacy } from './tools'
 	import OtherLogin from './other-login.vue'
 	const emit = defineEmits(['retrieve-password', 'login'])
 	const props = defineProps({
@@ -43,7 +43,7 @@
 	})
 	const ruleForm = reactive({
 		email: [{ validator: validateEmail, trigger: 'change' }],
-		password: [{ validator: validatePassLength, trigger: 'change' }],
+		password: [{ validator: validatePass, trigger: 'change' }],
 		privacy: [{ validator: validatePrivacy, trigger: 'change' }]
 	})
 	const formData = reactive({

src/views/pay/payment.vue

@@ -14,7 +14,15 @@
 			</div>
 			<div class="agreement">
 				<el-checkbox v-model="agreement">
-					<div class="text" v-html="$t('Pay.AgreementText')"></div
+					<div
+						class="text"
+						v-html="
+							$t('Pay.AgreementText', {
+								onTermsClick: 'openTermsView()',
+								onPrivacyClick: 'openPrivacyView()'
+							})
+						"
+					></div
 				></el-checkbox>
 			</div>
 			<div class="title">
@@ -90,6 +98,17 @@
 	import { CreateOrder, ORDER_STATUS, GetOrderStatus } from '@/api/shoppingCart'
 	import { useRouter, useRoute } from 'vue-router'
 	import { ElMessage } from 'element-plus'
+	import { UrlList, openView } from '@/utils/UrlList'
+	window['openTermsView'] = () => {
+		const e = window.event as Event
+		e.preventDefault()
+		openView(UrlList.terms)
+	}
+	window['openPrivacyView'] = () => {
+		const e = window.event as Event
+		e.preventDefault()
+		openView(UrlList.privacy)
+	}
 	const onBack = () => router.back()
 	const router = useRouter()
 	const route = useRoute()
@@ -124,7 +143,7 @@
 	const createOrderCall = (res: any) => {
 		const url = res.paymentLink
 		const paymentId = res.paymentId
-		openView(url)
+		openPayView(url)
 		router.replace({
 			query: {
 				list: query.value.list,
@@ -143,7 +162,7 @@
 		})
 	}
 	const viewTime = ref(null)
-	const openView = (url, width = 600, height = 800) => {
+	const openPayView = (url, width = 600, height = 800) => {
 		const left = (screen.width - width) / 2
 		const top = (screen.height - height) / 2
 		const view = window.open(

src/views/shopping-drawer.vue

@@ -53,10 +53,10 @@ const {} = toRefs(data);
 			<div class="content">
 				<div class="img-list">
 					<div class="img-box">
-						<img :src="img" alt="">
+						<!-- <img :src="img" alt=""> -->
 					</div>
 					<div class="img-box">
-						<img :src="img" alt="">
+						<!-- <img :src="img" alt=""> -->
 					</div>
 					<div class="img-box">
 						<img :src="cover" alt="">