!52 2022-1-20 Leung

Merge pull request !52 from Admin/sit-Leung

rc-busness/assets/css/login.less

@@ -1,7 +1,7 @@
 .container{
 	min-height:100vh;
 	height:100%;
-	background-color:#f6f6f6;
+	background-color:#fff;
 	display: flex;
 	flex-direction: column;
 }
@@ -22,6 +22,7 @@
 @media screen and (max-width:768px) {
 	.ts-max-width--460{
 		padding:4.375rem 1.25rem;
+		box-shadow: unset;
 	}
 	.rc-column *{
 		font-size:.875rem;

rc-busness/components/addressInput.vue

@@ -41,6 +41,7 @@ export default {
 	props:["defaultValues"],
 	data(){
 		return{
+			animationTimer:undefined,
 			displayValue:"",
 			returnValue:"",
 			returnValueArr:[],
@@ -158,7 +159,7 @@ export default {
 						if(obj.id.indexOf(provinceId)<0)
 						{
 							console.log('500 : error via checking validatePickedValues');
-							_self.returnValueArr[index]={};
+							_self.returnValueArr.splice(index,1);
 						}
 						else
 						{
@@ -172,7 +173,7 @@ export default {
 						if(areaId && obj.id.indexOf(areaId)<0)
 						{
 							console.log('501 : error via checking validatePickedValues');
-							_self.returnValueArr[index]={};
+							_self.returnValueArr.splice(index,1);
 						}
 						else{
 							validatedIndex=index;
@@ -230,9 +231,15 @@ export default {
 				//TODO show warning here
 				let errorEle=document.querySelector(".ts-area-picker-values");
 				errorEle.classList.add("error");
-				setTimeout(function(){
+				let _self = this;
-					errorEle.classList.remove("error");
+				if(!this.animationTimer)
-				},2000);
+				{
+					this.animationTimer = setTimeout(function(){
+						errorEle.classList.remove("error");
+						clearTimeout(_self.animationTimer);
+						_self.animationTimer=undefined;
+					},2000);
+				}
 				tabIndex=lastValidatedTabIndex+1;
 			}
 			this.curDisplayingColIndex=tabIndex;
@@ -304,6 +311,23 @@ export default {
 	.ts-area-picker-values{
 		width:100%;
 		height:100%;
+		&.error{
+			position:relative;
+			width:100%;
+			height:78%;
+			&:after{
+				content: " ";
+				position:absolute;
+				width:100%;
+				height:100%;
+				left:0;
+				top:0;
+				animation-name: flash-error;
+				animation-iteration-count: 2;
+				animation-duration: .5s;
+				animation-direction: forwards;
+			}
+		}
 		ul{
 			padding:1rem 2.5rem 2rem 2.5rem;
 			margin:0;
@@ -396,10 +420,12 @@ export default {
 	@keyframes flash-error
 	{
 		from {
-			opacity:.6;
+			opacity:0;
+			background-color:#fff;
 		}
 		to {
 			opacity:.3;
+			background-color:#E2001A;
 		}
 	}
 </style>

rc-busness/nuxt.config.js

@@ -4,10 +4,10 @@ export default {
   
   // Global page headers: https://go.nuxtjs.dev/config-head
   head: {
-    title: 'rc-busness',
+    title: '皇家官方商城',
     
     htmlAttrs: {
-      lang: 'en',
+      lang: 'zh-cn',
     },
     script: [
       //{ src: '/js/rem.js' },

rc-busness/pages/index.vue

@@ -1067,7 +1067,8 @@
 			spaceBetween: 0,
 			autoplay: true,
 			pagination: {
-				el: '#homeBannerSwiperPagnation'
+				el: '#homeBannerSwiperPagnation',
+				clickable:true
 			},
 			paginationClickable: true,
 			loopAdditionalSlides: 100,
@@ -1094,6 +1095,7 @@
 			loopAdditionalSlides: 100,
 			pagination: {
 				el: '#catStarSwiperPagnation',
+				clickable:true
 			},
 			navigation: {
 				nextEl: '.swiper-button-next',
@@ -1117,6 +1119,7 @@
 			loopAdditionalSlides: 100,
 			pagination: {
 				el: '#dogStarSwiperPagnation',
+				clickable:true
 			},
 			navigation: {
 				nextEl: '.swiper-button-next',

rc-busness/pages/userlogin/edit.vue

@@ -64,7 +64,7 @@
       </div>
       <div class="rc-layout-container rc-two-column rc-button">
         <div class="rc-column rc-text--left">
-          <a href="#" class="rc-styled-link"><span>隐私政策</span></a>
+          <a href="https://royalcanin.com.cn/privacy" target="_blank" class="rc-styled-link"><span>隐私政策</span></a>
         </div>
         <div class="rc-column rc-text--right">
           <nuxt-link :to="`/userlogin/login/`" class="rc-styled-link">

rc-busness/pages/userlogin/login.vue

@@ -84,7 +84,7 @@
       </div>
       <div class="rc-layout-container rc-two-column rc-button">
         <div class="rc-column rc-text--left">
-          <a href="#" class="rc-styled-link"><span>隐私政策</span></a>
+          <a href="https://royalcanin.com.cn/privacy" target="_blank" class="rc-styled-link"><span>隐私政策</span></a>
         </div>
         <div class="rc-column rc-text--right">
           <nuxt-link :to="`/userlogin/edit/`" class="rc-styled-link">